diff --git a/.tx/config b/.tx/config
index 842cff547f7f4f4475b7d7dd7f03bd510d949053..c08b50e7040b9f45728a9af0db2efb87d24de103 100644
--- a/.tx/config
+++ b/.tx/config
@@ -2,7 +2,7 @@
host = https://www.transifex.com
type = PO
-[FusionDirectory-109.core]
+[FusionDirectory-110.core]
file_filter = locale/<lang>/fusiondirectory.po
source_file = locale/en/fusiondirectory.po
source_lang = en
diff --git a/Changelog b/Changelog
index c9db9fe3e1afff82e1c65eacae2181e065408dc6..d62b8622f3162d1aa50595ec86db333c84c85f22 100644
--- a/Changelog
+++ b/Changelog
@@ -1,23 +1,103 @@
FusionDirectory changelog
=========================
+* FusionDirectory 1.0.10
+
+[Feature] Bugs #1217: DNS service must be redone
+|Fix] Bugs #2171: creating CNAME entries is not intuitive
+|Fix] Bugs #2573: when changing the address range of a no used zone name, the reverse of the dns of this zone break
+|Fix] Bugs #4251: When I have DNS zone created, DNS plugin asks for subnet and netmask for that zone.
+|Fix] Bugs #4468: Error when I try to move a system with the DNS tab activate
+|Fix] Bugs #4476: rewrite the part about fusiondirectory core in the documentation
+|Fix] Bugs #4477: rewrite the configuration password recovery page as this as been integrated into the configuration in core
+|Fix] Bugs #4480: LDAP::convert and LDAP::fix functions are causing problems
+|Fix] Bugs #4482: Debug log prevent connection in some cases
+[Feature] Bugs #4484: allow ldap ipv6 uris
+|Fix] Bugs #4490: nagios.tpl file is not used anymore
+|Fix] Bugs #4495: Use ldap_escape in compute_dn
+[Feature] Bugs #4496: DNS plugin should support RFC 2317 for reverse zones
+|Fix] Bugs #4498: Bad error message when we will use a GID with a non-existent group
+[Feature] Bugs #4504: Support for split horizon should be added
+|Fix] Bugs #4505: fusiondirectory-setup --migrate-users not work when the users don't have all the samba attributs
+|Fix] Bugs #4508: second email and first email are inverted in the password recovery configuration page
+|Fix] Bugs #4509: Force GID option is broken
+|Fix] Bugs #4511: Add a button to launch argonaut-ldap2zone from FusionDirectory
+|Fix] Bugs #4512: when using cyrus in unix hierarchy mode and creating a user and activating mail tab at the same time, the mailbox is not created
+|Fix] Bugs #4514: It takes too long to load the reference tab for a DNS zone
+[Feature] Bugs #4515: fusiondirectory-setup need an option to migrate the dns 1.0.9.x version to 1.0.10
+|Fix] Bugs #4517: Some obsolete objectClass are still searched for in config
+|Fix] Bugs #4518: Plugin deletion contains some useless ldap operation
+|Fix] Bugs #4519: ldap::rmdir_recursive is not optimal
+|Fix] Bugs #4520: Syslog server field should be removed
+|Fix] Bugs #4521: LDAP server field should be removed (gotoLdapField)
+|Fix] Bugs #4523: ntp server should be removed
+[Feature] Bugs #4525: we should have attribute for start and end date into the personal-fd.schema and add it to the personal schema
+[Feature] Bugs #4526: add "co" attribute into personal-fd.schema and into personal plugin
+[Feature] Bugs #4527: create a community plugin to manage community aka organization and projects
+[Feature] Bugs #4528: tab community on the user
+[Feature] Bugs #4529: The category in department and organization should be a dropdown filled from the configuration backend
+[Feature] Bugs #4530: in the department and organization we need to add the labeledUri
+[Feature] Bugs #4531: The co (country friendlyName) in department and organization should be added and be dropdown filled from the configuration backend
+[Feature] Bugs #4532: the personal plugin should have a field where we can put the badge number
+[Feature] Bugs #4533: make a subcontracting plugin
+|Fix] Bugs #4540: Problème avec les vcf (vcards)
+|Fix] Bugs #4541: [intégration du schéma OPENNEBULA et création du plugin de gestion des groupes]
+|Fix] Bugs #4542: fusiondirectory-setup --deprecated-ldif not found the asterisk deprecated
+[Feature] Bugs #4543: Add an option to fusiondirectory-setup to see the uid that are duplicated
+[Feature] Bugs #4544: Possibility to see the uid that are duplicate when we install FusionDirectory
+|Fix] Bugs #4545: When we migrate an old FusionDirectory we not have argonautClientProtocol attribute
+|Fix] Bugs #4555: the terminal plugin has an error with the latest ntp removal fix
+|Fix] Bugs #4557: when a user is on top people branch and get an acl in subtree for a lower branch i get " The supplied base is not valid and has been reset to the previous value! "
+[Feature] Bugs #4561: be able to select all user from ou=people,dc=opensides,dc=be but be confined to your branch for all the rest
+[Feature] Bugs #4562: add http auth
+|Fix] Bugs #4563: DNS zone serial is not updated when record are changed through the DNS tab of a system
+|Fix] Bugs #4569: Groups containing unknown type objects or deleted objects does not appear
+|Fix] Bugs #4575: Error with samba plugin and sambantpassword attribute
+[Feature] Bugs #4576: create tab for the plugin community onto organization and department
+[Feature] Bugs #4580: Newsletter plugin
+|Fix] Bugs #4591: It’s impossible to delete root records in DNS zones
+|Fix] Bugs #4592: its best if we use the /html/themes everywher in place of /html/images evertime is possible
+|Fix] Bugs #4600: 'base' sticky or not ?
+|Fix] Bugs #4602: assignements / object selection step : sometimes the current object doesn't shows up
+|Fix] Bugs #4603: With debug set, toggle button is absent when selecting users to add them to a group
+|Fix] Bugs #4605: inside group selections of users, the selections is not showing all users
+[Feature] Bugs #4606: the login column is missing in the groupOfname user selection list
+|Fix] Bugs #4608: assignements / object selection step : sometimes the current object doesn't shows up
+|Fix] Bugs #4610: postalAddress (and homepostalAddress) content should stick to the RFC
+|Fix] Bugs #4610: postalAddress (and homepostalAddress) content should stick to the RFC
+|Fix] Bugs #4611: setRequired should be public
+|Fix] Bugs #4613: Error about sambaUnixIdPool is unclear
+|Fix] FusionDirectory plugins - Bugs #4620: postalAddress (and homepostalAddress) content should stick to the RFC
+|Fix] FusionDirectory plugins - Bugs #4622: DNS record should be sorted
+[Feature] Wishlist #2843: Assigning multiple domain names for servers.
+[Feature] Wishlist #3265: rewrite DNS plugins
+|Fix] Wishlist #4252: Systems plugin - when enable "Add to DNS" should be able to check about adding PTR and more A records
+|Fix] Wishlist #4478: Using %askme% in User id and group id in templates does not work
+|Fix] Wishlist #4486: possible documentation tweaks
+|Fix] Wishlist #4492: "login" name in group add page
+|Fix] Wishlist #4497: The order of user id and group id are inverted
+[Feature] Wishlist #4560: community users and entities management specifications
+[Feature] Wishlist #4564: Add a C modifier for counting an array
+[Feature] Wishlist #4565: Fixedbutton themes should replace the default one
+[Feature] Wishlist #4609: Add "project/org full name" attribute in dep community's tab
+
* FusionDirectory 1.0.9.3
-Bugs #4444: Debug log prevent connection in some cases
-Bugs #4452: Adding a user to a group using "Groups and roles" tab creates some PHP errors
-Bugs #4453: Adding a user to a group using "Groups and roles" with trustMode fails
-Bugs #4456: Can't find a way to specify a '/' in distribution or media name in the repository plugin
-Bugs #4457: FusionDirectory don't find the dns server if he is in a department
-Bugs #4459: Desactivate other authentification method from configuration file
-Bugs #4463: There are still traces of the rsyslog plugin in the schema and config class
-Bugs #4464: There are still traces of the rsyslog plugin in the schema and config class
-Bugs #4465: remove from the service-fd.schema objectClass no longer used
-Bugs #4466: Pull request 11 from github
-Bugs #4479: In primary group in unix tab there is a «None» option
-Bugs #4481: «Enable primary group filter» option is obsolete
-Bugs #4485: 'fusiondirectory-insert-schema -m' should check if the specificed file exists
-Wishlist #4385: Locked users can connect using SSH keys
-Wishlist #4473: Locked users can connect using SSH keys
+[Fix] Bugs #4444: Debug log prevent connection in some cases
+[Fix] Bugs #4452: Adding a user to a group using "Groups and roles" tab creates some PHP errors
+[Fix] Bugs #4453: Adding a user to a group using "Groups and roles" with trustMode fails
+[Fix] Bugs #4456: Can't find a way to specify a '/' in distribution or media name in the repository plugin
+[Fix] Bugs #4457: FusionDirectory don't find the dns server if he is in a department
+[Feature] Bugs #4459: Desactivate other authentification method from configuration file
+[Fix] Bugs #4463: There are still traces of the rsyslog plugin in the schema and config class
+[Fix] Bugs #4464: There are still traces of the rsyslog plugin in the schema and config class
+[Fix] Bugs #4465: remove from the service-fd.schema objectClass no longer used
+[Fix] Bugs #4466: Pull request 11 from github
+[Fix] Bugs #4479: In primary group in unix tab there is a «None» option
+[Fix] Bugs #4481: «Enable primary group filter» option is obsolete
+[Fix] Bugs #4485: 'fusiondirectory-insert-schema -m' should check if the specificed file exists
+[Fix] Wishlist #4385: Locked users can connect using SSH keys
+[Fix] Wishlist #4473: Locked users can connect using SSH keys
* FusionDirectory 1.0.9.2
diff --git a/contrib/bin/fusiondirectory-setup b/contrib/bin/fusiondirectory-setup
index b38b004eed14b7818ce5938a05f3b830909f3b60..4a50345cdf25f3bbd5a115b709ac218e4488add7 100644
--- a/contrib/bin/fusiondirectory-setup
+++ b/contrib/bin/fusiondirectory-setup
@@ -57,6 +57,8 @@ use XML::Twig;
# To hide password input
use Term::ReadKey;
+use Data::Dumper;
+
# fd's directory and class.cache file's path declaration
my %vars = (
fd_home => "/var/www/fusiondirectory",
@@ -89,6 +91,8 @@ my $configrdn = "cn=config,ou=fusiondirectory";
my $userrdn = "ou=people";
my $aclrolerdn = "ou=aclroles";
my $grouprdn = "ou=groups";
+my $systemrdn = "ou=systems";
+my $dnsrdn = "ou=dns";
#################################################################################################################################################
@@ -1043,6 +1047,58 @@ sub check_ldap {
$unbind->code && warn "! Unable to unbind from LDAP server: ", $unbind->error."\n";
}
+# function that check for duplicated uid or gid numbers
+sub check_id_numbers {
+ read_ldap_config();
+
+ # initiate the LDAP connexion
+ my %hash_ldap_param = get_ldap_connexion();
+
+ # LDAP's connection's parameters
+ my $ldap = $hash_ldap_param{ldap};
+ my $base = $hash_ldap_param{base};
+
+ check_id_numbers_generic($ldap, $base, 'posixAccount','uidNumber','users');
+
+ check_id_numbers_generic($ldap, $base, 'posixGroup','gidNumber','groups');
+}
+
+sub check_id_numbers_generic {
+ my ($ldap, $base, $objectClass, $attribute, $type) = @_;
+
+ my $mesg = $ldap->search(
+ filter => "(&(objectClass=$objectClass)($attribute=*))",
+ base => $base,
+ attrs => [$attribute]
+ );
+ $mesg->code && die $mesg->error;
+
+ my @entries = $mesg->entries;
+
+ my %tmp = ();
+
+ foreach my $entry (@entries) {
+ if (not defined $tmp{$entry->get_value($attribute)}) {
+ $tmp{$entry->get_value($attribute)} = ();
+ }
+ push @{$tmp{$entry->get_value($attribute)}}, $entry->dn();
+ }
+
+ my $dups = 0;
+ while (my ($id, $dns) = each %tmp) {
+ if (scalar(@$dns) > 1) {
+ $dups = 1;
+ print "The following $type use the same $attribute $id:\n";
+ foreach my $dn (@$dns) {
+ print "\t$dn\n";
+ }
+ }
+ }
+ if ($dups == 0) {
+ print "There are no duplicated ${attribute}s\n";
+ }
+}
+
# function that create a directory and copy plugin files in it
sub create_and_copy_plugin_dir {
my ($plugin_dir,$dest_dir) = @_;
@@ -1154,7 +1210,7 @@ sub migrate_users {
if (ask_yn_question("Add the inetOrgPerson objectClass to all these entries?")) {
foreach my $entry (@entries) {
$mesg = $ldap->modify($entry->dn(), add => { "objectClass" => ["person","organizationalPerson","inetOrgPerson"]});
- $mesg->code && print $mesg->error;
+ $mesg->code && print $mesg->error."\n";
}
}
}
@@ -1191,22 +1247,23 @@ sub migrate_users {
) {
push(@replace, "fdPersonalInfo");
}
- if (
- ($entry->exists('sambaLMPassword') || $entry->exists('sambaNTPassword') ||
- $entry->exists('sambaPwdLastSet') || $entry->exists('sambaBadPasswordCount') ||
- $entry->exists('sambaBadPasswordTime'))
- && !(grep {$_ eq 'sambaSamAccount'} @classes)
- ) {
- @delete = ('sambaLMPassword','sambaNTPassword','sambaPwdLastSet','sambaBadPasswordCount','sambaBadPasswordTime');
+ 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 );
- $mesg->code && print $mesg->error;
+ $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";
}
- $mesg = $ldap->modify($entry->dn(), replace => { "objectClass" => \@replace });
- $mesg->code && print $mesg->error;
undef @replace;
+ undef @delete;
}
}
}
@@ -1216,6 +1273,128 @@ sub migrate_users {
$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";
+ }
+
+
+ $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";
+ }
+ }
+ }
+}
+
sub migrate_acls {
# initiate the LDAP connexion
my %hash_ldap_param = get_ldap_connexion();
@@ -1530,6 +1709,12 @@ sub read_ldap_config {
if (($mesg->entries)[0]->exists('fdAclRoleRDN')) {
$aclrolerdn = ($mesg->entries)[0]->get_value('fdAclRoleRDN');
}
+ if (($mesg->entries)[0]->exists('fdSystemRDN')) {
+ $systemrdn = ($mesg->entries)[0]->get_value('fdSystemRDN');
+ }
+ if (($mesg->entries)[0]->exists('fdDnsRDN')) {
+ $dnsrdn = ($mesg->entries)[0]->get_value('fdDnsRDN');
+ }
}
return ($mesg->entries)[0];
@@ -1617,18 +1802,20 @@ die ("! You have to run this script as root\n") if ($<!=0);
$commands{"--check-directories"} = ["Checking FusionDirectory's directories", \&check_directories];
$commands{"--check-config"} = ["Checking FusionDirectory's config file", \&check_config];
$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-dns"} = ["Migrating DNS zones for FD 1.0.10", \&migrate_dns];
$commands{"--migrate-acls"} = ["Migrating your ACLs", \&migrate_acls];
$commands{"--install-plugins"} = ["Installing FusionDirectory's plugins", \&install_plugins];
$commands{"--encrypt-passwords"} = ["Encrypt passwords in fusiondirectory.conf", \&encrypt_passwords];
- $commands{"--show-version"} = ["Show FusionDirectory version from variables_common.inc", \&show_version];
+ $commands{"--show-version"} = ["Show FusionDirectory version from variables_common.inc", \&show_version];
$commands{"--list-vars"} = ["List possible vars to give --set", \&list_vars];
$commands{"--write-vars"} = ["Choose FusionDirectory Directories", \&write_vars];
$commands{"--set-VAR=value"} = ["Set the variable VAR to value see --list-vars", \&die]; # Won't be called because it contains uppercase
$commands{"--list-deprecated"} = ["List deprecated attributes and objectclasses", \&list_deprecated];
- $commands{"--check-deprecated"} = ["List LDAP entries using deprecated attributes or objectclasses", \&check_deprecated];
+ $commands{"--check-deprecated"} = ["List LDAP entries using deprecated attributes or objectclasses", \&check_deprecated];
$commands{"--ldif-deprecated"} = ["# Print an LDIF removing deprecated attributes",\&ldif_deprecated];
- $commands{"--show-config"} = ["Show an LDAPÂ dump of the FusionDirectory configuration",\&show_ldap_config];
+ $commands{"--show-config"} = ["Show an LDAPÂ dump of the FusionDirectory configuration", \&show_ldap_config];
$commands{"--set-config-VAR=value"} = ["Set the value in LDAP of a configuration field",\&set_config_var];
my $usage = 0;
@@ -1707,10 +1894,18 @@ This option perform a check on FusionDirectory's config file.
This option check your LDAP tree. Looking for admin account, and groups or people branch. If one of those don't exists, the script will ask you what to do.
+=item --check-ids
+
+This option check your LDAP tree for duplicated uidNumber or gidNumber among users and groups.
+
=item --migrate-users
This option add FusionDirectory attributes to the people branch.
+=item --migrate-dns
+
+This option moves DNS zones from systems branch to DNS branch, which is necessary for FusionDirectory 1.0.10 and above.
+
=item --migrate-acls
This option will migrated old GOsa style acl from 1.0.7 into FusionDirectory acl roles in 1.0.8
diff --git a/contrib/docs/UPGRADE b/contrib/docs/UPGRADE
index 85ab9fe6ee8e19e2425f668c914a325a2f8d84e7..1f06c27a8f16a170a67186ff4e52246609e79dae 100644
--- a/contrib/docs/UPGRADE
+++ b/contrib/docs/UPGRADE
@@ -1099,6 +1099,172 @@ step at the exception of the gosaAccount class that is migrated with **fusiondir
Please read it carefully before applying !!
+
+Migrate FusionDirectory from 1.0.9.3 to 1.0.10
+==============================================
+
+Ubuntu 12.0.4 TLS users
+=======================
+
+Since 1.0.9.2 FusionDirectory need the php-cas library for CAS server support. This library can normally found in universe in the Ubuntu repositories
+
+In case you did not find it, grab the deb from here and install it
+
+http://packages.ubuntu.com/trusty/all/php-cas/download
+
+and select your preferred mirror
+
+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 configuration schema
+
+fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/core-fd.schema
+
+fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/core-fd-conf.schema
+
+- if your are using the personal plugin you have to update his schema
+
+fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/personal-fd.schema
+
+- if your are using the system plugin you have to update his schema
+
+fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/systems-fd.schema
+
+fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/systems-fd-conf.schema
+
+fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/service-fd.schema
+
+- if your are using the dns plugin you have to update his schema
+
+fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/dns-fd-conf.schema
+
+and install a new schema
+
+fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/dns-fd.schema
+
+Remove old schema from /etc/ldap/schema/fusiondirectory
+=======================================================
+
+The old schema are not automatically removed from /etc/ldap/schema/fusiondirectory.
+You can safely remove recovery-fd.schema and asterisk-fd-conf.schema if they still exist
+
+Check for deprecated attributes and objectClasses in your LDAP
+
+fusiondirectory-setup --list-deprecated show deprecated attributes and objectClasses for FusionDirectory
+
+fusiondirectory-setup --list-deprecated
+List deprecated attributes and objectclasses
+Deprecated attributes:
+ gotoFilesystem (GOto - Gonicus Terminal Concept, value filesystem.) - 1.3.6.1.4.1.10098.1.1.1.6
+ gotoFloppyEnable (GOto - Gonicus Terminal Concept, value floppyEnable.) - 1.3.6.1.4.1.10098.1.1.1.7
+ gotoSysStatus (Keeps current system status - info shown in GOsa) - 1.3.6.1.4.1.10098.1.1.2.11
+ gotoXColordepth (GOto - Gonicus Terminal Concept, value xColordepth.) - 1.3.6.1.4.1.10098.1.1.1.21
+ gotoHardwareChecksum (GOto - quick way to see if something has changed) - 1.3.6.1.4.1.10098.1.1.2.12
+ goFaxPassword (Admin password for fax server) - 1.3.6.1.4.1.10098.1.1.9.23
+ gotoNtpServer (GOto - Gonicus Terminal Concept, value ntpServer.) - 1.3.6.1.4.1.10098.1.1.1.2
+ gotoXDriver (GOto - Gonicus Terminal Concept, value xDriver.) - 1.3.6.1.4.1.10098.1.1.1.28
+ fdSnapshotAdminDn (FusionDirectory - Snaphost admin dn) - 1.3.6.1.4.1.38414.8.17.4
+ fdPersonalTitleInDN (FusionDirectory - Personal title in dn) - 1.3.6.1.4.1.38414.8.12.5
+ gotoXMouseport (GOto - Gonicus Terminal Concept, value xMouseport.) - 1.3.6.1.4.1.10098.1.1.1.22
+ gotoAdaptPath (GOto - Gonicus Terminal Concept, value adaptpath.) - 1.3.6.1.4.1.10098.1.1.1.33
+ goFonCountryCode (Store country code) - 1.3.6.1.4.1.10098.1.1.9.29
+ gotoSndModule (GOto - Gonicus Terminal Concept, value sound Modules.) - 1.3.6.1.4.1.10098.1.1.1.29
+ gotoXKbLayout (GOto - Gonicus Terminal Concept, value xKblayout.) - 1.3.6.1.4.1.10098.1.1.1.26
+ gotoProfileFlags (GOto - Flags for Profile handling - C is for caching) - 1.3.6.1.4.1.10098.1.1.11.7
+ ghSoundAdapter (Hardware definitions, value soundAdapter) - 1.3.6.1.4.1.10098.1.1.2.7
+ gotoScannerModel (GOto - Gonicus Terminal Concept, value scannerModel.) - 1.3.6.1.4.1.10098.1.1.1.40
+ gotoScannerEnable (GOto - Gonicus Terminal Concept, value scannerEnable.) - 1.3.6.1.4.1.10098.1.1.1.10
+ gosaSubtreeACL (GOsa - ACL entry) - 1.3.6.1.4.1.10098.1.1.12.1
+ ghUsbSupport (Hardware definitions, value usbSupport) - 1.3.6.1.4.1.10098.1.1.2.3
+ gotoLpdEnable (GOto - Gonicus Terminal Concept, value lpdEnable.) - 1.3.6.1.4.1.10098.1.1.1.9
+ gotoProfileQuota (GOto - save quota for home) - 1.3.6.1.4.1.10098.1.1.11.15
+ gotoScannerBackend (GOto - Gonicus Terminal Concept, value scannerBackend.) - 1.3.6.1.4.1.10098.1.1.1.39
+ goSyslogSection (What sections wants the server for its syslog service? i.e. *.*) - 1.3.6.1.4.1.10098.1.1.9.9
+ fdAccountRDN (FusionDirectory - use a placeholder pattern for generating account RDNs) - 1.3.6.1.4.1.38414.8.12.2
+ goFaxAdmin (Admin principal for fax server) - 1.3.6.1.4.1.10098.1.1.9.22
+ goLogDriver (FD logging MDB2 driver name) - 1.3.6.1.4.1.10098.1.1.9.84
+ ghNetNic (Hardware definitions, value Network Device) - 1.3.6.1.4.1.10098.1.1.2.8
+ academicTitle (Field to represent the academic title) - 1.3.6.1.4.1.10098.1.1.6.2
+ fdPhoneMacroRDN (FusionDirectory - Phone macro RDN) - 1.3.6.1.4.1.38414.19.10.2
+ gosaLoginRestriction (GOsa - Multivalue attribute to carry a number of allowed ips/subnets) - 1.3.6.1.4.1.10098.1.1.12.46
+ gotoLpdServer (GOto - Gonicus Terminal Concept, value lpdServer.) - 1.3.6.1.4.1.10098.1.1.1.4
+ ghCpuType (Hardware definitions, value cpuType) - 1.3.6.1.4.1.10098.1.1.2.1
+ gotoXMonitor (GOto - Gonicus Terminal Concept, value xMonitor.) - 1.3.6.1.4.1.10098.1.1.1.17
+ fdRfc2307bis (FusionDirectory - rfc2307bis) - 1.3.6.1.4.1.38414.8.10.1
+ gotoXVsync (GOto - Gonicus Terminal Concept, value xVsync.) - 1.3.6.1.4.1.10098.1.1.1.19
+ fdSipContexts (FusionDirectory - available sip contexts) - 1.3.6.1.4.1.38414.19.11.1
+ gotoShare (GOto - specifies a share) - 1.3.6.1.4.1.10098.1.1.11.9
+ fdCopyPaste (FusionDirectory - (de)Activate copy/paste) - 1.3.6.1.4.1.38414.8.14.5
+ goLogPassword (Admin password for log server) - 1.3.6.1.4.1.10098.1.1.9.25
+ gotoCdromEnable (GOto - Gonicus Terminal Concept, value cdromEnable.) - 1.3.6.1.4.1.10098.1.1.1.8
+ gotoProfileServer (GOto - specifies the profile server) - 1.3.6.1.4.1.10098.1.1.11.8
+ fdSnapshotAdminPassword (FusionDirectory - Snaphost admin password) - 1.3.6.1.4.1.38414.8.17.5
+ ghMemSize (Hardware definitions, value memSize) - 1.3.6.1.4.1.10098.1.1.2.2
+ fdSnapshotURI (FusionDirectory - Snaphost URI) - 1.3.6.1.4.1.38414.8.17.3
+ gotoAutoFs (GOto - Gonicus Terminal Concept, value autofs.) - 1.3.6.1.4.1.10098.1.1.1.31
+ goFonAreaCode (Store area code) - 1.3.6.1.4.1.10098.1.1.9.28
+ ghInventoryNumber (Unique number for inclusion in an inventory) - 1.3.6.1.4.1.10098.1.1.2.10
+ fdPhoneConferenceRDN (FusionDirectory - Phone conference RDN) - 1.3.6.1.4.1.38414.19.10.3
+ gotoXMouseType (Hardware definitions, value Type of mouse) - 1.3.6.1.4.1.10098.1.1.1.34
+ fdPrimaryGroupFilter (FusionDirectory - Primary group filter) - 1.3.6.1.4.1.38414.8.14.1
+ gotoXHsync (GOto - Gonicus Terminal Concept, value xHsync.) - 1.3.6.1.4.1.10098.1.1.1.18
+ gosaDefaultLanguage (GOsa - Defines the default language for a user) - 1.3.6.1.4.1.10098.1.1.12.14
+ ghIdeDev (Hardware definitions, value ideDev) - 1.3.6.1.4.1.10098.1.1.2.4
+ gotoXKbVariant (GOto - Gonicus Terminal Concept, value xKbvariant.) - 1.3.6.1.4.1.10098.1.1.1.27
+ gotoModules (GOto - Gonicus Terminal Concept, value kernel modules.) - 1.3.6.1.4.1.10098.1.1.1.32
+ gotoXMouseButtons (GOto - Gonicus Terminal Concept, value xMouseButtons.) - 1.3.6.1.4.1.10098.1.1.1.23
+ fdIdGenerator (FusionDirectory - An automatic way to generate new user ids) - 1.3.6.1.4.1.38414.8.12.4
+ fdVoicemailContexts (FusionDirectory - available voicemail contexts) - 1.3.6.1.4.1.38414.19.11.2
+ ghScsiDev (Hardware definitions, value scsiDev) - 1.3.6.1.4.1.10098.1.1.2.5
+ goFonAdmin (Admin user for fon server) - 1.3.6.1.4.1.10098.1.1.9.26
+ ghGfxAdapter (Hardware definitions, value Grafikkarte) - 1.3.6.1.4.1.10098.1.1.2.9
+ fdPasswordHook (FusionDirectory - Password hook (external command)) - 1.3.6.1.4.1.38414.8.13.4
+ gotoXKbModel (GOto - Gonicus Terminal Concept, value xKbmodel.) - 1.3.6.1.4.1.10098.1.1.1.25
+ gotoRootPasswd (GOto - Gonicus Terminal Concept, value rootPasswd.) - 1.3.6.1.4.1.10098.1.1.1.14
+ goLogDB (GOsa logging DB name) - 1.3.6.1.4.1.10098.1.1.9.83
+ goLogAdmin (Admin user for log server) - 1.3.6.1.4.1.10098.1.1.9.24
+ gotoXResolution (GOto - Gonicus Terminal Concept, value xResolution.) - 1.3.6.1.4.1.10098.1.1.1.20
+ gotoScannerClients (GOto - Gonicus Terminal Concept, value scannerClients.) - 1.3.6.1.4.1.10098.1.1.1.11
+ gotoFontPath (GOto - Gonicus Terminal Concept, value fontPath.) - 1.3.6.1.4.1.10098.1.1.1.5
+ goFonPassword (Admin password for fon server) - 1.3.6.1.4.1.10098.1.1.9.27
+Deprecated objectClasses:
+ goNfsServer (NFS server description) - 1.3.6.1.4.1.10098.1.2.1.19
+ goCupsServer (CUPS server description) - 1.3.6.1.4.1.10098.1.2.1.23
+ gosaCacheEntry (GOsa - Class for GOsa caching) - 1.3.6.1.4.1.10098.1.2.1.19.3
+ gosaObject (GOsa - Class for GOsa settings) - 1.3.6.1.4.1.10098.1.2.1.19.1
+ goFaxServer (Fax server description) - 1.3.6.1.4.1.10098.1.2.1.26
+ goFonServer (Fon server description) - 1.3.6.1.4.1.10098.1.2.1.29
+ gosaUserTemplate (GOsa - Class for GOsa User Templates) - 1.3.6.1.4.1.10098.1.2.1.19.11
+ gosaAccount (GOsa - Class for GOsa Accounts) - 1.3.6.1.4.1.10098.1.2.1.19.6
+ goLogDBServer (Log DB server description) - 1.3.6.1.4.1.10098.1.2.1.28
+ goSyslogServer (Syslog server description) - 1.3.6.1.4.1.10098.1.2.1.21
+ goNtpServer (Time server description) - 1.3.6.1.4.1.10098.1.2.1.20
+
+fusiondirectory-setup --check-deprecated 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
+
+fusiondirectory-setup --ldif-deprecated will output an ldif file on the console that you can use with ldapmodify to clean you ldap server from old attributes.
+
+If they are old objectClasses it will warn you and you will have to remove it by hand, they have been specified at the **fusiondirectory-setup --check-deprecated** step.
+
+!! Please read it carefully before applying !!
+
---
* Further information
diff --git a/contrib/man/fusiondirectory-insert-schema.1 b/contrib/man/fusiondirectory-insert-schema.1
index cf9516a37fe38eb86d69b25c76083f94cf5deb0e..c721f9a022943a97860f76193331aaf6de862c1d 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 "2016-01-29" "FusionDirectory 1.0.9.3" "FusionDirectory Documentation"
+.TH FUSIONDIRECTORY-INSERT-SCHEMA 1 "2016-02-10" "FusionDirectory 1.0.10" "FusionDirectory Documentation"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/contrib/man/fusiondirectory-setup.1 b/contrib/man/fusiondirectory-setup.1
index 3418714c3b09fb0833fcecd847443d53a8afb4a8..431384ed780873b544f82394cf16949049b879d5 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 "2016-01-29" "FusionDirectory 1.0.9.3" "FusionDirectory Documentation"
+.TH FUSIONDIRECTORY-SETUP 1 "2016-02-19" "FusionDirectory 1.0.10" "FusionDirectory Documentation"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -165,6 +165,9 @@ This option check your \s-1LDAP\s0 tree. Looking for admin account, and groups o
.IP "\-\-migrate\-users" 4
.IX Item "--migrate-users"
This option add FusionDirectory attributes to the people branch.
+.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\-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
diff --git a/contrib/man/fusiondirectory.conf.5 b/contrib/man/fusiondirectory.conf.5
index 2730f743da3254a0d2e5a32ab4a547cf12db51b4..2b779f1dadea0befaf62dcbe50c1a199143dc9c5 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 "2016-01-29" "FusionDirectory 1.0.9.3" "FusionDirectory Documentation"
+.TH FUSIONDIRECTORY.CONF 1 "2016-02-10" "FusionDirectory 1.0.10" "FusionDirectory Documentation"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/contrib/openldap/core-fd-conf.schema b/contrib/openldap/core-fd-conf.schema
index d35e9e1f8a1eca088a2e02088ec8e4d3fcd6a0db..6084f58c8fd1db8ded41d4388f71683ea1ee1ec5 100644
--- a/contrib/openldap/core-fd-conf.schema
+++ b/contrib/openldap/core-fd-conf.schema
@@ -166,6 +166,12 @@ attributetype ( 1.3.6.1.4.1.38414.8.12.18 NAME 'fdCnPattern'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
SINGLE-VALUE)
+attributetype ( 1.3.6.1.4.1.38414.8.12.19 NAME 'fdRestrictRoleMembers'
+ DESC 'FusionDirectory - Restrict role members to users from the same LDAP branch'
+ EQUALITY booleanMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
+ SINGLE-VALUE )
+
# Password
attributetype ( 1.3.6.1.4.1.38414.8.13.1 NAME 'fdPasswordDefaultHash'
@@ -295,6 +301,12 @@ attributetype ( 1.3.6.1.4.1.38414.8.15.5 NAME 'fdSessionLifeTime'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
SINGLE-VALUE)
+attributetype ( 1.3.6.1.4.1.38414.8.15.6 NAME 'fdHttpAuthActivated'
+ DESC 'FusionDirectory - HTTP Auth activation'
+ EQUALITY booleanMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
+ SINGLE-VALUE )
+
# Debugging
attributetype ( 1.3.6.1.4.1.38414.8.16.1 NAME 'fdDisplayErrors'
@@ -392,6 +404,12 @@ attributetype ( 1.3.6.1.4.1.38414.8.18.6 NAME 'fdAclTabOnObjects'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
SINGLE-VALUE )
+attributetype ( 1.3.6.1.4.1.38414.8.18.7 NAME 'fdDepartmentCategories'
+ DESC 'FusionDirectory - available categories for departments'
+ EQUALITY caseExactIA5Match
+ SUBSTR caseExactIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
# Plugins
attributetype ( 1.3.6.1.4.1.38414.8.19.1 NAME 'fdOGroupRDN'
@@ -556,17 +574,18 @@ objectclass ( 1.3.6.1.4.1.38414.8.2.1 NAME 'fusionDirectoryConf'
fdStrictNamingRules $ fdMinId $ fdUidNumberBase $
fdGidNumberBase $ fdUserRDN $ fdGroupRDN $ fdIdAllocationMethod $
fdGidNumberPoolMin $ fdUidNumberPoolMin $ fdGidNumberPoolMax $ fdUidNumberPoolMax $
- fdAclRoleRDN $ fdCnPattern $
+ fdAclRoleRDN $ fdCnPattern $ fdRestrictRoleMembers $
fdPasswordDefaultHash $ fdPasswordMinLength $ fdPasswordMinDiffer $
fdPasswordHook $ fdHandleExpiredAccounts $ fdSaslRealm $ fdSaslExop $
fdForcePasswordDefaultHash $
fdPrimaryGroupFilter $ fdListSummary $
fdModificationDetectionAttribute $ fdLogging $ fdLdapSizeLimit $
fdLoginAttribute $ fdForceSSL $ fdWarnSSL $ fdStoreFilterSettings $ fdSessionLifeTime $
+ fdHttpAuthActivated $
fdDisplayErrors $ fdLdapMaxQueryTime $ fdLdapStats $ fdDebugLevel $
fdEnableSnapshots $ fdSnapshotBase $
fdTabHook $ fdShells $ fdDisplayHookOutput $
- fdAclTabOnObjects $
+ fdAclTabOnObjects $ fdDepartmentCategories $
fdRfc2307bis $ fdCopyPaste $ fdSnapshotURI $
fdSnapshotAdminDn $ fdSnapshotAdminPassword $ fdPersonalTitleInDN $ fdAccountRDN $
fdSslCaCertPath $ fdSslKeyPath $ fdSslCertPath $
diff --git a/contrib/openldap/core-fd.schema b/contrib/openldap/core-fd.schema
index 4ecf57cac704229ead69ba8aa0e998e426e9ef36..54d111b691ca98d3fbf63a774e093d473c47f50f 100644
--- a/contrib/openldap/core-fd.schema
+++ b/contrib/openldap/core-fd.schema
@@ -108,7 +108,7 @@ objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.3 NAME 'gosaCacheEntry' SUP top STRUCTU
objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.4 NAME 'gosaDepartment' SUP top AUXILIARY
DESC 'GOsa - Class to mark Departments for GOsa'
MUST ( ou $ description )
- MAY ( manager ))
+ MAY ( manager $ co $ labeledURI ) )
objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.6 NAME 'gosaAccount' SUP top AUXILIARY
DESC 'GOsa - Class for GOsa Accounts'
diff --git a/html/index.php b/html/index.php
index 00d82646c4dd4afd5fcbf28681348d45ec53067a..e5db9d2c795d74117c2df34488a010cdde55714d 100644
--- a/html/index.php
+++ b/html/index.php
@@ -192,7 +192,7 @@ if (isset($_POST['server'])) {
}
$config->set_current($server);
-if ($config->get_cfg_value('casActivated') == 'TRUE') {
+if (($config->get_cfg_value('casActivated') == 'TRUE') || ($config->get_cfg_value('httpAuthActivated') == 'TRUE')) {
session::global_set('DEBUGLEVEL', 0);
}
@@ -351,6 +351,15 @@ class Index {
exit;
}
+ /* Return HTTP authentication header */
+ static function authenticateHeader($message = 'Authentication required')
+ {
+ header('WWW-Authenticate: Basic realm="FusionDirectory"');
+ header('HTTP/1.0 401 Unauthorized');
+ echo "$message\n";
+ exit;
+ }
+
/* Run each step in $steps, stop on errors */
static function runSteps($steps)
{
@@ -393,6 +402,36 @@ class Index {
}
}
+ /* All login steps in the right order for HTTP auth login */
+ static function authLoginProcess()
+ {
+ global $config, $message, $ui;
+
+ self::init();
+
+ if (!isset($_SERVER['PHP_AUTH_USER'])) {
+ self::authenticateHeader();
+ }
+
+ self::$username = $_SERVER['PHP_AUTH_USER'];
+ self::$password = $_SERVER['PHP_AUTH_PW'];
+
+ $success = self::runSteps(array(
+ 'validateUserInput',
+ 'ldapLoginUser',
+ 'loginAndCheckExpired',
+ 'runSchemaCheck',
+ 'checkForLockingBranch',
+ ));
+
+ if ($success) {
+ /* Everything went well, redirect to main.php */
+ self::redirect();
+ } else {
+ self::authenticateHeader($message);
+ }
+ }
+
/* All login steps in the right order for CAS login */
static function casLoginProcess()
{
@@ -425,7 +464,7 @@ class Index {
$verify_attr = explode(',', $config->get_cfg_value('loginAttribute', 'uid'));
$filter = '';
foreach ($verify_attr as $attr) {
- $filter .= '('.$attr.'='.self::$username.')';
+ $filter .= '('.$attr.'='.ldap_escape_f(self::$username).')';
}
$ldap->search('(&(|'.$filter.')(objectClass=inetOrgPerson))');
$attrs = $ldap->fetch();
@@ -466,7 +505,9 @@ class Index {
}
}
-if ($config->get_cfg_value('casActivated') == 'TRUE') {
+if ($config->get_cfg_value('httpAuthActivated') == 'TRUE') {
+ Index::authLoginProcess();
+} elseif ($config->get_cfg_value('casActivated') == 'TRUE') {
require_once('CAS.php');
/* Move CASÂ autoload before FD autoload */
spl_autoload_unregister('CAS_autoload');
diff --git a/html/themes/default/plugin.css b/html/themes/default/plugin.css
index 89ba7c55ce8134833d908679df77fa2f18c95e61..5b627d2aaa35ba463fb4c0f070f86d5574450c63 100644
--- a/html/themes/default/plugin.css
+++ b/html/themes/default/plugin.css
@@ -41,6 +41,20 @@ text-align:right;
font-family:arial,helvetica,sans-serif;
clear:both;
}
+p.plugbottom {
+position:fixed;
+bottom:0px;
+right:10px;
+margin:0;
+box-shadow:0px 0px 2px black;
+border-radius:5px 5px 0 0;
+width:auto;
+padding-left:10px;
+padding-right:10px;
+padding-bottom:5px;
+padding-top:5px;
+background:#BC9;
+}
html.rtl .plugbottom {
text-align:left;
}
@@ -223,6 +237,10 @@ background-color:#DFEFFF;
padding-right:1px;
border:none;
}
+ p.plugbottom {
+ left:5px;
+ right:5px;
+ }
.plugbottom input[type=submit], .plugbottom input[type=button] {
border:1px solid #DDD;
width:30% !important;
diff --git a/html/themes/default/style.css b/html/themes/default/style.css
index 95c297920cffa5cd09ad4b1c5fc9581be5a95951..832edfe939a82ce4ce59bee390923e02aab018ff 100644
--- a/html/themes/default/style.css
+++ b/html/themes/default/style.css
@@ -222,6 +222,10 @@ text-align:right;
/********************** Template migration *********************/
+form#mainform {
+margin:0;
+}
+
table.framework {
height:auto;
width:100%;
@@ -243,6 +247,7 @@ table.framework td#maincell {
background-color:white;
width:auto;
vertical-align:top;
+padding-bottom:35px;
}
/* cellpadding="0" */
@@ -748,4 +753,8 @@ color:#000;
width:100%;
border-spacing:0;
}
+ table.framework #maincell
+ {
+ padding-bottom:55px;
+ }
}
diff --git a/html/themes/fixedbuttons/index.theme b/html/themes/fixedbuttons/index.theme
deleted file mode 100644
index 921b8d76c73730410777f2e2ed261a80aead2b4d..0000000000000000000000000000000000000000
--- a/html/themes/fixedbuttons/index.theme
+++ /dev/null
@@ -1,5 +0,0 @@
-[Icon Theme]
-Name=FusionDirectory fixed frame
-Comment=FusionDirectory theme that changes the position of the bottom buttons to fixed
-Inherits=default
-
diff --git a/html/themes/fixedbuttons/theme.css b/html/themes/fixedbuttons/theme.css
deleted file mode 100644
index 425ae5f1acf4ca697c9d305db9d15ff7c093ed57..0000000000000000000000000000000000000000
--- a/html/themes/fixedbuttons/theme.css
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Themes can override this file to add some CSS */
-
-table.framework #maincell
-{
-padding-bottom:35px;
-}
-
-p.plugbottom
-{
-position:fixed;
-bottom:0px;
-right:10px;
-margin:0;
-box-shadow:0px 0px 2px black;
-border-radius:5px 5px 0 0;
-width:auto;
-padding-left:10px;
-padding-right:10px;
-padding-bottom:5px;
-padding-top:5px;
-background:#BC9;
-}
-
-
-/* On small screens */
-@media (max-width: 640px) {
- table.framework #maincell
- {
- padding-bottom:55px;
- }
-
- p.plugbottom
- {
- left:5px;
- right:5px;
- }
-}
diff --git a/ihtml/themes/default/simpleplugin_section_alone.tpl b/ihtml/themes/default/simpleplugin_section_alone.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..d350f71ac5e8d4a87ffa8035c786713b217819df
--- /dev/null
+++ b/ihtml/themes/default/simpleplugin_section_alone.tpl
@@ -0,0 +1,3 @@
+{include file={filePath file="simpleplugin_section.tpl"}}
+{* Empty div to avoid breaking CSS rules which uses :nth-child(even) *}
+<div></div>
diff --git a/include/class_config.inc b/include/class_config.inc
index 0fce26575c17516b7513be15c6b5bfa9b220dd4c..ff25f9c41092bf804ad6528bdfee47aee27c9a04 100644
--- a/include/class_config.inc
+++ b/include/class_config.inc
@@ -476,67 +476,12 @@ class config {
$this->data['SERVERS']['IMAP'] = $mailMethodClass::get_server_list($this);
} elseif (class_available('mailMethod')) {
msg_dialog::display(
- _("Error"),
- sprintf(_("The selected mail method (class %s) is not available"), $mailMethodClass),
+ _('Error'),
+ sprintf(_('The selected mail method (class %s) is not available'), $mailMethodClass),
ERROR_DIALOG
);
}
- /* Get kerberos servers */
- $ldap->cd($this->current['BASE']);
- $ldap->search("(objectClass=goKrbServer)(goKrbRealm=*)(goKrbAdmin=*))");
- $this->data['SERVERS']['KERBEROS'] = array();
- while ($attrs = $ldap->fetch()) {
- $this->data['SERVERS']['KERBEROS'][] = array(
- 'SERVER' => $attrs['cn'][0],
- 'REALM' => $attrs['goKrbRealm'][0],
- 'ADMIN' => $attrs['goKrbAdmin'][0]
- );
- }
-
- /* Get fax servers */
- $ldap->cd($this->current['BASE']);
- $ldap->search("(objectClass=goFaxServer)");
- $this->data['SERVERS']['FAX'] = array();
- while ($attrs = $ldap->fetch()) {
- $this->data['SERVERS']['FAX'][] = array(
- 'SERVER' => $attrs['cn'][0],
- 'LOGIN' => $attrs['goFaxAdmin'][0],
- 'PASSWORD' => $attrs['goFaxPassword'][0]
- );
- }
-
- /* Get asterisk servers */
- $ldap->cd($this->current['BASE']);
- $ldap->search("(objectClass=goFonServer)");
- $this->data['SERVERS']['FON'] = array();
- while ($attrs = $ldap->fetch()) {
-
- $entry = array(
- 'DN' => $attrs['dn'],
- 'SERVER' => $attrs['cn'][0],
- 'LOGIN' => $attrs['goFonAdmin'][0],
- 'PASSWORD' => $attrs['goFonPassword'][0],
- 'DB' => "gophone",
- 'SIP_TABLE' => "sip_users",
- 'EXT_TABLE' => "extensions",
- 'VOICE_TABLE' => "voicemail_users",
- 'QUEUE_TABLE' => "queues",
- 'QUEUE_MEMBER_TABLE' => "queue_members"
- );
- if (isset($attrs['fdAsteriskDriver'][0])) {
- $entry['DRIVER'] = $attrs['fdAsteriskDriver'][0];
- }
-
- /* Add 0 entry for development */
- if (count($this->data['SERVERS']['FON']) == 0) {
- $this->data['SERVERS']['FON'][0] = $entry;
- }
-
- /* Add entry with 'dn' as index */
- $this->data['SERVERS']['FON'][$attrs['dn']] = $entry;
- }
-
/* Get NFS server lists */
$tmp = array("default");
$tmp2 = array("default");
@@ -559,55 +504,40 @@ class config {
/* Load Terminalservers */
$ldap->cd ($this->current['BASE']);
- $ldap->search ("(objectClass=goTerminalServer)", array("cn","gotoSessionType"));
+ $ldap->search ('(objectClass=goTerminalServer)', array('cn','gotoSessionType'));
$this->data['SERVERS']['TERMINAL'] = array();
- $this->data['SERVERS']['TERMINAL'][] = "default";
+ $this->data['SERVERS']['TERMINAL'][] = 'default';
$this->data['SERVERS']['TERMINAL_SESSION_TYPES'] = array();
while ($attrs = $ldap->fetch()) {
- $this->data['SERVERS']['TERMINAL'][] = $attrs["cn"][0];
- if (isset( $attrs["gotoSessionType"]['count'])) {
- for ($i = 0; $i < $attrs["gotoSessionType"]['count']; $i++) {
- $this->data['SERVERS']['TERMINAL_SESSION_TYPES'][$attrs["cn"][0]][] = $attrs["gotoSessionType"][$i];
+ $this->data['SERVERS']['TERMINAL'][] = $attrs['cn'][0];
+ if (isset( $attrs['gotoSessionType']['count'])) {
+ for ($i = 0; $i < $attrs['gotoSessionType']['count']; $i++) {
+ $this->data['SERVERS']['TERMINAL_SESSION_TYPES'][$attrs['cn'][0]][] = $attrs['gotoSessionType'][$i];
}
}
}
- /* Ldap Server
- */
+ /* Ldap Server */
$this->data['SERVERS']['LDAP'] = array();
$ldap->cd($this->current['BASE']);
- $ldap->search("(&(objectClass=goLdapServer)(goLdapBase=*))");
+ $ldap->search('(&(objectClass=goLdapServer)(goLdapBase=*))');
while ($attrs = $ldap->fetch()) {
$this->data['SERVERS']['LDAP'][$attrs['dn']] = $attrs;
}
- /* Get misc server lists */
- $this->data['SERVERS']['SYSLOG'] = array("default");
- $this->data['SERVERS']['NTP'] = array("default");
- $ldap->cd($this->current['BASE']);
- $ldap->search("(objectClass=goNtpServer)");
- while ($attrs = $ldap->fetch()) {
- $this->data['SERVERS']['NTP'][] = $attrs["cn"][0];
- }
- $ldap->cd($this->current['BASE']);
- $ldap->search("(objectClass=goSyslogServer)");
- while ($attrs = $ldap->fetch()) {
- $this->data['SERVERS']['SYSLOG'][] = $attrs["cn"][0];
- }
-
/* Get samba servers from LDAP */
$this->data['SERVERS']['SAMBA'] = array();
if (class_available('sambaAccount')) {
$ldap->cd($this->current['BASE']);
- $ldap->search("(objectClass=sambaDomain)");
+ $ldap->search('(objectClass=sambaDomain)');
while ($attrs = $ldap->fetch()) {
- $this->data['SERVERS']['SAMBA'][$attrs['sambaDomainName'][0]] = array( "SID" => "","RIDBASE" => "");
- if (isset($attrs["sambaSID"][0])) {
- $this->data['SERVERS']['SAMBA'][$attrs['sambaDomainName'][0]]["SID"] = $attrs["sambaSID"][0];
+ $this->data['SERVERS']['SAMBA'][$attrs['sambaDomainName'][0]] = array( 'SID' => '','RIDBASE' => '');
+ if (isset($attrs['sambaSID'][0])) {
+ $this->data['SERVERS']['SAMBA'][$attrs['sambaDomainName'][0]]['SID'] = $attrs['sambaSID'][0];
}
- if (isset($attrs["sambaAlgorithmicRidBase"][0])) {
- $this->data['SERVERS']['SAMBA'][$attrs['sambaDomainName'][0]]["RIDBASE"] = $attrs["sambaAlgorithmicRidBase"][0];
+ if (isset($attrs['sambaAlgorithmicRidBase'][0])) {
+ $this->data['SERVERS']['SAMBA'][$attrs['sambaDomainName'][0]]['RIDBASE'] = $attrs['sambaAlgorithmicRidBase'][0];
}
}
diff --git a/include/class_filter.inc b/include/class_filter.inc
index f09247ea3f64c626f7622780ead924c0b3e82de1..aac3ec5e8c7e7ab098f3ea0a867526571c5040a9 100644
--- a/include/class_filter.inc
+++ b/include/class_filter.inc
@@ -466,11 +466,11 @@ class filter
// Do not replace escaped \$ - This is required to be able to search for e.g. windows machines.
if ($this->elementValues[$tag] == "") {
- $e_unset = preg_replace('/([^\\\\])\$/', '${1}'.normalizeLdap($this->elementValues[$tag]), $e_unset);
+ $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);
} else {
- $e_set = preg_replace('/([^\\\\])\$/', '${1}'.normalizeLdap($this->elementValues[$tag]), $e_set);
+ $e_set = preg_replace('/([^\\\\])\$/', '${1}'.ldap_escape_f($this->elementValues[$tag]), $e_set);
$e_set = preg_replace('/\\\\\$/', '$', $e_set);
$filter = preg_replace("/\\$$tag/", $e_set, $filter);
}
@@ -566,7 +566,7 @@ class filter
}
// Make filter
- $filter = preg_replace("/\\$$tag/", normalizeLdap($value), $filter);
+ $filter = preg_replace("/\\$$tag/", ldap_escape_f($value), $filter);
if (isset($config['base']) && isset($config['scope']) && isset($config['category'])) {
$result = call_user_func(array($backend, 'query'), $this, $config['base'], $config['scope'], $filter, $attributes,
$config["category"], $config["objectStorage"]);
diff --git a/include/class_ldap.inc b/include/class_ldap.inc
index 4ce75e9508c0aed5f7233fb23b5bd5e723b5f6e8..33ddbdbb9bf808e5b77144105bda403c9d85ef61 100644
--- a/include/class_ldap.inc
+++ b/include/class_ldap.inc
@@ -27,7 +27,7 @@
* Source code for Class LDAP
*/
-define("SPECIALS_OVERRIDE", TRUE);
+define("SPECIALS_OVERRIDE", FALSE);
/*!
* \brief This class contains all ldap function needed to make
@@ -167,8 +167,8 @@ class LDAP
*/
static function prepare4filter($dn)
{
- $fixed = normalizeLdap(str_replace('\\\\', '\\\\\\', LDAP::fix($dn)));
- return str_replace('\\,', '\\\\,', $fixed);
+ trigger_error('deprecated, use ldap_escape_f instead');
+ return ldap_escape_f($dn);
}
/*!
@@ -703,21 +703,21 @@ class LDAP
$delarray = array();
/* Get sorted list of dn's to delete */
- $this->ls($srp, "(objectClass=*)", $deletedn);
- while ($this->fetch($srp)) {
- $deldn = $this->getDN($srp);
- $delarray[$deldn] = strlen($deldn);
+ $this->cd($deletedn);
+ $this->search($srp, "(objectClass=*)", array('dn'));
+ while ($attrs = $this->fetch($srp)) {
+ $delarray[$attrs['dn']] = strlen($attrs['dn']);
}
arsort($delarray);
reset($delarray);
/* Really Delete ALL dn's in subtree */
foreach (array_keys($delarray) as $key) {
- $this->rmdir_recursive($srp, $key);
+ $r = @ldap_delete($this->cid, LDAP::fix($key));
+ if ($r === FALSE) {
+ break;
+ }
}
-
- /* Finally Delete own Node */
- $r = @ldap_delete($this->cid, LDAP::fix($deletedn));
$this->error = @ldap_error($this->cid);
return ($r ? $r : 0);
} else {
diff --git a/include/class_ldapMultiplexer.inc b/include/class_ldapMultiplexer.inc
index 027abeb6da034ec71700dac5f26e6542e7f1b739..f7faa9e23930a5ac561670fbf82d6294d3bdb8cb 100644
--- a/include/class_ldapMultiplexer.inc
+++ b/include/class_ldapMultiplexer.inc
@@ -64,10 +64,7 @@ class ldapMultiplexer {
array_unshift($parameters, $this->sr);
}
- $class = new ReflectionClass($this->object);
- $method = $class->getMethod($methodName);
-
- return $method->invokeArgs($this->object, $parameters);
+ return call_user_func_array(array($this->object, $methodName), $parameters);
}
/*
diff --git a/include/class_listing.inc b/include/class_listing.inc
index 58ec895a497d434b695565b86fbb6a3ec3850830..9d2231a3872d00fc4714e5449f946aa63252073a 100644
--- a/include/class_listing.inc
+++ b/include/class_listing.inc
@@ -1500,6 +1500,10 @@ class listing {
}
}
+ if (!empty($this->bases) && !isset($this->bases[$this->base])) {
+ $this->base = key($this->bases);
+ }
+
// Populate base selector if already present
if ($this->baseSelector && $this->baseMode) {
$this->baseSelector->setBases($this->bases);
@@ -1786,7 +1790,6 @@ class listing {
*/
function getType($dn)
{
- $dn = LDAP::fix($dn);
if (isset($this->objectDnMapping[$dn])) {
return $this->objectDnMapping[$dn];
}
diff --git a/include/class_plugin.inc b/include/class_plugin.inc
index 1b47d0e42fd72f09f74e7844bce4842af54f98da..6149b7da0ed41f6472acb55e41a99625a70f96f6 100644
--- a/include/class_plugin.inc
+++ b/include/class_plugin.inc
@@ -345,41 +345,40 @@ class plugin
*/
function remove_from_parent()
{
- /* include global link_info */
- $ldap = $this->config->get_ldap_link();
+ $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];
+ if (!$this->mainTab) {
+ /* include global link_info */
+ $ldap = $this->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']);
+ }
}
- } else {
- if (isset($tmp['objectClass'])) {
- $oc = $tmp['objectClass'];
- unset($oc['count']);
- }
- }
- /* Remove objectClasses from entry */
- $ldap->cd($this->dn);
- $this->attrs = array();
- $this->attrs['objectClass'] = array_remove_entries_ics($this->objectclasses, $oc);
+ /* 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();
+ /* Unset attributes from entry */
+ foreach ($this->attributes as $val) {
+ $this->attrs["$val"] = array();
+ }
}
- /* Do not write in plugin base class, this must be done by
- children, since there are normally additional attribs,
- lists, etc. */
if ($this->initially_was_account) {
$this->handle_pre_events('remove');
}
@@ -646,6 +645,8 @@ class plugin
} else {
return array(join($str));
}
+ case 'C': // Count
+ return array(count($str));
case 'c': // comment
return array('');
case 'b': // base64
@@ -775,7 +776,7 @@ class plugin
}
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 = $r[0];
+ $r = reset($r);
}
}
unset($r);
@@ -1009,7 +1010,7 @@ class plugin
$base = preg_replace('/^,*/', '', $base);
/* Try to use plain entry first */
- $dn = $attribute.'='.$this->$attribute.','.$base;
+ $dn = $attribute.'='.ldap_escape_dn($this->$attribute).','.$base;
if ($dn == $this->orig_dn) {
return $dn;
}
@@ -1024,7 +1025,7 @@ class plugin
continue;
}
- $dn = "$attribute=".$this->$attribute."+$attr=".$this->$attr.",$base";
+ $dn = $attribute.'='.ldap_escape_dn($this->$attribute).'+'.$attr.'='.ldap_escape_dn($this->$attr).','.$base;
if ($dn == $this->orig_dn) {
return $dn;
}
diff --git a/include/class_template.inc b/include/class_template.inc
index fe03f009e32e12d946a1634df8ae15cce5d969eb..21bd8bc808671ca301c7f262e358658a1f79b895 100644
--- a/include/class_template.inc
+++ b/include/class_template.inc
@@ -49,11 +49,11 @@ class template
$this->tabObject->by_object[$class]->is_account = $plugin->is_account;
$this->attributes[$class] = array();
$attrs = array_unique(array_merge($this->tabObject->by_object[$class]->getRequiredAttributes(), $this->needed));
- foreach ($attrs as $attr) {
+ foreach (array_keys($this->tabObject->by_object[$class]->attributesAccess) as $attr) {
if (isset($this->attrs[$attr])) {
continue;
}
- if (isset($this->tabObject->by_object[$class]->attributesAccess[$attr])) {
+ if (in_array($attr, $attrs)) {
$this->attributes[$class][] = $attr;
}
}
diff --git a/include/class_userinfo.inc b/include/class_userinfo.inc
index bdfc43f2db9c9348b9b352fe05faf9c681b57e6d..e7833755cb3b2bfd4d62c15c8cb3bff89cb3d6d9 100644
--- a/include/class_userinfo.inc
+++ b/include/class_userinfo.inc
@@ -107,13 +107,13 @@ class userinfo
$ldap->cd($this->config->current['BASE']);
/* Get member groups... */
- $ldap->search('(&(objectClass=posixGroup)(memberUid='.$this->uid.'))', array('dn'));
+ $ldap->search('(&(objectClass=posixGroup)(memberUid='.ldap_escape_f($this->uid).'))', array('dn'));
while ($attrs = $ldap->fetch()) {
$this->groups[$attrs['dn']] = $attrs['dn'];
}
/* Get member roles... */
- $ldap->search('(&(objectClass=organizationalRole)(roleOccupant='.$this->dn.'))', array('dn'));
+ $ldap->search('(&(objectClass=organizationalRole)(roleOccupant='.ldap_escape_f($this->dn).'))', array('dn'));
while ($attrs = $ldap->fetch()) {
$this->roles[$attrs['dn']] = $attrs['dn'];
}
diff --git a/include/functions.inc b/include/functions.inc
index 147bd5abd29d14adf5564a86647cd61c250450ee..6c70c3a8ec132fd60d938c97c2103c03f43bbc45 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -25,19 +25,19 @@
*/
/* Define common locations and variables */
-require_once ("variables.inc");
+require_once ('variables.inc');
/* Include required files */
-require_once (CACHE_DIR."/".CLASS_CACHE);
-require_once ("functions_debug.inc");
-require_once ("accept-to-gettext.inc");
+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('GL_NONE', 0);
+define('GL_SUBSEARCH', 1);
+define('GL_SIZELIMIT', 2);
+define('GL_CONVERT', 4);
+define('GL_NO_ACL_CHECK', 8);
/* Heimdal stuff */
define('UNIVERSAL', 0x00);
@@ -58,24 +58,24 @@ define('DES3_CBC_MD5', 5);
define('DES3_CBC_SHA1', 16);
/* 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 */
-define ("DEBUG_DB", 4); /*! Debug level for database operations */
-define ("DEBUG_SHELL", 8); /*! Debug level for shell commands */
-define ("DEBUG_POST", 16); /*! Debug level for POST content */
-define ("DEBUG_SESSION", 32); /*! Debug level for SESSION content */
-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); // FAI (incomplete)
+define ('DEBUG_TRACE', 1); /*! Debug level for tracing of common actions (save, check, etc.) */
+define ('DEBUG_LDAP', 2); /*! Debug level for LDAP queries */
+define ('DEBUG_DB', 4); /*! Debug level for database operations */
+define ('DEBUG_SHELL', 8); /*! Debug level for shell commands */
+define ('DEBUG_POST', 16); /*! Debug level for POST content */
+define ('DEBUG_SESSION', 32); /*! Debug level for SESSION content */
+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); // FAI (incomplete)
// Define shadow states
-define ("POSIX_ACCOUNT_EXPIRED", 1);
-define ("POSIX_WARN_ABOUT_EXPIRATION", 2);
-define ("POSIX_FORCE_PASSWORD_CHANGE", 4);
-define ("POSIX_DISALLOW_PASSWORD_CHANGE", 8);
+define ('POSIX_ACCOUNT_EXPIRED', 1);
+define ('POSIX_WARN_ABOUT_EXPIRATION', 2);
+define ('POSIX_FORCE_PASSWORD_CHANGE', 4);
+define ('POSIX_DISALLOW_PASSWORD_CHANGE', 8);
/* Rewrite german 'umlauts' and spanish 'accents'
to get better results */
@@ -115,7 +115,7 @@ function __fusiondirectory_autoload($class_name)
if ($class_mapping === NULL) {
if (isset($config) && is_object($config) &&
- $config->get_cfg_value("displayerrors") == "TRUE") {
+ $config->get_cfg_value('displayerrors') == 'TRUE') {
list($trace,) = html_trace();
echo $trace;
echo "<br/>\n";
@@ -125,11 +125,11 @@ function __fusiondirectory_autoload($class_name)
}
if (isset($class_mapping["$class_name"])) {
- require_once($BASE_DIR."/".$class_mapping["$class_name"]);
+ require_once($BASE_DIR.'/'.$class_mapping["$class_name"]);
} else {
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $class_name, "Could not load");
+ @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $class_name, 'Could not load');
if (isset($config) && is_object($config) &&
- $config->get_cfg_value("displayerrors") == "TRUE") {
+ $config->get_cfg_value('displayerrors') == 'TRUE') {
list($trace,) = html_trace();
echo $trace;
echo "<br/>\n";
@@ -171,7 +171,7 @@ function plugin_available($plugin)
if (!isset($class_mapping[$plugin])) {
return FALSE;
} else {
- return is_readable($BASE_DIR."/".$class_mapping[$plugin]);
+ return is_readable($BASE_DIR.'/'.$class_mapping[$plugin]);
}
}
@@ -237,10 +237,10 @@ function make_seed()
*
* \param string $info Optional: Additional information
*/
-function DEBUG($level, $line, $function, $file, $data, $info = "")
+function DEBUG($level, $line, $function, $file, $data, $info = '')
{
static $first = TRUE;
- if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+ if (($_SERVER['REQUEST_METHOD'] == 'POST') && preg_match('/index.php$/', $_SERVER['REQUEST_URI'])) {
return;
}
if (session::global_get('DEBUGLEVEL') & $level) {
@@ -253,7 +253,7 @@ function DEBUG($level, $line, $function, $file, $data, $info = "")
$first = FALSE;
}
$output = "DEBUG[$level] ";
- if ($function != "") {
+ if ($function != '') {
$output .= "($file:$function():$line) - $info: ";
} else {
$output .= "($file:$line) - $info: ";
@@ -289,16 +289,16 @@ function get_browser_language()
global $config;
$ui = get_userinfo();
if (isset($ui) && $ui !== NULL) {
- if ($ui->language != "") {
- return $ui->language.".UTF-8";
+ if ($ui->language != '') {
+ return $ui->language.'.UTF-8';
}
}
/* Check for global language settings in fusiondirectory.conf */
- 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";
+ if (!preg_match('/utf/i', $lang)) {
+ $lang .= '.UTF-8';
}
return $lang;
}
@@ -335,15 +335,15 @@ function get_browser_language()
*
* \return string Full path to the template file
*/
-function get_template_path($filename = '', $plugin = FALSE, $path = "")
+function get_template_path($filename = '', $plugin = FALSE, $path = '')
{
global $config, $BASE_DIR;
/* Set theme */
if (isset ($config)) {
- $theme = $config->get_cfg_value("theme", "default");
+ $theme = $config->get_cfg_value('theme', 'default');
} else {
- $theme = "default";
+ $theme = 'default';
}
/* Return path for empty filename */
@@ -353,10 +353,10 @@ 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')));
+ if ($path == '') {
+ $nf = preg_replace("!^".$BASE_DIR."/!", '', preg_replace('/^\.\.\//', '', session::global_get('plugin_dir')));
} else {
- $nf = preg_replace("!^".$BASE_DIR."/!", "", $path);
+ $nf = preg_replace("!^".$BASE_DIR."/!", '', $path);
}
if (file_exists("$BASE_DIR/ihtml/themes/$theme/$nf")) {
return "$BASE_DIR/ihtml/themes/$theme/$nf/$filename";
@@ -364,7 +364,7 @@ function get_template_path($filename = '', $plugin = FALSE, $path = "")
if (file_exists("$BASE_DIR/ihtml/themes/default/$nf")) {
return "$BASE_DIR/ihtml/themes/default/$nf/$filename";
}
- if ($path == "") {
+ if ($path == '') {
return session::global_get('plugin_dir')."/$filename";
} else {
return $path."/$filename";
@@ -434,7 +434,7 @@ function array_remove_entries_ics($needles, $haystack)
function array_merge_unique($ar1, $ar2)
{
if (!is_array($ar1) || !is_array($ar2)) {
- trigger_error("Specified parameter(s) are not valid arrays.");
+ trigger_error('Specified parameter(s) are not valid arrays.');
} else {
return array_values(array_unique(array_merge($ar1, $ar2)));
}
@@ -488,12 +488,12 @@ function ldap_init ($server, $base, $binddn = '', $pass = '')
global $config;
$ldap = new LDAP ($binddn, $pass, $server,
- isset($config->current['LDAPFOLLOWREFERRALS']) && $config->current['LDAPFOLLOWREFERRALS'] == "TRUE",
- isset($config->current['LDAPTLS']) && $config->current['LDAPTLS'] == "TRUE");
+ isset($config->current['LDAPFOLLOWREFERRALS']) && $config->current['LDAPFOLLOWREFERRALS'] == 'TRUE',
+ isset($config->current['LDAPTLS']) && $config->current['LDAPTLS'] == 'TRUE');
/* Sadly we've no proper return values here. Use the error message instead. */
if (!$ldap->success()) {
- msg_dialog::display(_("Fatal error"),
+ msg_dialog::display(_('Fatal error'),
sprintf(_("FATAL: Error when connecting the LDAP. Server said '%s'."), $ldap->get_error()),
FATAL_ERROR_DIALOG);
exit();
@@ -523,8 +523,8 @@ function ldap_login_user ($username, $password)
/* look through the entire ldap */
$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'),
+ msg_dialog::display(_('LDAP error'),
+ msgPool::ldaperror($ldap->get_error(), '', LDAP_AUTH).'<br><br>'.session::get('errors'),
FATAL_ERROR_DIALOG);
exit();
}
@@ -565,7 +565,7 @@ function ldap_login_user ($username, $password)
/* 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);
+ msg_dialog::display(_('Internal error'), _('Login (uid) is not unique inside the LDAP tree. Please contact your administrator.'), FATAL_ERROR_DIALOG);
return NULL;
}
@@ -588,9 +588,9 @@ function ldap_login_user ($username, $password)
$ldap->disconnect();
$ldap = new ldapMultiplexer(new LDAP($ui->dn, $password, $config->current['SERVER'],
isset($config->current['LDAPFOLLOWREFERRALS']) &&
- $config->current['LDAPFOLLOWREFERRALS'] == "TRUE",
+ $config->current['LDAPFOLLOWREFERRALS'] == 'TRUE',
isset($config->current['LDAPTLS'])
- && $config->current['LDAPTLS'] == "TRUE"));
+ && $config->current['LDAPTLS'] == 'TRUE'));
if (!$ldap->success()) {
return NULL;
}
@@ -629,8 +629,8 @@ function add_lock($object, $user)
/* Remember which entries were opened as read only, because we
don't need to remove any locks for them later.
*/
- if (!session::global_is_set("LOCK_CACHE")) {
- session::global_set("LOCK_CACHE", array(""));
+ if (!session::global_is_set('LOCK_CACHE')) {
+ session::global_set('LOCK_CACHE', array(''));
}
if (is_array($object)) {
foreach ($object as $obj) {
@@ -639,7 +639,7 @@ function add_lock($object, $user)
return;
}
- $cache = &session::global_get("LOCK_CACHE");
+ $cache = &session::global_get('LOCK_CACHE');
if (isset($_POST['open_readonly'])) {
$cache['READ_ONLY'][$object] = TRUE;
return;
@@ -649,18 +649,18 @@ function add_lock($object, $user)
}
/* Just a sanity check... */
- if ($object == "" || $user == "") {
- msg_dialog::display(_("Internal error"), _("Error while adding a lock. Contact the developers!"), ERROR_DIALOG);
+ if ($object == '' || $user == '') {
+ msg_dialog::display(_('Internal error'), _('Error while adding a lock. Contact the developers!'), ERROR_DIALOG);
return;
}
/* Check for existing entries in lock area */
$ldap = $config->get_ldap_link();
$ldap->cd(get_ou('lockRDN').get_ou('fusiondirectoryRDN').$config->current['BASE']);
- $ldap->search("(&(objectClass=gosaLockEntry)(gosaUser=$user)(gosaObject=".base64_encode($object)."))",
- array("gosaUser"));
+ $ldap->search('(&(objectClass=gosaLockEntry)(gosaUser='.ldap_escape_f($user).')(gosaObject='.base64_encode($object).'))',
+ array('gosaUser'));
if (!$ldap->success()) {
- msg_dialog::display(_("Configuration error"), sprintf(_("Cannot create locking information in LDAP tree. Please contact your administrator!")."<br><br>"._('LDAP server returned: %s'), "<br><br><i>".$ldap->get_error()."</i>"), ERROR_DIALOG);
+ msg_dialog::display(_('Configuration error'), sprintf(_('Cannot create locking information in LDAP tree. Please contact your administrator!').'<br><br>'._('LDAP server returned: %s'), '<br><br><i>'.$ldap->get_error().'</i>'), ERROR_DIALOG);
return;
}
@@ -675,7 +675,7 @@ function add_lock($object, $user)
$attrs['cn'] = '$name';
$ldap->add($attrs);
if (!$ldap->success()) {
- msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), "cn=$name,".get_ou('lockRDN').get_ou('fusiondirectoryRDN').$config->current['BASE'], 0), LDAP_ERROR);
+ msg_dialog::display(_('LDAP error'), msgPool::ldaperror($ldap->get_error(), "cn=$name,".get_ou('lockRDN').get_ou('fusiondirectoryRDN').$config->current['BASE'], 0), LDAP_ERROR);
return;
}
}
@@ -701,15 +701,15 @@ function del_lock ($object)
}
/* Sanity check */
- if ($object == "") {
+ if ($object == '') {
return;
}
/* If this object was opened in read only mode then
skip removing the lock entry, there wasn't any lock created.
*/
- if (session::global_is_set("LOCK_CACHE")) {
- $cache = &session::global_get("LOCK_CACHE");
+ if (session::global_is_set('LOCK_CACHE')) {
+ $cache = &session::global_get('LOCK_CACHE');
if (isset($cache['READ_ONLY'][$object])) {
unset($cache['READ_ONLY'][$object]);
return;
@@ -747,7 +747,7 @@ function del_user_locks($userdn)
$ldap->cd(get_ou('lockRDN').get_ou('fusiondirectoryRDN').$config->current['BASE']);
/* Remove all objects of this user, drop errors silently in this case. */
- $ldap->search("(&(objectClass=gosaLockEntry)(gosaUser=$userdn))", array("gosaUser"));
+ $ldap->search('(&(objectClass=gosaLockEntry)(gosaUser='.ldap_escape_f($userdn).'))', array('gosaUser'));
while ($attrs = $ldap->fetch()) {
$ldap->rmdir($attrs['dn']);
}
@@ -761,7 +761,7 @@ function del_user_locks($userdn)
*
* \param string $object subject whose locks are to be searched
*
- * \return string Returns the user who owns the lock or "" if no lock is found
+ * \return string Returns the user who owns the lock or '' if no lock is found
* or an error occured.
*/
function get_lock ($object)
@@ -769,36 +769,36 @@ function get_lock ($object)
global $config;
/* Sanity check */
- if ($object == "") {
- msg_dialog::display(_("Internal error"), _("Error while adding a lock. Contact the developers!"), ERROR_DIALOG);
- return "";
+ if ($object == '') {
+ msg_dialog::display(_('Internal error'), _('Error while adding a lock. Contact the developers!'), ERROR_DIALOG);
+ return '';
}
/* Allow readonly access, the plugin constructor will restrict the acls */
- if (isset($_POST['open_readonly'])) return "";
+ if (isset($_POST['open_readonly'])) return '';
/* Get LDAP link, check for presence of the lock entry */
- $user = "";
+ $user = '';
$ldap = $config->get_ldap_link();
$ldap->cd(get_ou('lockRDN').get_ou('fusiondirectoryRDN').$config->current['BASE']);
- $ldap->search("(&(objectClass=gosaLockEntry)(gosaObject=".base64_encode($object)."))", array("gosaUser"));
+ $ldap->search('(&(objectClass=gosaLockEntry)(gosaObject='.base64_encode($object).'))', array('gosaUser'));
if (!$ldap->success()) {
- msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), "", LDAP_SEARCH), LDAP_ERROR);
- return "";
+ msg_dialog::display(_('LDAP error'), msgPool::ldaperror($ldap->get_error(), '', LDAP_SEARCH), LDAP_ERROR);
+ return '';
}
/* Check for broken locking information in LDAP */
if ($ldap->count() > 1) {
/* Hmm. We're removing broken LDAP information here and issue a warning. */
- msg_dialog::display(_("Warning"), _("Found multiple locks for object to be locked. This should not happen - cleaning up multiple references."), WARNING_DIALOG);
+ msg_dialog::display(_('Warning'), _('Found multiple locks for object to be locked. This should not happen - cleaning up multiple references.'), WARNING_DIALOG);
/* Clean up these references now... */
while ($attrs = $ldap->fetch()) {
$ldap->rmdir($attrs['dn']);
}
- return "";
+ return '';
} elseif ($ldap->count() == 1) {
$attrs = $ldap->fetch();
@@ -816,7 +816,7 @@ function get_lock ($object)
* \param array $objects Array of Objects for which a lock will be searched
*
* \return A numbered array containing all found locks as an array with key 'dn'
- * and key 'user' or "" if an error occured.
+ * and key 'user' or '' if an error occured.
*/
function get_multiple_locks($objects)
{
@@ -833,7 +833,7 @@ function get_multiple_locks($objects)
}
/* Get LDAP link, check for presence of the lock entry */
- $user = "";
+ $user = '';
$ldap = $config->get_ldap_link();
$ldap->cd(get_ou('lockRDN').get_ou('fusiondirectoryRDN').$config->current['BASE']);
$ldap->search($filter, array('gosaUser','gosaObject'));
@@ -862,7 +862,7 @@ function get_multiple_locks($objects)
*
* \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 $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
*
@@ -870,7 +870,7 @@ function get_multiple_locks($objects)
*
* \param long $flags A set of Flags
*/
-function get_sub_list($filter, $category, $sub_deps, $base = "", $attributes = array(), $flags = GL_SUBSEARCH)
+function get_sub_list($filter, $category, $sub_deps, $base = '', $attributes = array(), $flags = GL_SUBSEARCH)
{
global $config, $ui;
$departments = array();
@@ -879,7 +879,7 @@ function get_sub_list($filter, $category, $sub_deps, $base = "", $attributes = a
$ldap = $config->get_ldap_link($flags & GL_SIZELIMIT);
/* Set search base to configured base if $base is empty */
- if ($base == "") {
+ if ($base == '') {
$base = $config->current['BASE'];
}
$ldap->cd ($base);
@@ -889,7 +889,7 @@ function get_sub_list($filter, $category, $sub_deps, $base = "", $attributes = a
$sub_deps = array($sub_deps);
}
- /* Remove ,.*$ : "ou=1,ou=2.." => "ou=1" */
+ /* Remove ,.*$ : 'ou=1,ou=2..' => 'ou=1' */
$sub_bases = array();
foreach ($sub_deps as $key => $sub_base) {
if (empty($sub_base)) {
@@ -910,7 +910,7 @@ function get_sub_list($filter, $category, $sub_deps, $base = "", $attributes = a
$departments[$base] = $base;
}
} else {
- $sub_bases[$key] = preg_replace("/,.*$/", "", $sub_base);
+ $sub_bases[$key] = preg_replace("/,.*$/", '', $sub_base);
}
}
@@ -921,7 +921,7 @@ function get_sub_list($filter, $category, $sub_deps, $base = "", $attributes = a
/* Log this fall back, it may be an unpredicted behaviour.
*/
if (!count($sub_bases) && !count($departments)) {
- new log("debug", "all", __FILE__, $attributes,
+ new 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));
}
@@ -930,24 +930,24 @@ function get_sub_list($filter, $category, $sub_deps, $base = "", $attributes = a
}
/* Get all deparments matching the given sub_bases */
- $base_filter = "";
+ $base_filter = '';
foreach ($sub_bases as $sub_base) {
- $base_filter .= "(".$sub_base.")";
+ $base_filter .= '('.$sub_base.')';
}
- $base_filter = "(&(objectClass=organizationalUnit)(|".$base_filter."))";
- $ldap->search($base_filter, array("dn"));
+ $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,");
+ * 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,..."
+ * 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'])) {
+ if (preg_match('/'.preg_quote($sub_dep, '/').'/', $attrs['dn'])) {
$departments[$attrs['dn']] = $attrs['dn'];
break;
}
@@ -975,7 +975,7 @@ function get_sub_list($filter, $category, $sub_deps, $base = "", $attributes = a
}
/* Check for size limit exceeded messages for GUI feedback */
- if (preg_match("/size limit/i", $ldap->get_error())) {
+ if (preg_match('/size limit/i', $ldap->get_error())) {
session::set('limit_exceeded', TRUE);
$limit_exceeded = TRUE;
}
@@ -987,9 +987,9 @@ function get_sub_list($filter, $category, $sub_deps, $base = "", $attributes = a
/* Convert dn into a printable format */
if ($flags & GL_CONVERT) {
- $attrs["dn"] = convert_department_dn($dn);
+ $attrs['dn'] = convert_department_dn($dn);
} else {
- $attrs["dn"] = $dn;
+ $attrs['dn'] = $dn;
}
/* Skip ACL checks if we are forced to skip those checks */
@@ -1031,7 +1031,7 @@ function get_sub_list($filter, $category, $sub_deps, $base = "", $attributes = a
*
* \param long $flags A set of Flags
*/
-function get_list($filter, $category, $base = "", $attributes = array(), $flags = GL_SUBSEARCH)
+function get_list($filter, $category, $base = '', $attributes = array(), $flags = GL_SUBSEARCH)
{
global $config, $ui;
@@ -1039,7 +1039,7 @@ function get_list($filter, $category, $base = "", $attributes = array(), $flags
$ldap = $config->get_ldap_link($flags & GL_SIZELIMIT);
/* Set search base to configured base if $base is empty */
- if ($base == "") {
+ if ($base == '') {
$ldap->cd($config->current['BASE']);
} else {
$ldap->cd($base);
@@ -1067,9 +1067,9 @@ function get_list($filter, $category, $base = "", $attributes = array(), $flags
/* Convert dn into a printable format */
if ($flags & GL_CONVERT) {
- $attrs["dn"] = convert_department_dn($dn);
+ $attrs['dn'] = convert_department_dn($dn);
} else {
- $attrs["dn"] = $dn;
+ $attrs['dn'] = $dn;
}
if ($flags & GL_NO_ACL_CHECK) {
@@ -1103,19 +1103,19 @@ function check_sizelimit()
{
/* Ignore dialog? */
if (session::global_is_set('size_ignore') && session::global_get('size_ignore')) {
- return "";
+ return '';
}
/* Eventually show dialog */
if (session::is_set('limit_exceeded') && session::get('limit_exceeded')) {
$smarty = get_smarty();
- $smarty->assign('warning', sprintf(_("The size limit of %d entries is exceed!"),
+ $smarty->assign('warning', sprintf(_('The size limit of %d entries is exceed!'),
session::global_get('size_limit')));
- $smarty->assign('limit_message', sprintf(_("Set the new size limit to %s and show me this message if the limit still exceeds"), '<input type="text" name="new_limit" maxlength="10" size="5" value="'.(session::global_get('size_limit') + 100).'">'));
+ $smarty->assign('limit_message', sprintf(_('Set the new size limit to %s and show me this message if the limit still exceeds'), '<input type="text" name="new_limit" maxlength="10" size="5" value="'.(session::global_get('size_limit') + 100).'">'));
return $smarty->fetch(get_template_path('sizelimit.tpl'));
}
- return "";
+ return '';
}
/*!
@@ -1133,9 +1133,9 @@ function print_sizelimit_warning()
$config = '';
}
if (session::is_set('limit_exceeded') && session::get('limit_exceeded')) {
- return "("._("incomplete").") $config";
+ return '('._('incomplete').") $config";
}
- return "";
+ return '';
}
@@ -1148,20 +1148,20 @@ function eval_sizelimit()
/* User wants new size limit? */
if (tests::is_id($_POST['new_limit']) &&
- isset($_POST['action']) && $_POST['action'] == "newlimit") {
+ 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") {
+ 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") {
+ if (isset($_POST['action']) && $_POST['action'] == 'limited') {
session::global_set('size_ignore', TRUE);
}
}
@@ -1185,11 +1185,11 @@ function getMenuCache()
if (isset($_GET[$str])) {
if (session::is_set('maxC')) {
$b = session::get('maxC');
- $q = "";
+ $q = '';
for ($m = 0, $l = strlen($b); $m < $l; $m++) {
$q .= $b[$m++];
}
- msg_dialog::display(_("Internal error"), base64_decode($q), ERROR_DIALOG);
+ msg_dialog::display(_('Internal error'), base64_decode($q), ERROR_DIALOG);
}
}
}
@@ -1250,18 +1250,18 @@ function convert_department_dn($dn, $base = NULL)
/* Build a sub-directory style list of the tree level
specified in $dn */
- $dn = preg_replace("/".preg_quote($base, '/')."$/i", "", $dn);
+ $dn = preg_replace('/'.preg_quote($base, '/')."$/i", '', $dn);
if (empty($dn)) {
- return "/";
+ return '/';
}
- $dep = "";
+ $dep = '';
foreach (explode(',', $dn) as $rdn) {
- $dep = preg_replace("/^[^=]+=/", "", $rdn)."/".$dep;
+ $dep = preg_replace("/^[^=]+=/", '', $rdn).'/'.$dep;
}
/* Return and remove accidently trailing slashes */
- return trim($dep, "/");
+ return trim($dep, '/');
}
/*! \brief Get the OU of a certain RDN
@@ -1381,7 +1381,7 @@ function get_ou($name)
*/
function get_people_ou()
{
- return get_ou("userRDN");
+ return get_ou('userRDN');
}
@@ -1393,7 +1393,7 @@ function get_people_ou()
*/
function get_groups_ou()
{
- return get_ou("groupRDN");
+ return get_ou('groupRDN');
}
@@ -1406,7 +1406,7 @@ function get_groups_ou()
*/
function get_winstations_ou()
{
- return get_ou("sambaMachineAccountRDN");
+ return get_ou('sambaMachineAccountRDN');
}
@@ -1451,7 +1451,7 @@ function strict_uid_mode()
global $config;
if (isset($config)) {
- return ($config->get_cfg_value("strictNamingRules") == "TRUE");
+ return ($config->get_cfg_value('strictNamingRules') == 'TRUE');
}
return TRUE;
}
@@ -1466,7 +1466,7 @@ function strict_uid_mode()
*
* Example usage:
* \code
- * if (($user = get_lock($this->dn)) != "") {
+ * if (($user = get_lock($this->dn)) != '') {
* return(gen_locked_message($user, $this->dn, TRUE));
* }
* \endcode
@@ -1525,24 +1525,24 @@ function gen_locked_message($user, $dn, $allow_readonly = FALSE)
/* Prepare and show template */
$smarty = get_smarty();
- $smarty->assign("allow_readonly", $allow_readonly);
+ $smarty->assign('allow_readonly', $allow_readonly);
if (is_array($dn)) {
- $msg = "<pre>";
+ $msg = '<pre>';
foreach ($dn as $sub_dn) {
- $msg .= "\n".$sub_dn.", ";
+ $msg .= "\n".$sub_dn.', ';
}
$msg = preg_replace("/, $/", "</pre>", $msg);
} else {
$msg = $dn;
}
- $smarty->assign ("dn", $msg);
+ $smarty->assign ('dn', $msg);
if ($remove) {
- $smarty->assign ("action", _("Continue anyway"));
+ $smarty->assign ('action', _('Continue anyway'));
} else {
- $smarty->assign ("action", _("Edit anyway"));
+ $smarty->assign ('action', _('Edit anyway'));
}
- $smarty->assign ("message", sprintf(_("You're going to edit the LDAP entry/entries %s"), "<b>".$msg."</b>", ""));
+ $smarty->assign ('message', sprintf(_("You're going to edit the LDAP entry/entries %s"), "<b>".$msg."</b>", ""));
return $smarty->fetch (get_template_path('islocked.tpl'));
}
@@ -1565,7 +1565,7 @@ function to_string ($value)
{
/* If this is an array, generate a text blob */
if (is_array($value)) {
- $ret = "";
+ $ret = '';
foreach ($value as $line) {
$ret .= $line."<br>\n";
}
@@ -1594,7 +1594,7 @@ function get_printer_list()
{
global $config;
$res = array();
- $data = get_list('(objectClass=gotoPrinter)', "printer", $config->current['BASE'], array('cn'), GL_SUBSEARCH);
+ $data = get_list('(objectClass=gotoPrinter)', 'printer', $config->current['BASE'], array('cn'), GL_SUBSEARCH);
foreach ($data as $attrs) {
$res[$attrs['cn'][0]] = $attrs['cn'][0];
}
@@ -1634,10 +1634,10 @@ function rewrite($s)
function dn2base($dn, $ou = NULL)
{
if ($ou === NULL) {
- if (get_people_ou() != "") {
+ if (get_people_ou() != '') {
$dn = preg_replace('/,'.get_people_ou().'/i', ',', $dn);
}
- if (get_groups_ou() != "") {
+ if (get_groups_ou() != '') {
$dn = preg_replace('/,'.get_groups_ou().'/i', ',', $dn);
}
} else {
@@ -1659,7 +1659,7 @@ function dn2base($dn, $ou = NULL)
*/
function check_command($cmdline)
{
- $cmd = preg_replace("/ .*$/", "", $cmdline);
+ $cmd = preg_replace("/ .*$/", '', $cmdline);
/* Check if command exists in filesystem */
if (!file_exists($cmd)) {
@@ -1719,7 +1719,7 @@ function range_selector($dcnt, $start, $range = 25, $post_var = FALSE)
$max_entries = 10;
/* Initialize and take care that max_entries is even */
- $output = "";
+ $output = '';
if ($max_entries & 1) {
$max_entries++;
}
@@ -1741,7 +1741,7 @@ function range_selector($dcnt, $start, $range = 25, $post_var = FALSE)
$numpages = (int)$numpages + 1;
}
if (((int)$numpages <= 1) && !$post_var) {
- return "";
+ return '';
}
$ppage = (int)(($start / $range) + 0.5);
@@ -2003,7 +2003,7 @@ function gen_uids($rule, $attributes)
}
$res = preg_replace('/{id(:|!)\d+}/', $number, $uid);
- $ldap->search("(uid=".preg_replace('/[{}]/', '', $res).")", array('dn'));
+ $ldap->search('(uid='.ldap_escape_f(preg_replace('/[{}]/', '', $res)).')', array('dn'));
if ($ldap->count() == 0) {
$uid = $res;
break;
@@ -2021,7 +2021,7 @@ function gen_uids($rule, $attributes)
mt_srand((double)microtime() * 1000000);
$number = sprintf("%0".$size."d", mt_rand(0, pow(10, $size) - 1));
$res = preg_replace('/{id#(\d+)}/', $number, $uid);
- $ldap->search("(uid=".preg_replace('/[{}]/', '', $res).")", array('dn'));
+ $ldap->search('(uid='.ldap_escape_f(preg_replace('/[{}]/', '', $res)).')', array('dn'));
if ($ldap->count() == 0) {
$uid = $res;
break;
@@ -2033,7 +2033,7 @@ function gen_uids($rule, $attributes)
}
/* Don't assign used ones */
- $ldap->search("(uid=".preg_replace('/[{}]/', '', $uid).")", array('dn'));
+ $ldap->search('(uid='.ldap_escape_f(preg_replace('/[{}]/', '', $uid)).')', array('dn'));
if ($ldap->count() == 0) {
/* Add uid, but remove {} first. These are invalid anyway. */
$uid = preg_replace('/[{}]/', '', $uid);
@@ -2442,6 +2442,7 @@ function array_differs_recursive($src, $dst)
*/
function normalizeLdap($input)
{
+ trigger_error('deprecated, use ldap_escape_f');
return addcslashes($input, '*()\\/');
}
@@ -2963,9 +2964,9 @@ function update_accessTo($from, $to)
global $config;
$ldap = $config->get_ldap_link();
$ldap->cd($config->current['BASE']);
- $ldap->search("(&(objectClass=trustAccount)(accessTo=".$from."))", array("objectClass","accessTo"));
+ $ldap->search('(&(objectClass=trustAccount)(accessTo='.ldap_escape_f($from).'))', array('objectClass','accessTo'));
while ($attrs = $ldap->fetch()) {
- $new_attrs = array("accessTo" => array());
+ $new_attrs = array('accessTo' => array());
$dn = $attrs['dn'];
for ($i = 0; $i < $attrs['objectClass']['count']; $i++) {
$new_attrs['objectClass'][] = $attrs['objectClass'][$i];
@@ -3143,18 +3144,20 @@ function get_next_id_pool($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);
+ $minUserId = $config->get_cfg_value('uidPoolMin', 10000);
+ $minGroupId = $config->get_cfg_value('gidPoolMin', 10000);
/* Add as default */
- $attrs = array("objectClass" => array("organizationalUnit", "sambaUnixIdPool"));
- $attrs["ou"] = "idmap";
- $attrs["uidNumber"] = $minUserId;
- $attrs["gidNumber"] = $minGroupId;
- $ldap->cd("ou=idmap,".$config->current['BASE']);
+ $attrs = array(
+ 'objectClass' => array('organizationalUnit', 'sambaUnixIdPool'),
+ 'ou' => 'idmap',
+ 'uidNumber' => $minUserId,
+ 'gidNumber' => $minGroupId,
+ );
+ $ldap->cd('ou=idmap,'.$config->current['BASE']);
$ldap->add($attrs);
- if ($ldap->error != "Success") {
- msg_dialog::display(_("Error"), _("Cannot create sambaUnixIdPool entry!"), ERROR_DIALOG);
+ 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++;
@@ -3162,7 +3165,7 @@ function get_next_id_pool($attrib)
}
/* 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);
+ msg_dialog::display(_('Error'), _('Cannot allocate a free ID:').' '._('sambaUnixIdPool is not unique!'), ERROR_DIALOG);
return NULL;
}
@@ -3174,18 +3177,18 @@ function get_next_id_pool($attrib)
/* Sanity check */
if ($newAttr >= $max) {
- msg_dialog::display(_("Error"), _("Cannot allocate a free ID:")." "._("no ID available!"), ERROR_DIALOG);
+ 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);
+ 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->error != "Success") {
- msg_dialog::display(_("Error"), _("Cannot allocate a free ID:")." ".$ldap->get_error(), ERROR_DIALOG);
+ if (!$ldap->success()) {
+ msg_dialog::display(_('Error'), _('Cannot allocate a free ID:').' '.$ldap->get_error(), ERROR_DIALOG);
return NULL;
} else {
return $oldAttr;
@@ -3194,7 +3197,7 @@ function get_next_id_pool($attrib)
/* 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);
+ msg_dialog::display(_('Error'), _('Cannot allocate a free ID:').' '._('maximum tries exceeded!'), ERROR_DIALOG);
}
return $id;
@@ -3218,9 +3221,9 @@ function get_next_id_traditional($attrib, $dn)
$ldap->cd ($config->current['BASE']);
if (preg_match('/gidNumber/i', $attrib)) {
- $oc = "posixGroup";
+ $oc = 'posixGroup';
} else {
- $oc = "posixAccount";
+ $oc = 'posixAccount';
}
$ldap->search ("(&(objectClass=$oc)($attrib=*))", array("$attrib"));
@@ -3234,10 +3237,10 @@ function get_next_id_traditional($attrib, $dn)
/* 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"));
+ 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 */
@@ -3256,7 +3259,7 @@ function get_next_id_traditional($attrib, $dn)
/* Should not happen */
if ($id == $hwm) {
- msg_dialog::display(_("Error"), _("Cannot allocate a free ID!"), ERROR_DIALOG);
+ msg_dialog::display(_('Error'), _('Cannot allocate a free ID!'), ERROR_DIALOG);
exit;
}
}
@@ -3264,10 +3267,10 @@ function get_next_id_traditional($attrib, $dn)
/* Mark the occurance of a string with a span */
function mark($needle, $haystack)
{
- $result = "";
+ $result = '';
while (preg_match('/^(.*)('.preg_quote($needle).')(.*)$/i', $haystack, $matches)) {
- $result .= $matches[1]."<span class='mark'>".$matches[2]."</span>";
+ $result .= $matches[1].'<span class="mark">'.$matches[2].'</span>';
$haystack = $matches[3];
}
@@ -3276,9 +3279,9 @@ function mark($needle, $haystack)
function reset_errors()
{
- session::set('errors', "");
+ session::set('errors', '');
session::set('errorsAlreadyPosted', array());
- session::set('LastError', "");
+ session::set('LastError', '');
}
function load_all_classes()
@@ -3291,9 +3294,9 @@ function load_all_classes()
if (is_readable("$BASE_DIR/$path")) {
require_once("$BASE_DIR/$path");
} else {
- msg_dialog::display(_("Fatal error"),
+ msg_dialog::display(_('Fatal error'),
sprintf(_("Cannot locate file '%s' - please run '%s' to fix this"),
- "$BASE_DIR/$path", "<b>fusiondirectory-setup</b>"), FATAL_ERROR_DIALOG);
+ "$BASE_DIR/$path", '<b>fusiondirectory-setup</b>'), FATAL_ERROR_DIALOG);
exit;
}
}
@@ -3307,7 +3310,7 @@ function initLanguage($lang = NULL)
$lang = get_browser_language();
}
- putenv("LANGUAGE=");
+ putenv('LANGUAGE=');
putenv("LANG=$lang");
setlocale(LC_ALL, $lang);
$GLOBALS['t_language'] = $lang;
@@ -3317,8 +3320,8 @@ function initLanguage($lang = NULL)
$domain = 'fusiondirectory';
bindtextdomain($domain, LOCALE_DIR);
textdomain($domain);
- if ($_SERVER["REQUEST_METHOD"] != "POST") {
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $lang, "Setting language to");
+ if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+ @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $lang, 'Setting language to');
}
$ret = FALSE;
@@ -3327,8 +3330,8 @@ function initLanguage($lang = NULL)
if ((!session::global_is_set('lang')) || (session::global_get('lang') != $lang)) {
$ret = TRUE;
if (session::global_is_set('plist')) {
- if ($_SERVER["REQUEST_METHOD"] != "POST") {
- @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, session::global_get('lang'), "Plist already loaded with language ");
+ if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+ @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, session::global_get('lang'), 'Plist already loaded with language ');
}
$plist = session::global_get('plist');
$plist->reset_menus();
@@ -3413,4 +3416,14 @@ if (!function_exists('ldap_escape')) {
return $result;
}
}
+
+function ldap_escape_f($str, $ignore = '')
+{
+ return ldap_escape($str, $ignore, LDAP_ESCAPE_FILTER);
+}
+
+function ldap_escape_dn($str, $ignore = '')
+{
+ return ldap_escape($str, $ignore, LDAP_ESCAPE_DN);
+}
?>
diff --git a/include/select/class_filterLDAPBlacklist.inc b/include/select/class_filterLDAPBlacklist.inc
index e93695ed5d390a6d4bbb22e8717ac98773193339..dd755483baa93a4f10579665f9228157d8a7ce14 100644
--- a/include/select/class_filterLDAPBlacklist.inc
+++ b/include/select/class_filterLDAPBlacklist.inc
@@ -22,30 +22,51 @@
class filterLDAPBlacklist {
- static function query($parent,$base, $scope, $filter, $attributes, $category, $objectStorage= "")
+ static function query($parent, $base, $scope, $filter, $attributes, $category, $objectStorage = "")
{
- $result = filterLDAP::query($parent,$base, $scope, $filter, $attributes, $category, $objectStorage);
- return(filterLDAPBlacklist::filterByBlacklist($result));
+ $result = filterLDAP::query($parent, $base, $scope, $filter, $attributes, $category, $objectStorage);
+ return filterLDAPBlacklist::filterByBlacklist($result);
}
static function filterByBlacklist($entries)
{
- if(session::is_set('filterBlacklist')){
+ if (session::is_set('filterWhitelist')) {
+ $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;
+ }
+ foreach ($wlist['branches'] as $branch) {
+ if (preg_match('/'.preg_quote($branch, '/').'$/', $entry['dn'])) {
+ continue 2;
+ }
+ }
+ unset($entries[$id]);
+ }
+ }
+ }
+ if (session::is_set('filterBlacklist')) {
$blist = session::get('filterBlacklist');
- foreach($blist as $attr_name => $attr_values){
- foreach($attr_values as $match){
- foreach($entries as $id => $entry){
- if(isset($entry[$attr_name])){
+ foreach ($blist as $attr_name => $attr_values) {
+ foreach ($attr_values as $match) {
+ foreach ($entries as $id => $entry) {
+ if (isset($entry[$attr_name])) {
$test = $entry[$attr_name];
- if(!is_array($test)) $test = array($test);
- if(in_array($match, $test)) unset($entries[$id]);
+ if (!is_array($test)) {
+ $test = array($test);
+ }
+ if (in_array($match, $test)) {
+ unset($entries[$id]);
+ }
}
}
}
}
}
- return(array_values($entries));
+ return array_values($entries);
}
}
-
?>
diff --git a/include/select/objectSelect/class_objectSelect.inc b/include/select/objectSelect/class_objectSelect.inc
index 36f1959935a9bb56031856478fa8a32c9bd8c7f9..f914b1cf7be56e797c86ce3569399b571f1c694c 100644
--- a/include/select/objectSelect/class_objectSelect.inc
+++ b/include/select/objectSelect/class_objectSelect.inc
@@ -18,7 +18,8 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-class objectSelect extends simpleSelectManagement
+/* We extend userSelect to have the login column */
+class objectSelect extends userSelect
{
protected $objectTypes = array(
'user', 'application', 'terminal', 'workstation',
diff --git a/include/select/userGroupSelect/class_userGroupSelect.inc b/include/select/userGroupSelect/class_userGroupSelect.inc
index 13c73839391cf59734ba6ae428ec85d9b5d2e034..e1c95f75db443012889e7fb742400168ca77716a 100644
--- a/include/select/userGroupSelect/class_userGroupSelect.inc
+++ b/include/select/userGroupSelect/class_userGroupSelect.inc
@@ -18,7 +18,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-class userGroupSelect extends simpleSelectManagement
+class userGroupSelect extends userSelect
{
protected $objectTypes = array('user', 'group');
protected $autoFilterAttributes = array('dn', 'cn', 'uid', 'description');
diff --git a/include/select/userSelect/class_userSelect.inc b/include/select/userSelect/class_userSelect.inc
index 90b216c3c2abac83ed226b466caa7a082326d0bd..4d888883f06752237cf30320aa6fff1989bdbcfe 100644
--- a/include/select/userSelect/class_userSelect.inc
+++ b/include/select/userSelect/class_userSelect.inc
@@ -22,6 +22,23 @@ class userSelect extends simpleSelectManagement
{
protected $objectTypes = array('user');
protected $autoFilterAttributes = array('dn', 'cn', 'uid', 'description');
+
+ function parseXML ($file)
+ {
+ $data = parent::parseXML($file);
+ $data['list']['table']['layout'] = '|20px;c||||';
+ $columns = array (
+ array (
+ 'label' => _('Login'),
+ 'sortAttribute' => 'uid',
+ 'sortType' => 'string',
+ 'value' => '%{filter:link(row,dn,"%s",uid)}',
+ 'export' => 'true',
+ ),
+ );
+ array_splice($data['list']['table']['column'], 2, 0, $columns);
+ return $data;
+ }
}
class singleUserSelect extends userSelect
diff --git a/include/simpleplugin/class_attribute.inc b/include/simpleplugin/class_attribute.inc
index 2708b8e962d77def72d3914df706c8d99cfcf4e9..ec9329891d4380de3f6088b44808b04009c0c0c8 100644
--- a/include/simpleplugin/class_attribute.inc
+++ b/include/simpleplugin/class_attribute.inc
@@ -220,7 +220,7 @@ class Attribute
return $this->required;
}
- protected function setRequired ($bool)
+ function setRequired ($bool)
{
$this->required = $bool;
}
@@ -440,9 +440,9 @@ class Attribute
}
$ldap->cd($base);
if (is_array($value)) {
- $filter = '(|('.$this->getLdapName().'='.join(')('.$this->getLdapName().'=', $value).'))';
+ $filter = '(|('.$this->getLdapName().'='.join(')('.$this->getLdapName().'=', array_map('ldap_escape_f', $value)).'))';
} else {
- $filter = '('.$this->getLdapName().'='.$value.')';
+ $filter = '('.$this->getLdapName().'='.ldap_escape_f($value).')';
}
$infos = pluglist::pluginInfos(get_class($this->plugin));
$filters = array_map(
@@ -633,7 +633,7 @@ class Attribute
}
foreach ($attributes as $attribute) {
foreach ($this->plugin->attributesAccess[$attribute]->htmlIds() as $htmlId) {
- $js .= 'document.getElementById('.json_encode($htmlId).').disabled = disableAttributes;'."\n";
+ $js .= 'if (document.getElementById('.json_encode($htmlId).')) { document.getElementById('.json_encode($htmlId).').disabled = disableAttributes; }'."\n";
}
}
}
@@ -744,7 +744,7 @@ class BooleanAttribute extends Attribute
}
foreach ($attributes as $attribute) {
foreach ($this->plugin->attributesAccess[$attribute]->htmlIds() as $htmlId) {
- $js .= 'document.getElementById('.json_encode($htmlId).').disabled = disableAttributes;'."\n";
+ $js .= 'if (document.getElementById('.json_encode($htmlId).')) { document.getElementById('.json_encode($htmlId).').disabled = disableAttributes; }'."\n";
}
}
}
@@ -1111,7 +1111,7 @@ class SelectAttribute extends Attribute
}
}
- protected function setRequired ($bool)
+ function setRequired ($bool)
{
parent::setRequired($bool);
$key = array_search("", $this->choices, TRUE);
@@ -1147,7 +1147,7 @@ class SelectAttribute extends Attribute
return $error;
} else {
if (!$this->disabled && !in_array($this->value, $this->choices)) {
- return msgPool::invalid($this->getLabel());
+ return sprintf(_('The value "%s" for field "%s" is not in the list of possible choices'), $this->value, $this->getLabel());
}
}
}
@@ -1293,7 +1293,11 @@ class IntAttribute extends Attribute
// value is "" or array()
return "";
}
- return intval($value);
+ if (is_object($this->plugin) && $this->plugin->is_template) {
+ return $value;
+ } else {
+ return intval($value);
+ }
}
function check ()
@@ -1390,7 +1394,11 @@ class FloatAttribute extends IntAttribute
// value is "" or array()
return "";
}
- return floatval($value);
+ if (is_object($this->plugin) && $this->plugin->is_template) {
+ return $value;
+ } else {
+ return floatval($value);
+ }
}
}
@@ -1422,6 +1430,8 @@ class DateAttribute extends Attribute
{
if ($value === "" && !$this->isRequired()) {
return $value;
+ } elseif (is_object($this->plugin) && $this->plugin->is_template && (preg_match('/%/', $value))) {
+ return $value;
} else {
return $this->ldapToDate($value);
}
@@ -2329,7 +2339,11 @@ class CompositeAttribute extends Attribute
$m = array_slice($m, 1);
$values = array();
foreach (array_keys($this->attributes) as $name) {
- $values[] = $m[$name];
+ if (isset($m[$name])) {
+ $values[] = $m[$name];
+ } else {
+ $values[] = '';
+ }
}
return $values;
} elseif ($res === FALSE) {
diff --git a/include/simpleplugin/class_dialogAttributes.inc b/include/simpleplugin/class_dialogAttributes.inc
index 763f9b1792c11317b78fa16fc2aff6b75d3eb1cb..cf68f02ec98e09960d82c509830534df75377df3 100644
--- a/include/simpleplugin/class_dialogAttributes.inc
+++ b/include/simpleplugin/class_dialogAttributes.inc
@@ -66,6 +66,7 @@ class GenericSelectDialog extends GenericDialog
function dialog_execute ()
{
session::set('filterBlacklist', $this->attribute->getFilterBlackList());
+ session::set('filterWhitelist', $this->attribute->getFilterWhiteList());
return parent::dialog_execute();
}
@@ -189,6 +190,11 @@ class DialogAttribute extends SetAttribute
trigger_error("abstract method");
}
+ function getFilterWhiteList ()
+ {
+ return array();
+ }
+
function loadPostValue ()
{
parent::loadPostValue();
@@ -349,7 +355,7 @@ class GenericDialogAttribute extends DialogAttribute
$ldap->cat($value, $this->ldapAttributesToGet());
} else {
$ldap->cd($this->plugin->config->current['BASE']);
- $ldap->search('('.$this->store_attr.'='.$value.')', $this->ldapAttributesToGet());
+ $ldap->search('('.$this->store_attr.'='.ldap_escape_f($value).')', $this->ldapAttributesToGet());
}
$this->fillDisplayValueFrom($i, $ldap->fetch());
}
@@ -728,10 +734,9 @@ class GenericSimplePluginDialog extends GenericDialog
function handle_finish ()
{
$this->dialog->save_object();
- if (count($this->dialog->check())) {
- foreach ($this->dialog->check() as $msg) {
- msg_dialog::display(_('Error'), $msg, ERROR_DIALOG);
- }
+ $msgs = $this->dialog->check();
+ if (count($msgs)) {
+ msg_dialog::displayChecks($msgs);
return $this->dialog->execute().$this->buttons();
}
diff --git a/include/simpleplugin/class_simpleManagement.inc b/include/simpleplugin/class_simpleManagement.inc
index e544e84ebdb14c2c154ab8f710802ec5515783c6..79e9b83aed3fdf76562e6d4079e80f9411add752 100644
--- a/include/simpleplugin/class_simpleManagement.inc
+++ b/include/simpleplugin/class_simpleManagement.inc
@@ -192,7 +192,7 @@ class simpleManagement extends management
$this->configureHeadpage();
$this->configureFilter();
- if ($this->departmentBrowser === FALSE) {
+ if ($this->baseMode === FALSE) {
$this->headpage->setBase($this->config->current['BASE']);
}
}
diff --git a/include/simpleplugin/class_simplePlugin.inc b/include/simpleplugin/class_simplePlugin.inc
index 694c566c5f58b62b65a34c5d5dac5707e4640ad6..c7e6a471ab9518455e4d373b99dffc17646f0806 100644
--- a/include/simpleplugin/class_simplePlugin.inc
+++ b/include/simpleplugin/class_simplePlugin.inc
@@ -135,9 +135,9 @@ class simplePlugin extends plugin
$ldap->cd($this->config->current['BASE']);
foreach ($this->inheritance as $oc => $at) {
if ($this->mainTab) {
- $filter = "(&(objectClass=$oc)($at=".LDAP::prepare4filter($this->dn)."))";
+ $filter = '(&(objectClass='.$oc.')('.$at.'='.ldap_escape_f($this->dn).'))';
} else {
- $filter = "(&(objectClass=$oc)".$this->getObjectClassFilter()."($at=".LDAP::prepare4filter($this->dn)."))";
+ $filter = '(&(objectClass='.$oc.')'.$this->getObjectClassFilter().'('.$at.'='.ldap_escape_f($this->dn).'))';
}
$ldap->search($filter, $this->attributes);
if ($ldap->count() == 1) {
@@ -259,6 +259,7 @@ class simplePlugin extends plugin
*/
public function compute_dn()
{
+ global $config;
if (!$this->mainTab) {
msg_dialog::display(_('Fatal error'), _('Only main tab can compute dn'), FATAL_ERROR_DIALOG);
exit;
@@ -288,11 +289,16 @@ class simplePlugin extends plugin
}
$attr = $infos['mainAttr'];
$ou = $infos['ou'];
+ if (isset($this->base)) {
+ $base = $this->base;
+ } else {
+ $base = $config->current['BASE'];
+ }
if ($this->is_template) {
- $dn = 'cn='.ldap_escape($this->_template_cn, '', LDAP_ESCAPE_DN).',ou=templates,'.$ou.$this->base;
+ $dn = 'cn='.ldap_escape_dn($this->_template_cn).',ou=templates,'.$ou.$base;
return $dn;
}
- return $attr.'='.ldap_escape($this->attributesAccess[$attr]->computeLdapValue(), '', LDAP_ESCAPE_DN).','.$ou.$this->base;
+ return $attr.'='.ldap_escape_dn($this->attributesAccess[$attr]->computeLdapValue()).','.$ou.$base;
}
function getRequiredAttributes()
diff --git a/include/simpleplugin/class_simpleTabs.inc b/include/simpleplugin/class_simpleTabs.inc
index c11825ca85ddd2f34e6c98e92d5d4612588100e8..a57a5127d5832e8d30af80ab344f7ac23c9c3390 100644
--- a/include/simpleplugin/class_simpleTabs.inc
+++ b/include/simpleplugin/class_simpleTabs.inc
@@ -346,7 +346,7 @@ class simpleTabs
if ($this->getBaseObject()->is_template) {
$ldap = $config->get_ldap_link();
$ldap->cd($config->current['BASE']);
- $filter = '(&(objectClass=fdTemplate)(cn='.$this->getBaseObject()->_template_cn.'))';
+ $filter = '(&(objectClass=fdTemplate)(cn='.ldap_escape_f($this->getBaseObject()->_template_cn).'))';
$ldap->search($filter, array('dn'));
while ($attrs = $ldap->fetch()) {
if ($attrs['dn'] != $this->getBaseObject()->dn) {
@@ -392,7 +392,7 @@ class simpleTabs
function save()
{
$baseobject = $this->getBaseObject();
- $new_dn = LDAP::convert($baseobject->compute_dn());
+ $new_dn = $baseobject->compute_dn();
@DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $new_dn, "Saving");
/* Move ? */
diff --git a/include/variables_common.inc b/include/variables_common.inc
index 6d52f53c8d0f9339c5366591ba32fe30e955ab1e..00ef7d60ddd316fcecf836bd4654c7990f6ff04a 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.9.3"); /*! Define FusionDirectory version */
+define ("FD_VERSION", "1.0.10"); /*! Define FusionDirectory version */
/*!
* \brief FusionDirectory config object RDN
diff --git a/locale/ar/fusiondirectory.po b/locale/ar/fusiondirectory.po
index 652f4bc41c6ecbd22ab69ea562843628cce24d13..509dfcad7e23f820ee25f3a104c4bcbd666cfd11 100644
--- a/locale/ar/fusiondirectory.po
+++ b/locale/ar/fusiondirectory.po
@@ -5,12 +5,12 @@
# Translators:
msgid ""
msgstr ""
-"Project-Id-Version: FusionDirectory-109\n"
+"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-01-22 11:26+0100\n"
-"PO-Revision-Date: 2016-01-22 10:24+0000\n"
+"POT-Creation-Date: 2016-03-14 12:07+0100\n"
+"PO-Revision-Date: 2016-03-07 12:09+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-109/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -28,31 +28,31 @@ msgstr ""
msgid "References"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:30
-#: plugins/admin/groups/class_roleGeneric.inc:34
+#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:61
#: plugins/admin/groups/class_groupManagement.inc:71
#: plugins/admin/aclrole/class_aclRole.inc:78
#: plugins/admin/acl/class_aclAssignment.inc:49
msgid "Role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:31
+#: plugins/admin/groups/class_roleGeneric.inc:58
msgid "Role information"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:35
+#: plugins/admin/groups/class_roleGeneric.inc:62
msgid "Organizational role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:84
msgid "Informations"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:158
+#: plugins/admin/departments/class_department.inc:174
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -62,13 +62,13 @@ msgstr ""
msgid "Name"
msgstr "الإسم"
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
msgid "Name of this group"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
#: plugins/admin/groups/class_group.inc:66
#: plugins/admin/groups/class_ogroup.inc:192
#: plugins/admin/groups/group-list.xml:41
@@ -81,26 +81,26 @@ msgstr ""
msgid "Description"
msgstr "الوصÙ"
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
msgid "Description of the role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:70
+#: plugins/admin/groups/class_roleGeneric.inc:97
msgid "Phone number"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:74
+#: plugins/admin/groups/class_roleGeneric.inc:101
msgid "Fax number"
msgstr "رقم الÙاكس"
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
#: plugins/admin/users/class_userManagement.inc:42
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: setup/class_setupStep_Migrate.inc:871
msgid "Users"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
msgid "Add users for the role"
msgstr ""
@@ -147,7 +147,7 @@ msgstr ""
#: plugins/admin/groups/class_group.inc:74
#: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:403
+#: plugins/personal/posix/class_posixAccount.inc:410
msgid "GID"
msgstr ""
@@ -204,23 +204,23 @@ msgid "Only allow this group to connect to this list of hosts"
msgstr ""
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458 include/functions.inc:794
-#: include/functions.inc:2548 include/class_xml.inc:55
+#: plugins/personal/posix/class_posixAccount.inc:465 include/functions.inc:794
+#: include/functions.inc:2549 include/class_xml.inc:55
#: include/simpleplugin/class_simpleTabs.inc:325 html/index.php:56
-#: html/index.php:62 html/index.php:481 html/class_passwordRecovery.inc:378
+#: html/index.php:62 html/index.php:522 html/class_passwordRecovery.inc:378
#: setup/class_setupStep_Migrate.inc:572
#: setup/class_setupStep_Migrate.inc:1083
#: setup/class_setupStep_Migrate.inc:1202
#: setup/class_setupStep_Migrate.inc:1313
-#: setup/class_setupStep_Migrate.inc:1372
-#: setup/class_setupStep_Migrate.inc:1411 plugins/admin/acl/remove.tpl.c:2
+#: setup/class_setupStep_Migrate.inc:1377
+#: setup/class_setupStep_Migrate.inc:1421 plugins/admin/acl/remove.tpl.c:2
#: ihtml/themes/default/islocked.tpl.c:5 ihtml/themes/default/remove.tpl.c:2
#: ihtml/themes/default/msg_dialog.tpl.c:5 setup/setup_checks.tpl.c:8
msgid "Warning"
msgstr "تØذير"
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458
+#: plugins/personal/posix/class_posixAccount.inc:465
msgid "Timeout while waiting for lock. Ignoring lock!"
msgstr ""
@@ -250,7 +250,7 @@ msgstr ""
msgid "Objects member of this group"
msgstr ""
-#: plugins/admin/groups/class_ogroup.inc:318
+#: plugins/admin/groups/class_ogroup.inc:313
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
@@ -279,10 +279,10 @@ msgstr ""
#: plugins/admin/departments/dep-list.xml:79
#: plugins/admin/users/user-list.xml:105
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-#: include/simpleplugin/class_dialogAttributes.inc:626
-#: include/simpleplugin/class_dialogAttributes.inc:627
-#: include/simpleplugin/class_attribute.inc:2661
-#: include/simpleplugin/class_attribute.inc:2662
+#: include/simpleplugin/class_dialogAttributes.inc:632
+#: include/simpleplugin/class_dialogAttributes.inc:633
+#: include/simpleplugin/class_attribute.inc:2675
+#: include/simpleplugin/class_attribute.inc:2676
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -293,8 +293,8 @@ msgstr ""
#: plugins/admin/departments/dep-list.xml:67
#: plugins/admin/departments/dep-list.xml:88
#: plugins/admin/users/user-list.xml:112
-#: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_dialogAttributes.inc:637
+#: include/simpleplugin/class_dialogAttributes.inc:642
+#: include/simpleplugin/class_dialogAttributes.inc:643
#: include/simpleplugin/simple-list.xml:75
#: include/simpleplugin/simple-list.xml:125
msgid "Remove"
@@ -343,7 +343,7 @@ msgid "Show application groups"
msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Show department groups"
+msgid "Show unidentified groups"
msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:137
@@ -432,51 +432,67 @@ msgid "Category of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:81
+msgid "Website"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:81
+#, php-format
+msgid "Website of this %s"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:85
#: plugins/personal/generic/class_user.inc:410
msgid "Manager"
msgstr ""
-#: plugins/admin/departments/class_department.inc:81
+#: plugins/admin/departments/class_department.inc:85
#, php-format
msgid "Manager of this %s"
msgstr ""
-#: plugins/admin/departments/class_department.inc:87
-#: plugins/admin/departments/class_department.inc:93
+#: plugins/admin/departments/class_department.inc:91
+#: plugins/admin/departments/class_department.inc:97
#: plugins/personal/generic/class_user.inc:304
msgid "Location"
msgstr ""
-#: plugins/admin/departments/class_department.inc:90
+#: plugins/admin/departments/class_department.inc:94
#: plugins/personal/generic/class_user.inc:308
msgid "State"
msgstr ""
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_country.inc:29
+#: plugins/admin/departments/class_country.inc:30
+#: plugins/admin/departments/class_country.inc:33
+msgid "Country"
+msgstr "البلد"
+
+#: plugins/admin/departments/class_department.inc:103
#: plugins/personal/generic/class_user.inc:312
msgid "Address"
msgstr "العنوان"
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:103
#, php-format
msgid "A postal address for this %s"
msgstr ""
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
#: plugins/personal/generic/class_user.inc:320
msgid "Phone"
msgstr "الهاتÙ"
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
msgid "Telephone number"
msgstr ""
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
#: plugins/personal/generic/class_user.inc:332
msgid "Fax"
msgstr "الÙاكس"
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
msgid "Facsimile telephone number"
msgstr ""
@@ -504,12 +520,6 @@ msgstr ""
msgid "locality"
msgstr ""
-#: plugins/admin/departments/class_country.inc:29
-#: plugins/admin/departments/class_country.inc:30
-#: plugins/admin/departments/class_country.inc:33
-msgid "Country"
-msgstr "البلد"
-
#: plugins/admin/departments/class_country.inc:50
msgid "country"
msgstr ""
@@ -552,7 +562,8 @@ msgid "Given name"
msgstr ""
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
+#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
msgid "Login"
@@ -665,8 +676,8 @@ msgid "Edit category ACL"
msgstr ""
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2671
-#: include/simpleplugin/class_attribute.inc:2672
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
+#: include/simpleplugin/class_attribute.inc:2686
#, php-format
msgid "Delete"
msgstr ""
@@ -771,19 +782,37 @@ msgstr ""
msgid "ACLs which are part of this group"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:38
+#: plugins/admin/acl/class_aclManagement.inc:31
+#: plugins/admin/acl/class_aclManagement.inc:32
+#: plugins/admin/acl/class_aclManagement.inc:45
+msgid "ACL assignment creation"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:33
+msgid "Create an ACL assignment on an arbitrary dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "Dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "DN you wish to add assignments for"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:135
msgid "ACL assignments"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:39
+#: plugins/admin/acl/class_aclManagement.inc:136
msgid "ACL assignments management"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:40
+#: plugins/admin/acl/class_aclManagement.inc:137
msgid "Manage ACL roles assignments to users"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:78
+#: plugins/admin/acl/class_aclManagement.inc:199
#: plugins/admin/acl/class_aclAssignment.inc:263
msgid "ACL Assignment"
msgstr ""
@@ -899,7 +928,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -994,59 +1023,59 @@ msgstr ""
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:336
+msgid "Homepage"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:336
+msgid "Personal homepage"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:342
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:351
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr ""
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:362
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
msgid "Display name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:374
msgid "Private phone"
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:374
msgid "Home phone number"
msgstr "رقم المنزل"
-#: plugins/personal/generic/class_user.inc:374
-msgid "Homepage"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:374
-msgid "Personal homepage"
-msgstr ""
-
#: plugins/personal/generic/class_user.inc:380
msgid "Organizational information"
msgstr ""
@@ -1279,33 +1308,33 @@ msgstr ""
msgid "automatic"
msgstr "تلقائي"
-#: plugins/personal/posix/class_posixAccount.inc:309
+#: plugins/personal/posix/class_posixAccount.inc:310
msgid "expired"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:311
+#: plugins/personal/posix/class_posixAccount.inc:312
msgid "grace time active"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:314
-#: plugins/personal/posix/class_posixAccount.inc:316
-#: plugins/personal/posix/class_posixAccount.inc:318
+#: plugins/personal/posix/class_posixAccount.inc:315
+#: plugins/personal/posix/class_posixAccount.inc:317
+#: plugins/personal/posix/class_posixAccount.inc:319
msgid "active"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:315
msgid "password expired"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:316
+#: plugins/personal/posix/class_posixAccount.inc:317
msgid "password not changeable"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:400
+#: plugins/personal/posix/class_posixAccount.inc:407
msgid "UID"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:516
+#: plugins/personal/posix/class_posixAccount.inc:525
#, php-format
msgid "Group of user %s"
msgstr ""
@@ -1477,424 +1506,440 @@ msgid "Core settings"
msgstr ""
#: plugins/config/class_configInLdap.inc:161
-msgid "Enable primary group filter"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"It is time consuming to evaluate which groups are primary and which are not,"
-" so you may want to disable it if your group plugin is slow."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:167
msgid "Display summary in listings"
msgstr ""
-#: plugins/config/class_configInLdap.inc:168
+#: 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:173
+#: plugins/config/class_configInLdap.inc:167
msgid "Edit locking"
msgstr ""
-#: plugins/config/class_configInLdap.inc:174
+#: 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:179
+#: plugins/config/class_configInLdap.inc:173
msgid "Enable logging"
msgstr ""
-#: plugins/config/class_configInLdap.inc:180
+#: plugins/config/class_configInLdap.inc:174
msgid "Event logging on FusionDirectory side."
msgstr ""
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "LDAP size limit"
msgstr ""
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "Defines the number of entries to get from LDAP by default."
msgstr ""
-#: plugins/config/class_configInLdap.inc:192
+#: plugins/config/class_configInLdap.inc:186
msgid "Login and session"
msgstr ""
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:189
msgid "Login attribute"
msgstr ""
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:190
msgid "Which LDAP attribute should be used as the login name during login."
msgstr ""
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:196
msgid "Enforce encrypted connections"
msgstr ""
-#: plugins/config/class_configInLdap.inc:203
+#: plugins/config/class_configInLdap.inc:197
msgid ""
"Enables PHP security checks to force encrypted access (https) to the web "
"interface."
msgstr ""
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:201
msgid "Warn if session is not encrypted"
msgstr ""
-#: plugins/config/class_configInLdap.inc:208
+#: plugins/config/class_configInLdap.inc:202
msgid "will display a warning to the user when http is used instead of https."
msgstr ""
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Session lifetime"
msgstr ""
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Defines when a session will expire in seconds."
msgstr ""
-#: plugins/config/class_configInLdap.inc:220
+#: plugins/config/class_configInLdap.inc:212
+msgid "HTTP authentication"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:212
+msgid "Use HTTP authentication protocol instead of the login form."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:219
#: include/class_SnapshotDialogs.inc:186
msgid "Snapshots"
msgstr ""
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid "Enable snapshots"
msgstr ""
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid ""
"This enables you to save certain states of entries and restore them later "
"on."
msgstr ""
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
msgid "Snapshot base"
msgstr ""
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
msgid "The base where snapshots should be stored inside of the LDAP."
msgstr ""
-#: plugins/config/class_configInLdap.inc:235
+#: plugins/config/class_configInLdap.inc:234
msgid "SSL"
msgstr ""
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Key path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Path to FusionDirectory private key. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Certificate path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Path to FusionDirectory certificate. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:262
msgid "CA certificate path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:247
msgid "Path to the CA certificate. Used for validating Argonaut Server host."
msgstr ""
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:254
msgid "CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "Enable CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "CAS login will be used instead of LDAP bind"
msgstr ""
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:262
msgid "Path to the CA certificate of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host"
msgstr ""
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port"
msgstr ""
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port the CAS server is listening on"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context to be used"
msgstr ""
-#: plugins/config/class_configInLdap.inc:285
+#: plugins/config/class_configInLdap.inc:284
msgid "People and group storage"
msgstr ""
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "People DN attribute"
msgstr ""
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "Attribute to use at the beginning of users dn"
msgstr ""
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "CN pattern"
msgstr ""
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "The pattern to use to build the common name field"
msgstr ""
-#: plugins/config/class_configInLdap.inc:299
+#: plugins/config/class_configInLdap.inc:298
msgid "Strict naming policy"
msgstr ""
-#: plugins/config/class_configInLdap.inc:300
+#: plugins/config/class_configInLdap.inc:299
msgid "Enables strict checking of user and group names"
msgstr ""
-#: plugins/config/class_configInLdap.inc:305
+#: plugins/config/class_configInLdap.inc:304
msgid "Group/user min id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:306
+#: plugins/config/class_configInLdap.inc:305
msgid ""
"The minimum assignable user or group id to avoid security leaks with id 0 "
"accounts."
msgstr ""
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid "Next id hook"
msgstr ""
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid ""
"A script to be called for finding the next free id number for users or "
"groups."
msgstr ""
-#: plugins/config/class_configInLdap.inc:315
+#: plugins/config/class_configInLdap.inc:314
msgid "Base number for user id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:315
msgid "Where to start looking for a new free user id."
msgstr ""
-#: plugins/config/class_configInLdap.inc:321
+#: plugins/config/class_configInLdap.inc:320
msgid "Base number for group id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:321
msgid "Where to start looking for a new free group id."
msgstr ""
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "Users RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "The branch where users are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "Groups RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "The branch where groups are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "ACL role RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "The branch where ACL roles are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Id allocation method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Method to allocate user/group ids"
msgstr ""
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Traditional"
msgstr ""
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Samba unix id pool"
msgstr ""
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Pool user id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Minimum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Pool user id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Maximum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Pool group id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Minimum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Pool group id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Maximum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:370
-msgid "Debugging"
+#: plugins/config/class_configInLdap.inc:367
+msgid "Restrict role members"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:367
+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:373
+msgid "Debugging"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:376
msgid "Display errors"
msgstr ""
-#: plugins/config/class_configInLdap.inc:374
+#: plugins/config/class_configInLdap.inc:377
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:378
+#: plugins/config/class_configInLdap.inc:381
msgid "Maximum LDAP query time"
msgstr ""
-#: plugins/config/class_configInLdap.inc:378
+#: plugins/config/class_configInLdap.inc:381
msgid ""
"Stop LDAP actions if there is no answer within the specified number of "
"seconds."
msgstr ""
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:386
msgid "Log LDAP statistics"
msgstr ""
-#: plugins/config/class_configInLdap.inc:384
+#: plugins/config/class_configInLdap.inc:387
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:389
+#: plugins/config/class_configInLdap.inc:392
msgid "Debug level"
msgstr ""
-#: plugins/config/class_configInLdap.inc:390
+#: plugins/config/class_configInLdap.inc:393
msgid "Display certain information on each page load."
msgstr ""
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:405
msgid "Miscellaneous"
msgstr ""
-#: plugins/config/class_configInLdap.inc:407
+#: plugins/config/class_configInLdap.inc:410
msgid "Hooks that are called when specific actions happens"
msgstr ""
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "tab"
msgstr ""
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "The tab that this hook concerns"
msgstr ""
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "mode"
msgstr ""
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "When to call this command"
msgstr ""
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "cmd"
msgstr ""
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "The command that will be called"
msgstr ""
-#: plugins/config/class_configInLdap.inc:429
+#: plugins/config/class_configInLdap.inc:432
msgid "Hooks"
msgstr ""
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:439
msgid "Display hook output"
msgstr ""
-#: plugins/config/class_configInLdap.inc:437
+#: plugins/config/class_configInLdap.inc:440
msgid ""
"When enabled successful hook execution output is displayed to the user using"
" a dialog."
msgstr ""
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available shells"
msgstr ""
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available POSIX shells for FD users."
msgstr ""
-#: plugins/config/class_configInLdap.inc:449
+#: plugins/config/class_configInLdap.inc:452
msgid "Show ACL tab on all objects"
msgstr ""
-#: plugins/config/class_configInLdap.inc:450
+#: plugins/config/class_configInLdap.inc:453
msgid ""
"For very specific ACL rights setting where you might need to give right on a"
" single object."
msgstr ""
-#: plugins/config/class_configInLdap.inc:464
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available department categories"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available categories in the departments dropdown"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:474
#: setup/class_setupStep_Language.inc:69
msgid "Automatic"
msgstr ""
@@ -1911,80 +1956,80 @@ msgstr ""
msgid "Password recovery settings"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:44
+#: plugins/config/class_recoveryConfig.inc:45
msgid "Activate password recovery"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:45
+#: plugins/config/class_recoveryConfig.inc:46
msgid "Whether to activate or not password recovery feature"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:50
+#: plugins/config/class_recoveryConfig.inc:51
msgid "Sender email address"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:51
+#: plugins/config/class_recoveryConfig.inc:52
msgid "Email address from which mails will be sent"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:57
+#: plugins/config/class_recoveryConfig.inc:58
msgid "Link validity (minutes)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:58
+#: plugins/config/class_recoveryConfig.inc:59
msgid "Number of minutes before a recovery link expires"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:64
+#: plugins/config/class_recoveryConfig.inc:65
msgid "Salt for tokens"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:65
+#: plugins/config/class_recoveryConfig.inc:66
msgid ""
"Just a security measure, you can put anything in there, even random "
"characters"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:71
+#: plugins/config/class_recoveryConfig.inc:72
msgid "Allow the use of alternate addresses"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:72
+#: plugins/config/class_recoveryConfig.inc:73
msgid ""
"Users will also be able to enter one of theirs alternate addresses to "
"recover their password"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:79
+#: plugins/config/class_recoveryConfig.inc:80
msgid "First email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:82
-#: plugins/config/class_recoveryConfig.inc:101
+#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:102
msgid "Subject"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:84
msgid "Subject of the first email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:86
+#: plugins/config/class_recoveryConfig.inc:87
msgid "[FusionDirectory] Password recovery link"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:89
+#: plugins/config/class_recoveryConfig.inc:90
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:91
#, 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 ""
-#: plugins/config/class_recoveryConfig.inc:93
+#: plugins/config/class_recoveryConfig.inc:94
#, php-format
msgid ""
"Hello,\n"
@@ -1996,31 +2041,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:98
+#: plugins/config/class_recoveryConfig.inc:99
msgid "Second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:103
msgid "Subject of the second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:105
+#: plugins/config/class_recoveryConfig.inc:106
msgid "[FusionDirectory] Password recovery successful"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:108
+#: plugins/config/class_recoveryConfig.inc:109
#, php-format
msgid "Body (%s is login)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:110
#, php-format
msgid ""
"Body of the second email, sent to confirm the password has been changed. Use"
" %s for the user login."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:112
+#: plugins/config/class_recoveryConfig.inc:113
#, php-format
msgid ""
"Hello,\n"
@@ -2088,13 +2133,13 @@ msgstr ""
msgid "Down"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2633
-#: include/simpleplugin/class_attribute.inc:2634
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
+#: include/simpleplugin/class_attribute.inc:2648
msgid "Sort up"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2646
-#: include/simpleplugin/class_attribute.inc:2647
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
+#: include/simpleplugin/class_attribute.inc:2661
msgid "Sort down"
msgstr ""
@@ -2106,27 +2151,26 @@ msgstr ""
#: include/class_config.inc:479 include/class_msgPool.inc:215
#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3106
-#: include/functions.inc:3127 include/functions.inc:3157
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197 include/functions.inc:3259
+#: include/class_msgPool.inc:740 include/functions.inc:3107
+#: include/functions.inc:3128 include/functions.inc:3158
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3260
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1663 include/class_CopyPasteHandler.inc:278
-#: include/simpleplugin/class_dialogAttributes.inc:733
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
-#: include/simpleplugin/class_attribute.inc:1774
-#: include/simpleplugin/class_attribute.inc:1877
-#: include/simpleplugin/class_attribute.inc:1879
+#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
+#: include/simpleplugin/class_attribute.inc:1784
+#: include/simpleplugin/class_attribute.inc:1887
+#: include/simpleplugin/class_attribute.inc:1889
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: 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:437
#: include/password-methods/class_password-methods.inc:447
-#: include/class_SnapshotHandler.inc:415 html/index.php:434 html/index.php:444
+#: include/class_SnapshotHandler.inc:415 html/index.php:473 html/index.php:483
#: setup/class_setupStep_Migrate.inc:935
#: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
msgid "Error"
@@ -2165,44 +2209,44 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: include/class_listing.inc:1586 include/class_listing.inc:1640
+#: include/class_listing.inc:1590 include/class_listing.inc:1644
msgid "Copy"
msgstr ""
-#: include/class_listing.inc:1592 include/class_listing.inc:1628
+#: include/class_listing.inc:1596 include/class_listing.inc:1632
msgid "Cut"
msgstr ""
-#: include/class_listing.inc:1600 include/class_listing.inc:1602
+#: include/class_listing.inc:1604 include/class_listing.inc:1606
#: include/class_CopyPasteHandler.inc:370
msgid "Paste"
msgstr ""
-#: include/class_listing.inc:1628
+#: include/class_listing.inc:1632
msgid "Cut this entry"
msgstr ""
-#: include/class_listing.inc:1640
+#: include/class_listing.inc:1644
msgid "Copy this entry"
msgstr ""
-#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_listing.inc:1677 include/class_listing.inc:1679
msgid "Restore snapshots"
msgstr ""
-#: include/class_listing.inc:1689
+#: include/class_listing.inc:1693
msgid "Export list"
msgstr ""
-#: include/class_listing.inc:1724 include/class_listing.inc:1725
+#: include/class_listing.inc:1728 include/class_listing.inc:1729
msgid "Restore snapshot"
msgstr ""
-#: include/class_listing.inc:1734
+#: include/class_listing.inc:1738
msgid "Create snapshot"
msgstr ""
-#: include/class_listing.inc:1735
+#: include/class_listing.inc:1739
msgid "Create a new snapshot from this object"
msgstr ""
@@ -2245,7 +2289,7 @@ msgid "XML error in fusiondirectory.conf: %s at line %d"
msgstr ""
#: include/class_config.inc:162 include/class_config.inc:300
-#: include/class_config.inc:985 include/class_config.inc:998
+#: include/class_config.inc:915 include/class_config.inc:928
#: include/functions.inc:663 include/class_timezone.inc:51
#: include/password-methods/class_password-methods-sha.inc:71
#: include/password-methods/class_password-methods-ssha.inc:75
@@ -2262,17 +2306,17 @@ msgid ""
"while your passwords are not encrypted."
msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:917
-#: include/class_ldap.inc:1371 include/functions.inc:526
+#: include/class_config.inc:337 include/class_ldap.inc:918
+#: include/class_ldap.inc:1372 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2985 include/simpleplugin/class_simplePlugin.inc:545
-#: include/simpleplugin/class_attribute.inc:2895
+#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2909
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
#: include/class_SnapshotHandler.inc:422 include/class_SnapshotHandler.inc:425
-#: html/index.php:360 html/class_passwordRecovery.inc:497
+#: html/index.php:369 html/class_passwordRecovery.inc:497
#: setup/class_setupStep_Migrate.inc:451
#: setup/class_setupStep_Migrate.inc:1130
msgid "LDAP error"
@@ -2287,38 +2331,38 @@ msgstr ""
msgid "The selected mail method (class %s) is not available"
msgstr ""
-#: include/class_config.inc:986
+#: include/class_config.inc:916
#, php-format
msgid ""
"The snapshot functionality is enabled, but the required variable '%s' is not"
" set."
msgstr ""
-#: include/class_config.inc:999
+#: include/class_config.inc:929
#, php-format
msgid ""
"The snapshot functionality is enabled, but the required compression module "
"is missing. Please install '%s'."
msgstr ""
-#: include/class_config.inc:1104
+#: include/class_config.inc:1034
msgid "All categories"
msgstr ""
-#: include/class_config.inc:1231
+#: include/class_config.inc:1161
msgid "My account"
msgstr ""
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
msgid "Performance warning"
msgstr ""
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
#, php-format
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr ""
-#: include/class_ldap.inc:868 include/class_ldap.inc:904
+#: include/class_ldap.inc:869 include/class_ldap.inc:905
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
@@ -2328,39 +2372,39 @@ msgstr ""
msgid "Internal error"
msgstr "خطأ داخلي"
-#: include/class_ldap.inc:868
+#: include/class_ldap.inc:869
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:904
+#: include/class_ldap.inc:905
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1016
+#: include/class_ldap.inc:1017
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr ""
-#: include/class_ldap.inc:1018
+#: include/class_ldap.inc:1019
#, php-format
msgid "while operating on LDAP server %s"
msgstr ""
-#: include/class_ldap.inc:1108
+#: include/class_ldap.inc:1109
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1220
+#: include/class_ldap.inc:1221
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr ""
-#: include/class_ldap.inc:1231
+#: include/class_ldap.inc:1232
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2948,10 +2992,10 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr ""
-#: include/functions.inc:496 include/functions.inc:3294
-#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:263
-#: include/simpleplugin/class_simplePlugin.inc:268
-#: include/simpleplugin/class_simplePlugin.inc:280
+#: include/functions.inc:496 include/functions.inc:3295
+#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
+#: include/simpleplugin/class_simplePlugin.inc:269
+#: include/simpleplugin/class_simplePlugin.inc:281
#: html/class_passwordRecovery.inc:216
msgid "Fatal error"
msgstr ""
@@ -3104,98 +3148,98 @@ msgstr ""
msgid "Cannot read to revision file!"
msgstr ""
-#: include/functions.inc:2548
+#: include/functions.inc:2549
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "LDAP warning"
msgstr ""
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "Cannot get schema information from server. No schema check possible!"
msgstr ""
-#: include/functions.inc:2584
+#: include/functions.inc:2585
msgid ""
"Used to lock currently edited entries to avoid multiple changes at the same "
"time."
msgstr ""
-#: include/functions.inc:2596
+#: include/functions.inc:2597
#, php-format
msgid "Missing required object class '%s'!"
msgstr ""
-#: include/functions.inc:2599
+#: include/functions.inc:2600
#, php-format
msgid "Missing optional object class '%s'!"
msgstr ""
-#: include/functions.inc:2603
+#: include/functions.inc:2604
#, php-format
msgid "Class(es) available"
msgstr ""
-#: include/functions.inc:2623
+#: include/functions.inc:2624
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2625
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2628
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2629
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3106 include/functions.inc:3127
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3106
+#: include/functions.inc:3107
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3127
+#: include/functions.inc:3128
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3157
+#: include/functions.inc:3158
msgid "Cannot create sambaUnixIdPool entry!"
msgstr ""
-#: include/functions.inc:3165
+#: include/functions.inc:3166
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3177 include/functions.inc:3181
+#: include/functions.inc:3178 include/functions.inc:3182
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3197
+#: include/functions.inc:3198
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3259
+#: include/functions.inc:3260
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3295
+#: include/functions.inc:3296
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
@@ -3351,13 +3395,13 @@ msgstr ""
msgid "XML error"
msgstr ""
-#: include/class_plugin.inc:554
+#: include/class_plugin.inc:553
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/class_plugin.inc:1466
+#: include/class_plugin.inc:1467
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -3383,32 +3427,32 @@ msgstr ""
msgid "This is the name of the template"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:263
+#: include/simpleplugin/class_simplePlugin.inc:264
msgid "Only main tab can compute dn"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:270
+#: include/simpleplugin/class_simplePlugin.inc:271
#, php-format
msgid "Could not compute dn: no parent tab class for \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:282
+#: include/simpleplugin/class_simplePlugin.inc:283
#, php-format
msgid ""
"Could not compute dn: could not find objectType infos from tab class \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:638
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:644
+#: include/simpleplugin/class_simplePlugin.inc:652
msgid "Error when saving"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:638
+#: include/simpleplugin/class_simplePlugin.inc:644
#, php-format
msgid "There is already an entry with the same dn : %s"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:652
#, php-format
msgid "The entry %s is not existing"
msgstr ""
@@ -3428,27 +3472,27 @@ msgstr ""
msgid "Show %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:409
+#: include/simpleplugin/class_dialogAttributes.inc:415
#, php-format
msgid "Group %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:411
+#: include/simpleplugin/class_dialogAttributes.inc:417
#, php-format
msgid "Role %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:446
+#: include/simpleplugin/class_dialogAttributes.inc:452
msgid "Group of user"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:615
+#: include/simpleplugin/class_dialogAttributes.inc:621
#: include/simpleplugin/class_attribute.inc:1090
#: include/simpleplugin/class_attribute.inc:1124
msgid "None"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:617
+#: include/simpleplugin/class_dialogAttributes.inc:623
msgid "Unknown"
msgstr ""
@@ -3489,11 +3533,16 @@ msgid "days"
msgstr ""
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2161
+#: include/simpleplugin/class_attribute.inc:2171
#, php-format
msgid "%s (required)"
msgstr ""
+#: include/simpleplugin/class_attribute.inc:1150
+#, php-format
+msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
+msgstr ""
+
#: include/simpleplugin/class_attribute.inc:1277
#, php-format
msgid "An integer between %d and %d"
@@ -3509,75 +3558,75 @@ msgstr ""
msgid "An integer smaller than %d"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1379
+#: include/simpleplugin/class_attribute.inc:1383
#, php-format
msgid "A float between %f and %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1381
+#: include/simpleplugin/class_attribute.inc:1385
#, php-format
msgid "A float larger than %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1383
+#: include/simpleplugin/class_attribute.inc:1387
#, php-format
msgid "A float smaller than %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1490
+#: include/simpleplugin/class_attribute.inc:1500
msgid "Error, incorrect date: "
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
#, php-format
msgid "Cannot read uploaded file: %s"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1530
+#: include/simpleplugin/class_attribute.inc:1540
msgid "file is empty"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1533
+#: include/simpleplugin/class_attribute.inc:1543
msgid "file not found"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1546
msgid "file not readable"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1569
+#: include/simpleplugin/class_attribute.inc:1579
#, php-format
msgid "%s (%d bytes)"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1616
-#: include/simpleplugin/class_attribute.inc:1793
+#: include/simpleplugin/class_attribute.inc:1626
+#: include/simpleplugin/class_attribute.inc:1803
msgid "Upload"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1621
-#: include/simpleplugin/class_attribute.inc:1622
+#: include/simpleplugin/class_attribute.inc:1631
+#: include/simpleplugin/class_attribute.inc:1632
msgid "Download"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1775
+#: include/simpleplugin/class_attribute.inc:1785
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1826
+#: include/simpleplugin/class_attribute.inc:1836
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1829
+#: include/simpleplugin/class_attribute.inc:1839
msgid "Object base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:2755
+#: include/simpleplugin/class_attribute.inc:2769
#, php-format
msgid "Invalid value for %s"
msgstr ""
@@ -3711,17 +3760,17 @@ msgstr ""
msgid "Account locked. Please contact your system administrator!"
msgstr ""
-#: html/index.php:436
+#: html/index.php:475
#, php-format
msgid "CAS user \"%s\" could not be found in the LDAP"
msgstr ""
-#: html/index.php:446
+#: html/index.php:485
#, php-format
msgid "CAS user \"%s\" match several users in the LDAP"
msgstr ""
-#: html/index.php:481
+#: html/index.php:522
msgid ""
"Your browser has cookies disabled. Please enable cookies and reload this "
"page before logging in!"
@@ -4044,7 +4093,7 @@ msgid "Checking for duplicated UID numbers"
msgstr ""
#: setup/class_setupStep_Migrate.inc:267
-msgid "Checking for duplicate GID numbers"
+msgid "Checking for duplicated GID numbers"
msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:487
@@ -4054,7 +4103,7 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:1179
#: setup/class_setupStep_Migrate.inc:1272
#: setup/class_setupStep_Migrate.inc:1351
-#: setup/class_setupStep_Migrate.inc:1390
+#: setup/class_setupStep_Migrate.inc:1395
msgid "LDAP query failed"
msgstr ""
@@ -4065,7 +4114,7 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:1180
#: setup/class_setupStep_Migrate.inc:1273
#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1391
+#: setup/class_setupStep_Migrate.inc:1396
msgid "Possibly the \"root object\" is missing."
msgstr ""
@@ -4220,14 +4269,14 @@ msgstr ""
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1373
+#: setup/class_setupStep_Migrate.inc:1378
#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\"."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1412
+#: setup/class_setupStep_Migrate.inc:1422
#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\"."
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
diff --git a/locale/ca/fusiondirectory.po b/locale/ca/fusiondirectory.po
index ae3a991d7140f44a43d080f7bdabf64342de5453..3f5e627ae2f43ecf052a86c39e651022fc70ac4e 100644
--- a/locale/ca/fusiondirectory.po
+++ b/locale/ca/fusiondirectory.po
@@ -5,12 +5,12 @@
# Translators:
msgid ""
msgstr ""
-"Project-Id-Version: FusionDirectory-109\n"
+"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-01-22 11:26+0100\n"
-"PO-Revision-Date: 2016-01-22 10:24+0000\n"
+"POT-Creation-Date: 2016-03-14 12:07+0100\n"
+"PO-Revision-Date: 2016-03-07 12:09+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-109/language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -28,31 +28,31 @@ msgstr ""
msgid "References"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:30
-#: plugins/admin/groups/class_roleGeneric.inc:34
+#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:61
#: plugins/admin/groups/class_groupManagement.inc:71
#: plugins/admin/aclrole/class_aclRole.inc:78
#: plugins/admin/acl/class_aclAssignment.inc:49
msgid "Role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:31
+#: plugins/admin/groups/class_roleGeneric.inc:58
msgid "Role information"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:35
+#: plugins/admin/groups/class_roleGeneric.inc:62
msgid "Organizational role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:84
msgid "Informations"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:158
+#: plugins/admin/departments/class_department.inc:174
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -62,13 +62,13 @@ msgstr ""
msgid "Name"
msgstr "Nom"
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
msgid "Name of this group"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
#: plugins/admin/groups/class_group.inc:66
#: plugins/admin/groups/class_ogroup.inc:192
#: plugins/admin/groups/group-list.xml:41
@@ -81,26 +81,26 @@ msgstr ""
msgid "Description"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
msgid "Description of the role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:70
+#: plugins/admin/groups/class_roleGeneric.inc:97
msgid "Phone number"
msgstr "Número de telèfon"
-#: plugins/admin/groups/class_roleGeneric.inc:74
+#: plugins/admin/groups/class_roleGeneric.inc:101
msgid "Fax number"
msgstr "Número de fax"
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
#: plugins/admin/users/class_userManagement.inc:42
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: setup/class_setupStep_Migrate.inc:871
msgid "Users"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
msgid "Add users for the role"
msgstr ""
@@ -147,7 +147,7 @@ msgstr ""
#: plugins/admin/groups/class_group.inc:74
#: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:403
+#: plugins/personal/posix/class_posixAccount.inc:410
msgid "GID"
msgstr ""
@@ -204,23 +204,23 @@ msgid "Only allow this group to connect to this list of hosts"
msgstr ""
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458 include/functions.inc:794
-#: include/functions.inc:2548 include/class_xml.inc:55
+#: plugins/personal/posix/class_posixAccount.inc:465 include/functions.inc:794
+#: include/functions.inc:2549 include/class_xml.inc:55
#: include/simpleplugin/class_simpleTabs.inc:325 html/index.php:56
-#: html/index.php:62 html/index.php:481 html/class_passwordRecovery.inc:378
+#: html/index.php:62 html/index.php:522 html/class_passwordRecovery.inc:378
#: setup/class_setupStep_Migrate.inc:572
#: setup/class_setupStep_Migrate.inc:1083
#: setup/class_setupStep_Migrate.inc:1202
#: setup/class_setupStep_Migrate.inc:1313
-#: setup/class_setupStep_Migrate.inc:1372
-#: setup/class_setupStep_Migrate.inc:1411 plugins/admin/acl/remove.tpl.c:2
+#: setup/class_setupStep_Migrate.inc:1377
+#: setup/class_setupStep_Migrate.inc:1421 plugins/admin/acl/remove.tpl.c:2
#: ihtml/themes/default/islocked.tpl.c:5 ihtml/themes/default/remove.tpl.c:2
#: ihtml/themes/default/msg_dialog.tpl.c:5 setup/setup_checks.tpl.c:8
msgid "Warning"
msgstr "AvÃs"
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458
+#: plugins/personal/posix/class_posixAccount.inc:465
msgid "Timeout while waiting for lock. Ignoring lock!"
msgstr ""
@@ -250,7 +250,7 @@ msgstr ""
msgid "Objects member of this group"
msgstr ""
-#: plugins/admin/groups/class_ogroup.inc:318
+#: plugins/admin/groups/class_ogroup.inc:313
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
@@ -279,10 +279,10 @@ msgstr ""
#: plugins/admin/departments/dep-list.xml:79
#: plugins/admin/users/user-list.xml:105
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-#: include/simpleplugin/class_dialogAttributes.inc:626
-#: include/simpleplugin/class_dialogAttributes.inc:627
-#: include/simpleplugin/class_attribute.inc:2661
-#: include/simpleplugin/class_attribute.inc:2662
+#: include/simpleplugin/class_dialogAttributes.inc:632
+#: include/simpleplugin/class_dialogAttributes.inc:633
+#: include/simpleplugin/class_attribute.inc:2675
+#: include/simpleplugin/class_attribute.inc:2676
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -293,8 +293,8 @@ msgstr ""
#: plugins/admin/departments/dep-list.xml:67
#: plugins/admin/departments/dep-list.xml:88
#: plugins/admin/users/user-list.xml:112
-#: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_dialogAttributes.inc:637
+#: include/simpleplugin/class_dialogAttributes.inc:642
+#: include/simpleplugin/class_dialogAttributes.inc:643
#: include/simpleplugin/simple-list.xml:75
#: include/simpleplugin/simple-list.xml:125
msgid "Remove"
@@ -343,7 +343,7 @@ msgid "Show application groups"
msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Show department groups"
+msgid "Show unidentified groups"
msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:137
@@ -432,51 +432,67 @@ msgid "Category of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:81
+msgid "Website"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:81
+#, php-format
+msgid "Website of this %s"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:85
#: plugins/personal/generic/class_user.inc:410
msgid "Manager"
msgstr "Responsable"
-#: plugins/admin/departments/class_department.inc:81
+#: plugins/admin/departments/class_department.inc:85
#, php-format
msgid "Manager of this %s"
msgstr ""
-#: plugins/admin/departments/class_department.inc:87
-#: plugins/admin/departments/class_department.inc:93
+#: plugins/admin/departments/class_department.inc:91
+#: plugins/admin/departments/class_department.inc:97
#: plugins/personal/generic/class_user.inc:304
msgid "Location"
msgstr "Localització"
-#: plugins/admin/departments/class_department.inc:90
+#: plugins/admin/departments/class_department.inc:94
#: plugins/personal/generic/class_user.inc:308
msgid "State"
msgstr "ProvÃncia"
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_country.inc:29
+#: plugins/admin/departments/class_country.inc:30
+#: plugins/admin/departments/class_country.inc:33
+msgid "Country"
+msgstr "Estat"
+
+#: plugins/admin/departments/class_department.inc:103
#: plugins/personal/generic/class_user.inc:312
msgid "Address"
msgstr "Adreça"
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:103
#, php-format
msgid "A postal address for this %s"
msgstr ""
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
#: plugins/personal/generic/class_user.inc:320
msgid "Phone"
msgstr "Telèfon"
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
msgid "Telephone number"
msgstr ""
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
#: plugins/personal/generic/class_user.inc:332
msgid "Fax"
msgstr "Fax"
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
msgid "Facsimile telephone number"
msgstr ""
@@ -504,12 +520,6 @@ msgstr "Localitat"
msgid "locality"
msgstr ""
-#: plugins/admin/departments/class_country.inc:29
-#: plugins/admin/departments/class_country.inc:30
-#: plugins/admin/departments/class_country.inc:33
-msgid "Country"
-msgstr "Estat"
-
#: plugins/admin/departments/class_country.inc:50
msgid "country"
msgstr ""
@@ -552,7 +562,8 @@ msgid "Given name"
msgstr ""
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
+#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
msgid "Login"
@@ -665,8 +676,8 @@ msgid "Edit category ACL"
msgstr ""
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2671
-#: include/simpleplugin/class_attribute.inc:2672
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
+#: include/simpleplugin/class_attribute.inc:2686
#, php-format
msgid "Delete"
msgstr ""
@@ -771,19 +782,37 @@ msgstr ""
msgid "ACLs which are part of this group"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:38
+#: plugins/admin/acl/class_aclManagement.inc:31
+#: plugins/admin/acl/class_aclManagement.inc:32
+#: plugins/admin/acl/class_aclManagement.inc:45
+msgid "ACL assignment creation"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:33
+msgid "Create an ACL assignment on an arbitrary dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "Dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "DN you wish to add assignments for"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:135
msgid "ACL assignments"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:39
+#: plugins/admin/acl/class_aclManagement.inc:136
msgid "ACL assignments management"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:40
+#: plugins/admin/acl/class_aclManagement.inc:137
msgid "Manage ACL roles assignments to users"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:78
+#: plugins/admin/acl/class_aclManagement.inc:199
#: plugins/admin/acl/class_aclAssignment.inc:263
msgid "ACL Assignment"
msgstr ""
@@ -899,7 +928,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -994,59 +1023,59 @@ msgstr ""
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:336
+msgid "Homepage"
+msgstr "PÃ gina principal"
+
+#: plugins/personal/generic/class_user.inc:336
+msgid "Personal homepage"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:342
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:351
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr "Llengua preferida"
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:362
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
msgid "Display name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home postal address"
msgstr "Adreça postal personal"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:374
msgid "Private phone"
msgstr "Telèfon privat"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:374
msgid "Home phone number"
msgstr "Número de telèfon personal"
-#: plugins/personal/generic/class_user.inc:374
-msgid "Homepage"
-msgstr "PÃ gina principal"
-
-#: plugins/personal/generic/class_user.inc:374
-msgid "Personal homepage"
-msgstr ""
-
#: plugins/personal/generic/class_user.inc:380
msgid "Organizational information"
msgstr ""
@@ -1279,33 +1308,33 @@ msgstr ""
msgid "automatic"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:309
+#: plugins/personal/posix/class_posixAccount.inc:310
msgid "expired"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:311
+#: plugins/personal/posix/class_posixAccount.inc:312
msgid "grace time active"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:314
-#: plugins/personal/posix/class_posixAccount.inc:316
-#: plugins/personal/posix/class_posixAccount.inc:318
+#: plugins/personal/posix/class_posixAccount.inc:315
+#: plugins/personal/posix/class_posixAccount.inc:317
+#: plugins/personal/posix/class_posixAccount.inc:319
msgid "active"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:315
msgid "password expired"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:316
+#: plugins/personal/posix/class_posixAccount.inc:317
msgid "password not changeable"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:400
+#: plugins/personal/posix/class_posixAccount.inc:407
msgid "UID"
msgstr "UID"
-#: plugins/personal/posix/class_posixAccount.inc:516
+#: plugins/personal/posix/class_posixAccount.inc:525
#, php-format
msgid "Group of user %s"
msgstr ""
@@ -1477,424 +1506,440 @@ msgid "Core settings"
msgstr ""
#: plugins/config/class_configInLdap.inc:161
-msgid "Enable primary group filter"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"It is time consuming to evaluate which groups are primary and which are not,"
-" so you may want to disable it if your group plugin is slow."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:167
msgid "Display summary in listings"
msgstr ""
-#: plugins/config/class_configInLdap.inc:168
+#: 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:173
+#: plugins/config/class_configInLdap.inc:167
msgid "Edit locking"
msgstr ""
-#: plugins/config/class_configInLdap.inc:174
+#: 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:179
+#: plugins/config/class_configInLdap.inc:173
msgid "Enable logging"
msgstr ""
-#: plugins/config/class_configInLdap.inc:180
+#: plugins/config/class_configInLdap.inc:174
msgid "Event logging on FusionDirectory side."
msgstr ""
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "LDAP size limit"
msgstr ""
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "Defines the number of entries to get from LDAP by default."
msgstr ""
-#: plugins/config/class_configInLdap.inc:192
+#: plugins/config/class_configInLdap.inc:186
msgid "Login and session"
msgstr ""
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:189
msgid "Login attribute"
msgstr ""
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:190
msgid "Which LDAP attribute should be used as the login name during login."
msgstr ""
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:196
msgid "Enforce encrypted connections"
msgstr ""
-#: plugins/config/class_configInLdap.inc:203
+#: plugins/config/class_configInLdap.inc:197
msgid ""
"Enables PHP security checks to force encrypted access (https) to the web "
"interface."
msgstr ""
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:201
msgid "Warn if session is not encrypted"
msgstr ""
-#: plugins/config/class_configInLdap.inc:208
+#: plugins/config/class_configInLdap.inc:202
msgid "will display a warning to the user when http is used instead of https."
msgstr ""
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Session lifetime"
msgstr ""
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Defines when a session will expire in seconds."
msgstr ""
-#: plugins/config/class_configInLdap.inc:220
+#: plugins/config/class_configInLdap.inc:212
+msgid "HTTP authentication"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:212
+msgid "Use HTTP authentication protocol instead of the login form."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:219
#: include/class_SnapshotDialogs.inc:186
msgid "Snapshots"
msgstr ""
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid "Enable snapshots"
msgstr ""
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid ""
"This enables you to save certain states of entries and restore them later "
"on."
msgstr ""
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
msgid "Snapshot base"
msgstr ""
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
msgid "The base where snapshots should be stored inside of the LDAP."
msgstr ""
-#: plugins/config/class_configInLdap.inc:235
+#: plugins/config/class_configInLdap.inc:234
msgid "SSL"
msgstr ""
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Key path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Path to FusionDirectory private key. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Certificate path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Path to FusionDirectory certificate. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:262
msgid "CA certificate path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:247
msgid "Path to the CA certificate. Used for validating Argonaut Server host."
msgstr ""
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:254
msgid "CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "Enable CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "CAS login will be used instead of LDAP bind"
msgstr ""
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:262
msgid "Path to the CA certificate of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host"
msgstr ""
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port"
msgstr ""
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port the CAS server is listening on"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context to be used"
msgstr ""
-#: plugins/config/class_configInLdap.inc:285
+#: plugins/config/class_configInLdap.inc:284
msgid "People and group storage"
msgstr ""
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "People DN attribute"
msgstr ""
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "Attribute to use at the beginning of users dn"
msgstr ""
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "CN pattern"
msgstr ""
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "The pattern to use to build the common name field"
msgstr ""
-#: plugins/config/class_configInLdap.inc:299
+#: plugins/config/class_configInLdap.inc:298
msgid "Strict naming policy"
msgstr ""
-#: plugins/config/class_configInLdap.inc:300
+#: plugins/config/class_configInLdap.inc:299
msgid "Enables strict checking of user and group names"
msgstr ""
-#: plugins/config/class_configInLdap.inc:305
+#: plugins/config/class_configInLdap.inc:304
msgid "Group/user min id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:306
+#: plugins/config/class_configInLdap.inc:305
msgid ""
"The minimum assignable user or group id to avoid security leaks with id 0 "
"accounts."
msgstr ""
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid "Next id hook"
msgstr ""
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid ""
"A script to be called for finding the next free id number for users or "
"groups."
msgstr ""
-#: plugins/config/class_configInLdap.inc:315
+#: plugins/config/class_configInLdap.inc:314
msgid "Base number for user id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:315
msgid "Where to start looking for a new free user id."
msgstr ""
-#: plugins/config/class_configInLdap.inc:321
+#: plugins/config/class_configInLdap.inc:320
msgid "Base number for group id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:321
msgid "Where to start looking for a new free group id."
msgstr ""
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "Users RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "The branch where users are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "Groups RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "The branch where groups are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "ACL role RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "The branch where ACL roles are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Id allocation method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Method to allocate user/group ids"
msgstr ""
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Traditional"
msgstr ""
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Samba unix id pool"
msgstr ""
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Pool user id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Minimum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Pool user id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Maximum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Pool group id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Minimum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Pool group id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Maximum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:370
-msgid "Debugging"
+#: plugins/config/class_configInLdap.inc:367
+msgid "Restrict role members"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:367
+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:373
+msgid "Debugging"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:376
msgid "Display errors"
msgstr ""
-#: plugins/config/class_configInLdap.inc:374
+#: plugins/config/class_configInLdap.inc:377
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:378
+#: plugins/config/class_configInLdap.inc:381
msgid "Maximum LDAP query time"
msgstr ""
-#: plugins/config/class_configInLdap.inc:378
+#: plugins/config/class_configInLdap.inc:381
msgid ""
"Stop LDAP actions if there is no answer within the specified number of "
"seconds."
msgstr ""
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:386
msgid "Log LDAP statistics"
msgstr ""
-#: plugins/config/class_configInLdap.inc:384
+#: plugins/config/class_configInLdap.inc:387
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:389
+#: plugins/config/class_configInLdap.inc:392
msgid "Debug level"
msgstr ""
-#: plugins/config/class_configInLdap.inc:390
+#: plugins/config/class_configInLdap.inc:393
msgid "Display certain information on each page load."
msgstr ""
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:405
msgid "Miscellaneous"
msgstr ""
-#: plugins/config/class_configInLdap.inc:407
+#: plugins/config/class_configInLdap.inc:410
msgid "Hooks that are called when specific actions happens"
msgstr ""
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "tab"
msgstr ""
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "The tab that this hook concerns"
msgstr ""
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "mode"
msgstr ""
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "When to call this command"
msgstr ""
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "cmd"
msgstr ""
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "The command that will be called"
msgstr ""
-#: plugins/config/class_configInLdap.inc:429
+#: plugins/config/class_configInLdap.inc:432
msgid "Hooks"
msgstr ""
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:439
msgid "Display hook output"
msgstr ""
-#: plugins/config/class_configInLdap.inc:437
+#: plugins/config/class_configInLdap.inc:440
msgid ""
"When enabled successful hook execution output is displayed to the user using"
" a dialog."
msgstr ""
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available shells"
msgstr ""
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available POSIX shells for FD users."
msgstr ""
-#: plugins/config/class_configInLdap.inc:449
+#: plugins/config/class_configInLdap.inc:452
msgid "Show ACL tab on all objects"
msgstr ""
-#: plugins/config/class_configInLdap.inc:450
+#: plugins/config/class_configInLdap.inc:453
msgid ""
"For very specific ACL rights setting where you might need to give right on a"
" single object."
msgstr ""
-#: plugins/config/class_configInLdap.inc:464
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available department categories"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available categories in the departments dropdown"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:474
#: setup/class_setupStep_Language.inc:69
msgid "Automatic"
msgstr ""
@@ -1911,80 +1956,80 @@ msgstr ""
msgid "Password recovery settings"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:44
+#: plugins/config/class_recoveryConfig.inc:45
msgid "Activate password recovery"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:45
+#: plugins/config/class_recoveryConfig.inc:46
msgid "Whether to activate or not password recovery feature"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:50
+#: plugins/config/class_recoveryConfig.inc:51
msgid "Sender email address"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:51
+#: plugins/config/class_recoveryConfig.inc:52
msgid "Email address from which mails will be sent"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:57
+#: plugins/config/class_recoveryConfig.inc:58
msgid "Link validity (minutes)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:58
+#: plugins/config/class_recoveryConfig.inc:59
msgid "Number of minutes before a recovery link expires"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:64
+#: plugins/config/class_recoveryConfig.inc:65
msgid "Salt for tokens"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:65
+#: plugins/config/class_recoveryConfig.inc:66
msgid ""
"Just a security measure, you can put anything in there, even random "
"characters"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:71
+#: plugins/config/class_recoveryConfig.inc:72
msgid "Allow the use of alternate addresses"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:72
+#: plugins/config/class_recoveryConfig.inc:73
msgid ""
"Users will also be able to enter one of theirs alternate addresses to "
"recover their password"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:79
+#: plugins/config/class_recoveryConfig.inc:80
msgid "First email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:82
-#: plugins/config/class_recoveryConfig.inc:101
+#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:102
msgid "Subject"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:84
msgid "Subject of the first email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:86
+#: plugins/config/class_recoveryConfig.inc:87
msgid "[FusionDirectory] Password recovery link"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:89
+#: plugins/config/class_recoveryConfig.inc:90
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:91
#, 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 ""
-#: plugins/config/class_recoveryConfig.inc:93
+#: plugins/config/class_recoveryConfig.inc:94
#, php-format
msgid ""
"Hello,\n"
@@ -1996,31 +2041,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:98
+#: plugins/config/class_recoveryConfig.inc:99
msgid "Second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:103
msgid "Subject of the second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:105
+#: plugins/config/class_recoveryConfig.inc:106
msgid "[FusionDirectory] Password recovery successful"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:108
+#: plugins/config/class_recoveryConfig.inc:109
#, php-format
msgid "Body (%s is login)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:110
#, php-format
msgid ""
"Body of the second email, sent to confirm the password has been changed. Use"
" %s for the user login."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:112
+#: plugins/config/class_recoveryConfig.inc:113
#, php-format
msgid ""
"Hello,\n"
@@ -2088,13 +2133,13 @@ msgstr ""
msgid "Down"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2633
-#: include/simpleplugin/class_attribute.inc:2634
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
+#: include/simpleplugin/class_attribute.inc:2648
msgid "Sort up"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2646
-#: include/simpleplugin/class_attribute.inc:2647
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
+#: include/simpleplugin/class_attribute.inc:2661
msgid "Sort down"
msgstr ""
@@ -2106,27 +2151,26 @@ msgstr ""
#: include/class_config.inc:479 include/class_msgPool.inc:215
#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3106
-#: include/functions.inc:3127 include/functions.inc:3157
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197 include/functions.inc:3259
+#: include/class_msgPool.inc:740 include/functions.inc:3107
+#: include/functions.inc:3128 include/functions.inc:3158
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3260
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1663 include/class_CopyPasteHandler.inc:278
-#: include/simpleplugin/class_dialogAttributes.inc:733
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
-#: include/simpleplugin/class_attribute.inc:1774
-#: include/simpleplugin/class_attribute.inc:1877
-#: include/simpleplugin/class_attribute.inc:1879
+#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
+#: include/simpleplugin/class_attribute.inc:1784
+#: include/simpleplugin/class_attribute.inc:1887
+#: include/simpleplugin/class_attribute.inc:1889
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: 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:437
#: include/password-methods/class_password-methods.inc:447
-#: include/class_SnapshotHandler.inc:415 html/index.php:434 html/index.php:444
+#: include/class_SnapshotHandler.inc:415 html/index.php:473 html/index.php:483
#: setup/class_setupStep_Migrate.inc:935
#: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
msgid "Error"
@@ -2165,44 +2209,44 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: include/class_listing.inc:1586 include/class_listing.inc:1640
+#: include/class_listing.inc:1590 include/class_listing.inc:1644
msgid "Copy"
msgstr ""
-#: include/class_listing.inc:1592 include/class_listing.inc:1628
+#: include/class_listing.inc:1596 include/class_listing.inc:1632
msgid "Cut"
msgstr ""
-#: include/class_listing.inc:1600 include/class_listing.inc:1602
+#: include/class_listing.inc:1604 include/class_listing.inc:1606
#: include/class_CopyPasteHandler.inc:370
msgid "Paste"
msgstr ""
-#: include/class_listing.inc:1628
+#: include/class_listing.inc:1632
msgid "Cut this entry"
msgstr ""
-#: include/class_listing.inc:1640
+#: include/class_listing.inc:1644
msgid "Copy this entry"
msgstr ""
-#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_listing.inc:1677 include/class_listing.inc:1679
msgid "Restore snapshots"
msgstr ""
-#: include/class_listing.inc:1689
+#: include/class_listing.inc:1693
msgid "Export list"
msgstr ""
-#: include/class_listing.inc:1724 include/class_listing.inc:1725
+#: include/class_listing.inc:1728 include/class_listing.inc:1729
msgid "Restore snapshot"
msgstr ""
-#: include/class_listing.inc:1734
+#: include/class_listing.inc:1738
msgid "Create snapshot"
msgstr ""
-#: include/class_listing.inc:1735
+#: include/class_listing.inc:1739
msgid "Create a new snapshot from this object"
msgstr ""
@@ -2245,7 +2289,7 @@ msgid "XML error in fusiondirectory.conf: %s at line %d"
msgstr ""
#: include/class_config.inc:162 include/class_config.inc:300
-#: include/class_config.inc:985 include/class_config.inc:998
+#: include/class_config.inc:915 include/class_config.inc:928
#: include/functions.inc:663 include/class_timezone.inc:51
#: include/password-methods/class_password-methods-sha.inc:71
#: include/password-methods/class_password-methods-ssha.inc:75
@@ -2262,17 +2306,17 @@ msgid ""
"while your passwords are not encrypted."
msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:917
-#: include/class_ldap.inc:1371 include/functions.inc:526
+#: include/class_config.inc:337 include/class_ldap.inc:918
+#: include/class_ldap.inc:1372 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2985 include/simpleplugin/class_simplePlugin.inc:545
-#: include/simpleplugin/class_attribute.inc:2895
+#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2909
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
#: include/class_SnapshotHandler.inc:422 include/class_SnapshotHandler.inc:425
-#: html/index.php:360 html/class_passwordRecovery.inc:497
+#: html/index.php:369 html/class_passwordRecovery.inc:497
#: setup/class_setupStep_Migrate.inc:451
#: setup/class_setupStep_Migrate.inc:1130
msgid "LDAP error"
@@ -2287,38 +2331,38 @@ msgstr ""
msgid "The selected mail method (class %s) is not available"
msgstr ""
-#: include/class_config.inc:986
+#: include/class_config.inc:916
#, php-format
msgid ""
"The snapshot functionality is enabled, but the required variable '%s' is not"
" set."
msgstr ""
-#: include/class_config.inc:999
+#: include/class_config.inc:929
#, php-format
msgid ""
"The snapshot functionality is enabled, but the required compression module "
"is missing. Please install '%s'."
msgstr ""
-#: include/class_config.inc:1104
+#: include/class_config.inc:1034
msgid "All categories"
msgstr ""
-#: include/class_config.inc:1231
+#: include/class_config.inc:1161
msgid "My account"
msgstr "El meu compte"
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
msgid "Performance warning"
msgstr ""
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
#, php-format
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr ""
-#: include/class_ldap.inc:868 include/class_ldap.inc:904
+#: include/class_ldap.inc:869 include/class_ldap.inc:905
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
@@ -2328,39 +2372,39 @@ msgstr ""
msgid "Internal error"
msgstr ""
-#: include/class_ldap.inc:868
+#: include/class_ldap.inc:869
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:904
+#: include/class_ldap.inc:905
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1016
+#: include/class_ldap.inc:1017
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr ""
-#: include/class_ldap.inc:1018
+#: include/class_ldap.inc:1019
#, php-format
msgid "while operating on LDAP server %s"
msgstr ""
-#: include/class_ldap.inc:1108
+#: include/class_ldap.inc:1109
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1220
+#: include/class_ldap.inc:1221
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr ""
-#: include/class_ldap.inc:1231
+#: include/class_ldap.inc:1232
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2948,10 +2992,10 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr ""
-#: include/functions.inc:496 include/functions.inc:3294
-#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:263
-#: include/simpleplugin/class_simplePlugin.inc:268
-#: include/simpleplugin/class_simplePlugin.inc:280
+#: include/functions.inc:496 include/functions.inc:3295
+#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
+#: include/simpleplugin/class_simplePlugin.inc:269
+#: include/simpleplugin/class_simplePlugin.inc:281
#: html/class_passwordRecovery.inc:216
msgid "Fatal error"
msgstr "Error fatal"
@@ -3104,98 +3148,98 @@ msgstr ""
msgid "Cannot read to revision file!"
msgstr ""
-#: include/functions.inc:2548
+#: include/functions.inc:2549
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "LDAP warning"
msgstr ""
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "Cannot get schema information from server. No schema check possible!"
msgstr ""
-#: include/functions.inc:2584
+#: include/functions.inc:2585
msgid ""
"Used to lock currently edited entries to avoid multiple changes at the same "
"time."
msgstr ""
-#: include/functions.inc:2596
+#: include/functions.inc:2597
#, php-format
msgid "Missing required object class '%s'!"
msgstr ""
-#: include/functions.inc:2599
+#: include/functions.inc:2600
#, php-format
msgid "Missing optional object class '%s'!"
msgstr ""
-#: include/functions.inc:2603
+#: include/functions.inc:2604
#, php-format
msgid "Class(es) available"
msgstr ""
-#: include/functions.inc:2623
+#: include/functions.inc:2624
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2625
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2628
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2629
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3106 include/functions.inc:3127
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3106
+#: include/functions.inc:3107
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3127
+#: include/functions.inc:3128
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3157
+#: include/functions.inc:3158
msgid "Cannot create sambaUnixIdPool entry!"
msgstr ""
-#: include/functions.inc:3165
+#: include/functions.inc:3166
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3177 include/functions.inc:3181
+#: include/functions.inc:3178 include/functions.inc:3182
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3197
+#: include/functions.inc:3198
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3259
+#: include/functions.inc:3260
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3295
+#: include/functions.inc:3296
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
@@ -3351,13 +3395,13 @@ msgstr ""
msgid "XML error"
msgstr ""
-#: include/class_plugin.inc:554
+#: include/class_plugin.inc:553
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/class_plugin.inc:1466
+#: include/class_plugin.inc:1467
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -3383,32 +3427,32 @@ msgstr "Nom de la plantilla"
msgid "This is the name of the template"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:263
+#: include/simpleplugin/class_simplePlugin.inc:264
msgid "Only main tab can compute dn"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:270
+#: include/simpleplugin/class_simplePlugin.inc:271
#, php-format
msgid "Could not compute dn: no parent tab class for \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:282
+#: include/simpleplugin/class_simplePlugin.inc:283
#, php-format
msgid ""
"Could not compute dn: could not find objectType infos from tab class \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:638
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:644
+#: include/simpleplugin/class_simplePlugin.inc:652
msgid "Error when saving"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:638
+#: include/simpleplugin/class_simplePlugin.inc:644
#, php-format
msgid "There is already an entry with the same dn : %s"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:652
#, php-format
msgid "The entry %s is not existing"
msgstr ""
@@ -3428,27 +3472,27 @@ msgstr ""
msgid "Show %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:409
+#: include/simpleplugin/class_dialogAttributes.inc:415
#, php-format
msgid "Group %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:411
+#: include/simpleplugin/class_dialogAttributes.inc:417
#, php-format
msgid "Role %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:446
+#: include/simpleplugin/class_dialogAttributes.inc:452
msgid "Group of user"
msgstr "Grup de l'usuari"
-#: include/simpleplugin/class_dialogAttributes.inc:615
+#: include/simpleplugin/class_dialogAttributes.inc:621
#: include/simpleplugin/class_attribute.inc:1090
#: include/simpleplugin/class_attribute.inc:1124
msgid "None"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:617
+#: include/simpleplugin/class_dialogAttributes.inc:623
msgid "Unknown"
msgstr ""
@@ -3489,11 +3533,16 @@ msgid "days"
msgstr ""
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2161
+#: include/simpleplugin/class_attribute.inc:2171
#, php-format
msgid "%s (required)"
msgstr ""
+#: include/simpleplugin/class_attribute.inc:1150
+#, php-format
+msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
+msgstr ""
+
#: include/simpleplugin/class_attribute.inc:1277
#, php-format
msgid "An integer between %d and %d"
@@ -3509,75 +3558,75 @@ msgstr ""
msgid "An integer smaller than %d"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1379
+#: include/simpleplugin/class_attribute.inc:1383
#, php-format
msgid "A float between %f and %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1381
+#: include/simpleplugin/class_attribute.inc:1385
#, php-format
msgid "A float larger than %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1383
+#: include/simpleplugin/class_attribute.inc:1387
#, php-format
msgid "A float smaller than %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1490
+#: include/simpleplugin/class_attribute.inc:1500
msgid "Error, incorrect date: "
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
#, php-format
msgid "Cannot read uploaded file: %s"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1530
+#: include/simpleplugin/class_attribute.inc:1540
msgid "file is empty"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1533
+#: include/simpleplugin/class_attribute.inc:1543
msgid "file not found"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1546
msgid "file not readable"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1569
+#: include/simpleplugin/class_attribute.inc:1579
#, php-format
msgid "%s (%d bytes)"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1616
-#: include/simpleplugin/class_attribute.inc:1793
+#: include/simpleplugin/class_attribute.inc:1626
+#: include/simpleplugin/class_attribute.inc:1803
msgid "Upload"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1621
-#: include/simpleplugin/class_attribute.inc:1622
+#: include/simpleplugin/class_attribute.inc:1631
+#: include/simpleplugin/class_attribute.inc:1632
msgid "Download"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1775
+#: include/simpleplugin/class_attribute.inc:1785
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1826
+#: include/simpleplugin/class_attribute.inc:1836
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr "Base"
-#: include/simpleplugin/class_attribute.inc:1829
+#: include/simpleplugin/class_attribute.inc:1839
msgid "Object base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:2755
+#: include/simpleplugin/class_attribute.inc:2769
#, php-format
msgid "Invalid value for %s"
msgstr ""
@@ -3711,17 +3760,17 @@ msgstr ""
msgid "Account locked. Please contact your system administrator!"
msgstr "El compte és blocat. Contacteu el vostre administrador de sistemes."
-#: html/index.php:436
+#: html/index.php:475
#, php-format
msgid "CAS user \"%s\" could not be found in the LDAP"
msgstr ""
-#: html/index.php:446
+#: html/index.php:485
#, php-format
msgid "CAS user \"%s\" match several users in the LDAP"
msgstr ""
-#: html/index.php:481
+#: html/index.php:522
msgid ""
"Your browser has cookies disabled. Please enable cookies and reload this "
"page before logging in!"
@@ -4044,7 +4093,7 @@ msgid "Checking for duplicated UID numbers"
msgstr ""
#: setup/class_setupStep_Migrate.inc:267
-msgid "Checking for duplicate GID numbers"
+msgid "Checking for duplicated GID numbers"
msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:487
@@ -4054,7 +4103,7 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:1179
#: setup/class_setupStep_Migrate.inc:1272
#: setup/class_setupStep_Migrate.inc:1351
-#: setup/class_setupStep_Migrate.inc:1390
+#: setup/class_setupStep_Migrate.inc:1395
msgid "LDAP query failed"
msgstr ""
@@ -4065,7 +4114,7 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:1180
#: setup/class_setupStep_Migrate.inc:1273
#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1391
+#: setup/class_setupStep_Migrate.inc:1396
msgid "Possibly the \"root object\" is missing."
msgstr ""
@@ -4220,14 +4269,14 @@ msgstr ""
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1373
+#: setup/class_setupStep_Migrate.inc:1378
#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\"."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1412
+#: setup/class_setupStep_Migrate.inc:1422
#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\"."
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
diff --git a/locale/cs_CZ/fusiondirectory.po b/locale/cs_CZ/fusiondirectory.po
index 795b35d44cbf529896b4e6bb6d5ff3840a9e6ede..248f5616abb8b3765659ee97816922b7459392db 100644
--- a/locale/cs_CZ/fusiondirectory.po
+++ b/locale/cs_CZ/fusiondirectory.po
@@ -3,15 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Pavel Borecki <pavel.borecki@gmail.com>, 2014-2015
msgid ""
msgstr ""
-"Project-Id-Version: FusionDirectory-109\n"
+"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-01-22 11:26+0100\n"
-"PO-Revision-Date: 2016-01-22 10:24+0000\n"
+"POT-Creation-Date: 2016-03-14 12:07+0100\n"
+"PO-Revision-Date: 2016-03-07 12:09+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-109/language/cs_CZ/)\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -29,31 +28,31 @@ msgstr "VÃtejte, %s!"
msgid "References"
msgstr "Odkazy"
-#: plugins/admin/groups/class_roleGeneric.inc:30
-#: plugins/admin/groups/class_roleGeneric.inc:34
+#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:61
#: plugins/admin/groups/class_groupManagement.inc:71
#: plugins/admin/aclrole/class_aclRole.inc:78
#: plugins/admin/acl/class_aclAssignment.inc:49
msgid "Role"
msgstr "Role"
-#: plugins/admin/groups/class_roleGeneric.inc:31
+#: plugins/admin/groups/class_roleGeneric.inc:58
msgid "Role information"
msgstr "Informace o roli"
-#: plugins/admin/groups/class_roleGeneric.inc:35
+#: plugins/admin/groups/class_roleGeneric.inc:62
msgid "Organizational role"
msgstr "OrganizaÄnà role"
-#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:84
msgid "Informations"
msgstr "Informace"
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:158
+#: plugins/admin/departments/class_department.inc:174
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -63,13 +62,13 @@ msgstr "Informace"
msgid "Name"
msgstr "Název"
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
msgid "Name of this group"
msgstr "Název této skupiny"
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
#: plugins/admin/groups/class_group.inc:66
#: plugins/admin/groups/class_ogroup.inc:192
#: plugins/admin/groups/group-list.xml:41
@@ -82,26 +81,26 @@ msgstr "Název této skupiny"
msgid "Description"
msgstr "Popis"
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
msgid "Description of the role"
msgstr "Popis role"
-#: plugins/admin/groups/class_roleGeneric.inc:70
+#: plugins/admin/groups/class_roleGeneric.inc:97
msgid "Phone number"
msgstr "Telefonnà ÄÃslo"
-#: plugins/admin/groups/class_roleGeneric.inc:74
+#: plugins/admin/groups/class_roleGeneric.inc:101
msgid "Fax number"
msgstr "Faxové ÄÃslo"
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
#: plugins/admin/users/class_userManagement.inc:42
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: setup/class_setupStep_Migrate.inc:871
msgid "Users"
msgstr "Uživatelé"
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
msgid "Add users for the role"
msgstr "Přidat uživatele pro tuto roli"
@@ -148,7 +147,7 @@ msgstr "Vynutit konkrétnà identifikátor pro tuto skupinu"
#: plugins/admin/groups/class_group.inc:74
#: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:403
+#: plugins/personal/posix/class_posixAccount.inc:410
msgid "GID"
msgstr "GID"
@@ -205,23 +204,23 @@ 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_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458 include/functions.inc:794
-#: include/functions.inc:2548 include/class_xml.inc:55
+#: plugins/personal/posix/class_posixAccount.inc:465 include/functions.inc:794
+#: include/functions.inc:2549 include/class_xml.inc:55
#: include/simpleplugin/class_simpleTabs.inc:325 html/index.php:56
-#: html/index.php:62 html/index.php:481 html/class_passwordRecovery.inc:378
+#: html/index.php:62 html/index.php:522 html/class_passwordRecovery.inc:378
#: setup/class_setupStep_Migrate.inc:572
#: setup/class_setupStep_Migrate.inc:1083
#: setup/class_setupStep_Migrate.inc:1202
#: setup/class_setupStep_Migrate.inc:1313
-#: setup/class_setupStep_Migrate.inc:1372
-#: setup/class_setupStep_Migrate.inc:1411 plugins/admin/acl/remove.tpl.c:2
+#: setup/class_setupStep_Migrate.inc:1377
+#: setup/class_setupStep_Migrate.inc:1421 plugins/admin/acl/remove.tpl.c:2
#: ihtml/themes/default/islocked.tpl.c:5 ihtml/themes/default/remove.tpl.c:2
#: ihtml/themes/default/msg_dialog.tpl.c:5 setup/setup_checks.tpl.c:8
msgid "Warning"
msgstr "VarovánÃ"
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458
+#: plugins/personal/posix/class_posixAccount.inc:465
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!"
@@ -251,7 +250,7 @@ msgstr "Älenské objekty"
msgid "Objects member of this group"
msgstr "Objekty spadajÃcà do této skupiny"
-#: plugins/admin/groups/class_ogroup.inc:318
+#: plugins/admin/groups/class_ogroup.inc:313
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"
@@ -280,10 +279,10 @@ msgstr "Vytvořit"
#: plugins/admin/departments/dep-list.xml:79
#: plugins/admin/users/user-list.xml:105
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-#: include/simpleplugin/class_dialogAttributes.inc:626
-#: include/simpleplugin/class_dialogAttributes.inc:627
-#: include/simpleplugin/class_attribute.inc:2661
-#: include/simpleplugin/class_attribute.inc:2662
+#: include/simpleplugin/class_dialogAttributes.inc:632
+#: include/simpleplugin/class_dialogAttributes.inc:633
+#: include/simpleplugin/class_attribute.inc:2675
+#: include/simpleplugin/class_attribute.inc:2676
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -294,8 +293,8 @@ msgstr "Upravit"
#: plugins/admin/departments/dep-list.xml:67
#: plugins/admin/departments/dep-list.xml:88
#: plugins/admin/users/user-list.xml:112
-#: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_dialogAttributes.inc:637
+#: include/simpleplugin/class_dialogAttributes.inc:642
+#: include/simpleplugin/class_dialogAttributes.inc:643
#: include/simpleplugin/simple-list.xml:75
#: include/simpleplugin/simple-list.xml:125
msgid "Remove"
@@ -344,8 +343,8 @@ msgid "Show application groups"
msgstr "Zobrazit skupiny aplikacÃ"
#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Show department groups"
-msgstr "Zobrazit skupiny oddÄ›lenÃ"
+msgid "Show unidentified groups"
+msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:137
#: include/select/groupSelect/group-filter.tpl.c:11
@@ -433,51 +432,67 @@ msgid "Category of this %s"
msgstr "Kategorie tohoto %s"
#: plugins/admin/departments/class_department.inc:81
+msgid "Website"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:81
+#, php-format
+msgid "Website of this %s"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:85
#: plugins/personal/generic/class_user.inc:410
msgid "Manager"
msgstr "NadÅ™Ãzený"
-#: plugins/admin/departments/class_department.inc:81
+#: plugins/admin/departments/class_department.inc:85
#, php-format
msgid "Manager of this %s"
msgstr "NadÅ™Ãzený tohoto %s"
-#: plugins/admin/departments/class_department.inc:87
-#: plugins/admin/departments/class_department.inc:93
+#: plugins/admin/departments/class_department.inc:91
+#: plugins/admin/departments/class_department.inc:97
#: plugins/personal/generic/class_user.inc:304
msgid "Location"
msgstr "UmÃstÄ›nÃ"
-#: plugins/admin/departments/class_department.inc:90
+#: plugins/admin/departments/class_department.inc:94
#: plugins/personal/generic/class_user.inc:308
msgid "State"
msgstr "Stav"
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_country.inc:29
+#: plugins/admin/departments/class_country.inc:30
+#: plugins/admin/departments/class_country.inc:33
+msgid "Country"
+msgstr "ZemÄ›"
+
+#: plugins/admin/departments/class_department.inc:103
#: plugins/personal/generic/class_user.inc:312
msgid "Address"
msgstr "Adresa"
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:103
#, php-format
msgid "A postal address for this %s"
msgstr "Poštovnà adresa pro toto %s"
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
#: plugins/personal/generic/class_user.inc:320
msgid "Phone"
msgstr "Telefon"
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
msgid "Telephone number"
msgstr "Telefonnà ÄÃslo"
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
#: plugins/personal/generic/class_user.inc:332
msgid "Fax"
msgstr "Fax"
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
msgid "Facsimile telephone number"
msgstr "Telefonnà ÄÃslo faxu"
@@ -505,12 +520,6 @@ msgstr "MÃsto"
msgid "locality"
msgstr "mÃsto"
-#: plugins/admin/departments/class_country.inc:29
-#: plugins/admin/departments/class_country.inc:30
-#: plugins/admin/departments/class_country.inc:33
-msgid "Country"
-msgstr "ZemÄ›"
-
#: plugins/admin/departments/class_country.inc:50
msgid "country"
msgstr "zemÄ›"
@@ -553,7 +562,8 @@ msgid "Given name"
msgstr "Jméno"
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
+#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
msgid "Login"
@@ -666,8 +676,8 @@ msgid "Edit category ACL"
msgstr "upravit ACL kategorie"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2671
-#: include/simpleplugin/class_attribute.inc:2672
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
+#: include/simpleplugin/class_attribute.inc:2686
#, php-format
msgid "Delete"
msgstr "Smazat"
@@ -772,19 +782,37 @@ msgstr "Seznamy pro Å™Ãzenà pÅ™Ãstupu"
msgid "ACLs which are part of this group"
msgstr "ACL seznamy, které jsou souÄástà této skupiny"
-#: plugins/admin/acl/class_aclManagement.inc:38
+#: plugins/admin/acl/class_aclManagement.inc:31
+#: plugins/admin/acl/class_aclManagement.inc:32
+#: plugins/admin/acl/class_aclManagement.inc:45
+msgid "ACL assignment creation"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:33
+msgid "Create an ACL assignment on an arbitrary dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "Dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "DN you wish to add assignments for"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:135
msgid "ACL assignments"
msgstr "Přiřazenà ACL"
-#: plugins/admin/acl/class_aclManagement.inc:39
+#: plugins/admin/acl/class_aclManagement.inc:136
msgid "ACL assignments management"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:40
+#: plugins/admin/acl/class_aclManagement.inc:137
msgid "Manage ACL roles assignments to users"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:78
+#: plugins/admin/acl/class_aclManagement.inc:199
#: plugins/admin/acl/class_aclAssignment.inc:263
msgid "ACL Assignment"
msgstr "přiřazenà ACL"
@@ -900,7 +928,7 @@ msgid "Password hash method to use"
msgstr "Metoda otisku hesla"
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -995,59 +1023,59 @@ msgstr "ÄŒÃslo na pracovnà pager"
msgid "Business fax number"
msgstr "ÄŒÃslo služebnÃho faxu"
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:336
+msgid "Homepage"
+msgstr "Webové stránky"
+
+#: plugins/personal/generic/class_user.inc:336
+msgid "Personal homepage"
+msgstr "Osobnà webové stránky"
+
+#: plugins/personal/generic/class_user.inc:342
msgid "Account information"
msgstr "Informace o úÄtu"
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
msgid "Login of this user"
msgstr "Přihlašovacà jméno tohoto uživatele"
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:351
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr "Upřednostňovaný jazyk"
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
msgid "Password of the user"
msgstr "Uživatelovo heslo"
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:362
msgid "Personal contact information"
msgstr "Osobnà kontaktnà údaje"
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
msgid "Display name"
msgstr "Zobrazovaný název"
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
msgid "Name this user should appear as. Used by Exchange."
msgstr "Jméno, pod kterým má být tento uživatel zobrazován. PoužÃváno MS Exchange."
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home address"
msgstr "Adresa bydliště"
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home postal address"
msgstr "Soukromá poštovnà adresa"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:374
msgid "Private phone"
msgstr "Soukromý telefon"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:374
msgid "Home phone number"
msgstr "Telefonnà ÄÃslo domů"
-#: plugins/personal/generic/class_user.inc:374
-msgid "Homepage"
-msgstr "Webové stránky"
-
-#: plugins/personal/generic/class_user.inc:374
-msgid "Personal homepage"
-msgstr "Osobnà webové stránky"
-
#: plugins/personal/generic/class_user.inc:380
msgid "Organizational information"
msgstr "OrganizaÄnà údaje"
@@ -1280,33 +1308,33 @@ msgstr "nenastavené"
msgid "automatic"
msgstr "samoÄinné"
-#: plugins/personal/posix/class_posixAccount.inc:309
+#: plugins/personal/posix/class_posixAccount.inc:310
msgid "expired"
msgstr "platnost skonÄila"
-#: plugins/personal/posix/class_posixAccount.inc:311
+#: plugins/personal/posix/class_posixAccount.inc:312
msgid "grace time active"
msgstr "běžà Äas odkladu"
-#: plugins/personal/posix/class_posixAccount.inc:314
-#: plugins/personal/posix/class_posixAccount.inc:316
-#: plugins/personal/posix/class_posixAccount.inc:318
+#: plugins/personal/posix/class_posixAccount.inc:315
+#: plugins/personal/posix/class_posixAccount.inc:317
+#: plugins/personal/posix/class_posixAccount.inc:319
msgid "active"
msgstr "aktivnÃ"
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:315
msgid "password expired"
msgstr "platnost hesla skonÄila"
-#: plugins/personal/posix/class_posixAccount.inc:316
+#: plugins/personal/posix/class_posixAccount.inc:317
msgid "password not changeable"
msgstr "heslo nelze změnit"
-#: plugins/personal/posix/class_posixAccount.inc:400
+#: plugins/personal/posix/class_posixAccount.inc:407
msgid "UID"
msgstr "UID"
-#: plugins/personal/posix/class_posixAccount.inc:516
+#: plugins/personal/posix/class_posixAccount.inc:525
#, php-format
msgid "Group of user %s"
msgstr "Skupina uživatele %s"
@@ -1478,424 +1506,440 @@ msgid "Core settings"
msgstr "Základnà nastavenÃ"
#: plugins/config/class_configInLdap.inc:161
-msgid "Enable primary group filter"
-msgstr "povolit filtrovánà uživatelů dle jejich hlavnÃch skupin"
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"It is time consuming to evaluate which groups are primary and which are not,"
-" so you may want to disable it if your group plugin is slow."
-msgstr "Je ÄasovÄ› nároÄné vyhodnotit, které skupiny jsou hlavnà a které nikoli, takže bude lépe vypnout to, pokud je zásuvný modul skupin pomalý."
-
-#: plugins/config/class_configInLdap.inc:167
msgid "Display summary in listings"
msgstr "Ve výpisech zobrazovat souhrn"
-#: plugins/config/class_configInLdap.inc:168
+#: 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:173
+#: plugins/config/class_configInLdap.inc:167
msgid "Edit locking"
msgstr "Upravit zamykánÃ"
-#: plugins/config/class_configInLdap.inc:174
+#: 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:179
+#: plugins/config/class_configInLdap.inc:173
msgid "Enable logging"
msgstr "Zapnout protokolovánÃ"
-#: plugins/config/class_configInLdap.inc:180
+#: 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:185
+#: plugins/config/class_configInLdap.inc:179
msgid "LDAP size limit"
msgstr "Nejvyššà umožněná velikost LDAP"
-#: plugins/config/class_configInLdap.inc:185
+#: 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."
-#: plugins/config/class_configInLdap.inc:192
+#: plugins/config/class_configInLdap.inc:186
msgid "Login and session"
msgstr "PÅ™ihlaÅ¡ovánà a sezenÃ"
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:189
msgid "Login attribute"
msgstr "atribut použitý pro pÅ™ihlaÅ¡ovánÃ"
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:190
msgid "Which LDAP attribute should be used as the login name during login."
msgstr "Který LDAP atribut by mÄ›l být použit jako pÅ™ihlaÅ¡ovacà jméno pÅ™i pÅ™ihlaÅ¡ovánÃ."
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:196
msgid "Enforce encrypted connections"
msgstr "Vynutit Å¡ifrované spojenÃ"
-#: plugins/config/class_configInLdap.inc:203
+#: plugins/config/class_configInLdap.inc:197
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Ã."
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:201
msgid "Warn if session is not encrypted"
msgstr "Varovat, pokud relace nenà šifrována"
-#: plugins/config/class_configInLdap.inc:208
+#: plugins/config/class_configInLdap.inc:202
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:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Session lifetime"
msgstr "Doba neÄinnosti, po jejÃmž uplynutà bude relace automaticky ukonÄena."
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Defines when a session will expire in seconds."
msgstr "UrÄuje, za jak dlouho (v sekundách) skonÄà platnost relace."
-#: plugins/config/class_configInLdap.inc:220
+#: plugins/config/class_configInLdap.inc:212
+msgid "HTTP authentication"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:212
+msgid "Use HTTP authentication protocol instead of the login form."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:219
#: include/class_SnapshotDialogs.inc:186
msgid "Snapshots"
msgstr "Zachycené stavy"
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid "Enable snapshots"
msgstr "Zapnout pořizovánà zachycených stavů"
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
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:228
+#: plugins/config/class_configInLdap.inc:227
msgid "Snapshot base"
msgstr "Základ zachyceného stavu"
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
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:235
+#: plugins/config/class_configInLdap.inc:234
msgid "SSL"
msgstr "SSL"
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Key path"
msgstr "UmÃstÄ›nà klÃÄe"
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Path to FusionDirectory private key. Unused for now."
msgstr "UmÃstÄ›nà soukromé Äásti klÃÄe FusionDirectory. V tuto chvÃli nenà použÃváno."
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Certificate path"
msgstr "UmÃstÄ›nà certifikátu"
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
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:248
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:262
msgid "CA certificate path"
msgstr "UmÃstÄ›nà certifikátu cert. autority"
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:247
msgid "Path to the CA certificate. Used for validating Argonaut Server host."
msgstr "UmÃstÄ›nà certifikátu cert. autority. Sloužà k ověřenà stroje s Argonaut serverem."
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:254
msgid "CAS"
msgstr "Ústřednà ověřovacà služba (CAS)"
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "Enable CAS"
msgstr "Zapnout CAS"
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
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:263
+#: plugins/config/class_configInLdap.inc:262
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:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host"
msgstr "Stroj"
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host of the CAS server"
msgstr "Stroj, na kterém je provozován CAS server"
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port"
msgstr "Port"
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port the CAS server is listening on"
msgstr "Port na kterém CAS server oÄekává spojenÃ"
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context"
msgstr "Kontext CAS"
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context to be used"
msgstr "Kontext CAS, který použÃt"
-#: plugins/config/class_configInLdap.inc:285
+#: plugins/config/class_configInLdap.inc:284
msgid "People and group storage"
msgstr "ÚložiÅ¡tÄ› úÄtů uživatelů a skupin"
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "People DN attribute"
msgstr "atribut úÄtu uživatele použitý jako DN"
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
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:294
+#: plugins/config/class_configInLdap.inc:293
msgid "CN pattern"
msgstr "Vzor CN"
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
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:299
+#: plugins/config/class_configInLdap.inc:298
msgid "Strict naming policy"
msgstr "PÅ™Ãsná pravidla pro pojmenovávánÃ"
-#: plugins/config/class_configInLdap.inc:300
+#: plugins/config/class_configInLdap.inc:299
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:305
+#: plugins/config/class_configInLdap.inc:304
msgid "Group/user min id"
msgstr "Nejnižšà identifikátor skupiny/uživatele"
-#: plugins/config/class_configInLdap.inc:306
+#: plugins/config/class_configInLdap.inc:305
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:311
+#: plugins/config/class_configInLdap.inc:310
msgid "Next id hook"
msgstr "HáÄek pÅ™ÃÅ¡tÃho identifikátoru"
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
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:315
+#: plugins/config/class_configInLdap.inc:314
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:316
+#: plugins/config/class_configInLdap.inc:315
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:321
+#: plugins/config/class_configInLdap.inc:320
msgid "Base number for group id"
msgstr "Od jakého ÄÃsla zaÄÃt pÅ™idÄ›lovat identifikátory skupin"
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:321
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:327
+#: plugins/config/class_configInLdap.inc:326
msgid "Users RDN"
msgstr "Relativnà rozlišený název uživatelů"
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "The branch where users are stored."
msgstr "Větev, ve které jsou uloženi uživatelé."
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "Groups RDN"
msgstr "Relativnà rozlišený název skupin"
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "The branch where groups are stored."
msgstr "Větev, ve které jsou uloženy skupiny."
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "ACL role RDN"
msgstr "Relativnà rozlišený název ACL úlohy"
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "The branch where ACL roles are stored."
msgstr "Větev, ve které jsou uloženy ACL úlohy."
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Id allocation method"
msgstr "Metoda přiřazovánà identifikátorů"
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Method to allocate user/group ids"
msgstr "Způsob přiřazovánà identifikátorů uživatelů/skupin"
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Traditional"
msgstr "TradiÄnÃ"
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Samba unix id pool"
msgstr "Rozsah unixových identifikátorů pro Samba"
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Pool user id min"
msgstr "Nejnižšà identifikátor uživatele"
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
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:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Pool user id max"
msgstr "Nejvyššà identifikátor uživatele"
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
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:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Pool group id min"
msgstr "Nejnižšà identifikátor skupiny"
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
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:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Pool group id max"
msgstr "Nejvyššà identifikátor skupiny"
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
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:370
+#: plugins/config/class_configInLdap.inc:367
+msgid "Restrict role members"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:367
+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:373
msgid "Debugging"
msgstr "Diagnostika"
-#: plugins/config/class_configInLdap.inc:373
+#: plugins/config/class_configInLdap.inc:376
msgid "Display errors"
msgstr "Zobrazit chyby"
-#: plugins/config/class_configInLdap.inc:374
+#: plugins/config/class_configInLdap.inc:377
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."
-#: plugins/config/class_configInLdap.inc:378
+#: plugins/config/class_configInLdap.inc:381
msgid "Maximum LDAP query time"
msgstr "maximálnà prodleva odpovědi LDAPu"
-#: plugins/config/class_configInLdap.inc:378
+#: plugins/config/class_configInLdap.inc:381
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."
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:386
msgid "Log LDAP statistics"
msgstr "Zaznamenávat statistiky LDAP"
-#: plugins/config/class_configInLdap.inc:384
+#: plugins/config/class_configInLdap.inc:387
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Ã."
-#: plugins/config/class_configInLdap.inc:389
+#: plugins/config/class_configInLdap.inc:392
msgid "Debug level"
msgstr "Úroveň podrobnostà diagnostických informacÃ"
-#: plugins/config/class_configInLdap.inc:390
+#: plugins/config/class_configInLdap.inc:393
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:402
+#: plugins/config/class_configInLdap.inc:405
msgid "Miscellaneous"
msgstr "Různé"
-#: plugins/config/class_configInLdap.inc:407
+#: 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:411
+#: plugins/config/class_configInLdap.inc:414
msgid "tab"
msgstr "panel"
-#: plugins/config/class_configInLdap.inc:411
+#: 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:416
+#: plugins/config/class_configInLdap.inc:419
msgid "mode"
msgstr "režim"
-#: plugins/config/class_configInLdap.inc:416
+#: 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:422
+#: plugins/config/class_configInLdap.inc:425
msgid "cmd"
msgstr "pÅ™Ãkaz"
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "The command that will be called"
msgstr "PÅ™Ãkaz, který bude spouÅ¡tÄ›n"
-#: plugins/config/class_configInLdap.inc:429
+#: plugins/config/class_configInLdap.inc:432
msgid "Hooks"
msgstr "háÄky"
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:439
msgid "Display hook output"
msgstr "Zobrazit výstup háÄku"
-#: plugins/config/class_configInLdap.inc:437
+#: plugins/config/class_configInLdap.inc:440
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:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available shells"
msgstr "Dostupné shelly"
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available POSIX shells for FD users."
msgstr "POSIX shelly, dostupné pro uživatele F.D."
-#: plugins/config/class_configInLdap.inc:449
+#: plugins/config/class_configInLdap.inc:452
msgid "Show ACL tab on all objects"
msgstr "Zobrazit panel ACL u všech objektů"
-#: plugins/config/class_configInLdap.inc:450
+#: plugins/config/class_configInLdap.inc:453
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:464
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available department categories"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available categories in the departments dropdown"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:474
#: setup/class_setupStep_Language.inc:69
msgid "Automatic"
msgstr "SamoÄinné"
@@ -1912,80 +1956,80 @@ msgstr "Nastavenà funkce obnovenà zapomenutého hesla"
msgid "Password recovery settings"
msgstr "Nastavenà obnovy zapomenutého hesla"
-#: plugins/config/class_recoveryConfig.inc:44
+#: plugins/config/class_recoveryConfig.inc:45
msgid "Activate password recovery"
msgstr "Zapnout funkci pro obnovu zapomenutého hesla"
-#: plugins/config/class_recoveryConfig.inc:45
+#: plugins/config/class_recoveryConfig.inc:46
msgid "Whether to activate or not password recovery feature"
msgstr "Zda zapnout funkci pro obnovovánà zapomenutých hesel"
-#: plugins/config/class_recoveryConfig.inc:50
+#: plugins/config/class_recoveryConfig.inc:51
msgid "Sender email address"
msgstr "E-mailová adresa odesilatele"
-#: plugins/config/class_recoveryConfig.inc:51
+#: plugins/config/class_recoveryConfig.inc:52
msgid "Email address from which mails will be sent"
msgstr "E-mailová adresa, ze které budou zprávy posÃlány"
-#: plugins/config/class_recoveryConfig.inc:57
+#: plugins/config/class_recoveryConfig.inc:58
msgid "Link validity (minutes)"
msgstr "Doba platnosti odkazu (minuty)"
-#: plugins/config/class_recoveryConfig.inc:58
+#: plugins/config/class_recoveryConfig.inc:59
msgid "Number of minutes before a recovery link expires"
msgstr "PoÄet minut, po jejichž uplynutà skonÄà platnost obnovovacÃho odkazu"
-#: plugins/config/class_recoveryConfig.inc:64
+#: plugins/config/class_recoveryConfig.inc:65
msgid "Salt for tokens"
msgstr "Kryptografická „sůl“ pro tokeny"
-#: plugins/config/class_recoveryConfig.inc:65
+#: plugins/config/class_recoveryConfig.inc:66
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"
-#: plugins/config/class_recoveryConfig.inc:71
+#: plugins/config/class_recoveryConfig.inc:72
msgid "Allow the use of alternate addresses"
msgstr "Umožnit použÃvánà alternativnÃch adres"
-#: plugins/config/class_recoveryConfig.inc:72
+#: plugins/config/class_recoveryConfig.inc:73
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"
-#: plugins/config/class_recoveryConfig.inc:79
+#: plugins/config/class_recoveryConfig.inc:80
msgid "First email"
msgstr "Prvnà e-mail"
-#: plugins/config/class_recoveryConfig.inc:82
-#: plugins/config/class_recoveryConfig.inc:101
+#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:102
msgid "Subject"
msgstr "Předmět"
-#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:84
msgid "Subject of the first email"
msgstr "PÅ™edmÄ›t prvnÃho e-mailu"
-#: plugins/config/class_recoveryConfig.inc:86
+#: plugins/config/class_recoveryConfig.inc:87
msgid "[FusionDirectory] Password recovery link"
msgstr "[FusionDirectory] Odkaz pro obnovu hesla"
-#: plugins/config/class_recoveryConfig.inc:89
+#: plugins/config/class_recoveryConfig.inc:90
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr "Tělo zprávy (prvnà %s je přihlašovacà jméno, druhé je odkaz)"
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:91
#, 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 "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:93
+#: plugins/config/class_recoveryConfig.inc:94
#, php-format
msgid ""
"Hello,\n"
@@ -1997,31 +2041,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr "Dobrý den,\n\nZde jsou Vaše přihlašovacà údaje:\n- přihlašovacà jméno: %s\n- odkaz pro obnovu hesla: %s\n\nVýše uvedený odkaz je platný pouze 10 minut!"
-#: plugins/config/class_recoveryConfig.inc:98
+#: plugins/config/class_recoveryConfig.inc:99
msgid "Second email"
msgstr "Druhý e-mail"
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:103
msgid "Subject of the second email"
msgstr "Předmět druhého e-mailu"
-#: plugins/config/class_recoveryConfig.inc:105
+#: plugins/config/class_recoveryConfig.inc:106
msgid "[FusionDirectory] Password recovery successful"
msgstr "[FusionDirectory] Obnova ztraceného hesla proběhla úspěšně"
-#: plugins/config/class_recoveryConfig.inc:108
+#: plugins/config/class_recoveryConfig.inc:109
#, php-format
msgid "Body (%s is login)"
msgstr "Tělo zprávy (%s je přihlašovacà jméno)"
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:110
#, php-format
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"
-#: plugins/config/class_recoveryConfig.inc:112
+#: plugins/config/class_recoveryConfig.inc:113
#, php-format
msgid ""
"Hello,\n"
@@ -2089,13 +2133,13 @@ msgstr "Nahoru"
msgid "Down"
msgstr "Dolů"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2633
-#: include/simpleplugin/class_attribute.inc:2634
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
+#: include/simpleplugin/class_attribute.inc:2648
msgid "Sort up"
msgstr "Seřadit vzestupně"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2646
-#: include/simpleplugin/class_attribute.inc:2647
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
+#: include/simpleplugin/class_attribute.inc:2661
msgid "Sort down"
msgstr "Seřadit sestupně"
@@ -2107,27 +2151,26 @@ msgstr "Vybrat vše"
#: include/class_config.inc:479 include/class_msgPool.inc:215
#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3106
-#: include/functions.inc:3127 include/functions.inc:3157
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197 include/functions.inc:3259
+#: include/class_msgPool.inc:740 include/functions.inc:3107
+#: include/functions.inc:3128 include/functions.inc:3158
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3260
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1663 include/class_CopyPasteHandler.inc:278
-#: include/simpleplugin/class_dialogAttributes.inc:733
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
-#: include/simpleplugin/class_attribute.inc:1774
-#: include/simpleplugin/class_attribute.inc:1877
-#: include/simpleplugin/class_attribute.inc:1879
+#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
+#: include/simpleplugin/class_attribute.inc:1784
+#: include/simpleplugin/class_attribute.inc:1887
+#: include/simpleplugin/class_attribute.inc:1889
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: 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:437
#: include/password-methods/class_password-methods.inc:447
-#: include/class_SnapshotHandler.inc:415 html/index.php:434 html/index.php:444
+#: include/class_SnapshotHandler.inc:415 html/index.php:473 html/index.php:483
#: setup/class_setupStep_Migrate.inc:935
#: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
msgid "Error"
@@ -2166,44 +2209,44 @@ msgstr "ZnovunaÄÃst seznam"
msgid "Submit"
msgstr "Odeslat"
-#: include/class_listing.inc:1586 include/class_listing.inc:1640
+#: include/class_listing.inc:1590 include/class_listing.inc:1644
msgid "Copy"
msgstr "zkopÃrovat"
-#: include/class_listing.inc:1592 include/class_listing.inc:1628
+#: include/class_listing.inc:1596 include/class_listing.inc:1632
msgid "Cut"
msgstr "Vyjmout"
-#: include/class_listing.inc:1600 include/class_listing.inc:1602
+#: include/class_listing.inc:1604 include/class_listing.inc:1606
#: include/class_CopyPasteHandler.inc:370
msgid "Paste"
msgstr "Vložit"
-#: include/class_listing.inc:1628
+#: include/class_listing.inc:1632
msgid "Cut this entry"
msgstr "Vyjmout tuto položku"
-#: include/class_listing.inc:1640
+#: include/class_listing.inc:1644
msgid "Copy this entry"
msgstr "ZkopÃrovat tuto položku"
-#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_listing.inc:1677 include/class_listing.inc:1679
msgid "Restore snapshots"
msgstr "Obnovit zachycené stavy"
-#: include/class_listing.inc:1689
+#: include/class_listing.inc:1693
msgid "Export list"
msgstr "Exportovat seznam"
-#: include/class_listing.inc:1724 include/class_listing.inc:1725
+#: include/class_listing.inc:1728 include/class_listing.inc:1729
msgid "Restore snapshot"
msgstr "Obnovit zachycený stav"
-#: include/class_listing.inc:1734
+#: include/class_listing.inc:1738
msgid "Create snapshot"
msgstr "PoÅ™Ãdit zachycený stav"
-#: include/class_listing.inc:1735
+#: include/class_listing.inc:1739
msgid "Create a new snapshot from this object"
msgstr "vytvoÅ™it nový snÃmek tohoto objektu"
@@ -2246,7 +2289,7 @@ msgid "XML error in fusiondirectory.conf: %s at line %d"
msgstr "Chyba XML ve fusiondirectory.conf: %s na řádku %d"
#: include/class_config.inc:162 include/class_config.inc:300
-#: include/class_config.inc:985 include/class_config.inc:998
+#: include/class_config.inc:915 include/class_config.inc:928
#: include/functions.inc:663 include/class_timezone.inc:51
#: include/password-methods/class_password-methods-sha.inc:71
#: include/password-methods/class_password-methods-ssha.inc:75
@@ -2263,17 +2306,17 @@ msgid ""
"while your passwords are not encrypted."
msgstr "Zdá se, že se pokouÅ¡Ãte dekódovat nÄ›co, co nenà zakódované : %s<br/>\\nOvěřte, zda nepoužÃváte soubor fusiondirectory.secrets byÅ¥ jsou vaÅ¡e hesla neÅ¡ifrovaná."
-#: include/class_config.inc:337 include/class_ldap.inc:917
-#: include/class_ldap.inc:1371 include/functions.inc:526
+#: include/class_config.inc:337 include/class_ldap.inc:918
+#: include/class_ldap.inc:1372 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2985 include/simpleplugin/class_simplePlugin.inc:545
-#: include/simpleplugin/class_attribute.inc:2895
+#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2909
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
#: include/class_SnapshotHandler.inc:422 include/class_SnapshotHandler.inc:425
-#: html/index.php:360 html/class_passwordRecovery.inc:497
+#: html/index.php:369 html/class_passwordRecovery.inc:497
#: setup/class_setupStep_Migrate.inc:451
#: setup/class_setupStep_Migrate.inc:1130
msgid "LDAP error"
@@ -2288,38 +2331,38 @@ msgstr "Nedařà se pÅ™ihlášenà do LDAPu. Kontaktujte prosÃm správce systé
msgid "The selected mail method (class %s) is not available"
msgstr "Zvolený způsob e-mailu (tÅ™Ãda %s) nenà dostupný"
-#: include/class_config.inc:986
+#: include/class_config.inc:916
#, 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."
-#: include/class_config.inc:999
+#: include/class_config.inc:929
#, 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'."
-#: include/class_config.inc:1104
+#: include/class_config.inc:1034
msgid "All categories"
msgstr "VÅ¡echny kategorie"
-#: include/class_config.inc:1231
+#: include/class_config.inc:1161
msgid "My account"
msgstr "Můj úÄet"
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
msgid "Performance warning"
msgstr "Varovánà ohledně výkonu"
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
#, 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:868 include/class_ldap.inc:904
+#: include/class_ldap.inc:869 include/class_ldap.inc:905
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
@@ -2329,39 +2372,39 @@ msgstr "Výkonnost LDAPu je špatná: poslednà dotaz trval celých %.2fs!"
msgid "Internal error"
msgstr "Vnitřnà chyba"
-#: include/class_ldap.inc:868
+#: include/class_ldap.inc:869
#, 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!"
-#: include/class_ldap.inc:904
+#: include/class_ldap.inc:905
#, 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:1016
+#: include/class_ldap.inc:1017
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr "při operaci na %s na LDAP serveru %s"
-#: include/class_ldap.inc:1018
+#: include/class_ldap.inc:1019
#, php-format
msgid "while operating on LDAP server %s"
msgstr "při operaci na LDAP serveru %s"
-#: include/class_ldap.inc:1108
+#: include/class_ldap.inc:1109
msgid "proc_open failed to execute ldapsearch"
msgstr "proc_open se nezdařilo vykonat ldapsearch"
-#: include/class_ldap.inc:1220
+#: include/class_ldap.inc:1221
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr "Toto nenà platné DN: '%s'. Celek pro import by mÄ›l zaÄÃnat na 'dn: …' na řádku %s"
-#: include/class_ldap.inc:1231
+#: include/class_ldap.inc:1232
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2949,10 +2992,10 @@ 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Ä"
-#: include/functions.inc:496 include/functions.inc:3294
-#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:263
-#: include/simpleplugin/class_simplePlugin.inc:268
-#: include/simpleplugin/class_simplePlugin.inc:280
+#: include/functions.inc:496 include/functions.inc:3295
+#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
+#: include/simpleplugin/class_simplePlugin.inc:269
+#: include/simpleplugin/class_simplePlugin.inc:281
#: html/class_passwordRecovery.inc:216
msgid "Fatal error"
msgstr "Fatálnà chyba"
@@ -3105,98 +3148,98 @@ msgstr "Nelze zapsat do souboru s revizemi!"
msgid "Cannot read to revision file!"
msgstr "Nelze ÄÃst ze souboru s revizemi!"
-#: include/functions.inc:2548
+#: include/functions.inc:2549
msgid "'nextIdHook' is not available. Using default base!"
msgstr "nextIdHook nenà k dispozici. Bude použit výchozà základ!"
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "LDAP warning"
msgstr "Varovánà LDAP"
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "Cannot get schema information from server. No schema check possible!"
msgstr "Nedařà se zÃskat informace o schématech ze serveru. Schémata proto nelze ověřit!"
-#: include/functions.inc:2584
+#: include/functions.inc:2585
msgid ""
"Used to lock currently edited entries to avoid multiple changes at the same "
"time."
msgstr "PoužÃvá se k uzamÄenà právÄ› upravovaných položek, aby se zabránilo vÃcero (vzájemnÄ› si vadÃcÃm) úpravám naráz."
-#: include/functions.inc:2596
+#: include/functions.inc:2597
#, php-format
msgid "Missing required object class '%s'!"
msgstr "Chybà nezbytnÄ› nutná tÅ™Ãda objektů '%s'!"
-#: include/functions.inc:2599
+#: include/functions.inc:2600
#, php-format
msgid "Missing optional object class '%s'!"
msgstr "Chybà volitelná tÅ™Ãda objektů %s!"
-#: include/functions.inc:2603
+#: include/functions.inc:2604
#, php-format
msgid "Class(es) available"
msgstr "Dostupné tÅ™Ãdy"
-#: include/functions.inc:2623
+#: include/functions.inc:2624
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."
-#: include/functions.inc:2624
+#: include/functions.inc:2625
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É"
-#: include/functions.inc:2627
+#: include/functions.inc:2628
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."
-#: include/functions.inc:2628
+#: include/functions.inc:2629
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr "Je tÅ™eba, aby ObjectClass posixGroup bylo STRUKTURÃLNÃ"
-#: include/functions.inc:3106 include/functions.inc:3127
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198
msgid "Cannot allocate a free ID:"
msgstr "Nenà k dispozici volné ID:"
-#: include/functions.inc:3106
+#: include/functions.inc:3107
msgid "unknown idAllocation method!"
msgstr "Neznámá metoda idAllocation (přiřazovánà ID)!"
-#: include/functions.inc:3127
+#: include/functions.inc:3128
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3157
+#: include/functions.inc:3158
msgid "Cannot create sambaUnixIdPool entry!"
msgstr "Nedařà se vytvořit položku sambaUnixIdPool!"
-#: include/functions.inc:3165
+#: include/functions.inc:3166
msgid "sambaUnixIdPool is not unique!"
msgstr "Identifikátor sambaUnixIdPool nenà jedineÄný!"
-#: include/functions.inc:3177 include/functions.inc:3181
+#: include/functions.inc:3178 include/functions.inc:3182
msgid "no ID available!"
msgstr "Nenà k dispozici ID!"
-#: include/functions.inc:3197
+#: include/functions.inc:3198
msgid "maximum tries exceeded!"
msgstr "PÅ™ekroÄen nejvyÅ¡Å¡Ã pÅ™ijatelný poÄet neúspěšných pokusů!"
-#: include/functions.inc:3259
+#: include/functions.inc:3260
msgid "Cannot allocate a free ID!"
msgstr "Nenà k dispozici volné ID – nenà co přidělit!"
-#: include/functions.inc:3295
+#: include/functions.inc:3296
#, 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)"
@@ -3352,13 +3395,13 @@ msgstr "připojeno"
msgid "XML error"
msgstr "Chyba v XML"
-#: include/class_plugin.inc:554
+#: include/class_plugin.inc:553
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/class_plugin.inc:1466
+#: include/class_plugin.inc:1467
#, php-format
msgid "Tab \"%s\""
msgstr "Panel %s"
@@ -3384,32 +3427,32 @@ msgstr "Název šablony"
msgid "This is the name of the template"
msgstr "Toto je název šablony"
-#: include/simpleplugin/class_simplePlugin.inc:263
+#: include/simpleplugin/class_simplePlugin.inc:264
msgid "Only main tab can compute dn"
msgstr "Pouze hlavnà panel může vypoÄÃtat rozliÅ¡ený název"
-#: include/simpleplugin/class_simplePlugin.inc:270
+#: include/simpleplugin/class_simplePlugin.inc:271
#, php-format
msgid "Could not compute dn: no parent tab class for \"%s\""
msgstr "Nedařà se spoÄÃtat rozliÅ¡ený název: žádná nadÅ™azená tÅ™Ãda panelu pro %s"
-#: include/simpleplugin/class_simplePlugin.inc:282
+#: include/simpleplugin/class_simplePlugin.inc:283
#, 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:638
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:644
+#: include/simpleplugin/class_simplePlugin.inc:652
msgid "Error when saving"
msgstr "Chyba pÅ™i ukládánÃ"
-#: include/simpleplugin/class_simplePlugin.inc:638
+#: include/simpleplugin/class_simplePlugin.inc:644
#, 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:646
+#: include/simpleplugin/class_simplePlugin.inc:652
#, php-format
msgid "The entry %s is not existing"
msgstr "Položka %s neexistuje"
@@ -3429,27 +3472,27 @@ msgstr "%s Å¡ablona"
msgid "Show %s"
msgstr "Zobrazit %s"
-#: include/simpleplugin/class_dialogAttributes.inc:409
+#: include/simpleplugin/class_dialogAttributes.inc:415
#, php-format
msgid "Group %s"
msgstr "Skupina %s"
-#: include/simpleplugin/class_dialogAttributes.inc:411
+#: include/simpleplugin/class_dialogAttributes.inc:417
#, php-format
msgid "Role %s"
msgstr "Role %s"
-#: include/simpleplugin/class_dialogAttributes.inc:446
+#: include/simpleplugin/class_dialogAttributes.inc:452
msgid "Group of user"
msgstr "Skupina uživatele"
-#: include/simpleplugin/class_dialogAttributes.inc:615
+#: include/simpleplugin/class_dialogAttributes.inc:621
#: include/simpleplugin/class_attribute.inc:1090
#: include/simpleplugin/class_attribute.inc:1124
msgid "None"
msgstr "žádné"
-#: include/simpleplugin/class_dialogAttributes.inc:617
+#: include/simpleplugin/class_dialogAttributes.inc:623
msgid "Unknown"
msgstr "neznámé"
@@ -3490,11 +3533,16 @@ msgid "days"
msgstr "dny"
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2161
+#: include/simpleplugin/class_attribute.inc:2171
#, php-format
msgid "%s (required)"
msgstr "%s (vyžadováno)"
+#: include/simpleplugin/class_attribute.inc:1150
+#, php-format
+msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
+msgstr ""
+
#: include/simpleplugin/class_attribute.inc:1277
#, php-format
msgid "An integer between %d and %d"
@@ -3510,75 +3558,75 @@ msgstr "Celé kladné ÄÃslo vÄ›tÅ¡Ã než %d"
msgid "An integer smaller than %d"
msgstr "Celé kladné ÄÃslo menÅ¡Ã než %d"
-#: include/simpleplugin/class_attribute.inc:1379
+#: include/simpleplugin/class_attribute.inc:1383
#, php-format
msgid "A float between %f and %f"
msgstr "Desetinné ÄÃslo z rozsahu %f až %f"
-#: include/simpleplugin/class_attribute.inc:1381
+#: include/simpleplugin/class_attribute.inc:1385
#, php-format
msgid "A float larger than %f"
msgstr "Desetinné ÄÃslo vÄ›tÅ¡Ã než %f"
-#: include/simpleplugin/class_attribute.inc:1383
+#: include/simpleplugin/class_attribute.inc:1387
#, php-format
msgid "A float smaller than %f"
msgstr "Desetinné ÄÃslo menÅ¡Ã než %f"
-#: include/simpleplugin/class_attribute.inc:1490
+#: include/simpleplugin/class_attribute.inc:1500
msgid "Error, incorrect date: "
msgstr "Chyba, neplatný datum:"
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
#, php-format
msgid "Cannot read uploaded file: %s"
msgstr "Nelze pÅ™eÄÃst nahraný soubor: %s"
-#: include/simpleplugin/class_attribute.inc:1530
+#: include/simpleplugin/class_attribute.inc:1540
msgid "file is empty"
msgstr "soubor je prázdný"
-#: include/simpleplugin/class_attribute.inc:1533
+#: include/simpleplugin/class_attribute.inc:1543
msgid "file not found"
msgstr "soubor nebyl nenalezen"
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1546
msgid "file not readable"
msgstr "soubor nenà Äitelný"
-#: include/simpleplugin/class_attribute.inc:1569
+#: include/simpleplugin/class_attribute.inc:1579
#, php-format
msgid "%s (%d bytes)"
msgstr "%s (%d bajtů)"
-#: include/simpleplugin/class_attribute.inc:1616
-#: include/simpleplugin/class_attribute.inc:1793
+#: include/simpleplugin/class_attribute.inc:1626
+#: include/simpleplugin/class_attribute.inc:1803
msgid "Upload"
msgstr "Nahrát"
-#: include/simpleplugin/class_attribute.inc:1621
-#: include/simpleplugin/class_attribute.inc:1622
+#: include/simpleplugin/class_attribute.inc:1631
+#: include/simpleplugin/class_attribute.inc:1632
msgid "Download"
msgstr "staženÃ"
-#: include/simpleplugin/class_attribute.inc:1775
+#: include/simpleplugin/class_attribute.inc:1785
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr "Fotografii uživatele nelze uložit – FusionDirectory k tomu potÅ™ebuje, aby byl nainstalován balÃÄek php5-imagick !"
-#: include/simpleplugin/class_attribute.inc:1826
+#: include/simpleplugin/class_attribute.inc:1836
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr "Základ"
-#: include/simpleplugin/class_attribute.inc:1829
+#: include/simpleplugin/class_attribute.inc:1839
msgid "Object base"
msgstr "Základ objektu"
-#: include/simpleplugin/class_attribute.inc:2755
+#: include/simpleplugin/class_attribute.inc:2769
#, php-format
msgid "Invalid value for %s"
msgstr "Neplatná hodnota pro %s"
@@ -3712,17 +3760,17 @@ msgstr "Zkontrolujte prosÃm správnost kombinace zadaného uživatelského jmé
msgid "Account locked. Please contact your system administrator!"
msgstr "ÚÄet je uzamÄen. Kontaktujte svého správce systémů!"
-#: html/index.php:436
+#: html/index.php:475
#, php-format
msgid "CAS user \"%s\" could not be found in the LDAP"
msgstr ""
-#: html/index.php:446
+#: html/index.php:485
#, php-format
msgid "CAS user \"%s\" match several users in the LDAP"
msgstr ""
-#: html/index.php:481
+#: html/index.php:522
msgid ""
"Your browser has cookies disabled. Please enable cookies and reload this "
"page before logging in!"
@@ -4045,8 +4093,8 @@ msgid "Checking for duplicated UID numbers"
msgstr "kontroluje se, zda neexistujà duplicity v ÄÃselných identifikátorech uživatelů (UID)"
#: setup/class_setupStep_Migrate.inc:267
-msgid "Checking for duplicate GID numbers"
-msgstr "kontroluje se, zda neexistujà duplicity v ÄÃselných identifikátorech skupin (GID)"
+msgid "Checking for duplicated GID numbers"
+msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:487
#: setup/class_setupStep_Migrate.inc:564 setup/class_setupStep_Migrate.inc:702
@@ -4055,7 +4103,7 @@ msgstr "kontroluje se, zda neexistujà duplicity v ÄÃselných identifikátorec
#: setup/class_setupStep_Migrate.inc:1179
#: setup/class_setupStep_Migrate.inc:1272
#: setup/class_setupStep_Migrate.inc:1351
-#: setup/class_setupStep_Migrate.inc:1390
+#: setup/class_setupStep_Migrate.inc:1395
msgid "LDAP query failed"
msgstr "Dotaz do LDAP nebyl úspěšný"
@@ -4066,7 +4114,7 @@ msgstr "Dotaz do LDAP nebyl úspěšný"
#: setup/class_setupStep_Migrate.inc:1180
#: setup/class_setupStep_Migrate.inc:1273
#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1391
+#: setup/class_setupStep_Migrate.inc:1396
msgid "Possibly the \"root object\" is missing."
msgstr "Možná chybà kořenový objekt."
@@ -4221,15 +4269,15 @@ msgstr "Bylo nalezeno %s oddÄ›lenÃ, která nebudou viditelná z FusionDirectory
msgid "Department migration"
msgstr "PÅ™emÃstÄ›nà oddÄ›lenÃ"
-#: setup/class_setupStep_Migrate.inc:1373
+#: setup/class_setupStep_Migrate.inc:1378
#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\"."
-msgstr "Nalezeno %s duplicitnÃch hodnot pro atribut uidNumber."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
+msgstr ""
-#: setup/class_setupStep_Migrate.inc:1412
+#: setup/class_setupStep_Migrate.inc:1422
#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\"."
-msgstr "Nalezeno %s duplicitnÃch hodnot pro atribut gidNumber."
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
+msgstr ""
#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
msgid "Language setup"
diff --git a/locale/de/fusiondirectory.po b/locale/de/fusiondirectory.po
index 815485589dc2c626fd548e648c74526aa1ba7e25..671e3ab1287f1df63806e4dc925f239750ef4d5b 100644
--- a/locale/de/fusiondirectory.po
+++ b/locale/de/fusiondirectory.po
@@ -3,15 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Ettore Atalan <atalanttore@googlemail.com>, 2014-2015
msgid ""
msgstr ""
-"Project-Id-Version: FusionDirectory-109\n"
+"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-01-22 11:26+0100\n"
-"PO-Revision-Date: 2016-01-22 10:24+0000\n"
+"POT-Creation-Date: 2016-03-14 12:07+0100\n"
+"PO-Revision-Date: 2016-03-07 12:09+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-109/language/de/)\n"
+"Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -29,31 +28,31 @@ msgstr "Willkommen %s!"
msgid "References"
msgstr "Referenzen"
-#: plugins/admin/groups/class_roleGeneric.inc:30
-#: plugins/admin/groups/class_roleGeneric.inc:34
+#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:61
#: plugins/admin/groups/class_groupManagement.inc:71
#: plugins/admin/aclrole/class_aclRole.inc:78
#: plugins/admin/acl/class_aclAssignment.inc:49
msgid "Role"
msgstr "Rolle"
-#: plugins/admin/groups/class_roleGeneric.inc:31
+#: plugins/admin/groups/class_roleGeneric.inc:58
msgid "Role information"
msgstr "Rolleninformation"
-#: plugins/admin/groups/class_roleGeneric.inc:35
+#: plugins/admin/groups/class_roleGeneric.inc:62
msgid "Organizational role"
msgstr "Organisatorische Rolle"
-#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:84
msgid "Informations"
msgstr "Informationen"
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:158
+#: plugins/admin/departments/class_department.inc:174
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -63,13 +62,13 @@ msgstr "Informationen"
msgid "Name"
msgstr "Name"
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
msgid "Name of this group"
msgstr "Name dieser Gruppe"
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
#: plugins/admin/groups/class_group.inc:66
#: plugins/admin/groups/class_ogroup.inc:192
#: plugins/admin/groups/group-list.xml:41
@@ -82,26 +81,26 @@ msgstr "Name dieser Gruppe"
msgid "Description"
msgstr "Beschreibung"
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
msgid "Description of the role"
msgstr "Beschreibung der Rolle"
-#: plugins/admin/groups/class_roleGeneric.inc:70
+#: plugins/admin/groups/class_roleGeneric.inc:97
msgid "Phone number"
msgstr "Telefonnummer"
-#: plugins/admin/groups/class_roleGeneric.inc:74
+#: plugins/admin/groups/class_roleGeneric.inc:101
msgid "Fax number"
msgstr "Faxnummer"
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
#: plugins/admin/users/class_userManagement.inc:42
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: setup/class_setupStep_Migrate.inc:871
msgid "Users"
msgstr "Benutzer"
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
msgid "Add users for the role"
msgstr "Benutzer für die Rolle hinzufügen"
@@ -148,7 +147,7 @@ msgstr "GID-Wert für diese Gruppe erzwingen"
#: plugins/admin/groups/class_group.inc:74
#: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:403
+#: plugins/personal/posix/class_posixAccount.inc:410
msgid "GID"
msgstr "GID"
@@ -205,23 +204,23 @@ 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_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458 include/functions.inc:794
-#: include/functions.inc:2548 include/class_xml.inc:55
+#: plugins/personal/posix/class_posixAccount.inc:465 include/functions.inc:794
+#: include/functions.inc:2549 include/class_xml.inc:55
#: include/simpleplugin/class_simpleTabs.inc:325 html/index.php:56
-#: html/index.php:62 html/index.php:481 html/class_passwordRecovery.inc:378
+#: html/index.php:62 html/index.php:522 html/class_passwordRecovery.inc:378
#: setup/class_setupStep_Migrate.inc:572
#: setup/class_setupStep_Migrate.inc:1083
#: setup/class_setupStep_Migrate.inc:1202
#: setup/class_setupStep_Migrate.inc:1313
-#: setup/class_setupStep_Migrate.inc:1372
-#: setup/class_setupStep_Migrate.inc:1411 plugins/admin/acl/remove.tpl.c:2
+#: setup/class_setupStep_Migrate.inc:1377
+#: setup/class_setupStep_Migrate.inc:1421 plugins/admin/acl/remove.tpl.c:2
#: ihtml/themes/default/islocked.tpl.c:5 ihtml/themes/default/remove.tpl.c:2
#: ihtml/themes/default/msg_dialog.tpl.c:5 setup/setup_checks.tpl.c:8
msgid "Warning"
msgstr "Warnung"
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458
+#: plugins/personal/posix/class_posixAccount.inc:465
msgid "Timeout while waiting for lock. Ignoring lock!"
msgstr "Wartezeit für Sperre abgelaufen. Ignoriere Sperre!"
@@ -251,7 +250,7 @@ msgstr "Zusammengefasste Objekte"
msgid "Objects member of this group"
msgstr "Objektmitglied dieser Gruppe"
-#: plugins/admin/groups/class_ogroup.inc:318
+#: plugins/admin/groups/class_ogroup.inc:313
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
@@ -280,10 +279,10 @@ msgstr "Anlegen"
#: plugins/admin/departments/dep-list.xml:79
#: plugins/admin/users/user-list.xml:105
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-#: include/simpleplugin/class_dialogAttributes.inc:626
-#: include/simpleplugin/class_dialogAttributes.inc:627
-#: include/simpleplugin/class_attribute.inc:2661
-#: include/simpleplugin/class_attribute.inc:2662
+#: include/simpleplugin/class_dialogAttributes.inc:632
+#: include/simpleplugin/class_dialogAttributes.inc:633
+#: include/simpleplugin/class_attribute.inc:2675
+#: include/simpleplugin/class_attribute.inc:2676
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -294,8 +293,8 @@ msgstr "Bearbeiten"
#: plugins/admin/departments/dep-list.xml:67
#: plugins/admin/departments/dep-list.xml:88
#: plugins/admin/users/user-list.xml:112
-#: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_dialogAttributes.inc:637
+#: include/simpleplugin/class_dialogAttributes.inc:642
+#: include/simpleplugin/class_dialogAttributes.inc:643
#: include/simpleplugin/simple-list.xml:75
#: include/simpleplugin/simple-list.xml:125
msgid "Remove"
@@ -344,8 +343,8 @@ msgid "Show application groups"
msgstr "Anwendungsgruppen anzeigen"
#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Show department groups"
-msgstr "Abteilungsgruppen anzeigen"
+msgid "Show unidentified groups"
+msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:137
#: include/select/groupSelect/group-filter.tpl.c:11
@@ -433,51 +432,67 @@ msgid "Category of this %s"
msgstr "Kategorie von diesem %s"
#: plugins/admin/departments/class_department.inc:81
+msgid "Website"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:81
+#, php-format
+msgid "Website of this %s"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:85
#: plugins/personal/generic/class_user.inc:410
msgid "Manager"
msgstr "Verwalter"
-#: plugins/admin/departments/class_department.inc:81
+#: plugins/admin/departments/class_department.inc:85
#, php-format
msgid "Manager of this %s"
msgstr "Verwalter von diesem %s"
-#: plugins/admin/departments/class_department.inc:87
-#: plugins/admin/departments/class_department.inc:93
+#: plugins/admin/departments/class_department.inc:91
+#: plugins/admin/departments/class_department.inc:97
#: plugins/personal/generic/class_user.inc:304
msgid "Location"
msgstr "Ort"
-#: plugins/admin/departments/class_department.inc:90
+#: plugins/admin/departments/class_department.inc:94
#: plugins/personal/generic/class_user.inc:308
msgid "State"
msgstr "Land"
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_country.inc:29
+#: plugins/admin/departments/class_country.inc:30
+#: plugins/admin/departments/class_country.inc:33
+msgid "Country"
+msgstr "Land"
+
+#: plugins/admin/departments/class_department.inc:103
#: plugins/personal/generic/class_user.inc:312
msgid "Address"
msgstr "Adresse"
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:103
#, php-format
msgid "A postal address for this %s"
msgstr "Eine postalische Anschrift für diesen %s"
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
#: plugins/personal/generic/class_user.inc:320
msgid "Phone"
msgstr "Telefon"
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
msgid "Telephone number"
msgstr "Telefonnummer"
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
#: plugins/personal/generic/class_user.inc:332
msgid "Fax"
msgstr "Fax"
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
msgid "Facsimile telephone number"
msgstr ""
@@ -505,12 +520,6 @@ msgstr "Standort"
msgid "locality"
msgstr "Ort"
-#: plugins/admin/departments/class_country.inc:29
-#: plugins/admin/departments/class_country.inc:30
-#: plugins/admin/departments/class_country.inc:33
-msgid "Country"
-msgstr "Land"
-
#: plugins/admin/departments/class_country.inc:50
msgid "country"
msgstr "Land"
@@ -553,7 +562,8 @@ msgid "Given name"
msgstr "Vorname"
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
+#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
msgid "Login"
@@ -666,8 +676,8 @@ msgid "Edit category ACL"
msgstr "ACL Kategorie bearbeiten"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2671
-#: include/simpleplugin/class_attribute.inc:2672
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
+#: include/simpleplugin/class_attribute.inc:2686
#, php-format
msgid "Delete"
msgstr "Entfernen"
@@ -772,19 +782,37 @@ msgstr "Zugriffssteuerungsrollen"
msgid "ACLs which are part of this group"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:38
+#: plugins/admin/acl/class_aclManagement.inc:31
+#: plugins/admin/acl/class_aclManagement.inc:32
+#: plugins/admin/acl/class_aclManagement.inc:45
+msgid "ACL assignment creation"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:33
+msgid "Create an ACL assignment on an arbitrary dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "Dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "DN you wish to add assignments for"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:135
msgid "ACL assignments"
msgstr "ACL-Zuordnungen"
-#: plugins/admin/acl/class_aclManagement.inc:39
+#: plugins/admin/acl/class_aclManagement.inc:136
msgid "ACL assignments management"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:40
+#: plugins/admin/acl/class_aclManagement.inc:137
msgid "Manage ACL roles assignments to users"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:78
+#: plugins/admin/acl/class_aclManagement.inc:199
#: plugins/admin/acl/class_aclAssignment.inc:263
msgid "ACL Assignment"
msgstr "ACL-Zuordnung"
@@ -900,7 +928,7 @@ msgid "Password hash method to use"
msgstr "Zu verwendende Passworthash-Methode"
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -995,59 +1023,59 @@ msgstr ""
msgid "Business fax number"
msgstr "Geschäftliche Faxnummer"
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:336
+msgid "Homepage"
+msgstr "Homepage"
+
+#: plugins/personal/generic/class_user.inc:336
+msgid "Personal homepage"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:342
msgid "Account information"
msgstr "Kontoinformation"
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:351
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr "Bevorzugte Sprache"
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
msgid "Password of the user"
msgstr "Passwort des Benutzers"
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:362
msgid "Personal contact information"
msgstr "Persönliche Kontaktinformation"
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
msgid "Display name"
msgstr "Anzeigename"
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home postal address"
msgstr "Private Adresse"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:374
msgid "Private phone"
msgstr "Privat-Telefon"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:374
msgid "Home phone number"
msgstr "Telefonnummer (privat)"
-#: plugins/personal/generic/class_user.inc:374
-msgid "Homepage"
-msgstr "Homepage"
-
-#: plugins/personal/generic/class_user.inc:374
-msgid "Personal homepage"
-msgstr ""
-
#: plugins/personal/generic/class_user.inc:380
msgid "Organizational information"
msgstr "Angabe zur Organisationseinheit"
@@ -1280,33 +1308,33 @@ msgstr "unkonfiguriert"
msgid "automatic"
msgstr "automatisch"
-#: plugins/personal/posix/class_posixAccount.inc:309
+#: plugins/personal/posix/class_posixAccount.inc:310
msgid "expired"
msgstr "abgelaufen"
-#: plugins/personal/posix/class_posixAccount.inc:311
+#: plugins/personal/posix/class_posixAccount.inc:312
msgid "grace time active"
msgstr "Nachfrist aktiv"
-#: plugins/personal/posix/class_posixAccount.inc:314
-#: plugins/personal/posix/class_posixAccount.inc:316
-#: plugins/personal/posix/class_posixAccount.inc:318
+#: plugins/personal/posix/class_posixAccount.inc:315
+#: plugins/personal/posix/class_posixAccount.inc:317
+#: plugins/personal/posix/class_posixAccount.inc:319
msgid "active"
msgstr "aktiv"
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:315
msgid "password expired"
msgstr "Passwort abgelaufen"
-#: plugins/personal/posix/class_posixAccount.inc:316
+#: plugins/personal/posix/class_posixAccount.inc:317
msgid "password not changeable"
msgstr "Passwort kann nicht geändert werden"
-#: plugins/personal/posix/class_posixAccount.inc:400
+#: plugins/personal/posix/class_posixAccount.inc:407
msgid "UID"
msgstr "UID"
-#: plugins/personal/posix/class_posixAccount.inc:516
+#: plugins/personal/posix/class_posixAccount.inc:525
#, php-format
msgid "Group of user %s"
msgstr "Gruppe des Benutzers %s"
@@ -1478,424 +1506,440 @@ msgid "Core settings"
msgstr "Kerneinstellungen"
#: plugins/config/class_configInLdap.inc:161
-msgid "Enable primary group filter"
-msgstr "Primären Gruppenfilter aktivieren"
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"It is time consuming to evaluate which groups are primary and which are not,"
-" so you may want to disable it if your group plugin is slow."
-msgstr "Es bedarf viel Zeit, einzuschätzen welche Gruppen primär und welche nicht sind, eventuell möchten Sie dies deaktivieren wenn Ihr Gruppenplugin langsam ist."
-
-#: plugins/config/class_configInLdap.inc:167
msgid "Display summary in listings"
msgstr "Zusammenfassung in Listen anzeigen"
-#: plugins/config/class_configInLdap.inc:168
+#: 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:173
+#: plugins/config/class_configInLdap.inc:167
msgid "Edit locking"
msgstr "Locking bearbeiten"
-#: plugins/config/class_configInLdap.inc:174
+#: plugins/config/class_configInLdap.inc:168
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:179
+#: plugins/config/class_configInLdap.inc:173
msgid "Enable logging"
msgstr "Logging aktivieren"
-#: plugins/config/class_configInLdap.inc:180
+#: plugins/config/class_configInLdap.inc:174
msgid "Event logging on FusionDirectory side."
msgstr "Ereignisloggins auf Seiten von FusionDirectory."
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "LDAP size limit"
msgstr "LDAP Größenlimit"
-#: plugins/config/class_configInLdap.inc:185
+#: 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."
-#: plugins/config/class_configInLdap.inc:192
+#: plugins/config/class_configInLdap.inc:186
msgid "Login and session"
msgstr "Anmeldung und Sitzung"
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:189
msgid "Login attribute"
msgstr "Anmeldeattribut"
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:190
msgid "Which LDAP attribute should be used as the login name during login."
msgstr "Welches LDAP Attribut soll als Loginname während des Logins verwendet werden."
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:196
msgid "Enforce encrypted connections"
msgstr "Erzwinge verschlüsselte Verbindungen"
-#: plugins/config/class_configInLdap.inc:203
+#: plugins/config/class_configInLdap.inc:197
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."
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:201
msgid "Warn if session is not encrypted"
msgstr "Bei unverschlüsselten Verbindungen warnen"
-#: plugins/config/class_configInLdap.inc:208
+#: plugins/config/class_configInLdap.inc:202
msgid "will display a warning to the user when http is used instead of https."
msgstr "Zeigt dem Benutzer eine Warnung wenn http anstelle von https verwendet wird."
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Session lifetime"
msgstr "Lebensdauer der Sitzung"
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Defines when a session will expire in seconds."
msgstr "Bestimmt in Sekunden wann eine Sitzung abläuft."
-#: plugins/config/class_configInLdap.inc:220
+#: plugins/config/class_configInLdap.inc:212
+msgid "HTTP authentication"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:212
+msgid "Use HTTP authentication protocol instead of the login form."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:219
#: include/class_SnapshotDialogs.inc:186
msgid "Snapshots"
msgstr "Schnappschüsse"
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid "Enable snapshots"
msgstr "Snapshots ermöglichen"
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
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:228
+#: plugins/config/class_configInLdap.inc:227
msgid "Snapshot base"
msgstr "Basis für Snapshots"
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
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:235
+#: plugins/config/class_configInLdap.inc:234
msgid "SSL"
msgstr "SSL"
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Key path"
msgstr "Schlüsselpfad"
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Path to FusionDirectory private key. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Certificate path"
msgstr "Zertifikatspfad"
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Path to FusionDirectory certificate. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:262
msgid "CA certificate path"
msgstr "CA-Zertifikatspfad"
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:247
msgid "Path to the CA certificate. Used for validating Argonaut Server host."
msgstr ""
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:254
msgid "CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "Enable CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "CAS login will be used instead of LDAP bind"
msgstr ""
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:262
msgid "Path to the CA certificate of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host"
msgstr "System"
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port"
msgstr "Port"
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port the CAS server is listening on"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context to be used"
msgstr ""
-#: plugins/config/class_configInLdap.inc:285
+#: plugins/config/class_configInLdap.inc:284
msgid "People and group storage"
msgstr "Ablage für Personen und Gruppen"
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "People DN attribute"
msgstr "DN-Attribut für Personen"
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "Attribute to use at the beginning of users dn"
msgstr "Zu verwendendes Attribut zu Beginn des Benutzers dn"
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "CN pattern"
msgstr "CN-Muster"
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "The pattern to use to build the common name field"
msgstr ""
-#: plugins/config/class_configInLdap.inc:299
+#: plugins/config/class_configInLdap.inc:298
msgid "Strict naming policy"
msgstr "Strikte Namenspolicy"
-#: plugins/config/class_configInLdap.inc:300
+#: plugins/config/class_configInLdap.inc:299
msgid "Enables strict checking of user and group names"
msgstr ""
-#: plugins/config/class_configInLdap.inc:305
+#: plugins/config/class_configInLdap.inc:304
msgid "Group/user min id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:306
+#: plugins/config/class_configInLdap.inc:305
msgid ""
"The minimum assignable user or group id to avoid security leaks with id 0 "
"accounts."
msgstr ""
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid "Next id hook"
msgstr "Nachster id hook"
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid ""
"A script to be called for finding the next free id number for users or "
"groups."
msgstr ""
-#: plugins/config/class_configInLdap.inc:315
+#: plugins/config/class_configInLdap.inc:314
msgid "Base number for user id"
msgstr "Basisnummer für Benutzerkennung"
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:315
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:321
+#: plugins/config/class_configInLdap.inc:320
msgid "Base number for group id"
msgstr "Basisnummer für Gruppenkennung"
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:321
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:327
+#: plugins/config/class_configInLdap.inc:326
msgid "Users RDN"
msgstr "Users RDN"
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "The branch where users are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "Groups RDN"
msgstr "Groups RDN"
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "The branch where groups are stored."
msgstr "Der Zweig in welchem Gruppen gespeichert werden."
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "ACL role RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "The branch where ACL roles are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Id allocation method"
msgstr "Id-Zuweisungsmethode"
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Method to allocate user/group ids"
msgstr ""
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Traditional"
msgstr "Traditionell"
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Samba unix id pool"
msgstr "Samba unix id pool"
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Pool user id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Minimum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Pool user id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Maximum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Pool group id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Minimum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Pool group id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Maximum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:370
+#: plugins/config/class_configInLdap.inc:367
+msgid "Restrict role members"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:367
+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:373
msgid "Debugging"
msgstr "Debugging"
-#: plugins/config/class_configInLdap.inc:373
+#: plugins/config/class_configInLdap.inc:376
msgid "Display errors"
msgstr "Fehler anzeigen"
-#: plugins/config/class_configInLdap.inc:374
+#: plugins/config/class_configInLdap.inc:377
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."
-#: plugins/config/class_configInLdap.inc:378
+#: plugins/config/class_configInLdap.inc:381
msgid "Maximum LDAP query time"
msgstr "Maximale LDAP Abfragedauer"
-#: plugins/config/class_configInLdap.inc:378
+#: plugins/config/class_configInLdap.inc:381
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."
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:386
msgid "Log LDAP statistics"
msgstr "Protokolliere LDAP-Statistiken"
-#: plugins/config/class_configInLdap.inc:384
+#: plugins/config/class_configInLdap.inc:387
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."
-#: plugins/config/class_configInLdap.inc:389
+#: plugins/config/class_configInLdap.inc:392
msgid "Debug level"
msgstr "Debug Level"
-#: plugins/config/class_configInLdap.inc:390
+#: plugins/config/class_configInLdap.inc:393
msgid "Display certain information on each page load."
msgstr "Gewisse Informationen bei jedem Seitenladen anzeigen."
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:405
msgid "Miscellaneous"
msgstr "Verschiedenes"
-#: plugins/config/class_configInLdap.inc:407
+#: 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:411
+#: plugins/config/class_configInLdap.inc:414
msgid "tab"
msgstr "Reiter"
-#: plugins/config/class_configInLdap.inc:411
+#: 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:416
+#: plugins/config/class_configInLdap.inc:419
msgid "mode"
msgstr "mode"
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "When to call this command"
msgstr "Wann dieser Befehl aufgerufen wird"
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "cmd"
msgstr "cmd"
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "The command that will be called"
msgstr "Der zu aufrufende Befehl"
-#: plugins/config/class_configInLdap.inc:429
+#: plugins/config/class_configInLdap.inc:432
msgid "Hooks"
msgstr "Hooks"
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:439
msgid "Display hook output"
msgstr ""
-#: plugins/config/class_configInLdap.inc:437
+#: plugins/config/class_configInLdap.inc:440
msgid ""
"When enabled successful hook execution output is displayed to the user using"
" a dialog."
msgstr ""
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available shells"
msgstr "Verfügbare Shells"
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available POSIX shells for FD users."
msgstr "Verfügbare POSIX-Shells für FD-Benutzer."
-#: plugins/config/class_configInLdap.inc:449
+#: plugins/config/class_configInLdap.inc:452
msgid "Show ACL tab on all objects"
msgstr "ACL-Reiter auf allen Objekten anzeigen"
-#: plugins/config/class_configInLdap.inc:450
+#: plugins/config/class_configInLdap.inc:453
msgid ""
"For very specific ACL rights setting where you might need to give right on a"
" single object."
msgstr ""
-#: plugins/config/class_configInLdap.inc:464
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available department categories"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available categories in the departments dropdown"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:474
#: setup/class_setupStep_Language.inc:69
msgid "Automatic"
msgstr "Automatisch"
@@ -1912,80 +1956,80 @@ msgstr "Einstellung für die Passwort Wiederherstellung"
msgid "Password recovery settings"
msgstr "Passwortwiederherstellungseinstellungen"
-#: plugins/config/class_recoveryConfig.inc:44
+#: plugins/config/class_recoveryConfig.inc:45
msgid "Activate password recovery"
msgstr "Passwortwiederherstellung aktivieren"
-#: plugins/config/class_recoveryConfig.inc:45
+#: plugins/config/class_recoveryConfig.inc:46
msgid "Whether to activate or not password recovery feature"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:50
+#: plugins/config/class_recoveryConfig.inc:51
msgid "Sender email address"
msgstr "Absender Emailadresse"
-#: plugins/config/class_recoveryConfig.inc:51
+#: plugins/config/class_recoveryConfig.inc:52
msgid "Email address from which mails will be sent"
msgstr "Emailadresse von der aus Mails verschickt werden"
-#: plugins/config/class_recoveryConfig.inc:57
+#: plugins/config/class_recoveryConfig.inc:58
msgid "Link validity (minutes)"
msgstr "Linkgültigkeit (Minuten)"
-#: plugins/config/class_recoveryConfig.inc:58
+#: plugins/config/class_recoveryConfig.inc:59
msgid "Number of minutes before a recovery link expires"
msgstr "Anzahl der Minuten bevor ein Wiederherstellungslink abläuft"
-#: plugins/config/class_recoveryConfig.inc:64
+#: plugins/config/class_recoveryConfig.inc:65
msgid "Salt for tokens"
msgstr "Salt für Tokens"
-#: plugins/config/class_recoveryConfig.inc:65
+#: plugins/config/class_recoveryConfig.inc:66
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"
-#: plugins/config/class_recoveryConfig.inc:71
+#: plugins/config/class_recoveryConfig.inc:72
msgid "Allow the use of alternate addresses"
msgstr "Erlaube die Nutzung von alternativen Adressen"
-#: plugins/config/class_recoveryConfig.inc:72
+#: plugins/config/class_recoveryConfig.inc:73
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"
-#: plugins/config/class_recoveryConfig.inc:79
+#: plugins/config/class_recoveryConfig.inc:80
msgid "First email"
msgstr "Erste Email"
-#: plugins/config/class_recoveryConfig.inc:82
-#: plugins/config/class_recoveryConfig.inc:101
+#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:102
msgid "Subject"
msgstr "Betreff"
-#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:84
msgid "Subject of the first email"
msgstr "Betreff der ersten Email"
-#: plugins/config/class_recoveryConfig.inc:86
+#: plugins/config/class_recoveryConfig.inc:87
msgid "[FusionDirectory] Password recovery link"
msgstr "[FusionDirectory] Password recovery link"
-#: plugins/config/class_recoveryConfig.inc:89
+#: plugins/config/class_recoveryConfig.inc:90
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr "Body (zuerst %s ist Login, zweiter ist Link)"
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:91
#, 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 "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:93
+#: plugins/config/class_recoveryConfig.inc:94
#, php-format
msgid ""
"Hello,\n"
@@ -1997,31 +2041,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr "Hallo, \n\nHier sind Ihre Informationen :\n- Login : %s\n- Link : %s\n\nDieser Link ist nur 10 Minuten gültig."
-#: plugins/config/class_recoveryConfig.inc:98
+#: plugins/config/class_recoveryConfig.inc:99
msgid "Second email"
msgstr "Zweite Email"
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:103
msgid "Subject of the second email"
msgstr "Betreff der zweiten Email"
-#: plugins/config/class_recoveryConfig.inc:105
+#: plugins/config/class_recoveryConfig.inc:106
msgid "[FusionDirectory] Password recovery successful"
msgstr "[FusionDirectory] Passwortwiederherstellung erfolgreich"
-#: plugins/config/class_recoveryConfig.inc:108
+#: plugins/config/class_recoveryConfig.inc:109
#, php-format
msgid "Body (%s is login)"
msgstr "Body (%s ist Login)"
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:110
#, php-format
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."
-#: plugins/config/class_recoveryConfig.inc:112
+#: plugins/config/class_recoveryConfig.inc:113
#, php-format
msgid ""
"Hello,\n"
@@ -2089,13 +2133,13 @@ msgstr "Auf"
msgid "Down"
msgstr "Ab"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2633
-#: include/simpleplugin/class_attribute.inc:2634
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
+#: include/simpleplugin/class_attribute.inc:2648
msgid "Sort up"
msgstr "Aufsteigend sortieren"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2646
-#: include/simpleplugin/class_attribute.inc:2647
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
+#: include/simpleplugin/class_attribute.inc:2661
msgid "Sort down"
msgstr "Absteigend sortieren"
@@ -2107,27 +2151,26 @@ msgstr "Alle auswählen"
#: include/class_config.inc:479 include/class_msgPool.inc:215
#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3106
-#: include/functions.inc:3127 include/functions.inc:3157
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197 include/functions.inc:3259
+#: include/class_msgPool.inc:740 include/functions.inc:3107
+#: include/functions.inc:3128 include/functions.inc:3158
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3260
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1663 include/class_CopyPasteHandler.inc:278
-#: include/simpleplugin/class_dialogAttributes.inc:733
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
-#: include/simpleplugin/class_attribute.inc:1774
-#: include/simpleplugin/class_attribute.inc:1877
-#: include/simpleplugin/class_attribute.inc:1879
+#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
+#: include/simpleplugin/class_attribute.inc:1784
+#: include/simpleplugin/class_attribute.inc:1887
+#: include/simpleplugin/class_attribute.inc:1889
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: 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:437
#: include/password-methods/class_password-methods.inc:447
-#: include/class_SnapshotHandler.inc:415 html/index.php:434 html/index.php:444
+#: include/class_SnapshotHandler.inc:415 html/index.php:473 html/index.php:483
#: setup/class_setupStep_Migrate.inc:935
#: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
msgid "Error"
@@ -2166,44 +2209,44 @@ msgstr "Liste neu laden"
msgid "Submit"
msgstr "Ãœbertragen"
-#: include/class_listing.inc:1586 include/class_listing.inc:1640
+#: include/class_listing.inc:1590 include/class_listing.inc:1644
msgid "Copy"
msgstr "Kopieren"
-#: include/class_listing.inc:1592 include/class_listing.inc:1628
+#: include/class_listing.inc:1596 include/class_listing.inc:1632
msgid "Cut"
msgstr "Ausschneiden"
-#: include/class_listing.inc:1600 include/class_listing.inc:1602
+#: include/class_listing.inc:1604 include/class_listing.inc:1606
#: include/class_CopyPasteHandler.inc:370
msgid "Paste"
msgstr "Einfügen"
-#: include/class_listing.inc:1628
+#: include/class_listing.inc:1632
msgid "Cut this entry"
msgstr "Diesen Eintrag ausschneiden"
-#: include/class_listing.inc:1640
+#: include/class_listing.inc:1644
msgid "Copy this entry"
msgstr "Diesen Eintrag kopieren"
-#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_listing.inc:1677 include/class_listing.inc:1679
msgid "Restore snapshots"
msgstr "Abzug wiederherstellen"
-#: include/class_listing.inc:1689
+#: include/class_listing.inc:1693
msgid "Export list"
msgstr "Liste exportieren"
-#: include/class_listing.inc:1724 include/class_listing.inc:1725
+#: include/class_listing.inc:1728 include/class_listing.inc:1729
msgid "Restore snapshot"
msgstr "Abzug wiederherstellen"
-#: include/class_listing.inc:1734
+#: include/class_listing.inc:1738
msgid "Create snapshot"
msgstr "Snapshot erstellen"
-#: include/class_listing.inc:1735
+#: include/class_listing.inc:1739
msgid "Create a new snapshot from this object"
msgstr "Erstelle einen neuen Snapshot dieses Objekts"
@@ -2246,7 +2289,7 @@ 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:162 include/class_config.inc:300
-#: include/class_config.inc:985 include/class_config.inc:998
+#: include/class_config.inc:915 include/class_config.inc:928
#: include/functions.inc:663 include/class_timezone.inc:51
#: include/password-methods/class_password-methods-sha.inc:71
#: include/password-methods/class_password-methods-ssha.inc:75
@@ -2263,17 +2306,17 @@ msgid ""
"while your passwords are not encrypted."
msgstr "Es scheint als wollen Sie etwas dekodieren, was nicht enkodiert wurde : %s</br>\\nBitte prüfen Sie ob Sie nicht eine fusiondirectory.secrets Datei nutzen während Ihre Passwörter nicht verschlüsselt werden."
-#: include/class_config.inc:337 include/class_ldap.inc:917
-#: include/class_ldap.inc:1371 include/functions.inc:526
+#: include/class_config.inc:337 include/class_ldap.inc:918
+#: include/class_ldap.inc:1372 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2985 include/simpleplugin/class_simplePlugin.inc:545
-#: include/simpleplugin/class_attribute.inc:2895
+#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2909
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
#: include/class_SnapshotHandler.inc:422 include/class_SnapshotHandler.inc:425
-#: html/index.php:360 html/class_passwordRecovery.inc:497
+#: html/index.php:369 html/class_passwordRecovery.inc:497
#: setup/class_setupStep_Migrate.inc:451
#: setup/class_setupStep_Migrate.inc:1130
msgid "LDAP error"
@@ -2288,38 +2331,38 @@ msgstr "Kann nicht mit dem LDAP-Server verbinden. Bitte benachrichtigen Sie den
msgid "The selected mail method (class %s) is not available"
msgstr "Die gewählte Mailmethode (class %s) ist nicht verfügbar"
-#: include/class_config.inc:986
+#: include/class_config.inc:916
#, 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."
-#: include/class_config.inc:999
+#: include/class_config.inc:929
#, 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'."
-#: include/class_config.inc:1104
+#: include/class_config.inc:1034
msgid "All categories"
msgstr "Alle Kategorien"
-#: include/class_config.inc:1231
+#: include/class_config.inc:1161
msgid "My account"
msgstr "Mein Konto"
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
msgid "Performance warning"
msgstr "Leistungswarnung"
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
#, php-format
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr "Die LDAP-Leistung ist mangelhaft: Die letzte Abfrage dauerte etwa %.2f Sekunden!"
-#: include/class_ldap.inc:868 include/class_ldap.inc:904
+#: include/class_ldap.inc:869 include/class_ldap.inc:905
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
@@ -2329,39 +2372,39 @@ msgstr "Die LDAP-Leistung ist mangelhaft: Die letzte Abfrage dauerte etwa %.2f S
msgid "Internal error"
msgstr "Interner Fehler"
-#: include/class_ldap.inc:868
+#: include/class_ldap.inc:869
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:904
+#: include/class_ldap.inc:905
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1016
+#: include/class_ldap.inc:1017
#, 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:1018
+#: include/class_ldap.inc:1019
#, php-format
msgid "while operating on LDAP server %s"
msgstr "während der Arbeit auf LDAP-Server '%s'"
-#: include/class_ldap.inc:1108
+#: include/class_ldap.inc:1109
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1220
+#: include/class_ldap.inc:1221
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr "Dies ist keine valide DN: '%s'. Ein Block für den Import sollte mit 'dn:...' beginnen in Zeile %s"
-#: include/class_ldap.inc:1231
+#: include/class_ldap.inc:1232
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2949,10 +2992,10 @@ 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"
-#: include/functions.inc:496 include/functions.inc:3294
-#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:263
-#: include/simpleplugin/class_simplePlugin.inc:268
-#: include/simpleplugin/class_simplePlugin.inc:280
+#: include/functions.inc:496 include/functions.inc:3295
+#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
+#: include/simpleplugin/class_simplePlugin.inc:269
+#: include/simpleplugin/class_simplePlugin.inc:281
#: html/class_passwordRecovery.inc:216
msgid "Fatal error"
msgstr "Schwerer Fehler"
@@ -3105,98 +3148,98 @@ msgstr "Kann nicht in Revisions-Datei schreiben!"
msgid "Cannot read to revision file!"
msgstr "Kann nicht von Revisionsdatei lesen!"
-#: include/functions.inc:2548
+#: include/functions.inc:2549
msgid "'nextIdHook' is not available. Using default base!"
msgstr "'nextIdHook' ist nicht verfügbar. Benutze Standardbasis!"
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "LDAP warning"
msgstr "LDAP-Warnung"
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "Cannot get schema information from server. No schema check possible!"
msgstr "Kann die Schema-Informationen nicht vom Server beziehen. Keine Schemaprüfung möglich!"
-#: include/functions.inc:2584
+#: include/functions.inc:2585
msgid ""
"Used to lock currently edited entries to avoid multiple changes at the same "
"time."
msgstr "Verwenden, um die momentan bearbeiteten Einträge für andere zu sperren (um gleichzeitige Änderungen zu verhindern)."
-#: include/functions.inc:2596
+#: include/functions.inc:2597
#, php-format
msgid "Missing required object class '%s'!"
msgstr "Die benötigte Objektklasse '%s' fehlt!"
-#: include/functions.inc:2599
+#: include/functions.inc:2600
#, php-format
msgid "Missing optional object class '%s'!"
msgstr "Die optionale Objektklasse '%s' fehlt!"
-#: include/functions.inc:2603
+#: include/functions.inc:2604
#, php-format
msgid "Class(es) available"
msgstr "Verfügbare Klasse(n)"
-#: include/functions.inc:2623
+#: include/functions.inc:2624
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2625
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2628
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2629
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3106 include/functions.inc:3127
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198
msgid "Cannot allocate a free ID:"
msgstr "Konnte keine freie ID allozieren:"
-#: include/functions.inc:3106
+#: include/functions.inc:3107
msgid "unknown idAllocation method!"
msgstr "unbekannte idAllocation-Methode!"
-#: include/functions.inc:3127
+#: include/functions.inc:3128
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr "%sPoolMin >= %sPoolMax!"
-#: include/functions.inc:3157
+#: include/functions.inc:3158
msgid "Cannot create sambaUnixIdPool entry!"
msgstr "kann sambaUnixIdPool-Eintrag nicht anlegen!"
-#: include/functions.inc:3165
+#: include/functions.inc:3166
msgid "sambaUnixIdPool is not unique!"
msgstr "sambaUnixIdPool ist nicht eindeutig!"
-#: include/functions.inc:3177 include/functions.inc:3181
+#: include/functions.inc:3178 include/functions.inc:3182
msgid "no ID available!"
msgstr "keine ID verfügbar!"
-#: include/functions.inc:3197
+#: include/functions.inc:3198
msgid "maximum tries exceeded!"
msgstr "maximale Anzahl von Versuchen abgelaufen!"
-#: include/functions.inc:3259
+#: include/functions.inc:3260
msgid "Cannot allocate a free ID!"
msgstr "Konnte keine freie ID allozieren!"
-#: include/functions.inc:3295
+#: include/functions.inc:3296
#, 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"
@@ -3352,13 +3395,13 @@ msgstr "in Zeile"
msgid "XML error"
msgstr "XML-Fehler"
-#: include/class_plugin.inc:554
+#: include/class_plugin.inc:553
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/class_plugin.inc:1466
+#: include/class_plugin.inc:1467
#, php-format
msgid "Tab \"%s\""
msgstr "Tab \"%s\""
@@ -3384,32 +3427,32 @@ msgstr "Name der Vorlage"
msgid "This is the name of the template"
msgstr "Dies ist der Name der Vorlage"
-#: include/simpleplugin/class_simplePlugin.inc:263
+#: include/simpleplugin/class_simplePlugin.inc:264
msgid "Only main tab can compute dn"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:270
+#: include/simpleplugin/class_simplePlugin.inc:271
#, php-format
msgid "Could not compute dn: no parent tab class for \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:282
+#: include/simpleplugin/class_simplePlugin.inc:283
#, php-format
msgid ""
"Could not compute dn: could not find objectType infos from tab class \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:638
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:644
+#: include/simpleplugin/class_simplePlugin.inc:652
msgid "Error when saving"
msgstr "Fehler beim Speichern"
-#: include/simpleplugin/class_simplePlugin.inc:638
+#: include/simpleplugin/class_simplePlugin.inc:644
#, 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:646
+#: include/simpleplugin/class_simplePlugin.inc:652
#, php-format
msgid "The entry %s is not existing"
msgstr "Der Eintrag %s existiert nicht"
@@ -3429,27 +3472,27 @@ msgstr "%s Vorlage"
msgid "Show %s"
msgstr "%s anzeigen"
-#: include/simpleplugin/class_dialogAttributes.inc:409
+#: include/simpleplugin/class_dialogAttributes.inc:415
#, php-format
msgid "Group %s"
msgstr "Gruppe %s"
-#: include/simpleplugin/class_dialogAttributes.inc:411
+#: include/simpleplugin/class_dialogAttributes.inc:417
#, php-format
msgid "Role %s"
msgstr "Rolle %s"
-#: include/simpleplugin/class_dialogAttributes.inc:446
+#: include/simpleplugin/class_dialogAttributes.inc:452
msgid "Group of user"
msgstr "Gruppe des Benutzers"
-#: include/simpleplugin/class_dialogAttributes.inc:615
+#: include/simpleplugin/class_dialogAttributes.inc:621
#: include/simpleplugin/class_attribute.inc:1090
#: include/simpleplugin/class_attribute.inc:1124
msgid "None"
msgstr "Keine"
-#: include/simpleplugin/class_dialogAttributes.inc:617
+#: include/simpleplugin/class_dialogAttributes.inc:623
msgid "Unknown"
msgstr "Unbekannt"
@@ -3490,11 +3533,16 @@ msgid "days"
msgstr "Tage"
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2161
+#: include/simpleplugin/class_attribute.inc:2171
#, php-format
msgid "%s (required)"
msgstr "%s (benötigt)"
+#: include/simpleplugin/class_attribute.inc:1150
+#, php-format
+msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
+msgstr ""
+
#: include/simpleplugin/class_attribute.inc:1277
#, php-format
msgid "An integer between %d and %d"
@@ -3510,75 +3558,75 @@ msgstr "Eine Ganzzahl/Integer größer als %d "
msgid "An integer smaller than %d"
msgstr "Eine Ganzzahl/Integer kleiner als %d "
-#: include/simpleplugin/class_attribute.inc:1379
+#: include/simpleplugin/class_attribute.inc:1383
#, php-format
msgid "A float between %f and %f"
msgstr "Ein Float zwischen %f und %f"
-#: include/simpleplugin/class_attribute.inc:1381
+#: include/simpleplugin/class_attribute.inc:1385
#, php-format
msgid "A float larger than %f"
msgstr "Ein Float größer als %f"
-#: include/simpleplugin/class_attribute.inc:1383
+#: include/simpleplugin/class_attribute.inc:1387
#, php-format
msgid "A float smaller than %f"
msgstr "Ein Float kleiner als %f"
-#: include/simpleplugin/class_attribute.inc:1490
+#: include/simpleplugin/class_attribute.inc:1500
msgid "Error, incorrect date: "
msgstr "Fehler, falsches Datum:"
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
#, php-format
msgid "Cannot read uploaded file: %s"
msgstr "Kann hochgeladene Datei nicht lesen: %s"
-#: include/simpleplugin/class_attribute.inc:1530
+#: include/simpleplugin/class_attribute.inc:1540
msgid "file is empty"
msgstr "Die Datei ist leer"
-#: include/simpleplugin/class_attribute.inc:1533
+#: include/simpleplugin/class_attribute.inc:1543
msgid "file not found"
msgstr "Die Datei wurde nicht gefunden"
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1546
msgid "file not readable"
msgstr "Die Datei ist nicht lesbar"
-#: include/simpleplugin/class_attribute.inc:1569
+#: include/simpleplugin/class_attribute.inc:1579
#, php-format
msgid "%s (%d bytes)"
msgstr "%s (%d Bytes)"
-#: include/simpleplugin/class_attribute.inc:1616
-#: include/simpleplugin/class_attribute.inc:1793
+#: include/simpleplugin/class_attribute.inc:1626
+#: include/simpleplugin/class_attribute.inc:1803
msgid "Upload"
msgstr "Hochladen"
-#: include/simpleplugin/class_attribute.inc:1621
-#: include/simpleplugin/class_attribute.inc:1622
+#: include/simpleplugin/class_attribute.inc:1631
+#: include/simpleplugin/class_attribute.inc:1632
msgid "Download"
msgstr "Herunterladen"
-#: include/simpleplugin/class_attribute.inc:1775
+#: include/simpleplugin/class_attribute.inc:1785
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr "Kann das Benutzerbild nicht speichern, FusionDirectory benötigt das Paket 'php5-imagick'!"
-#: include/simpleplugin/class_attribute.inc:1826
+#: include/simpleplugin/class_attribute.inc:1836
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr "Basis"
-#: include/simpleplugin/class_attribute.inc:1829
+#: include/simpleplugin/class_attribute.inc:1839
msgid "Object base"
msgstr "Objektbasis"
-#: include/simpleplugin/class_attribute.inc:2755
+#: include/simpleplugin/class_attribute.inc:2769
#, php-format
msgid "Invalid value for %s"
msgstr "Ungültiger Wert für %s"
@@ -3712,17 +3760,17 @@ msgstr "Bitte überprüfen Sie die Kombination von Benutzernamen und Passwort."
msgid "Account locked. Please contact your system administrator!"
msgstr "Das Konto ist gesperrt. Bitte benachrichtigen Sie den Administrator!"
-#: html/index.php:436
+#: html/index.php:475
#, php-format
msgid "CAS user \"%s\" could not be found in the LDAP"
msgstr ""
-#: html/index.php:446
+#: html/index.php:485
#, php-format
msgid "CAS user \"%s\" match several users in the LDAP"
msgstr ""
-#: html/index.php:481
+#: html/index.php:522
msgid ""
"Your browser has cookies disabled. Please enable cookies and reload this "
"page before logging in!"
@@ -4045,8 +4093,8 @@ msgid "Checking for duplicated UID numbers"
msgstr "Prüfe auf doppelte UID Nummern"
#: setup/class_setupStep_Migrate.inc:267
-msgid "Checking for duplicate GID numbers"
-msgstr "Prüfe auf doppelte GID Nummern"
+msgid "Checking for duplicated GID numbers"
+msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:487
#: setup/class_setupStep_Migrate.inc:564 setup/class_setupStep_Migrate.inc:702
@@ -4055,7 +4103,7 @@ msgstr "Prüfe auf doppelte GID Nummern"
#: setup/class_setupStep_Migrate.inc:1179
#: setup/class_setupStep_Migrate.inc:1272
#: setup/class_setupStep_Migrate.inc:1351
-#: setup/class_setupStep_Migrate.inc:1390
+#: setup/class_setupStep_Migrate.inc:1395
msgid "LDAP query failed"
msgstr "LDAP-Abfrage fehlgeschlagen."
@@ -4066,7 +4114,7 @@ msgstr "LDAP-Abfrage fehlgeschlagen."
#: setup/class_setupStep_Migrate.inc:1180
#: setup/class_setupStep_Migrate.inc:1273
#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1391
+#: setup/class_setupStep_Migrate.inc:1396
msgid "Possibly the \"root object\" is missing."
msgstr ""
@@ -4221,14 +4269,14 @@ msgstr "Fand %s Abteilungen, die nicht in FusionDirectory sichtbar sein werden."
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1373
+#: setup/class_setupStep_Migrate.inc:1378
#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\"."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1412
+#: setup/class_setupStep_Migrate.inc:1422
#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\"."
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
diff --git a/locale/el_GR/fusiondirectory.po b/locale/el_GR/fusiondirectory.po
index 4318facc84cdb978a23cdfd4fd3196a36f9bc634..cbda1d4f695a3ea146c0663bef70eb0c43484a36 100644
--- a/locale/el_GR/fusiondirectory.po
+++ b/locale/el_GR/fusiondirectory.po
@@ -11,12 +11,12 @@
# Nikos Charonitakis <charosn@her.forthnet.gr>, 2005
msgid ""
msgstr ""
-"Project-Id-Version: FusionDirectory-109\n"
+"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-01-22 11:26+0100\n"
-"PO-Revision-Date: 2016-01-22 10:24+0000\n"
+"POT-Creation-Date: 2016-03-14 12:07+0100\n"
+"PO-Revision-Date: 2016-03-07 12:09+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-109/language/el_GR/)\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -34,31 +34,31 @@ msgstr "Καλώς ήλθατε στο %s!"
msgid "References"
msgstr "ΑναφοÏÎÏ‚"
-#: plugins/admin/groups/class_roleGeneric.inc:30
-#: plugins/admin/groups/class_roleGeneric.inc:34
+#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:61
#: plugins/admin/groups/class_groupManagement.inc:71
#: plugins/admin/aclrole/class_aclRole.inc:78
#: plugins/admin/acl/class_aclAssignment.inc:49
msgid "Role"
msgstr "Ρόλος"
-#: plugins/admin/groups/class_roleGeneric.inc:31
+#: plugins/admin/groups/class_roleGeneric.inc:58
msgid "Role information"
msgstr "ΠληÏοφοÏίες Ïόλου"
-#: plugins/admin/groups/class_roleGeneric.inc:35
+#: plugins/admin/groups/class_roleGeneric.inc:62
msgid "Organizational role"
msgstr "Ρόλος οÏγανισμοÏ"
-#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:84
msgid "Informations"
msgstr "ΠληÏοφοÏίες"
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:158
+#: plugins/admin/departments/class_department.inc:174
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -68,13 +68,13 @@ msgstr "ΠληÏοφοÏίες"
msgid "Name"
msgstr "Όνομα"
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
msgid "Name of this group"
msgstr "Όνομα αυτής της ομάδας"
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
#: plugins/admin/groups/class_group.inc:66
#: plugins/admin/groups/class_ogroup.inc:192
#: plugins/admin/groups/group-list.xml:41
@@ -87,26 +87,26 @@ msgstr "Όνομα αυτής της ομάδας"
msgid "Description"
msgstr "ΠεÏιγÏαφή"
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
msgid "Description of the role"
msgstr "ΠεÏιγÏαφή του Ïόλου"
-#: plugins/admin/groups/class_roleGeneric.inc:70
+#: plugins/admin/groups/class_roleGeneric.inc:97
msgid "Phone number"
msgstr "ΑÏιθμός τηλεφώνου"
-#: plugins/admin/groups/class_roleGeneric.inc:74
+#: plugins/admin/groups/class_roleGeneric.inc:101
msgid "Fax number"
msgstr "ΑÏιθμός φαξ"
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
#: plugins/admin/users/class_userManagement.inc:42
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: setup/class_setupStep_Migrate.inc:871
msgid "Users"
msgstr "ΧÏήστες"
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
msgid "Add users for the role"
msgstr "Î Ïοσθήκη χÏηστών για το Ïόλο"
@@ -153,7 +153,7 @@ msgstr "Εξαναγκασμός τιμής GID για αυτή την ομάδ
#: plugins/admin/groups/class_group.inc:74
#: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:403
+#: plugins/personal/posix/class_posixAccount.inc:410
msgid "GID"
msgstr "GID"
@@ -210,23 +210,23 @@ msgid "Only allow this group to connect to this list of hosts"
msgstr "ΕπιτÏÎπεται σ'αυτή την ομάδα να συνδÎεται στην ακόλουθη λίστα διακομιστών"
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458 include/functions.inc:794
-#: include/functions.inc:2548 include/class_xml.inc:55
+#: plugins/personal/posix/class_posixAccount.inc:465 include/functions.inc:794
+#: include/functions.inc:2549 include/class_xml.inc:55
#: include/simpleplugin/class_simpleTabs.inc:325 html/index.php:56
-#: html/index.php:62 html/index.php:481 html/class_passwordRecovery.inc:378
+#: html/index.php:62 html/index.php:522 html/class_passwordRecovery.inc:378
#: setup/class_setupStep_Migrate.inc:572
#: setup/class_setupStep_Migrate.inc:1083
#: setup/class_setupStep_Migrate.inc:1202
#: setup/class_setupStep_Migrate.inc:1313
-#: setup/class_setupStep_Migrate.inc:1372
-#: setup/class_setupStep_Migrate.inc:1411 plugins/admin/acl/remove.tpl.c:2
+#: setup/class_setupStep_Migrate.inc:1377
+#: setup/class_setupStep_Migrate.inc:1421 plugins/admin/acl/remove.tpl.c:2
#: ihtml/themes/default/islocked.tpl.c:5 ihtml/themes/default/remove.tpl.c:2
#: ihtml/themes/default/msg_dialog.tpl.c:5 setup/setup_checks.tpl.c:8
msgid "Warning"
msgstr "Î Ïοειδοποίηση"
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458
+#: plugins/personal/posix/class_posixAccount.inc:465
msgid "Timeout while waiting for lock. Ignoring lock!"
msgstr "ΥπÎÏβαση χÏόνου κατά την αναμονή για κλÎιδωμα. Αγνόηση κλειδώματος!"
@@ -256,7 +256,7 @@ msgstr "Αντικείμενα μÎλους"
msgid "Objects member of this group"
msgstr "Αντικείμενα μÎλους για αυτή την ομάδα"
-#: plugins/admin/groups/class_ogroup.inc:318
+#: plugins/admin/groups/class_ogroup.inc:313
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr "Τοποθετηση σταθμών εÏγασίας και τεÏματικών στην ίδια ομάδα δεν επιτÏÎπεται"
@@ -285,10 +285,10 @@ msgstr "ΔημιουÏγία"
#: plugins/admin/departments/dep-list.xml:79
#: plugins/admin/users/user-list.xml:105
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-#: include/simpleplugin/class_dialogAttributes.inc:626
-#: include/simpleplugin/class_dialogAttributes.inc:627
-#: include/simpleplugin/class_attribute.inc:2661
-#: include/simpleplugin/class_attribute.inc:2662
+#: include/simpleplugin/class_dialogAttributes.inc:632
+#: include/simpleplugin/class_dialogAttributes.inc:633
+#: include/simpleplugin/class_attribute.inc:2675
+#: include/simpleplugin/class_attribute.inc:2676
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -299,8 +299,8 @@ msgstr "ΕπεξεÏγασία"
#: plugins/admin/departments/dep-list.xml:67
#: plugins/admin/departments/dep-list.xml:88
#: plugins/admin/users/user-list.xml:112
-#: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_dialogAttributes.inc:637
+#: include/simpleplugin/class_dialogAttributes.inc:642
+#: include/simpleplugin/class_dialogAttributes.inc:643
#: include/simpleplugin/simple-list.xml:75
#: include/simpleplugin/simple-list.xml:125
msgid "Remove"
@@ -349,8 +349,8 @@ msgid "Show application groups"
msgstr "Εμφάνιση ομάδων εφαÏμογών"
#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Show department groups"
-msgstr "Εμφάνιση ομάδων τμημάτων"
+msgid "Show unidentified groups"
+msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:137
#: include/select/groupSelect/group-filter.tpl.c:11
@@ -438,51 +438,67 @@ msgid "Category of this %s"
msgstr "ΚατηγοÏία του %s"
#: plugins/admin/departments/class_department.inc:81
+msgid "Website"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:81
+#, php-format
+msgid "Website of this %s"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:85
#: plugins/personal/generic/class_user.inc:410
msgid "Manager"
msgstr "ΔιαχειÏιστής"
-#: plugins/admin/departments/class_department.inc:81
+#: plugins/admin/departments/class_department.inc:85
#, php-format
msgid "Manager of this %s"
msgstr "ΔιαχειÏιστής του %s"
-#: plugins/admin/departments/class_department.inc:87
-#: plugins/admin/departments/class_department.inc:93
+#: plugins/admin/departments/class_department.inc:91
+#: plugins/admin/departments/class_department.inc:97
#: plugins/personal/generic/class_user.inc:304
msgid "Location"
msgstr "Τοποθεσία"
-#: plugins/admin/departments/class_department.inc:90
+#: plugins/admin/departments/class_department.inc:94
#: plugins/personal/generic/class_user.inc:308
msgid "State"
msgstr "Πολιτεία"
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_country.inc:29
+#: plugins/admin/departments/class_country.inc:30
+#: plugins/admin/departments/class_country.inc:33
+msgid "Country"
+msgstr "ΧώÏα"
+
+#: plugins/admin/departments/class_department.inc:103
#: plugins/personal/generic/class_user.inc:312
msgid "Address"
msgstr "ΔιεÏθυνση"
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:103
#, php-format
msgid "A postal address for this %s"
msgstr "Μια ταχυδÏομική διεÏθυνση για %s"
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
#: plugins/personal/generic/class_user.inc:320
msgid "Phone"
msgstr "ΤηλÎφωνο"
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
msgid "Telephone number"
msgstr "ΑÏιθμός τηλεφώνου"
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
#: plugins/personal/generic/class_user.inc:332
msgid "Fax"
msgstr "Φαξ"
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
msgid "Facsimile telephone number"
msgstr "ΑÏιθμός φαξ"
@@ -510,12 +526,6 @@ msgstr "ΠεÏιοχή"
msgid "locality"
msgstr "τοπικότητα"
-#: plugins/admin/departments/class_country.inc:29
-#: plugins/admin/departments/class_country.inc:30
-#: plugins/admin/departments/class_country.inc:33
-msgid "Country"
-msgstr "ΧώÏα"
-
#: plugins/admin/departments/class_country.inc:50
msgid "country"
msgstr "χώÏα"
@@ -558,7 +568,8 @@ msgid "Given name"
msgstr "Βαπτιστικό"
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
+#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
msgid "Login"
@@ -671,8 +682,8 @@ msgid "Edit category ACL"
msgstr "ΕπεξεÏγασία κατηγοÏίας ACL"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2671
-#: include/simpleplugin/class_attribute.inc:2672
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
+#: include/simpleplugin/class_attribute.inc:2686
#, php-format
msgid "Delete"
msgstr "ΔιαγÏαφή"
@@ -777,19 +788,37 @@ msgstr ""
msgid "ACLs which are part of this group"
msgstr "ACLs που είναι μÎÏος αυτής της ομάδας"
-#: plugins/admin/acl/class_aclManagement.inc:38
+#: plugins/admin/acl/class_aclManagement.inc:31
+#: plugins/admin/acl/class_aclManagement.inc:32
+#: plugins/admin/acl/class_aclManagement.inc:45
+msgid "ACL assignment creation"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:33
+msgid "Create an ACL assignment on an arbitrary dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "Dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "DN you wish to add assignments for"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:135
msgid "ACL assignments"
msgstr "ΑναθÎσεις ACL"
-#: plugins/admin/acl/class_aclManagement.inc:39
+#: plugins/admin/acl/class_aclManagement.inc:136
msgid "ACL assignments management"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:40
+#: plugins/admin/acl/class_aclManagement.inc:137
msgid "Manage ACL roles assignments to users"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:78
+#: plugins/admin/acl/class_aclManagement.inc:199
#: plugins/admin/acl/class_aclAssignment.inc:263
msgid "ACL Assignment"
msgstr "Ανάθεση ACL"
@@ -905,7 +934,7 @@ msgid "Password hash method to use"
msgstr "ÎœÎθοδος hash για χÏήση κωδικοÏ"
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -1000,59 +1029,59 @@ msgstr "ΑÏιθμός βομβητή εÏγασίας"
msgid "Business fax number"
msgstr "ΑÏιθμός φαξ εÏγασίας"
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:336
+msgid "Homepage"
+msgstr "Ιστοσελίδα"
+
+#: plugins/personal/generic/class_user.inc:336
+msgid "Personal homepage"
+msgstr "Î Ïοσωπική ιστοσελίδα"
+
+#: plugins/personal/generic/class_user.inc:342
msgid "Account information"
msgstr "ΠληÏοφοÏίες λογαÏιασμοÏ"
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
msgid "Login of this user"
msgstr "ΛογαÏιασμός σÏνδεσης Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… χÏήστη."
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:351
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr "Î Ïοτιμώμενη γλώσσα"
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
msgid "Password of the user"
msgstr "Ο κωδικός του χÏήστη"
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:362
msgid "Personal contact information"
msgstr "Î ÏοσωπικÎÏ‚ πληÏοφοÏίες επαφής"
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
msgid "Display name"
msgstr "Όνομα που εμφανίζεται"
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
msgid "Name this user should appear as. Used by Exchange."
msgstr "Το όνομα με το οποίο Ï€ÏÎπει να εμφανίζεται ο χÏήστης. ΧÏησιμοποιείται από το Exchange."
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home address"
msgstr "ΔιεÏθυνση οικίας"
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home postal address"
msgstr "ΤαχυδÏομική διεÏθυνση οικίας"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:374
msgid "Private phone"
msgstr "Ιδιωτικό τηλÎφωνο"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:374
msgid "Home phone number"
msgstr "ΤηλÎφωνο οικίας"
-#: plugins/personal/generic/class_user.inc:374
-msgid "Homepage"
-msgstr "Ιστοσελίδα"
-
-#: plugins/personal/generic/class_user.inc:374
-msgid "Personal homepage"
-msgstr "Î Ïοσωπική ιστοσελίδα"
-
#: plugins/personal/generic/class_user.inc:380
msgid "Organizational information"
msgstr "ΠληÏοφοÏίες οÏγανισμοÏ"
@@ -1285,33 +1314,33 @@ msgstr "μη ÏυθμισμÎνο"
msgid "automatic"
msgstr "αυτόματο"
-#: plugins/personal/posix/class_posixAccount.inc:309
+#: plugins/personal/posix/class_posixAccount.inc:310
msgid "expired"
msgstr " Îληξε"
-#: plugins/personal/posix/class_posixAccount.inc:311
+#: plugins/personal/posix/class_posixAccount.inc:312
msgid "grace time active"
msgstr "χÏονικό διάστημα χάÏιτος ενεÏγό"
-#: plugins/personal/posix/class_posixAccount.inc:314
-#: plugins/personal/posix/class_posixAccount.inc:316
-#: plugins/personal/posix/class_posixAccount.inc:318
+#: plugins/personal/posix/class_posixAccount.inc:315
+#: plugins/personal/posix/class_posixAccount.inc:317
+#: plugins/personal/posix/class_posixAccount.inc:319
msgid "active"
msgstr "ενεÏγό"
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:315
msgid "password expired"
msgstr "ο κωδικός Ï€Ïόσβασης Îχει λήξει"
-#: plugins/personal/posix/class_posixAccount.inc:316
+#: plugins/personal/posix/class_posixAccount.inc:317
msgid "password not changeable"
msgstr "ο κωδικός Ï€Ïόσβασης δεν μποÏεί να αλλάξει"
-#: plugins/personal/posix/class_posixAccount.inc:400
+#: plugins/personal/posix/class_posixAccount.inc:407
msgid "UID"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:516
+#: plugins/personal/posix/class_posixAccount.inc:525
#, php-format
msgid "Group of user %s"
msgstr "Ομάδα του χÏήστη %s"
@@ -1483,424 +1512,440 @@ msgid "Core settings"
msgstr ""
#: plugins/config/class_configInLdap.inc:161
-msgid "Enable primary group filter"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"It is time consuming to evaluate which groups are primary and which are not,"
-" so you may want to disable it if your group plugin is slow."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:167
msgid "Display summary in listings"
msgstr ""
-#: plugins/config/class_configInLdap.inc:168
+#: 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:173
+#: plugins/config/class_configInLdap.inc:167
msgid "Edit locking"
msgstr "ΕπεξεÏγασία κλειδώματος"
-#: plugins/config/class_configInLdap.inc:174
+#: 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:179
+#: plugins/config/class_configInLdap.inc:173
msgid "Enable logging"
msgstr ""
-#: plugins/config/class_configInLdap.inc:180
+#: plugins/config/class_configInLdap.inc:174
msgid "Event logging on FusionDirectory side."
msgstr ""
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "LDAP size limit"
msgstr ""
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "Defines the number of entries to get from LDAP by default."
msgstr ""
-#: plugins/config/class_configInLdap.inc:192
+#: plugins/config/class_configInLdap.inc:186
msgid "Login and session"
msgstr ""
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:189
msgid "Login attribute"
msgstr ""
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:190
msgid "Which LDAP attribute should be used as the login name during login."
msgstr ""
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:196
msgid "Enforce encrypted connections"
msgstr "Επιβολή κÏυπτογÏαφημÎνων συνδÎσεων"
-#: plugins/config/class_configInLdap.inc:203
+#: plugins/config/class_configInLdap.inc:197
msgid ""
"Enables PHP security checks to force encrypted access (https) to the web "
"interface."
msgstr ""
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:201
msgid "Warn if session is not encrypted"
msgstr "Î Ïοειδοποίηση αν η συνεδÏία δεν είναι κÏυπτογÏαφημÎνη"
-#: plugins/config/class_configInLdap.inc:208
+#: plugins/config/class_configInLdap.inc:202
msgid "will display a warning to the user when http is used instead of https."
msgstr "θα εμφανίσει Ï€Ïοειδοποίηση Ï€Ïος το χÏήστη όταν το Ï€Ïωτόκολλο http χÏησιμοποιείται αντί του Ï€Ïωτοκόλλου https "
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Session lifetime"
msgstr "ΔιάÏκεια συνεδÏίας"
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Defines when a session will expire in seconds."
msgstr "ΚαθοÏίζει πότε μια συνεδÏία θα λήξει μÎσα σε δευτεÏόλεπτα"
-#: plugins/config/class_configInLdap.inc:220
+#: plugins/config/class_configInLdap.inc:212
+msgid "HTTP authentication"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:212
+msgid "Use HTTP authentication protocol instead of the login form."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:219
#: include/class_SnapshotDialogs.inc:186
msgid "Snapshots"
msgstr "Στιγμιότυπα"
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid "Enable snapshots"
msgstr "ΕνεÏγοποίηση λήψεων στιγμιότυπων"
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid ""
"This enables you to save certain states of entries and restore them later "
"on."
msgstr ""
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
msgid "Snapshot base"
msgstr ""
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
msgid "The base where snapshots should be stored inside of the LDAP."
msgstr ""
-#: plugins/config/class_configInLdap.inc:235
+#: plugins/config/class_configInLdap.inc:234
msgid "SSL"
msgstr ""
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Key path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Path to FusionDirectory private key. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Certificate path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Path to FusionDirectory certificate. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:262
msgid "CA certificate path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:247
msgid "Path to the CA certificate. Used for validating Argonaut Server host."
msgstr ""
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:254
msgid "CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "Enable CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "CAS login will be used instead of LDAP bind"
msgstr ""
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:262
msgid "Path to the CA certificate of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host"
msgstr "Σ'υστημα"
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port"
msgstr "ΘÏÏα"
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port the CAS server is listening on"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context to be used"
msgstr ""
-#: plugins/config/class_configInLdap.inc:285
+#: plugins/config/class_configInLdap.inc:284
msgid "People and group storage"
msgstr ""
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "People DN attribute"
msgstr ""
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "Attribute to use at the beginning of users dn"
msgstr ""
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "CN pattern"
msgstr ""
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "The pattern to use to build the common name field"
msgstr ""
-#: plugins/config/class_configInLdap.inc:299
+#: plugins/config/class_configInLdap.inc:298
msgid "Strict naming policy"
msgstr "ΑυστηÏή πολιτική ονοματοδοσίας"
-#: plugins/config/class_configInLdap.inc:300
+#: plugins/config/class_configInLdap.inc:299
msgid "Enables strict checking of user and group names"
msgstr "ΕνεÏγοποίηση αυστηÏÎ¿Ï ÎµÎ»Îγχου στα ονόματα χÏηστών και ομάδων"
-#: plugins/config/class_configInLdap.inc:305
+#: plugins/config/class_configInLdap.inc:304
msgid "Group/user min id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:306
+#: plugins/config/class_configInLdap.inc:305
msgid ""
"The minimum assignable user or group id to avoid security leaks with id 0 "
"accounts."
msgstr ""
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid "Next id hook"
msgstr ""
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid ""
"A script to be called for finding the next free id number for users or "
"groups."
msgstr "Ένα σενάÏιο που θα κληθεί για την εÏÏεση του επόμενου ελεÏθεÏου id για χÏήστες ή ομάδες."
-#: plugins/config/class_configInLdap.inc:315
+#: plugins/config/class_configInLdap.inc:314
msgid "Base number for user id"
msgstr "ΑÏιθμός βάση για user id"
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:315
msgid "Where to start looking for a new free user id."
msgstr "Τοποθεσία εÏÏεσης νÎου ελεÏθεÏου user id."
-#: plugins/config/class_configInLdap.inc:321
+#: plugins/config/class_configInLdap.inc:320
msgid "Base number for group id"
msgstr "ΑÏιθμός βάση για group id"
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:321
msgid "Where to start looking for a new free group id."
msgstr "Τοποθεσία εÏÏεσης νÎου ελεÏθεÏου group id."
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "Users RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "The branch where users are stored."
msgstr "Κλάδος στον οποίο αποθηκεÏονται χÏήστες."
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "Groups RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "The branch where groups are stored."
msgstr "Κλάδος στον οποίο αποθηκεÏονται ομάδες."
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "ACL role RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "The branch where ACL roles are stored."
msgstr "Κλάδος στον οποίο αποθηκεÏονται Ïόλοι ACL."
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Id allocation method"
msgstr "ÎœÎθοδος διανομής id"
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Method to allocate user/group ids"
msgstr "ÎœÎθοδος για την διανομή user/group id"
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Traditional"
msgstr "ΠαÏαδοσιακή"
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Samba unix id pool"
msgstr ""
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Pool user id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Minimum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Pool user id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Maximum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Pool group id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Minimum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Pool group id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Maximum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:370
+#: plugins/config/class_configInLdap.inc:367
+msgid "Restrict role members"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:367
+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:373
msgid "Debugging"
msgstr "Αποσφαλμάτωση"
-#: plugins/config/class_configInLdap.inc:373
+#: plugins/config/class_configInLdap.inc:376
msgid "Display errors"
msgstr "Î Ïοβολή σφαλμάτων"
-#: plugins/config/class_configInLdap.inc:374
+#: plugins/config/class_configInLdap.inc:377
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:378
+#: plugins/config/class_configInLdap.inc:381
msgid "Maximum LDAP query time"
msgstr ""
-#: plugins/config/class_configInLdap.inc:378
+#: plugins/config/class_configInLdap.inc:381
msgid ""
"Stop LDAP actions if there is no answer within the specified number of "
"seconds."
msgstr ""
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:386
msgid "Log LDAP statistics"
msgstr ""
-#: plugins/config/class_configInLdap.inc:384
+#: plugins/config/class_configInLdap.inc:387
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:389
+#: plugins/config/class_configInLdap.inc:392
msgid "Debug level"
msgstr ""
-#: plugins/config/class_configInLdap.inc:390
+#: plugins/config/class_configInLdap.inc:393
msgid "Display certain information on each page load."
msgstr ""
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:405
msgid "Miscellaneous"
msgstr "ΔιάφοÏα"
-#: plugins/config/class_configInLdap.inc:407
+#: plugins/config/class_configInLdap.inc:410
msgid "Hooks that are called when specific actions happens"
msgstr ""
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "tab"
msgstr ""
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "The tab that this hook concerns"
msgstr ""
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "mode"
msgstr "λειτουÏγία"
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "When to call this command"
msgstr "Πότε καλείται αυτή η εντολή"
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "cmd"
msgstr ""
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "The command that will be called"
msgstr "Η εντολή που θα κληθεί"
-#: plugins/config/class_configInLdap.inc:429
+#: plugins/config/class_configInLdap.inc:432
msgid "Hooks"
msgstr "Hooks"
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:439
msgid "Display hook output"
msgstr ""
-#: plugins/config/class_configInLdap.inc:437
+#: plugins/config/class_configInLdap.inc:440
msgid ""
"When enabled successful hook execution output is displayed to the user using"
" a dialog."
msgstr ""
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available shells"
msgstr ""
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available POSIX shells for FD users."
msgstr ""
-#: plugins/config/class_configInLdap.inc:449
+#: plugins/config/class_configInLdap.inc:452
msgid "Show ACL tab on all objects"
msgstr ""
-#: plugins/config/class_configInLdap.inc:450
+#: plugins/config/class_configInLdap.inc:453
msgid ""
"For very specific ACL rights setting where you might need to give right on a"
" single object."
msgstr ""
-#: plugins/config/class_configInLdap.inc:464
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available department categories"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available categories in the departments dropdown"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:474
#: setup/class_setupStep_Language.inc:69
msgid "Automatic"
msgstr ""
@@ -1917,80 +1962,80 @@ msgstr ""
msgid "Password recovery settings"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:44
+#: plugins/config/class_recoveryConfig.inc:45
msgid "Activate password recovery"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:45
+#: plugins/config/class_recoveryConfig.inc:46
msgid "Whether to activate or not password recovery feature"
msgstr "ΕνεÏγοποίηση ή όχι της ανάκτησης του ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï€Ïόσβασης"
-#: plugins/config/class_recoveryConfig.inc:50
+#: plugins/config/class_recoveryConfig.inc:51
msgid "Sender email address"
msgstr "ΔιεÏθυνση ηλεκτÏÎ¿Î½Î¹ÎºÎ¿Ï Ï„Î±Ï‡Ï…Î´Ïομείου αποστολÎα"
-#: plugins/config/class_recoveryConfig.inc:51
+#: plugins/config/class_recoveryConfig.inc:52
msgid "Email address from which mails will be sent"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:57
+#: plugins/config/class_recoveryConfig.inc:58
msgid "Link validity (minutes)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:58
+#: plugins/config/class_recoveryConfig.inc:59
msgid "Number of minutes before a recovery link expires"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:64
+#: plugins/config/class_recoveryConfig.inc:65
msgid "Salt for tokens"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:65
+#: plugins/config/class_recoveryConfig.inc:66
msgid ""
"Just a security measure, you can put anything in there, even random "
"characters"
msgstr "Ως μÎÏ„Ïο ασφαλείας, μποÏείτε να βάλετε οτιδήποτε εκεί, ακόμα και τυχαίους χαÏακτήÏες"
-#: plugins/config/class_recoveryConfig.inc:71
+#: plugins/config/class_recoveryConfig.inc:72
msgid "Allow the use of alternate addresses"
msgstr "Îα επιτÏÎπεται η χÏήση εναλλακτικών διευθÏνσεων."
-#: plugins/config/class_recoveryConfig.inc:72
+#: plugins/config/class_recoveryConfig.inc:73
msgid ""
"Users will also be able to enter one of theirs alternate addresses to "
"recover their password"
msgstr "Οι χÏήστες θα Îχουν επίσης τη δυνατότητα να εισάγουν μία από τις εναλλακτικÎÏ‚ τους διευθÏνσεις για να ανακτήσουν τον κωδικό τους"
-#: plugins/config/class_recoveryConfig.inc:79
+#: plugins/config/class_recoveryConfig.inc:80
msgid "First email"
msgstr "Î Ïώτο email"
-#: plugins/config/class_recoveryConfig.inc:82
-#: plugins/config/class_recoveryConfig.inc:101
+#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:102
msgid "Subject"
msgstr "ΘÎμα"
-#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:84
msgid "Subject of the first email"
msgstr "ΘÎμα του Ï€Ïώτου email"
-#: plugins/config/class_recoveryConfig.inc:86
+#: plugins/config/class_recoveryConfig.inc:87
msgid "[FusionDirectory] Password recovery link"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:89
+#: plugins/config/class_recoveryConfig.inc:90
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:91
#, 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 ""
-#: plugins/config/class_recoveryConfig.inc:93
+#: plugins/config/class_recoveryConfig.inc:94
#, php-format
msgid ""
"Hello,\n"
@@ -2002,31 +2047,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:98
+#: plugins/config/class_recoveryConfig.inc:99
msgid "Second email"
msgstr "ΔεÏτεÏο email"
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:103
msgid "Subject of the second email"
msgstr "ΘÎμα του δεÏτεÏου email"
-#: plugins/config/class_recoveryConfig.inc:105
+#: plugins/config/class_recoveryConfig.inc:106
msgid "[FusionDirectory] Password recovery successful"
msgstr "[FusionDirectory] Επιτυχής επαναφοÏά ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï€Ïόσβασης"
-#: plugins/config/class_recoveryConfig.inc:108
+#: plugins/config/class_recoveryConfig.inc:109
#, php-format
msgid "Body (%s is login)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:110
#, php-format
msgid ""
"Body of the second email, sent to confirm the password has been changed. Use"
" %s for the user login."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:112
+#: plugins/config/class_recoveryConfig.inc:113
#, php-format
msgid ""
"Hello,\n"
@@ -2094,13 +2139,13 @@ msgstr "Πάνω"
msgid "Down"
msgstr "Κάτω"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2633
-#: include/simpleplugin/class_attribute.inc:2634
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
+#: include/simpleplugin/class_attribute.inc:2648
msgid "Sort up"
msgstr "Ταξινόμηση πάνω"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2646
-#: include/simpleplugin/class_attribute.inc:2647
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
+#: include/simpleplugin/class_attribute.inc:2661
msgid "Sort down"
msgstr "Ταξινόμηση κάτω"
@@ -2112,27 +2157,26 @@ msgstr "Επιλογή όλων"
#: include/class_config.inc:479 include/class_msgPool.inc:215
#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3106
-#: include/functions.inc:3127 include/functions.inc:3157
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197 include/functions.inc:3259
+#: include/class_msgPool.inc:740 include/functions.inc:3107
+#: include/functions.inc:3128 include/functions.inc:3158
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3260
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1663 include/class_CopyPasteHandler.inc:278
-#: include/simpleplugin/class_dialogAttributes.inc:733
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
-#: include/simpleplugin/class_attribute.inc:1774
-#: include/simpleplugin/class_attribute.inc:1877
-#: include/simpleplugin/class_attribute.inc:1879
+#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
+#: include/simpleplugin/class_attribute.inc:1784
+#: include/simpleplugin/class_attribute.inc:1887
+#: include/simpleplugin/class_attribute.inc:1889
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: 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:437
#: include/password-methods/class_password-methods.inc:447
-#: include/class_SnapshotHandler.inc:415 html/index.php:434 html/index.php:444
+#: include/class_SnapshotHandler.inc:415 html/index.php:473 html/index.php:483
#: setup/class_setupStep_Migrate.inc:935
#: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
msgid "Error"
@@ -2171,44 +2215,44 @@ msgstr "ΕπαναφόÏτωση λίστας"
msgid "Submit"
msgstr "Υποβολή"
-#: include/class_listing.inc:1586 include/class_listing.inc:1640
+#: include/class_listing.inc:1590 include/class_listing.inc:1644
msgid "Copy"
msgstr "ΑντιγÏαφή"
-#: include/class_listing.inc:1592 include/class_listing.inc:1628
+#: include/class_listing.inc:1596 include/class_listing.inc:1632
msgid "Cut"
msgstr "Αποκοπή"
-#: include/class_listing.inc:1600 include/class_listing.inc:1602
+#: include/class_listing.inc:1604 include/class_listing.inc:1606
#: include/class_CopyPasteHandler.inc:370
msgid "Paste"
msgstr "Επικόλληση"
-#: include/class_listing.inc:1628
+#: include/class_listing.inc:1632
msgid "Cut this entry"
msgstr "Αποκοπή αυτής της εγγÏαφής"
-#: include/class_listing.inc:1640
+#: include/class_listing.inc:1644
msgid "Copy this entry"
msgstr "ΑντιγÏαφή αυτής της εγγÏαφής"
-#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_listing.inc:1677 include/class_listing.inc:1679
msgid "Restore snapshots"
msgstr "ΕπαναφοÏά στιγμιοτÏπων"
-#: include/class_listing.inc:1689
+#: include/class_listing.inc:1693
msgid "Export list"
msgstr "Εξαγωγή λίστας"
-#: include/class_listing.inc:1724 include/class_listing.inc:1725
+#: include/class_listing.inc:1728 include/class_listing.inc:1729
msgid "Restore snapshot"
msgstr "ΕπαναφοÏά στιγμιοτÏπου"
-#: include/class_listing.inc:1734
+#: include/class_listing.inc:1738
msgid "Create snapshot"
msgstr "ΔημιουÏγία στιγμιότυπου"
-#: include/class_listing.inc:1735
+#: include/class_listing.inc:1739
msgid "Create a new snapshot from this object"
msgstr "ΔημιουÏγία νÎου στιγμιότυπου από αυτό το αντικείμενο"
@@ -2251,7 +2295,7 @@ msgid "XML error in fusiondirectory.conf: %s at line %d"
msgstr ""
#: include/class_config.inc:162 include/class_config.inc:300
-#: include/class_config.inc:985 include/class_config.inc:998
+#: include/class_config.inc:915 include/class_config.inc:928
#: include/functions.inc:663 include/class_timezone.inc:51
#: include/password-methods/class_password-methods-sha.inc:71
#: include/password-methods/class_password-methods-ssha.inc:75
@@ -2268,17 +2312,17 @@ msgid ""
"while your passwords are not encrypted."
msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:917
-#: include/class_ldap.inc:1371 include/functions.inc:526
+#: include/class_config.inc:337 include/class_ldap.inc:918
+#: include/class_ldap.inc:1372 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2985 include/simpleplugin/class_simplePlugin.inc:545
-#: include/simpleplugin/class_attribute.inc:2895
+#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2909
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
#: include/class_SnapshotHandler.inc:422 include/class_SnapshotHandler.inc:425
-#: html/index.php:360 html/class_passwordRecovery.inc:497
+#: html/index.php:369 html/class_passwordRecovery.inc:497
#: setup/class_setupStep_Migrate.inc:451
#: setup/class_setupStep_Migrate.inc:1130
msgid "LDAP error"
@@ -2293,38 +2337,38 @@ msgstr "Αδυναμία bind σε LDAP. Επικοινωνήστε με τον
msgid "The selected mail method (class %s) is not available"
msgstr ""
-#: include/class_config.inc:986
+#: include/class_config.inc:916
#, php-format
msgid ""
"The snapshot functionality is enabled, but the required variable '%s' is not"
" set."
msgstr ""
-#: include/class_config.inc:999
+#: include/class_config.inc:929
#, php-format
msgid ""
"The snapshot functionality is enabled, but the required compression module "
"is missing. Please install '%s'."
msgstr ""
-#: include/class_config.inc:1104
+#: include/class_config.inc:1034
msgid "All categories"
msgstr "Όλες οι κατηγοÏίες"
-#: include/class_config.inc:1231
+#: include/class_config.inc:1161
msgid "My account"
msgstr "Ο λογαÏιασμός μου"
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
msgid "Performance warning"
msgstr ""
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
#, php-format
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr ""
-#: include/class_ldap.inc:868 include/class_ldap.inc:904
+#: include/class_ldap.inc:869 include/class_ldap.inc:905
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
@@ -2334,39 +2378,39 @@ msgstr ""
msgid "Internal error"
msgstr "ΕσωτεÏικό σφάλμα"
-#: include/class_ldap.inc:868
+#: include/class_ldap.inc:869
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:904
+#: include/class_ldap.inc:905
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1016
+#: include/class_ldap.inc:1017
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr ""
-#: include/class_ldap.inc:1018
+#: include/class_ldap.inc:1019
#, php-format
msgid "while operating on LDAP server %s"
msgstr ""
-#: include/class_ldap.inc:1108
+#: include/class_ldap.inc:1109
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1220
+#: include/class_ldap.inc:1221
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr ""
-#: include/class_ldap.inc:1231
+#: include/class_ldap.inc:1232
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2954,10 +2998,10 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr ""
-#: include/functions.inc:496 include/functions.inc:3294
-#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:263
-#: include/simpleplugin/class_simplePlugin.inc:268
-#: include/simpleplugin/class_simplePlugin.inc:280
+#: include/functions.inc:496 include/functions.inc:3295
+#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
+#: include/simpleplugin/class_simplePlugin.inc:269
+#: include/simpleplugin/class_simplePlugin.inc:281
#: html/class_passwordRecovery.inc:216
msgid "Fatal error"
msgstr "ΜοιÏαίο σφάλμα"
@@ -3110,98 +3154,98 @@ msgstr "ΑδÏνατη η εγγÏαφή σε αÏχείο αναθεώÏηση
msgid "Cannot read to revision file!"
msgstr "ΑδÏνατη η ανάγνωση σε αÏχείο αναθεώÏησης!"
-#: include/functions.inc:2548
+#: include/functions.inc:2549
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "LDAP warning"
msgstr "Î Ïοειδοποίηση LDAP "
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "Cannot get schema information from server. No schema check possible!"
msgstr "Αδυναμία λήψης πληÏοφοÏιών σχήματος για τον εξυπηÏετητή. Δεν υπάÏχει η δυνατότητα ελÎγχου σχήματος!"
-#: include/functions.inc:2584
+#: include/functions.inc:2585
msgid ""
"Used to lock currently edited entries to avoid multiple changes at the same "
"time."
msgstr ""
-#: include/functions.inc:2596
+#: include/functions.inc:2597
#, php-format
msgid "Missing required object class '%s'!"
msgstr "Λείπει η απαιτοÏμενη κλάση αντικειμÎνου '%s'!"
-#: include/functions.inc:2599
+#: include/functions.inc:2600
#, php-format
msgid "Missing optional object class '%s'!"
msgstr ""
-#: include/functions.inc:2603
+#: include/functions.inc:2604
#, php-format
msgid "Class(es) available"
msgstr "ΔαθÎσιμες κλάσεις"
-#: include/functions.inc:2623
+#: include/functions.inc:2624
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2625
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2628
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2629
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3106 include/functions.inc:3127
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198
msgid "Cannot allocate a free ID:"
msgstr "Δεν είναι δυνατό να ανατεθεί μια free ID:"
-#: include/functions.inc:3106
+#: include/functions.inc:3107
msgid "unknown idAllocation method!"
msgstr "αγνωστη μÎθοδος idAllocation"
-#: include/functions.inc:3127
+#: include/functions.inc:3128
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3157
+#: include/functions.inc:3158
msgid "Cannot create sambaUnixIdPool entry!"
msgstr "Αδυναμία δημιουÏγίας καταχώÏισης sambaUnixIdPool!"
-#: include/functions.inc:3165
+#: include/functions.inc:3166
msgid "sambaUnixIdPool is not unique!"
msgstr "sambaUnixIdPool δεν είναι μοναδική!"
-#: include/functions.inc:3177 include/functions.inc:3181
+#: include/functions.inc:3178 include/functions.inc:3182
msgid "no ID available!"
msgstr "Μη διαθÎσιμη ID!"
-#: include/functions.inc:3197
+#: include/functions.inc:3198
msgid "maximum tries exceeded!"
msgstr "ΥπÎÏβαση μεγίστου οÏίου Ï€Ïοσπαθειών!"
-#: include/functions.inc:3259
+#: include/functions.inc:3260
msgid "Cannot allocate a free ID!"
msgstr "Δεν είναι δυνατή η διάθεση μιας free ID!"
-#: include/functions.inc:3295
+#: include/functions.inc:3296
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr "ΑδÏνατος ο εντοπισμός του αÏχείου '%s' - ΠαÏακαλώ εκτελÎστε την εντολή '%s' για να το διοÏθώσετε"
@@ -3357,13 +3401,13 @@ msgstr "σε γÏαμμή"
msgid "XML error"
msgstr "Σφάλμα XML"
-#: include/class_plugin.inc:554
+#: include/class_plugin.inc:553
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/class_plugin.inc:1466
+#: include/class_plugin.inc:1467
#, php-format
msgid "Tab \"%s\""
msgstr "Tab \"%s\""
@@ -3389,32 +3433,32 @@ msgstr "Όνομα Ï€ÏοτÏπου"
msgid "This is the name of the template"
msgstr "Αυτό είναι το όνομα του Ï€ÏοτÏπου"
-#: include/simpleplugin/class_simplePlugin.inc:263
+#: include/simpleplugin/class_simplePlugin.inc:264
msgid "Only main tab can compute dn"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:270
+#: include/simpleplugin/class_simplePlugin.inc:271
#, php-format
msgid "Could not compute dn: no parent tab class for \"%s\""
msgstr "Αδυναμία Ï…Ï€Î¿Î»Î¿Î³Î¹ÏƒÎ¼Î¿Ï dn: δεν υπάÏχει γονική tab class για \"%s\""
-#: include/simpleplugin/class_simplePlugin.inc:282
+#: include/simpleplugin/class_simplePlugin.inc:283
#, php-format
msgid ""
"Could not compute dn: could not find objectType infos from tab class \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:638
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:644
+#: include/simpleplugin/class_simplePlugin.inc:652
msgid "Error when saving"
msgstr "Σφάλμα κατά την αποθήκευση"
-#: include/simpleplugin/class_simplePlugin.inc:638
+#: include/simpleplugin/class_simplePlugin.inc:644
#, php-format
msgid "There is already an entry with the same dn : %s"
msgstr "ΥπάÏχει ήδη μια καταχώÏιση με το ίδιο dn : %s"
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:652
#, php-format
msgid "The entry %s is not existing"
msgstr "Η καταχώÏιση %s δεν υπάÏχει."
@@ -3434,27 +3478,27 @@ msgstr "Ï€Ïότυπο %s"
msgid "Show %s"
msgstr "Εμφάνιση %s"
-#: include/simpleplugin/class_dialogAttributes.inc:409
+#: include/simpleplugin/class_dialogAttributes.inc:415
#, php-format
msgid "Group %s"
msgstr "Ομάδα %s"
-#: include/simpleplugin/class_dialogAttributes.inc:411
+#: include/simpleplugin/class_dialogAttributes.inc:417
#, php-format
msgid "Role %s"
msgstr "Ρόλος %s"
-#: include/simpleplugin/class_dialogAttributes.inc:446
+#: include/simpleplugin/class_dialogAttributes.inc:452
msgid "Group of user"
msgstr "Ομάδα του χÏήστη"
-#: include/simpleplugin/class_dialogAttributes.inc:615
+#: include/simpleplugin/class_dialogAttributes.inc:621
#: include/simpleplugin/class_attribute.inc:1090
#: include/simpleplugin/class_attribute.inc:1124
msgid "None"
msgstr "ΚανÎνα"
-#: include/simpleplugin/class_dialogAttributes.inc:617
+#: include/simpleplugin/class_dialogAttributes.inc:623
msgid "Unknown"
msgstr "Άγνωστο"
@@ -3495,11 +3539,16 @@ msgid "days"
msgstr "ημÎÏες"
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2161
+#: include/simpleplugin/class_attribute.inc:2171
#, php-format
msgid "%s (required)"
msgstr "%s (απαιτείται)"
+#: include/simpleplugin/class_attribute.inc:1150
+#, php-format
+msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
+msgstr ""
+
#: include/simpleplugin/class_attribute.inc:1277
#, php-format
msgid "An integer between %d and %d"
@@ -3515,75 +3564,75 @@ msgstr "Ένας ακÎÏαιος μεγαλÏτεÏος από %d"
msgid "An integer smaller than %d"
msgstr "Ένας ακÎÏαιος μικÏότεÏος από %d"
-#: include/simpleplugin/class_attribute.inc:1379
+#: include/simpleplugin/class_attribute.inc:1383
#, php-format
msgid "A float between %f and %f"
msgstr "Δεκαδικός Î¼ÎµÏ„Î±Î¾Ï %f και %f"
-#: include/simpleplugin/class_attribute.inc:1381
+#: include/simpleplugin/class_attribute.inc:1385
#, php-format
msgid "A float larger than %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1383
+#: include/simpleplugin/class_attribute.inc:1387
#, php-format
msgid "A float smaller than %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1490
+#: include/simpleplugin/class_attribute.inc:1500
msgid "Error, incorrect date: "
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
#, php-format
msgid "Cannot read uploaded file: %s"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1530
+#: include/simpleplugin/class_attribute.inc:1540
msgid "file is empty"
msgstr "Το αÏχείο είναι κενό"
-#: include/simpleplugin/class_attribute.inc:1533
+#: include/simpleplugin/class_attribute.inc:1543
msgid "file not found"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1546
msgid "file not readable"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1569
+#: include/simpleplugin/class_attribute.inc:1579
#, php-format
msgid "%s (%d bytes)"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1616
-#: include/simpleplugin/class_attribute.inc:1793
+#: include/simpleplugin/class_attribute.inc:1626
+#: include/simpleplugin/class_attribute.inc:1803
msgid "Upload"
msgstr "Αποστολή"
-#: include/simpleplugin/class_attribute.inc:1621
-#: include/simpleplugin/class_attribute.inc:1622
+#: include/simpleplugin/class_attribute.inc:1631
+#: include/simpleplugin/class_attribute.inc:1632
msgid "Download"
msgstr "Λήψη"
-#: include/simpleplugin/class_attribute.inc:1775
+#: include/simpleplugin/class_attribute.inc:1785
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1826
+#: include/simpleplugin/class_attribute.inc:1836
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr "Base"
-#: include/simpleplugin/class_attribute.inc:1829
+#: include/simpleplugin/class_attribute.inc:1839
msgid "Object base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:2755
+#: include/simpleplugin/class_attribute.inc:2769
#, php-format
msgid "Invalid value for %s"
msgstr ""
@@ -3717,17 +3766,17 @@ msgstr "ΠαÏακαλώ ελÎγξτε το συνδυασμό όνομα χÏ
msgid "Account locked. Please contact your system administrator!"
msgstr ""
-#: html/index.php:436
+#: html/index.php:475
#, php-format
msgid "CAS user \"%s\" could not be found in the LDAP"
msgstr ""
-#: html/index.php:446
+#: html/index.php:485
#, php-format
msgid "CAS user \"%s\" match several users in the LDAP"
msgstr ""
-#: html/index.php:481
+#: html/index.php:522
msgid ""
"Your browser has cookies disabled. Please enable cookies and reload this "
"page before logging in!"
@@ -4050,7 +4099,7 @@ msgid "Checking for duplicated UID numbers"
msgstr ""
#: setup/class_setupStep_Migrate.inc:267
-msgid "Checking for duplicate GID numbers"
+msgid "Checking for duplicated GID numbers"
msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:487
@@ -4060,7 +4109,7 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:1179
#: setup/class_setupStep_Migrate.inc:1272
#: setup/class_setupStep_Migrate.inc:1351
-#: setup/class_setupStep_Migrate.inc:1390
+#: setup/class_setupStep_Migrate.inc:1395
msgid "LDAP query failed"
msgstr ""
@@ -4071,7 +4120,7 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:1180
#: setup/class_setupStep_Migrate.inc:1273
#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1391
+#: setup/class_setupStep_Migrate.inc:1396
msgid "Possibly the \"root object\" is missing."
msgstr ""
@@ -4226,14 +4275,14 @@ msgstr ""
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1373
+#: setup/class_setupStep_Migrate.inc:1378
#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\"."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1412
+#: setup/class_setupStep_Migrate.inc:1422
#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\"."
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
diff --git a/locale/en/fusiondirectory.po b/locale/en/fusiondirectory.po
index d12aa3615d0bdd9818a16a44ef7781ce51507143..1419cbb0a839c2299151a810f3df9460e3a8f49e 100644
--- a/locale/en/fusiondirectory.po
+++ b/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory VERSION\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-01-22 11:26+0100\n"
+"POT-Creation-Date: 2016-03-08 17:12+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
"Language-Team: English\n"
@@ -29,31 +29,31 @@ msgstr ""
msgid "References"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:30
-#: plugins/admin/groups/class_roleGeneric.inc:34
+#: plugins/admin/groups/class_roleGeneric.inc:53
+#: plugins/admin/groups/class_roleGeneric.inc:57
#: plugins/admin/groups/class_groupManagement.inc:71
#: plugins/admin/aclrole/class_aclRole.inc:78
#: plugins/admin/acl/class_aclAssignment.inc:49
msgid "Role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:31
+#: plugins/admin/groups/class_roleGeneric.inc:54
msgid "Role information"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:35
+#: plugins/admin/groups/class_roleGeneric.inc:58
msgid "Organizational role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:80
msgid "Informations"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:84
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:158
+#: plugins/admin/departments/class_department.inc:174
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -63,13 +63,13 @@ msgstr ""
msgid "Name"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:84
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
msgid "Name of this group"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:89
#: plugins/admin/groups/class_group.inc:66
#: plugins/admin/groups/class_ogroup.inc:192
#: plugins/admin/groups/group-list.xml:41
@@ -82,26 +82,26 @@ msgstr ""
msgid "Description"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:89
msgid "Description of the role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:70
+#: plugins/admin/groups/class_roleGeneric.inc:93
msgid "Phone number"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:74
+#: plugins/admin/groups/class_roleGeneric.inc:97
msgid "Fax number"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:101
#: plugins/admin/users/class_userManagement.inc:42
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: setup/class_setupStep_Migrate.inc:871
msgid "Users"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:101
msgid "Add users for the role"
msgstr ""
@@ -148,7 +148,7 @@ msgstr ""
#: plugins/admin/groups/class_group.inc:74
#: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:403
+#: plugins/personal/posix/class_posixAccount.inc:410
msgid "GID"
msgstr ""
@@ -205,23 +205,23 @@ msgid "Only allow this group to connect to this list of hosts"
msgstr ""
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458 include/functions.inc:794
-#: include/functions.inc:2548 include/class_xml.inc:55
+#: plugins/personal/posix/class_posixAccount.inc:465 include/functions.inc:794
+#: include/functions.inc:2549 include/class_xml.inc:55
#: include/simpleplugin/class_simpleTabs.inc:325 html/index.php:56
-#: html/index.php:62 html/index.php:481 html/class_passwordRecovery.inc:378
+#: html/index.php:62 html/index.php:522 html/class_passwordRecovery.inc:378
#: setup/class_setupStep_Migrate.inc:572
#: setup/class_setupStep_Migrate.inc:1083
#: setup/class_setupStep_Migrate.inc:1202
#: setup/class_setupStep_Migrate.inc:1313
-#: setup/class_setupStep_Migrate.inc:1372
-#: setup/class_setupStep_Migrate.inc:1411 plugins/admin/acl/remove.tpl.c:2
+#: setup/class_setupStep_Migrate.inc:1377
+#: setup/class_setupStep_Migrate.inc:1421 plugins/admin/acl/remove.tpl.c:2
#: ihtml/themes/default/islocked.tpl.c:5 ihtml/themes/default/remove.tpl.c:2
#: ihtml/themes/default/msg_dialog.tpl.c:5 setup/setup_checks.tpl.c:8
msgid "Warning"
msgstr ""
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458
+#: plugins/personal/posix/class_posixAccount.inc:465
msgid "Timeout while waiting for lock. Ignoring lock!"
msgstr ""
@@ -251,7 +251,7 @@ msgstr ""
msgid "Objects member of this group"
msgstr ""
-#: plugins/admin/groups/class_ogroup.inc:318
+#: plugins/admin/groups/class_ogroup.inc:313
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
@@ -280,10 +280,10 @@ msgstr ""
#: plugins/admin/departments/dep-list.xml:79
#: plugins/admin/users/user-list.xml:105
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-#: include/simpleplugin/class_dialogAttributes.inc:626
-#: include/simpleplugin/class_dialogAttributes.inc:627
-#: include/simpleplugin/class_attribute.inc:2661
-#: include/simpleplugin/class_attribute.inc:2662
+#: include/simpleplugin/class_dialogAttributes.inc:632
+#: include/simpleplugin/class_dialogAttributes.inc:633
+#: include/simpleplugin/class_attribute.inc:2675
+#: include/simpleplugin/class_attribute.inc:2676
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -294,8 +294,8 @@ msgstr ""
#: plugins/admin/departments/dep-list.xml:67
#: plugins/admin/departments/dep-list.xml:88
#: plugins/admin/users/user-list.xml:112
-#: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_dialogAttributes.inc:637
+#: include/simpleplugin/class_dialogAttributes.inc:642
+#: include/simpleplugin/class_dialogAttributes.inc:643
#: include/simpleplugin/simple-list.xml:75
#: include/simpleplugin/simple-list.xml:125
msgid "Remove"
@@ -344,7 +344,7 @@ msgid "Show application groups"
msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Show department groups"
+msgid "Show unidentified groups"
msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:137
@@ -433,51 +433,67 @@ msgid "Category of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:81
+msgid "Website"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:81
+#, php-format
+msgid "Website of this %s"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:85
#: plugins/personal/generic/class_user.inc:410
msgid "Manager"
msgstr ""
-#: plugins/admin/departments/class_department.inc:81
+#: plugins/admin/departments/class_department.inc:85
#, php-format
msgid "Manager of this %s"
msgstr ""
-#: plugins/admin/departments/class_department.inc:87
-#: plugins/admin/departments/class_department.inc:93
+#: plugins/admin/departments/class_department.inc:91
+#: plugins/admin/departments/class_department.inc:97
#: plugins/personal/generic/class_user.inc:304
msgid "Location"
msgstr ""
-#: plugins/admin/departments/class_department.inc:90
+#: plugins/admin/departments/class_department.inc:94
#: plugins/personal/generic/class_user.inc:308
msgid "State"
msgstr ""
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_country.inc:29
+#: plugins/admin/departments/class_country.inc:30
+#: plugins/admin/departments/class_country.inc:33
+msgid "Country"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:103
#: plugins/personal/generic/class_user.inc:312
msgid "Address"
msgstr ""
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:103
#, php-format
msgid "A postal address for this %s"
msgstr ""
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
#: plugins/personal/generic/class_user.inc:320
msgid "Phone"
msgstr ""
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
msgid "Telephone number"
msgstr ""
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
#: plugins/personal/generic/class_user.inc:332
msgid "Fax"
msgstr ""
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
msgid "Facsimile telephone number"
msgstr ""
@@ -505,12 +521,6 @@ msgstr ""
msgid "locality"
msgstr ""
-#: plugins/admin/departments/class_country.inc:29
-#: plugins/admin/departments/class_country.inc:30
-#: plugins/admin/departments/class_country.inc:33
-msgid "Country"
-msgstr ""
-
#: plugins/admin/departments/class_country.inc:50
msgid "country"
msgstr ""
@@ -553,7 +563,8 @@ msgid "Given name"
msgstr ""
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
+#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
msgid "Login"
@@ -666,8 +677,8 @@ msgid "Edit category ACL"
msgstr ""
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2671
-#: include/simpleplugin/class_attribute.inc:2672
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
+#: include/simpleplugin/class_attribute.inc:2686
#, php-format
msgid "Delete"
msgstr ""
@@ -772,19 +783,37 @@ msgstr ""
msgid "ACLs which are part of this group"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:38
+#: plugins/admin/acl/class_aclManagement.inc:31
+#: plugins/admin/acl/class_aclManagement.inc:32
+#: plugins/admin/acl/class_aclManagement.inc:45
+msgid "ACL assignment creation"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:33
+msgid "Create an ACL assignment on an arbitrary dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "Dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "DN you wish to add assignments for"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:135
msgid "ACL assignments"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:39
+#: plugins/admin/acl/class_aclManagement.inc:136
msgid "ACL assignments management"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:40
+#: plugins/admin/acl/class_aclManagement.inc:137
msgid "Manage ACL roles assignments to users"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:78
+#: plugins/admin/acl/class_aclManagement.inc:199
#: plugins/admin/acl/class_aclAssignment.inc:263
msgid "ACL Assignment"
msgstr ""
@@ -900,7 +929,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -995,57 +1024,57 @@ msgstr ""
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:336
+msgid "Homepage"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:336
+msgid "Personal homepage"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:342
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:351
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr ""
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:358
-msgid "Personal contact information"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:362
-msgid "Display name"
-msgstr ""
-
#: plugins/personal/generic/class_user.inc:362
-msgid "Name this user should appear as. Used by Exchange."
+msgid "Personal contact information"
msgstr ""
#: plugins/personal/generic/class_user.inc:366
-msgid "Home address"
+msgid "Display name"
msgstr ""
#: plugins/personal/generic/class_user.inc:366
-msgid "Home postal address"
+msgid "Name this user should appear as. Used by Exchange."
msgstr ""
#: plugins/personal/generic/class_user.inc:370
-msgid "Private phone"
+msgid "Home address"
msgstr ""
#: plugins/personal/generic/class_user.inc:370
-msgid "Home phone number"
+msgid "Home postal address"
msgstr ""
#: plugins/personal/generic/class_user.inc:374
-msgid "Homepage"
+msgid "Private phone"
msgstr ""
#: plugins/personal/generic/class_user.inc:374
-msgid "Personal homepage"
+msgid "Home phone number"
msgstr ""
#: plugins/personal/generic/class_user.inc:380
@@ -1280,33 +1309,33 @@ msgstr ""
msgid "automatic"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:309
+#: plugins/personal/posix/class_posixAccount.inc:310
msgid "expired"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:311
+#: plugins/personal/posix/class_posixAccount.inc:312
msgid "grace time active"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:314
-#: plugins/personal/posix/class_posixAccount.inc:316
-#: plugins/personal/posix/class_posixAccount.inc:318
+#: plugins/personal/posix/class_posixAccount.inc:315
+#: plugins/personal/posix/class_posixAccount.inc:317
+#: plugins/personal/posix/class_posixAccount.inc:319
msgid "active"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:315
msgid "password expired"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:316
+#: plugins/personal/posix/class_posixAccount.inc:317
msgid "password not changeable"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:400
+#: plugins/personal/posix/class_posixAccount.inc:407
msgid "UID"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:516
+#: plugins/personal/posix/class_posixAccount.inc:525
#, php-format
msgid "Group of user %s"
msgstr ""
@@ -1478,423 +1507,439 @@ msgid "Core settings"
msgstr ""
#: plugins/config/class_configInLdap.inc:161
-msgid "Enable primary group filter"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"It is time consuming to evaluate which groups are primary and which are not, "
-"so you may want to disable it if your group plugin is slow."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:167
msgid "Display summary in listings"
msgstr ""
-#: plugins/config/class_configInLdap.inc:168
+#: 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:173
+#: plugins/config/class_configInLdap.inc:167
msgid "Edit locking"
msgstr ""
-#: plugins/config/class_configInLdap.inc:174
+#: 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:179
+#: plugins/config/class_configInLdap.inc:173
msgid "Enable logging"
msgstr ""
-#: plugins/config/class_configInLdap.inc:180
+#: plugins/config/class_configInLdap.inc:174
msgid "Event logging on FusionDirectory side."
msgstr ""
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "LDAP size limit"
msgstr ""
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "Defines the number of entries to get from LDAP by default."
msgstr ""
-#: plugins/config/class_configInLdap.inc:192
+#: plugins/config/class_configInLdap.inc:186
msgid "Login and session"
msgstr ""
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:189
msgid "Login attribute"
msgstr ""
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:190
msgid "Which LDAP attribute should be used as the login name during login."
msgstr ""
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:196
msgid "Enforce encrypted connections"
msgstr ""
-#: plugins/config/class_configInLdap.inc:203
+#: plugins/config/class_configInLdap.inc:197
msgid ""
"Enables PHP security checks to force encrypted access (https) to the web "
"interface."
msgstr ""
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:201
msgid "Warn if session is not encrypted"
msgstr ""
-#: plugins/config/class_configInLdap.inc:208
+#: plugins/config/class_configInLdap.inc:202
msgid "will display a warning to the user when http is used instead of https."
msgstr ""
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Session lifetime"
msgstr ""
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Defines when a session will expire in seconds."
msgstr ""
-#: plugins/config/class_configInLdap.inc:220
+#: plugins/config/class_configInLdap.inc:212
+msgid "HTTP authentication"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:212
+msgid "Use HTTP authentication protocol instead of the login form."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:219
#: include/class_SnapshotDialogs.inc:186
msgid "Snapshots"
msgstr ""
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid "Enable snapshots"
msgstr ""
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid ""
"This enables you to save certain states of entries and restore them later on."
msgstr ""
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
msgid "Snapshot base"
msgstr ""
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
msgid "The base where snapshots should be stored inside of the LDAP."
msgstr ""
-#: plugins/config/class_configInLdap.inc:235
+#: plugins/config/class_configInLdap.inc:234
msgid "SSL"
msgstr ""
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Key path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Path to FusionDirectory private key. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Certificate path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Path to FusionDirectory certificate. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:262
msgid "CA certificate path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:247
msgid "Path to the CA certificate. Used for validating Argonaut Server host."
msgstr ""
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:254
msgid "CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "Enable CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "CAS login will be used instead of LDAP bind"
msgstr ""
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:262
msgid "Path to the CA certificate of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host"
msgstr ""
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port"
msgstr ""
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port the CAS server is listening on"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context to be used"
msgstr ""
-#: plugins/config/class_configInLdap.inc:285
+#: plugins/config/class_configInLdap.inc:284
msgid "People and group storage"
msgstr ""
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "People DN attribute"
msgstr ""
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "Attribute to use at the beginning of users dn"
msgstr ""
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "CN pattern"
msgstr ""
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "The pattern to use to build the common name field"
msgstr ""
-#: plugins/config/class_configInLdap.inc:299
+#: plugins/config/class_configInLdap.inc:298
msgid "Strict naming policy"
msgstr ""
-#: plugins/config/class_configInLdap.inc:300
+#: plugins/config/class_configInLdap.inc:299
msgid "Enables strict checking of user and group names"
msgstr ""
-#: plugins/config/class_configInLdap.inc:305
+#: plugins/config/class_configInLdap.inc:304
msgid "Group/user min id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:306
+#: plugins/config/class_configInLdap.inc:305
msgid ""
"The minimum assignable user or group id to avoid security leaks with id 0 "
"accounts."
msgstr ""
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid "Next id hook"
msgstr ""
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid ""
"A script to be called for finding the next free id number for users or "
"groups."
msgstr ""
-#: plugins/config/class_configInLdap.inc:315
+#: plugins/config/class_configInLdap.inc:314
msgid "Base number for user id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:315
msgid "Where to start looking for a new free user id."
msgstr ""
-#: plugins/config/class_configInLdap.inc:321
+#: plugins/config/class_configInLdap.inc:320
msgid "Base number for group id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:321
msgid "Where to start looking for a new free group id."
msgstr ""
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "Users RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "The branch where users are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "Groups RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "The branch where groups are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "ACL role RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "The branch where ACL roles are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Id allocation method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Method to allocate user/group ids"
msgstr ""
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Traditional"
msgstr ""
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Samba unix id pool"
msgstr ""
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Pool user id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Minimum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Pool user id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Maximum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Pool group id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Minimum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Pool group id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Maximum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:370
-msgid "Debugging"
+#: plugins/config/class_configInLdap.inc:367
+msgid "Restrict role members"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:367
+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:373
+msgid "Debugging"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:376
msgid "Display errors"
msgstr ""
-#: plugins/config/class_configInLdap.inc:374
+#: plugins/config/class_configInLdap.inc:377
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:378
+#: plugins/config/class_configInLdap.inc:381
msgid "Maximum LDAP query time"
msgstr ""
-#: plugins/config/class_configInLdap.inc:378
+#: plugins/config/class_configInLdap.inc:381
msgid ""
"Stop LDAP actions if there is no answer within the specified number of "
"seconds."
msgstr ""
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:386
msgid "Log LDAP statistics"
msgstr ""
-#: plugins/config/class_configInLdap.inc:384
+#: plugins/config/class_configInLdap.inc:387
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:389
+#: plugins/config/class_configInLdap.inc:392
msgid "Debug level"
msgstr ""
-#: plugins/config/class_configInLdap.inc:390
+#: plugins/config/class_configInLdap.inc:393
msgid "Display certain information on each page load."
msgstr ""
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:405
msgid "Miscellaneous"
msgstr ""
-#: plugins/config/class_configInLdap.inc:407
+#: plugins/config/class_configInLdap.inc:410
msgid "Hooks that are called when specific actions happens"
msgstr ""
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "tab"
msgstr ""
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "The tab that this hook concerns"
msgstr ""
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "mode"
msgstr ""
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "When to call this command"
msgstr ""
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "cmd"
msgstr ""
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "The command that will be called"
msgstr ""
-#: plugins/config/class_configInLdap.inc:429
+#: plugins/config/class_configInLdap.inc:432
msgid "Hooks"
msgstr ""
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:439
msgid "Display hook output"
msgstr ""
-#: plugins/config/class_configInLdap.inc:437
+#: plugins/config/class_configInLdap.inc:440
msgid ""
"When enabled successful hook execution output is displayed to the user using "
"a dialog."
msgstr ""
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available shells"
msgstr ""
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available POSIX shells for FD users."
msgstr ""
-#: plugins/config/class_configInLdap.inc:449
+#: plugins/config/class_configInLdap.inc:452
msgid "Show ACL tab on all objects"
msgstr ""
-#: plugins/config/class_configInLdap.inc:450
+#: plugins/config/class_configInLdap.inc:453
msgid ""
"For very specific ACL rights setting where you might need to give right on a "
"single object."
msgstr ""
-#: plugins/config/class_configInLdap.inc:464
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available department categories"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available categories in the departments dropdown"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:474
#: setup/class_setupStep_Language.inc:69
msgid "Automatic"
msgstr ""
@@ -1911,80 +1956,80 @@ msgstr ""
msgid "Password recovery settings"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:44
+#: plugins/config/class_recoveryConfig.inc:45
msgid "Activate password recovery"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:45
+#: plugins/config/class_recoveryConfig.inc:46
msgid "Whether to activate or not password recovery feature"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:50
+#: plugins/config/class_recoveryConfig.inc:51
msgid "Sender email address"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:51
+#: plugins/config/class_recoveryConfig.inc:52
msgid "Email address from which mails will be sent"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:57
+#: plugins/config/class_recoveryConfig.inc:58
msgid "Link validity (minutes)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:58
+#: plugins/config/class_recoveryConfig.inc:59
msgid "Number of minutes before a recovery link expires"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:64
+#: plugins/config/class_recoveryConfig.inc:65
msgid "Salt for tokens"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:65
+#: plugins/config/class_recoveryConfig.inc:66
msgid ""
"Just a security measure, you can put anything in there, even random "
"characters"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:71
+#: plugins/config/class_recoveryConfig.inc:72
msgid "Allow the use of alternate addresses"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:72
+#: plugins/config/class_recoveryConfig.inc:73
msgid ""
"Users will also be able to enter one of theirs alternate addresses to "
"recover their password"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:79
+#: plugins/config/class_recoveryConfig.inc:80
msgid "First email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:82
-#: plugins/config/class_recoveryConfig.inc:101
+#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:102
msgid "Subject"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:84
msgid "Subject of the first email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:86
+#: plugins/config/class_recoveryConfig.inc:87
msgid "[FusionDirectory] Password recovery link"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:89
+#: plugins/config/class_recoveryConfig.inc:90
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:91
#, 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 ""
-#: plugins/config/class_recoveryConfig.inc:93
+#: plugins/config/class_recoveryConfig.inc:94
#, php-format
msgid ""
"Hello,\n"
@@ -1996,31 +2041,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:98
+#: plugins/config/class_recoveryConfig.inc:99
msgid "Second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:103
msgid "Subject of the second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:105
+#: plugins/config/class_recoveryConfig.inc:106
msgid "[FusionDirectory] Password recovery successful"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:108
+#: plugins/config/class_recoveryConfig.inc:109
#, php-format
msgid "Body (%s is login)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:110
#, php-format
msgid ""
"Body of the second email, sent to confirm the password has been changed. Use "
"%s for the user login."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:112
+#: plugins/config/class_recoveryConfig.inc:113
#, php-format
msgid ""
"Hello,\n"
@@ -2088,13 +2133,13 @@ msgstr ""
msgid "Down"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2633
-#: include/simpleplugin/class_attribute.inc:2634
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
+#: include/simpleplugin/class_attribute.inc:2648
msgid "Sort up"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2646
-#: include/simpleplugin/class_attribute.inc:2647
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
+#: include/simpleplugin/class_attribute.inc:2661
msgid "Sort down"
msgstr ""
@@ -2106,27 +2151,26 @@ msgstr ""
#: include/class_config.inc:479 include/class_msgPool.inc:215
#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3106
-#: include/functions.inc:3127 include/functions.inc:3157
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197 include/functions.inc:3259
+#: include/class_msgPool.inc:740 include/functions.inc:3107
+#: include/functions.inc:3128 include/functions.inc:3158
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3260
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1663 include/class_CopyPasteHandler.inc:278
-#: include/simpleplugin/class_dialogAttributes.inc:733
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
-#: include/simpleplugin/class_attribute.inc:1774
-#: include/simpleplugin/class_attribute.inc:1877
-#: include/simpleplugin/class_attribute.inc:1879
+#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
+#: include/simpleplugin/class_attribute.inc:1784
+#: include/simpleplugin/class_attribute.inc:1887
+#: include/simpleplugin/class_attribute.inc:1889
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: 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:437
#: include/password-methods/class_password-methods.inc:447
-#: include/class_SnapshotHandler.inc:415 html/index.php:434 html/index.php:444
+#: include/class_SnapshotHandler.inc:415 html/index.php:473 html/index.php:483
#: setup/class_setupStep_Migrate.inc:935
#: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
msgid "Error"
@@ -2165,44 +2209,44 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: include/class_listing.inc:1586 include/class_listing.inc:1640
+#: include/class_listing.inc:1590 include/class_listing.inc:1644
msgid "Copy"
msgstr ""
-#: include/class_listing.inc:1592 include/class_listing.inc:1628
+#: include/class_listing.inc:1596 include/class_listing.inc:1632
msgid "Cut"
msgstr ""
-#: include/class_listing.inc:1600 include/class_listing.inc:1602
+#: include/class_listing.inc:1604 include/class_listing.inc:1606
#: include/class_CopyPasteHandler.inc:370
msgid "Paste"
msgstr ""
-#: include/class_listing.inc:1628
+#: include/class_listing.inc:1632
msgid "Cut this entry"
msgstr ""
-#: include/class_listing.inc:1640
+#: include/class_listing.inc:1644
msgid "Copy this entry"
msgstr ""
-#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_listing.inc:1677 include/class_listing.inc:1679
msgid "Restore snapshots"
msgstr ""
-#: include/class_listing.inc:1689
+#: include/class_listing.inc:1693
msgid "Export list"
msgstr ""
-#: include/class_listing.inc:1724 include/class_listing.inc:1725
+#: include/class_listing.inc:1728 include/class_listing.inc:1729
msgid "Restore snapshot"
msgstr ""
-#: include/class_listing.inc:1734
+#: include/class_listing.inc:1738
msgid "Create snapshot"
msgstr ""
-#: include/class_listing.inc:1735
+#: include/class_listing.inc:1739
msgid "Create a new snapshot from this object"
msgstr ""
@@ -2245,7 +2289,7 @@ msgid "XML error in fusiondirectory.conf: %s at line %d"
msgstr ""
#: include/class_config.inc:162 include/class_config.inc:300
-#: include/class_config.inc:985 include/class_config.inc:998
+#: include/class_config.inc:915 include/class_config.inc:928
#: include/functions.inc:663 include/class_timezone.inc:51
#: include/password-methods/class_password-methods-sha.inc:71
#: include/password-methods/class_password-methods-ssha.inc:75
@@ -2262,17 +2306,17 @@ msgid ""
"passwords are not encrypted."
msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:917
-#: include/class_ldap.inc:1371 include/functions.inc:526
+#: include/class_config.inc:337 include/class_ldap.inc:918
+#: include/class_ldap.inc:1372 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2985 include/simpleplugin/class_simplePlugin.inc:545
-#: include/simpleplugin/class_attribute.inc:2895
+#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2909
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
#: include/class_SnapshotHandler.inc:422 include/class_SnapshotHandler.inc:425
-#: html/index.php:360 html/class_passwordRecovery.inc:497
+#: html/index.php:369 html/class_passwordRecovery.inc:497
#: setup/class_setupStep_Migrate.inc:451
#: setup/class_setupStep_Migrate.inc:1130
msgid "LDAP error"
@@ -2287,38 +2331,38 @@ msgstr ""
msgid "The selected mail method (class %s) is not available"
msgstr ""
-#: include/class_config.inc:986
+#: include/class_config.inc:916
#, php-format
msgid ""
"The snapshot functionality is enabled, but the required variable '%s' is not "
"set."
msgstr ""
-#: include/class_config.inc:999
+#: include/class_config.inc:929
#, php-format
msgid ""
"The snapshot functionality is enabled, but the required compression module "
"is missing. Please install '%s'."
msgstr ""
-#: include/class_config.inc:1104
+#: include/class_config.inc:1034
msgid "All categories"
msgstr ""
-#: include/class_config.inc:1231
+#: include/class_config.inc:1161
msgid "My account"
msgstr ""
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
msgid "Performance warning"
msgstr ""
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
#, php-format
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr ""
-#: include/class_ldap.inc:868 include/class_ldap.inc:904
+#: include/class_ldap.inc:869 include/class_ldap.inc:905
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
@@ -2328,39 +2372,39 @@ msgstr ""
msgid "Internal error"
msgstr ""
-#: include/class_ldap.inc:868
+#: include/class_ldap.inc:869
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:904
+#: include/class_ldap.inc:905
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1016
+#: include/class_ldap.inc:1017
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr ""
-#: include/class_ldap.inc:1018
+#: include/class_ldap.inc:1019
#, php-format
msgid "while operating on LDAP server %s"
msgstr ""
-#: include/class_ldap.inc:1108
+#: include/class_ldap.inc:1109
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1220
+#: include/class_ldap.inc:1221
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
"in line %s"
msgstr ""
-#: include/class_ldap.inc:1231
+#: include/class_ldap.inc:1232
#, php-format
msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
msgstr ""
@@ -2945,10 +2989,10 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr ""
-#: include/functions.inc:496 include/functions.inc:3294
-#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:263
-#: include/simpleplugin/class_simplePlugin.inc:268
-#: include/simpleplugin/class_simplePlugin.inc:280
+#: include/functions.inc:496 include/functions.inc:3295
+#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
+#: include/simpleplugin/class_simplePlugin.inc:269
+#: include/simpleplugin/class_simplePlugin.inc:281
#: html/class_passwordRecovery.inc:216
msgid "Fatal error"
msgstr ""
@@ -3101,97 +3145,97 @@ msgstr ""
msgid "Cannot read to revision file!"
msgstr ""
-#: include/functions.inc:2548
+#: include/functions.inc:2549
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "LDAP warning"
msgstr ""
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "Cannot get schema information from server. No schema check possible!"
msgstr ""
-#: include/functions.inc:2584
+#: include/functions.inc:2585
msgid ""
"Used to lock currently edited entries to avoid multiple changes at the same "
"time."
msgstr ""
-#: include/functions.inc:2596
+#: include/functions.inc:2597
#, php-format
msgid "Missing required object class '%s'!"
msgstr ""
-#: include/functions.inc:2599
+#: include/functions.inc:2600
#, php-format
msgid "Missing optional object class '%s'!"
msgstr ""
-#: include/functions.inc:2603
+#: include/functions.inc:2604
#, php-format
msgid "Class(es) available"
msgstr ""
-#: include/functions.inc:2623
+#: include/functions.inc:2624
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2625
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2628
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2629
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3106 include/functions.inc:3127
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3106
+#: include/functions.inc:3107
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3127
+#: include/functions.inc:3128
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3157
+#: include/functions.inc:3158
msgid "Cannot create sambaUnixIdPool entry!"
msgstr ""
-#: include/functions.inc:3165
+#: include/functions.inc:3166
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3177 include/functions.inc:3181
+#: include/functions.inc:3178 include/functions.inc:3182
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3197
+#: include/functions.inc:3198
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3259
+#: include/functions.inc:3260
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3295
+#: include/functions.inc:3296
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
@@ -3347,13 +3391,13 @@ msgstr ""
msgid "XML error"
msgstr ""
-#: include/class_plugin.inc:554
+#: include/class_plugin.inc:553
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/class_plugin.inc:1466
+#: include/class_plugin.inc:1467
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -3379,32 +3423,32 @@ msgstr ""
msgid "This is the name of the template"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:263
+#: include/simpleplugin/class_simplePlugin.inc:264
msgid "Only main tab can compute dn"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:270
+#: include/simpleplugin/class_simplePlugin.inc:271
#, php-format
msgid "Could not compute dn: no parent tab class for \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:282
+#: include/simpleplugin/class_simplePlugin.inc:283
#, php-format
msgid ""
"Could not compute dn: could not find objectType infos from tab class \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:638
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:644
+#: include/simpleplugin/class_simplePlugin.inc:652
msgid "Error when saving"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:638
+#: include/simpleplugin/class_simplePlugin.inc:644
#, php-format
msgid "There is already an entry with the same dn : %s"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:652
#, php-format
msgid "The entry %s is not existing"
msgstr ""
@@ -3424,27 +3468,27 @@ msgstr ""
msgid "Show %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:409
+#: include/simpleplugin/class_dialogAttributes.inc:415
#, php-format
msgid "Group %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:411
+#: include/simpleplugin/class_dialogAttributes.inc:417
#, php-format
msgid "Role %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:446
+#: include/simpleplugin/class_dialogAttributes.inc:452
msgid "Group of user"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:615
+#: include/simpleplugin/class_dialogAttributes.inc:621
#: include/simpleplugin/class_attribute.inc:1090
#: include/simpleplugin/class_attribute.inc:1124
msgid "None"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:617
+#: include/simpleplugin/class_dialogAttributes.inc:623
msgid "Unknown"
msgstr ""
@@ -3485,11 +3529,17 @@ msgid "days"
msgstr ""
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2161
+#: include/simpleplugin/class_attribute.inc:2171
#, php-format
msgid "%s (required)"
msgstr ""
+#: include/simpleplugin/class_attribute.inc:1150
+#, php-format
+msgid ""
+"The value \"%s\" for field \"%s\" is not in the list of possible choices"
+msgstr ""
+
#: include/simpleplugin/class_attribute.inc:1277
#, php-format
msgid "An integer between %d and %d"
@@ -3505,75 +3555,75 @@ msgstr ""
msgid "An integer smaller than %d"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1379
+#: include/simpleplugin/class_attribute.inc:1383
#, php-format
msgid "A float between %f and %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1381
+#: include/simpleplugin/class_attribute.inc:1385
#, php-format
msgid "A float larger than %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1383
+#: include/simpleplugin/class_attribute.inc:1387
#, php-format
msgid "A float smaller than %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1490
+#: include/simpleplugin/class_attribute.inc:1500
msgid "Error, incorrect date: "
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
#, php-format
msgid "Cannot read uploaded file: %s"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1530
+#: include/simpleplugin/class_attribute.inc:1540
msgid "file is empty"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1533
+#: include/simpleplugin/class_attribute.inc:1543
msgid "file not found"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1546
msgid "file not readable"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1569
+#: include/simpleplugin/class_attribute.inc:1579
#, php-format
msgid "%s (%d bytes)"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1616
-#: include/simpleplugin/class_attribute.inc:1793
+#: include/simpleplugin/class_attribute.inc:1626
+#: include/simpleplugin/class_attribute.inc:1803
msgid "Upload"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1621
-#: include/simpleplugin/class_attribute.inc:1622
+#: include/simpleplugin/class_attribute.inc:1631
+#: include/simpleplugin/class_attribute.inc:1632
msgid "Download"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1775
+#: include/simpleplugin/class_attribute.inc:1785
msgid ""
"Cannot save user picture, FusionDirectory requires the package 'php5-"
"imagick' to be installed!"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1826
+#: include/simpleplugin/class_attribute.inc:1836
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1829
+#: include/simpleplugin/class_attribute.inc:1839
msgid "Object base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:2755
+#: include/simpleplugin/class_attribute.inc:2769
#, php-format
msgid "Invalid value for %s"
msgstr ""
@@ -3708,17 +3758,17 @@ msgstr ""
msgid "Account locked. Please contact your system administrator!"
msgstr ""
-#: html/index.php:436
+#: html/index.php:475
#, php-format
msgid "CAS user \"%s\" could not be found in the LDAP"
msgstr ""
-#: html/index.php:446
+#: html/index.php:485
#, php-format
msgid "CAS user \"%s\" match several users in the LDAP"
msgstr ""
-#: html/index.php:481
+#: html/index.php:522
msgid ""
"Your browser has cookies disabled. Please enable cookies and reload this "
"page before logging in!"
@@ -4041,7 +4091,7 @@ msgid "Checking for duplicated UID numbers"
msgstr ""
#: setup/class_setupStep_Migrate.inc:267
-msgid "Checking for duplicate GID numbers"
+msgid "Checking for duplicated GID numbers"
msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:487
@@ -4051,7 +4101,7 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:1179
#: setup/class_setupStep_Migrate.inc:1272
#: setup/class_setupStep_Migrate.inc:1351
-#: setup/class_setupStep_Migrate.inc:1390
+#: setup/class_setupStep_Migrate.inc:1395
msgid "LDAP query failed"
msgstr ""
@@ -4062,7 +4112,7 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:1180
#: setup/class_setupStep_Migrate.inc:1273
#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1391
+#: setup/class_setupStep_Migrate.inc:1396
msgid "Possibly the \"root object\" is missing."
msgstr ""
@@ -4219,14 +4269,14 @@ msgstr ""
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1373
+#: setup/class_setupStep_Migrate.inc:1378
#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\"."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1412
+#: setup/class_setupStep_Migrate.inc:1422
#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\"."
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
diff --git a/locale/es/fusiondirectory.po b/locale/es/fusiondirectory.po
index 73bc68e9635f5223ea9611b15207fbc370be748f..fb254145efcae73b2775d6c07d9c20eebad65bf5 100644
--- a/locale/es/fusiondirectory.po
+++ b/locale/es/fusiondirectory.po
@@ -5,12 +5,12 @@
# Translators:
msgid ""
msgstr ""
-"Project-Id-Version: FusionDirectory-109\n"
+"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-01-22 11:26+0100\n"
-"PO-Revision-Date: 2016-01-22 10:24+0000\n"
+"POT-Creation-Date: 2016-03-14 12:07+0100\n"
+"PO-Revision-Date: 2016-03-07 12:09+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-109/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -28,31 +28,31 @@ msgstr "¡Bienvenido %s!"
msgid "References"
msgstr "Referencias"
-#: plugins/admin/groups/class_roleGeneric.inc:30
-#: plugins/admin/groups/class_roleGeneric.inc:34
+#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:61
#: plugins/admin/groups/class_groupManagement.inc:71
#: plugins/admin/aclrole/class_aclRole.inc:78
#: plugins/admin/acl/class_aclAssignment.inc:49
msgid "Role"
msgstr "Rol"
-#: plugins/admin/groups/class_roleGeneric.inc:31
+#: plugins/admin/groups/class_roleGeneric.inc:58
msgid "Role information"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:35
+#: plugins/admin/groups/class_roleGeneric.inc:62
msgid "Organizational role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:84
msgid "Informations"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:158
+#: plugins/admin/departments/class_department.inc:174
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -62,13 +62,13 @@ msgstr ""
msgid "Name"
msgstr "Nombre"
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
msgid "Name of this group"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
#: plugins/admin/groups/class_group.inc:66
#: plugins/admin/groups/class_ogroup.inc:192
#: plugins/admin/groups/group-list.xml:41
@@ -81,26 +81,26 @@ msgstr ""
msgid "Description"
msgstr "Descripción"
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
msgid "Description of the role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:70
+#: plugins/admin/groups/class_roleGeneric.inc:97
msgid "Phone number"
msgstr "Número de teléfono"
-#: plugins/admin/groups/class_roleGeneric.inc:74
+#: plugins/admin/groups/class_roleGeneric.inc:101
msgid "Fax number"
msgstr "Número de Fax"
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
#: plugins/admin/users/class_userManagement.inc:42
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: setup/class_setupStep_Migrate.inc:871
msgid "Users"
msgstr "Usuarios"
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
msgid "Add users for the role"
msgstr ""
@@ -147,7 +147,7 @@ msgstr ""
#: plugins/admin/groups/class_group.inc:74
#: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:403
+#: plugins/personal/posix/class_posixAccount.inc:410
msgid "GID"
msgstr "GID"
@@ -204,23 +204,23 @@ msgid "Only allow this group to connect to this list of hosts"
msgstr ""
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458 include/functions.inc:794
-#: include/functions.inc:2548 include/class_xml.inc:55
+#: plugins/personal/posix/class_posixAccount.inc:465 include/functions.inc:794
+#: include/functions.inc:2549 include/class_xml.inc:55
#: include/simpleplugin/class_simpleTabs.inc:325 html/index.php:56
-#: html/index.php:62 html/index.php:481 html/class_passwordRecovery.inc:378
+#: html/index.php:62 html/index.php:522 html/class_passwordRecovery.inc:378
#: setup/class_setupStep_Migrate.inc:572
#: setup/class_setupStep_Migrate.inc:1083
#: setup/class_setupStep_Migrate.inc:1202
#: setup/class_setupStep_Migrate.inc:1313
-#: setup/class_setupStep_Migrate.inc:1372
-#: setup/class_setupStep_Migrate.inc:1411 plugins/admin/acl/remove.tpl.c:2
+#: setup/class_setupStep_Migrate.inc:1377
+#: setup/class_setupStep_Migrate.inc:1421 plugins/admin/acl/remove.tpl.c:2
#: ihtml/themes/default/islocked.tpl.c:5 ihtml/themes/default/remove.tpl.c:2
#: ihtml/themes/default/msg_dialog.tpl.c:5 setup/setup_checks.tpl.c:8
msgid "Warning"
msgstr "Aviso"
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458
+#: plugins/personal/posix/class_posixAccount.inc:465
msgid "Timeout while waiting for lock. Ignoring lock!"
msgstr "Tiempo de espera agotado esperando un bloqueo. ¡Ignorando bloqueo!"
@@ -250,7 +250,7 @@ msgstr "Objetos miembros"
msgid "Objects member of this group"
msgstr ""
-#: plugins/admin/groups/class_ogroup.inc:318
+#: plugins/admin/groups/class_ogroup.inc:313
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
@@ -279,10 +279,10 @@ msgstr "Crear"
#: plugins/admin/departments/dep-list.xml:79
#: plugins/admin/users/user-list.xml:105
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-#: include/simpleplugin/class_dialogAttributes.inc:626
-#: include/simpleplugin/class_dialogAttributes.inc:627
-#: include/simpleplugin/class_attribute.inc:2661
-#: include/simpleplugin/class_attribute.inc:2662
+#: include/simpleplugin/class_dialogAttributes.inc:632
+#: include/simpleplugin/class_dialogAttributes.inc:633
+#: include/simpleplugin/class_attribute.inc:2675
+#: include/simpleplugin/class_attribute.inc:2676
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -293,8 +293,8 @@ msgstr "Editar"
#: plugins/admin/departments/dep-list.xml:67
#: plugins/admin/departments/dep-list.xml:88
#: plugins/admin/users/user-list.xml:112
-#: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_dialogAttributes.inc:637
+#: include/simpleplugin/class_dialogAttributes.inc:642
+#: include/simpleplugin/class_dialogAttributes.inc:643
#: include/simpleplugin/simple-list.xml:75
#: include/simpleplugin/simple-list.xml:125
msgid "Remove"
@@ -343,7 +343,7 @@ msgid "Show application groups"
msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Show department groups"
+msgid "Show unidentified groups"
msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:137
@@ -432,51 +432,67 @@ msgid "Category of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:81
+msgid "Website"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:81
+#, php-format
+msgid "Website of this %s"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:85
#: plugins/personal/generic/class_user.inc:410
msgid "Manager"
msgstr "Gestor"
-#: plugins/admin/departments/class_department.inc:81
+#: plugins/admin/departments/class_department.inc:85
#, php-format
msgid "Manager of this %s"
msgstr ""
-#: plugins/admin/departments/class_department.inc:87
-#: plugins/admin/departments/class_department.inc:93
+#: plugins/admin/departments/class_department.inc:91
+#: plugins/admin/departments/class_department.inc:97
#: plugins/personal/generic/class_user.inc:304
msgid "Location"
msgstr "Localización"
-#: plugins/admin/departments/class_department.inc:90
+#: plugins/admin/departments/class_department.inc:94
#: plugins/personal/generic/class_user.inc:308
msgid "State"
msgstr "Provincia"
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_country.inc:29
+#: plugins/admin/departments/class_country.inc:30
+#: plugins/admin/departments/class_country.inc:33
+msgid "Country"
+msgstr "PaÃs"
+
+#: plugins/admin/departments/class_department.inc:103
#: plugins/personal/generic/class_user.inc:312
msgid "Address"
msgstr "Dirección"
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:103
#, php-format
msgid "A postal address for this %s"
msgstr ""
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
#: plugins/personal/generic/class_user.inc:320
msgid "Phone"
msgstr "Teléfono"
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
msgid "Telephone number"
msgstr "Número de teléfono"
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
#: plugins/personal/generic/class_user.inc:332
msgid "Fax"
msgstr "Fax"
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
msgid "Facsimile telephone number"
msgstr ""
@@ -504,12 +520,6 @@ msgstr "Localidad"
msgid "locality"
msgstr ""
-#: plugins/admin/departments/class_country.inc:29
-#: plugins/admin/departments/class_country.inc:30
-#: plugins/admin/departments/class_country.inc:33
-msgid "Country"
-msgstr "PaÃs"
-
#: plugins/admin/departments/class_country.inc:50
msgid "country"
msgstr ""
@@ -552,7 +562,8 @@ msgid "Given name"
msgstr "Nombre de pila"
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
+#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
msgid "Login"
@@ -665,8 +676,8 @@ msgid "Edit category ACL"
msgstr "Editar la categorÃa ACL"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2671
-#: include/simpleplugin/class_attribute.inc:2672
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
+#: include/simpleplugin/class_attribute.inc:2686
#, php-format
msgid "Delete"
msgstr "Eliminar"
@@ -771,19 +782,37 @@ msgstr ""
msgid "ACLs which are part of this group"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:38
+#: plugins/admin/acl/class_aclManagement.inc:31
+#: plugins/admin/acl/class_aclManagement.inc:32
+#: plugins/admin/acl/class_aclManagement.inc:45
+msgid "ACL assignment creation"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:33
+msgid "Create an ACL assignment on an arbitrary dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "Dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "DN you wish to add assignments for"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:135
msgid "ACL assignments"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:39
+#: plugins/admin/acl/class_aclManagement.inc:136
msgid "ACL assignments management"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:40
+#: plugins/admin/acl/class_aclManagement.inc:137
msgid "Manage ACL roles assignments to users"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:78
+#: plugins/admin/acl/class_aclManagement.inc:199
#: plugins/admin/acl/class_aclAssignment.inc:263
msgid "ACL Assignment"
msgstr "Asignación de ACL"
@@ -899,7 +928,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -994,59 +1023,59 @@ msgstr ""
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:336
+msgid "Homepage"
+msgstr "Página Web"
+
+#: plugins/personal/generic/class_user.inc:336
+msgid "Personal homepage"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:342
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:351
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr "Idioma preferido"
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:362
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
msgid "Display name"
msgstr "Nombre a Mostrar"
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home postal address"
msgstr "Dirección Postal personal"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:374
msgid "Private phone"
msgstr "Teléfono privado"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:374
msgid "Home phone number"
msgstr "Número de teléfono personal"
-#: plugins/personal/generic/class_user.inc:374
-msgid "Homepage"
-msgstr "Página Web"
-
-#: plugins/personal/generic/class_user.inc:374
-msgid "Personal homepage"
-msgstr ""
-
#: plugins/personal/generic/class_user.inc:380
msgid "Organizational information"
msgstr "Información corporativa"
@@ -1279,33 +1308,33 @@ msgstr "Sin configurar"
msgid "automatic"
msgstr "automático"
-#: plugins/personal/posix/class_posixAccount.inc:309
+#: plugins/personal/posix/class_posixAccount.inc:310
msgid "expired"
msgstr "expiró"
-#: plugins/personal/posix/class_posixAccount.inc:311
+#: plugins/personal/posix/class_posixAccount.inc:312
msgid "grace time active"
msgstr "Periodo de gracia activado"
-#: plugins/personal/posix/class_posixAccount.inc:314
-#: plugins/personal/posix/class_posixAccount.inc:316
-#: plugins/personal/posix/class_posixAccount.inc:318
+#: plugins/personal/posix/class_posixAccount.inc:315
+#: plugins/personal/posix/class_posixAccount.inc:317
+#: plugins/personal/posix/class_posixAccount.inc:319
msgid "active"
msgstr "activo"
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:315
msgid "password expired"
msgstr "la contraseña expiró"
-#: plugins/personal/posix/class_posixAccount.inc:316
+#: plugins/personal/posix/class_posixAccount.inc:317
msgid "password not changeable"
msgstr "no puede cambiar la contraseña"
-#: plugins/personal/posix/class_posixAccount.inc:400
+#: plugins/personal/posix/class_posixAccount.inc:407
msgid "UID"
msgstr "UID"
-#: plugins/personal/posix/class_posixAccount.inc:516
+#: plugins/personal/posix/class_posixAccount.inc:525
#, php-format
msgid "Group of user %s"
msgstr ""
@@ -1477,424 +1506,440 @@ msgid "Core settings"
msgstr ""
#: plugins/config/class_configInLdap.inc:161
-msgid "Enable primary group filter"
-msgstr "Activar filtro de grupo primario"
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"It is time consuming to evaluate which groups are primary and which are not,"
-" so you may want to disable it if your group plugin is slow."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:167
msgid "Display summary in listings"
msgstr "Mostrar resumen en listados"
-#: plugins/config/class_configInLdap.inc:168
+#: 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:173
+#: plugins/config/class_configInLdap.inc:167
msgid "Edit locking"
msgstr ""
-#: plugins/config/class_configInLdap.inc:174
+#: 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:179
+#: plugins/config/class_configInLdap.inc:173
msgid "Enable logging"
msgstr ""
-#: plugins/config/class_configInLdap.inc:180
+#: plugins/config/class_configInLdap.inc:174
msgid "Event logging on FusionDirectory side."
msgstr ""
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "LDAP size limit"
msgstr ""
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "Defines the number of entries to get from LDAP by default."
msgstr ""
-#: plugins/config/class_configInLdap.inc:192
+#: plugins/config/class_configInLdap.inc:186
msgid "Login and session"
msgstr "Inicio y sesión"
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:189
msgid "Login attribute"
msgstr "Atributo de inicio de sesión"
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:190
msgid "Which LDAP attribute should be used as the login name during login."
msgstr ""
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:196
msgid "Enforce encrypted connections"
msgstr "Forzar conexiones seguras"
-#: plugins/config/class_configInLdap.inc:203
+#: plugins/config/class_configInLdap.inc:197
msgid ""
"Enables PHP security checks to force encrypted access (https) to the web "
"interface."
msgstr ""
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:201
msgid "Warn if session is not encrypted"
msgstr "Avisar si la sesión no esta codificada"
-#: plugins/config/class_configInLdap.inc:208
+#: plugins/config/class_configInLdap.inc:202
msgid "will display a warning to the user when http is used instead of https."
msgstr ""
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Session lifetime"
msgstr "Duración de sesiones."
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Defines when a session will expire in seconds."
msgstr ""
-#: plugins/config/class_configInLdap.inc:220
+#: plugins/config/class_configInLdap.inc:212
+msgid "HTTP authentication"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:212
+msgid "Use HTTP authentication protocol instead of the login form."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:219
#: include/class_SnapshotDialogs.inc:186
msgid "Snapshots"
msgstr ""
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid "Enable snapshots"
msgstr "Activar instantaneas"
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid ""
"This enables you to save certain states of entries and restore them later "
"on."
msgstr ""
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
msgid "Snapshot base"
msgstr "Base de instantaneas"
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
msgid "The base where snapshots should be stored inside of the LDAP."
msgstr ""
-#: plugins/config/class_configInLdap.inc:235
+#: plugins/config/class_configInLdap.inc:234
msgid "SSL"
msgstr ""
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Key path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Path to FusionDirectory private key. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Certificate path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Path to FusionDirectory certificate. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:262
msgid "CA certificate path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:247
msgid "Path to the CA certificate. Used for validating Argonaut Server host."
msgstr ""
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:254
msgid "CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "Enable CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "CAS login will be used instead of LDAP bind"
msgstr ""
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:262
msgid "Path to the CA certificate of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host"
msgstr "Nombre de equipo"
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port"
msgstr "Puerto"
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port the CAS server is listening on"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context to be used"
msgstr ""
-#: plugins/config/class_configInLdap.inc:285
+#: plugins/config/class_configInLdap.inc:284
msgid "People and group storage"
msgstr "Almacén de grupos y usuarios"
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "People DN attribute"
msgstr "Atributo 'dn' de los usuarios"
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "Attribute to use at the beginning of users dn"
msgstr ""
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "CN pattern"
msgstr ""
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "The pattern to use to build the common name field"
msgstr ""
-#: plugins/config/class_configInLdap.inc:299
+#: plugins/config/class_configInLdap.inc:298
msgid "Strict naming policy"
msgstr ""
-#: plugins/config/class_configInLdap.inc:300
+#: plugins/config/class_configInLdap.inc:299
msgid "Enables strict checking of user and group names"
msgstr ""
-#: plugins/config/class_configInLdap.inc:305
+#: plugins/config/class_configInLdap.inc:304
msgid "Group/user min id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:306
+#: plugins/config/class_configInLdap.inc:305
msgid ""
"The minimum assignable user or group id to avoid security leaks with id 0 "
"accounts."
msgstr ""
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid "Next id hook"
msgstr ""
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid ""
"A script to be called for finding the next free id number for users or "
"groups."
msgstr ""
-#: plugins/config/class_configInLdap.inc:315
+#: plugins/config/class_configInLdap.inc:314
msgid "Base number for user id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:315
msgid "Where to start looking for a new free user id."
msgstr ""
-#: plugins/config/class_configInLdap.inc:321
+#: plugins/config/class_configInLdap.inc:320
msgid "Base number for group id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:321
msgid "Where to start looking for a new free group id."
msgstr ""
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "Users RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "The branch where users are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "Groups RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "The branch where groups are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "ACL role RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "The branch where ACL roles are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Id allocation method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Method to allocate user/group ids"
msgstr ""
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Traditional"
msgstr ""
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Samba unix id pool"
msgstr ""
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Pool user id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Minimum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Pool user id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Maximum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Pool group id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Minimum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Pool group id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Maximum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:370
+#: plugins/config/class_configInLdap.inc:367
+msgid "Restrict role members"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:367
+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:373
msgid "Debugging"
msgstr "Depurando"
-#: plugins/config/class_configInLdap.inc:373
+#: plugins/config/class_configInLdap.inc:376
msgid "Display errors"
msgstr ""
-#: plugins/config/class_configInLdap.inc:374
+#: plugins/config/class_configInLdap.inc:377
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:378
+#: plugins/config/class_configInLdap.inc:381
msgid "Maximum LDAP query time"
msgstr "Tiempo de consulta máxima de LDAP"
-#: plugins/config/class_configInLdap.inc:378
+#: plugins/config/class_configInLdap.inc:381
msgid ""
"Stop LDAP actions if there is no answer within the specified number of "
"seconds."
msgstr ""
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:386
msgid "Log LDAP statistics"
msgstr "Registrar estadÃsticas LDAP"
-#: plugins/config/class_configInLdap.inc:384
+#: plugins/config/class_configInLdap.inc:387
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:389
+#: plugins/config/class_configInLdap.inc:392
msgid "Debug level"
msgstr "Nivel de depuración"
-#: plugins/config/class_configInLdap.inc:390
+#: plugins/config/class_configInLdap.inc:393
msgid "Display certain information on each page load."
msgstr ""
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:405
msgid "Miscellaneous"
msgstr "Varios"
-#: plugins/config/class_configInLdap.inc:407
+#: plugins/config/class_configInLdap.inc:410
msgid "Hooks that are called when specific actions happens"
msgstr ""
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "tab"
msgstr ""
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "The tab that this hook concerns"
msgstr ""
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "mode"
msgstr "Modo"
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "When to call this command"
msgstr ""
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "cmd"
msgstr ""
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "The command that will be called"
msgstr ""
-#: plugins/config/class_configInLdap.inc:429
+#: plugins/config/class_configInLdap.inc:432
msgid "Hooks"
msgstr "Métodos"
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:439
msgid "Display hook output"
msgstr ""
-#: plugins/config/class_configInLdap.inc:437
+#: plugins/config/class_configInLdap.inc:440
msgid ""
"When enabled successful hook execution output is displayed to the user using"
" a dialog."
msgstr ""
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available shells"
msgstr ""
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available POSIX shells for FD users."
msgstr ""
-#: plugins/config/class_configInLdap.inc:449
+#: plugins/config/class_configInLdap.inc:452
msgid "Show ACL tab on all objects"
msgstr ""
-#: plugins/config/class_configInLdap.inc:450
+#: plugins/config/class_configInLdap.inc:453
msgid ""
"For very specific ACL rights setting where you might need to give right on a"
" single object."
msgstr ""
-#: plugins/config/class_configInLdap.inc:464
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available department categories"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available categories in the departments dropdown"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:474
#: setup/class_setupStep_Language.inc:69
msgid "Automatic"
msgstr "Automatico"
@@ -1911,80 +1956,80 @@ msgstr ""
msgid "Password recovery settings"
msgstr "Opciones de recuperación de clave"
-#: plugins/config/class_recoveryConfig.inc:44
+#: plugins/config/class_recoveryConfig.inc:45
msgid "Activate password recovery"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:45
+#: plugins/config/class_recoveryConfig.inc:46
msgid "Whether to activate or not password recovery feature"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:50
+#: plugins/config/class_recoveryConfig.inc:51
msgid "Sender email address"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:51
+#: plugins/config/class_recoveryConfig.inc:52
msgid "Email address from which mails will be sent"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:57
+#: plugins/config/class_recoveryConfig.inc:58
msgid "Link validity (minutes)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:58
+#: plugins/config/class_recoveryConfig.inc:59
msgid "Number of minutes before a recovery link expires"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:64
+#: plugins/config/class_recoveryConfig.inc:65
msgid "Salt for tokens"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:65
+#: plugins/config/class_recoveryConfig.inc:66
msgid ""
"Just a security measure, you can put anything in there, even random "
"characters"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:71
+#: plugins/config/class_recoveryConfig.inc:72
msgid "Allow the use of alternate addresses"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:72
+#: plugins/config/class_recoveryConfig.inc:73
msgid ""
"Users will also be able to enter one of theirs alternate addresses to "
"recover their password"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:79
+#: plugins/config/class_recoveryConfig.inc:80
msgid "First email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:82
-#: plugins/config/class_recoveryConfig.inc:101
+#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:102
msgid "Subject"
msgstr "Asunto"
-#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:84
msgid "Subject of the first email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:86
+#: plugins/config/class_recoveryConfig.inc:87
msgid "[FusionDirectory] Password recovery link"
msgstr "[FusionDirectory] Enlace de recuperación de clave"
-#: plugins/config/class_recoveryConfig.inc:89
+#: plugins/config/class_recoveryConfig.inc:90
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:91
#, 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 ""
-#: plugins/config/class_recoveryConfig.inc:93
+#: plugins/config/class_recoveryConfig.inc:94
#, php-format
msgid ""
"Hello,\n"
@@ -1996,31 +2041,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr "Saludos,\nAquà están los datos solicitados:\n\n- Usuario: %s\n- Enlace: %s\n\nEl enlace solo es valido por 10 minutos."
-#: plugins/config/class_recoveryConfig.inc:98
+#: plugins/config/class_recoveryConfig.inc:99
msgid "Second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:103
msgid "Subject of the second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:105
+#: plugins/config/class_recoveryConfig.inc:106
msgid "[FusionDirectory] Password recovery successful"
msgstr "[FusionDirectory] Recuperación de clave realizada con exito"
-#: plugins/config/class_recoveryConfig.inc:108
+#: plugins/config/class_recoveryConfig.inc:109
#, php-format
msgid "Body (%s is login)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:110
#, php-format
msgid ""
"Body of the second email, sent to confirm the password has been changed. Use"
" %s for the user login."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:112
+#: plugins/config/class_recoveryConfig.inc:113
#, php-format
msgid ""
"Hello,\n"
@@ -2088,13 +2133,13 @@ msgstr "Arriba"
msgid "Down"
msgstr "Abajo"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2633
-#: include/simpleplugin/class_attribute.inc:2634
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
+#: include/simpleplugin/class_attribute.inc:2648
msgid "Sort up"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2646
-#: include/simpleplugin/class_attribute.inc:2647
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
+#: include/simpleplugin/class_attribute.inc:2661
msgid "Sort down"
msgstr ""
@@ -2106,27 +2151,26 @@ msgstr "Seleccione todos"
#: include/class_config.inc:479 include/class_msgPool.inc:215
#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3106
-#: include/functions.inc:3127 include/functions.inc:3157
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197 include/functions.inc:3259
+#: include/class_msgPool.inc:740 include/functions.inc:3107
+#: include/functions.inc:3128 include/functions.inc:3158
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3260
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1663 include/class_CopyPasteHandler.inc:278
-#: include/simpleplugin/class_dialogAttributes.inc:733
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
-#: include/simpleplugin/class_attribute.inc:1774
-#: include/simpleplugin/class_attribute.inc:1877
-#: include/simpleplugin/class_attribute.inc:1879
+#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
+#: include/simpleplugin/class_attribute.inc:1784
+#: include/simpleplugin/class_attribute.inc:1887
+#: include/simpleplugin/class_attribute.inc:1889
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: 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:437
#: include/password-methods/class_password-methods.inc:447
-#: include/class_SnapshotHandler.inc:415 html/index.php:434 html/index.php:444
+#: include/class_SnapshotHandler.inc:415 html/index.php:473 html/index.php:483
#: setup/class_setupStep_Migrate.inc:935
#: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
msgid "Error"
@@ -2165,44 +2209,44 @@ msgstr "Recargar lista"
msgid "Submit"
msgstr "Enviar"
-#: include/class_listing.inc:1586 include/class_listing.inc:1640
+#: include/class_listing.inc:1590 include/class_listing.inc:1644
msgid "Copy"
msgstr "Copiar"
-#: include/class_listing.inc:1592 include/class_listing.inc:1628
+#: include/class_listing.inc:1596 include/class_listing.inc:1632
msgid "Cut"
msgstr "Mover"
-#: include/class_listing.inc:1600 include/class_listing.inc:1602
+#: include/class_listing.inc:1604 include/class_listing.inc:1606
#: include/class_CopyPasteHandler.inc:370
msgid "Paste"
msgstr "Pegar"
-#: include/class_listing.inc:1628
+#: include/class_listing.inc:1632
msgid "Cut this entry"
msgstr "Mover esta entrada"
-#: include/class_listing.inc:1640
+#: include/class_listing.inc:1644
msgid "Copy this entry"
msgstr "Copiar esta entrada"
-#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_listing.inc:1677 include/class_listing.inc:1679
msgid "Restore snapshots"
msgstr "Recuperar instantánea"
-#: include/class_listing.inc:1689
+#: include/class_listing.inc:1693
msgid "Export list"
msgstr "Exportar lista"
-#: include/class_listing.inc:1724 include/class_listing.inc:1725
+#: include/class_listing.inc:1728 include/class_listing.inc:1729
msgid "Restore snapshot"
msgstr "Recuperar instantanea"
-#: include/class_listing.inc:1734
+#: include/class_listing.inc:1738
msgid "Create snapshot"
msgstr "Crear instantánea"
-#: include/class_listing.inc:1735
+#: include/class_listing.inc:1739
msgid "Create a new snapshot from this object"
msgstr "¡Crear una nueva instantánea de este objeto!"
@@ -2245,7 +2289,7 @@ 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:162 include/class_config.inc:300
-#: include/class_config.inc:985 include/class_config.inc:998
+#: include/class_config.inc:915 include/class_config.inc:928
#: include/functions.inc:663 include/class_timezone.inc:51
#: include/password-methods/class_password-methods-sha.inc:71
#: include/password-methods/class_password-methods-ssha.inc:75
@@ -2262,17 +2306,17 @@ msgid ""
"while your passwords are not encrypted."
msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:917
-#: include/class_ldap.inc:1371 include/functions.inc:526
+#: include/class_config.inc:337 include/class_ldap.inc:918
+#: include/class_ldap.inc:1372 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2985 include/simpleplugin/class_simplePlugin.inc:545
-#: include/simpleplugin/class_attribute.inc:2895
+#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2909
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
#: include/class_SnapshotHandler.inc:422 include/class_SnapshotHandler.inc:425
-#: html/index.php:360 html/class_passwordRecovery.inc:497
+#: html/index.php:369 html/class_passwordRecovery.inc:497
#: setup/class_setupStep_Migrate.inc:451
#: setup/class_setupStep_Migrate.inc:1130
msgid "LDAP error"
@@ -2287,38 +2331,38 @@ msgstr "No se puede conectar a LDAP: Por favor consulte con el administrador de
msgid "The selected mail method (class %s) is not available"
msgstr ""
-#: include/class_config.inc:986
+#: include/class_config.inc:916
#, 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."
-#: include/class_config.inc:999
+#: include/class_config.inc:929
#, 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'."
-#: include/class_config.inc:1104
+#: include/class_config.inc:1034
msgid "All categories"
msgstr "Todas las categorÃas"
-#: include/class_config.inc:1231
+#: include/class_config.inc:1161
msgid "My account"
msgstr "Mi cuenta"
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
msgid "Performance warning"
msgstr "Aviso e rendimiento"
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
#, 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:868 include/class_ldap.inc:904
+#: include/class_ldap.inc:869 include/class_ldap.inc:905
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
@@ -2328,39 +2372,39 @@ msgstr "El rendimiento LDAP es bajo: ¡la última consulta tardó sobre %.2fs!"
msgid "Internal error"
msgstr "error interno"
-#: include/class_ldap.inc:868
+#: include/class_ldap.inc:869
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:904
+#: include/class_ldap.inc:905
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1016
+#: include/class_ldap.inc:1017
#, 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:1018
+#: include/class_ldap.inc:1019
#, php-format
msgid "while operating on LDAP server %s"
msgstr "mientras operaba en el servidor LDAP '%s'"
-#: include/class_ldap.inc:1108
+#: include/class_ldap.inc:1109
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1220
+#: include/class_ldap.inc:1221
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr "No es un DN válido: '%s': El bloque para importar debe empezar por 'dn: ...' en la linea %s"
-#: include/class_ldap.inc:1231
+#: include/class_ldap.inc:1232
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2948,10 +2992,10 @@ 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'"
-#: include/functions.inc:496 include/functions.inc:3294
-#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:263
-#: include/simpleplugin/class_simplePlugin.inc:268
-#: include/simpleplugin/class_simplePlugin.inc:280
+#: include/functions.inc:496 include/functions.inc:3295
+#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
+#: include/simpleplugin/class_simplePlugin.inc:269
+#: include/simpleplugin/class_simplePlugin.inc:281
#: html/class_passwordRecovery.inc:216
msgid "Fatal error"
msgstr "Error fatal"
@@ -3104,98 +3148,98 @@ msgstr "¡No se puede escribir en el archivo de revisión!"
msgid "Cannot read to revision file!"
msgstr "No se puede leer el archivo de revisión!"
-#: include/functions.inc:2548
+#: include/functions.inc:2549
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "LDAP warning"
msgstr "Aviso LDAP"
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "Cannot get schema information from server. No schema check possible!"
msgstr "No puedo obtener información de esquemas del servidor. ¡No es posible comprobar los esquemas!"
-#: include/functions.inc:2584
+#: include/functions.inc:2585
msgid ""
"Used to lock currently edited entries to avoid multiple changes at the same "
"time."
msgstr "Usado para bloquear entradas editadas actualmente y asà evitar múltiples cambios simultáneos."
-#: include/functions.inc:2596
+#: include/functions.inc:2597
#, php-format
msgid "Missing required object class '%s'!"
msgstr "¡No se ha encontrado la clase de objeto necesaria '%s'!"
-#: include/functions.inc:2599
+#: include/functions.inc:2600
#, php-format
msgid "Missing optional object class '%s'!"
msgstr "¡No se ha encontrado la clase de objeto opcional '%s'!"
-#: include/functions.inc:2603
+#: include/functions.inc:2604
#, php-format
msgid "Class(es) available"
msgstr "Clase(s) disponibles"
-#: include/functions.inc:2623
+#: include/functions.inc:2624
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2625
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2628
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2629
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3106 include/functions.inc:3127
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198
msgid "Cannot allocate a free ID:"
msgstr "No se puede asignar un identificador (ID) libre:"
-#: include/functions.inc:3106
+#: include/functions.inc:3107
msgid "unknown idAllocation method!"
msgstr "¡método de asignación de id desconocido!"
-#: include/functions.inc:3127
+#: include/functions.inc:3128
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr "¡%sPoolMin >= %sPoolMax!"
-#: include/functions.inc:3157
+#: include/functions.inc:3158
msgid "Cannot create sambaUnixIdPool entry!"
msgstr "¡No se puede crear la entrada sambaUnixIdPool!"
-#: include/functions.inc:3165
+#: include/functions.inc:3166
msgid "sambaUnixIdPool is not unique!"
msgstr "¡sambaUnixIdPool no es único!"
-#: include/functions.inc:3177 include/functions.inc:3181
+#: include/functions.inc:3178 include/functions.inc:3182
msgid "no ID available!"
msgstr "¡No hay ID disponibles!"
-#: include/functions.inc:3197
+#: include/functions.inc:3198
msgid "maximum tries exceeded!"
msgstr "¡Excedido el número de intentos máximo!"
-#: include/functions.inc:3259
+#: include/functions.inc:3260
msgid "Cannot allocate a free ID!"
msgstr "¡No se puede asignar un identificador (ID) libre!"
-#: include/functions.inc:3295
+#: include/functions.inc:3296
#, 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"
@@ -3351,13 +3395,13 @@ msgstr "En linea"
msgid "XML error"
msgstr "Error XML"
-#: include/class_plugin.inc:554
+#: include/class_plugin.inc:553
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/class_plugin.inc:1466
+#: include/class_plugin.inc:1467
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -3383,32 +3427,32 @@ msgstr "Nombre de la plantilla"
msgid "This is the name of the template"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:263
+#: include/simpleplugin/class_simplePlugin.inc:264
msgid "Only main tab can compute dn"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:270
+#: include/simpleplugin/class_simplePlugin.inc:271
#, php-format
msgid "Could not compute dn: no parent tab class for \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:282
+#: include/simpleplugin/class_simplePlugin.inc:283
#, php-format
msgid ""
"Could not compute dn: could not find objectType infos from tab class \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:638
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:644
+#: include/simpleplugin/class_simplePlugin.inc:652
msgid "Error when saving"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:638
+#: include/simpleplugin/class_simplePlugin.inc:644
#, php-format
msgid "There is already an entry with the same dn : %s"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:652
#, php-format
msgid "The entry %s is not existing"
msgstr ""
@@ -3428,27 +3472,27 @@ msgstr ""
msgid "Show %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:409
+#: include/simpleplugin/class_dialogAttributes.inc:415
#, php-format
msgid "Group %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:411
+#: include/simpleplugin/class_dialogAttributes.inc:417
#, php-format
msgid "Role %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:446
+#: include/simpleplugin/class_dialogAttributes.inc:452
msgid "Group of user"
msgstr "Grupo de usuarios"
-#: include/simpleplugin/class_dialogAttributes.inc:615
+#: include/simpleplugin/class_dialogAttributes.inc:621
#: include/simpleplugin/class_attribute.inc:1090
#: include/simpleplugin/class_attribute.inc:1124
msgid "None"
msgstr "Ninguno"
-#: include/simpleplugin/class_dialogAttributes.inc:617
+#: include/simpleplugin/class_dialogAttributes.inc:623
msgid "Unknown"
msgstr "Desconocido"
@@ -3489,11 +3533,16 @@ msgid "days"
msgstr "dÃas"
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2161
+#: include/simpleplugin/class_attribute.inc:2171
#, php-format
msgid "%s (required)"
msgstr ""
+#: include/simpleplugin/class_attribute.inc:1150
+#, php-format
+msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
+msgstr ""
+
#: include/simpleplugin/class_attribute.inc:1277
#, php-format
msgid "An integer between %d and %d"
@@ -3509,75 +3558,75 @@ msgstr ""
msgid "An integer smaller than %d"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1379
+#: include/simpleplugin/class_attribute.inc:1383
#, php-format
msgid "A float between %f and %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1381
+#: include/simpleplugin/class_attribute.inc:1385
#, php-format
msgid "A float larger than %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1383
+#: include/simpleplugin/class_attribute.inc:1387
#, php-format
msgid "A float smaller than %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1490
+#: include/simpleplugin/class_attribute.inc:1500
msgid "Error, incorrect date: "
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
#, php-format
msgid "Cannot read uploaded file: %s"
msgstr "No puedo leer el archivo: %s"
-#: include/simpleplugin/class_attribute.inc:1530
+#: include/simpleplugin/class_attribute.inc:1540
msgid "file is empty"
msgstr "el archivo está vacÃo"
-#: include/simpleplugin/class_attribute.inc:1533
+#: include/simpleplugin/class_attribute.inc:1543
msgid "file not found"
msgstr "fichero no encontrado"
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1546
msgid "file not readable"
msgstr "fichero no accesible"
-#: include/simpleplugin/class_attribute.inc:1569
+#: include/simpleplugin/class_attribute.inc:1579
#, php-format
msgid "%s (%d bytes)"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1616
-#: include/simpleplugin/class_attribute.inc:1793
+#: include/simpleplugin/class_attribute.inc:1626
+#: include/simpleplugin/class_attribute.inc:1803
msgid "Upload"
msgstr "Enviar"
-#: include/simpleplugin/class_attribute.inc:1621
-#: include/simpleplugin/class_attribute.inc:1622
+#: include/simpleplugin/class_attribute.inc:1631
+#: include/simpleplugin/class_attribute.inc:1632
msgid "Download"
msgstr "Descargar"
-#: include/simpleplugin/class_attribute.inc:1775
+#: include/simpleplugin/class_attribute.inc:1785
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr "No se puede guardar la foto del usuario, FusionDirectory requiere que este instalado el paquete 'php5-imagick'"
-#: include/simpleplugin/class_attribute.inc:1826
+#: include/simpleplugin/class_attribute.inc:1836
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr "Base"
-#: include/simpleplugin/class_attribute.inc:1829
+#: include/simpleplugin/class_attribute.inc:1839
msgid "Object base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:2755
+#: include/simpleplugin/class_attribute.inc:2769
#, php-format
msgid "Invalid value for %s"
msgstr ""
@@ -3711,17 +3760,17 @@ msgstr "Por favor compruebe la combinación nombre de usuario/contraseña"
msgid "Account locked. Please contact your system administrator!"
msgstr "Cuenta bloqueada. ¡Por favor contacte con su administrador de sistemas!"
-#: html/index.php:436
+#: html/index.php:475
#, php-format
msgid "CAS user \"%s\" could not be found in the LDAP"
msgstr ""
-#: html/index.php:446
+#: html/index.php:485
#, php-format
msgid "CAS user \"%s\" match several users in the LDAP"
msgstr ""
-#: html/index.php:481
+#: html/index.php:522
msgid ""
"Your browser has cookies disabled. Please enable cookies and reload this "
"page before logging in!"
@@ -4044,8 +4093,8 @@ msgid "Checking for duplicated UID numbers"
msgstr "Comprobando números UID duplicados"
#: setup/class_setupStep_Migrate.inc:267
-msgid "Checking for duplicate GID numbers"
-msgstr "Comprobando números GID duplicados"
+msgid "Checking for duplicated GID numbers"
+msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:487
#: setup/class_setupStep_Migrate.inc:564 setup/class_setupStep_Migrate.inc:702
@@ -4054,7 +4103,7 @@ msgstr "Comprobando números GID duplicados"
#: setup/class_setupStep_Migrate.inc:1179
#: setup/class_setupStep_Migrate.inc:1272
#: setup/class_setupStep_Migrate.inc:1351
-#: setup/class_setupStep_Migrate.inc:1390
+#: setup/class_setupStep_Migrate.inc:1395
msgid "LDAP query failed"
msgstr "La consulta LDAP ha fallado"
@@ -4065,7 +4114,7 @@ msgstr "La consulta LDAP ha fallado"
#: setup/class_setupStep_Migrate.inc:1180
#: setup/class_setupStep_Migrate.inc:1273
#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1391
+#: setup/class_setupStep_Migrate.inc:1396
msgid "Possibly the \"root object\" is missing."
msgstr ""
@@ -4220,14 +4269,14 @@ msgstr "Se encontraron %s departamentos que no serán visibles en FusionDirector
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1373
+#: setup/class_setupStep_Migrate.inc:1378
#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\"."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1412
+#: setup/class_setupStep_Migrate.inc:1422
#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\"."
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
diff --git a/locale/es_CO/fusiondirectory.po b/locale/es_CO/fusiondirectory.po
index 522fc4ef7d7313ae3af460a5ec3b113804737a5f..70ea159eb114d534d095472f5261a67e69fef6ce 100644
--- a/locale/es_CO/fusiondirectory.po
+++ b/locale/es_CO/fusiondirectory.po
@@ -6,12 +6,12 @@
# Miguel Ortiz <daychuzleo@gmail.com>, 2015
msgid ""
msgstr ""
-"Project-Id-Version: FusionDirectory-109\n"
+"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-01-22 11:26+0100\n"
-"PO-Revision-Date: 2016-01-22 10:24+0000\n"
+"POT-Creation-Date: 2016-03-14 12:07+0100\n"
+"PO-Revision-Date: 2016-03-07 12:09+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-109/language/es_CO/)\n"
+"Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -29,31 +29,31 @@ msgstr "¡Bienvenido %s!"
msgid "References"
msgstr "Referencias"
-#: plugins/admin/groups/class_roleGeneric.inc:30
-#: plugins/admin/groups/class_roleGeneric.inc:34
+#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:61
#: plugins/admin/groups/class_groupManagement.inc:71
#: plugins/admin/aclrole/class_aclRole.inc:78
#: plugins/admin/acl/class_aclAssignment.inc:49
msgid "Role"
msgstr "Rol"
-#: plugins/admin/groups/class_roleGeneric.inc:31
+#: plugins/admin/groups/class_roleGeneric.inc:58
msgid "Role information"
msgstr "Información del Rol"
-#: plugins/admin/groups/class_roleGeneric.inc:35
+#: plugins/admin/groups/class_roleGeneric.inc:62
msgid "Organizational role"
msgstr "Rol Profesional"
-#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:84
msgid "Informations"
msgstr "Datos"
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:158
+#: plugins/admin/departments/class_department.inc:174
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -63,13 +63,13 @@ msgstr "Datos"
msgid "Name"
msgstr "Nombre"
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
msgid "Name of this group"
msgstr "Nombre de este grupo"
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
#: plugins/admin/groups/class_group.inc:66
#: plugins/admin/groups/class_ogroup.inc:192
#: plugins/admin/groups/group-list.xml:41
@@ -82,26 +82,26 @@ msgstr "Nombre de este grupo"
msgid "Description"
msgstr "Descripción"
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
msgid "Description of the role"
msgstr "Descripción del Rol"
-#: plugins/admin/groups/class_roleGeneric.inc:70
+#: plugins/admin/groups/class_roleGeneric.inc:97
msgid "Phone number"
msgstr "Teléfono"
-#: plugins/admin/groups/class_roleGeneric.inc:74
+#: plugins/admin/groups/class_roleGeneric.inc:101
msgid "Fax number"
msgstr "Fax"
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
#: plugins/admin/users/class_userManagement.inc:42
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: setup/class_setupStep_Migrate.inc:871
msgid "Users"
msgstr "Usuarios"
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
msgid "Add users for the role"
msgstr "Agregar usuarios al rol"
@@ -148,7 +148,7 @@ msgstr "Forzar GID para este grupo"
#: plugins/admin/groups/class_group.inc:74
#: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:403
+#: plugins/personal/posix/class_posixAccount.inc:410
msgid "GID"
msgstr "GID"
@@ -205,23 +205,23 @@ 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:181
-#: plugins/personal/posix/class_posixAccount.inc:458 include/functions.inc:794
-#: include/functions.inc:2548 include/class_xml.inc:55
+#: plugins/personal/posix/class_posixAccount.inc:465 include/functions.inc:794
+#: include/functions.inc:2549 include/class_xml.inc:55
#: include/simpleplugin/class_simpleTabs.inc:325 html/index.php:56
-#: html/index.php:62 html/index.php:481 html/class_passwordRecovery.inc:378
+#: html/index.php:62 html/index.php:522 html/class_passwordRecovery.inc:378
#: setup/class_setupStep_Migrate.inc:572
#: setup/class_setupStep_Migrate.inc:1083
#: setup/class_setupStep_Migrate.inc:1202
#: setup/class_setupStep_Migrate.inc:1313
-#: setup/class_setupStep_Migrate.inc:1372
-#: setup/class_setupStep_Migrate.inc:1411 plugins/admin/acl/remove.tpl.c:2
+#: setup/class_setupStep_Migrate.inc:1377
+#: setup/class_setupStep_Migrate.inc:1421 plugins/admin/acl/remove.tpl.c:2
#: ihtml/themes/default/islocked.tpl.c:5 ihtml/themes/default/remove.tpl.c:2
#: ihtml/themes/default/msg_dialog.tpl.c:5 setup/setup_checks.tpl.c:8
msgid "Warning"
msgstr "Advertencia"
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458
+#: plugins/personal/posix/class_posixAccount.inc:465
msgid "Timeout while waiting for lock. Ignoring lock!"
msgstr "Tiempo de espera superado mientras se esperaba el bloqueo. ¡Ignorando el bloqueo!"
@@ -251,7 +251,7 @@ msgstr "Objetos miembro"
msgid "Objects member of this group"
msgstr "Objetos miembro de este grupo"
-#: plugins/admin/groups/class_ogroup.inc:318
+#: plugins/admin/groups/class_ogroup.inc:313
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."
@@ -280,10 +280,10 @@ msgstr "Crear"
#: plugins/admin/departments/dep-list.xml:79
#: plugins/admin/users/user-list.xml:105
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-#: include/simpleplugin/class_dialogAttributes.inc:626
-#: include/simpleplugin/class_dialogAttributes.inc:627
-#: include/simpleplugin/class_attribute.inc:2661
-#: include/simpleplugin/class_attribute.inc:2662
+#: include/simpleplugin/class_dialogAttributes.inc:632
+#: include/simpleplugin/class_dialogAttributes.inc:633
+#: include/simpleplugin/class_attribute.inc:2675
+#: include/simpleplugin/class_attribute.inc:2676
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -294,8 +294,8 @@ msgstr "Editar"
#: plugins/admin/departments/dep-list.xml:67
#: plugins/admin/departments/dep-list.xml:88
#: plugins/admin/users/user-list.xml:112
-#: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_dialogAttributes.inc:637
+#: include/simpleplugin/class_dialogAttributes.inc:642
+#: include/simpleplugin/class_dialogAttributes.inc:643
#: include/simpleplugin/simple-list.xml:75
#: include/simpleplugin/simple-list.xml:125
msgid "Remove"
@@ -344,8 +344,8 @@ msgid "Show application groups"
msgstr "Mostrar grupos de aplicación"
#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Show department groups"
-msgstr "Mostrar grupos por departamento"
+msgid "Show unidentified groups"
+msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:137
#: include/select/groupSelect/group-filter.tpl.c:11
@@ -433,51 +433,67 @@ msgid "Category of this %s"
msgstr "CategorÃa de este %s"
#: plugins/admin/departments/class_department.inc:81
+msgid "Website"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:81
+#, php-format
+msgid "Website of this %s"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:85
#: plugins/personal/generic/class_user.inc:410
msgid "Manager"
msgstr "Mánager"
-#: plugins/admin/departments/class_department.inc:81
+#: plugins/admin/departments/class_department.inc:85
#, php-format
msgid "Manager of this %s"
msgstr "Mánager de este %s"
-#: plugins/admin/departments/class_department.inc:87
-#: plugins/admin/departments/class_department.inc:93
+#: plugins/admin/departments/class_department.inc:91
+#: plugins/admin/departments/class_department.inc:97
#: plugins/personal/generic/class_user.inc:304
msgid "Location"
msgstr "Ubicación"
-#: plugins/admin/departments/class_department.inc:90
+#: plugins/admin/departments/class_department.inc:94
#: plugins/personal/generic/class_user.inc:308
msgid "State"
msgstr "Estado"
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_country.inc:29
+#: plugins/admin/departments/class_country.inc:30
+#: plugins/admin/departments/class_country.inc:33
+msgid "Country"
+msgstr "PaÃs"
+
+#: plugins/admin/departments/class_department.inc:103
#: plugins/personal/generic/class_user.inc:312
msgid "Address"
msgstr "Dirección"
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:103
#, php-format
msgid "A postal address for this %s"
msgstr "Dirección postal de este %s"
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
#: plugins/personal/generic/class_user.inc:320
msgid "Phone"
msgstr "Teléfono"
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
msgid "Telephone number"
msgstr "Número telefónico"
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
#: plugins/personal/generic/class_user.inc:332
msgid "Fax"
msgstr "Fax"
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
msgid "Facsimile telephone number"
msgstr "Teléfono alternativo"
@@ -505,12 +521,6 @@ msgstr "Localidad"
msgid "locality"
msgstr "localidad"
-#: plugins/admin/departments/class_country.inc:29
-#: plugins/admin/departments/class_country.inc:30
-#: plugins/admin/departments/class_country.inc:33
-msgid "Country"
-msgstr "PaÃs"
-
#: plugins/admin/departments/class_country.inc:50
msgid "country"
msgstr "paÃs"
@@ -553,7 +563,8 @@ msgid "Given name"
msgstr "Nombre"
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
+#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
msgid "Login"
@@ -666,8 +677,8 @@ msgid "Edit category ACL"
msgstr "Editar categiorÃa ACL"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2671
-#: include/simpleplugin/class_attribute.inc:2672
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
+#: include/simpleplugin/class_attribute.inc:2686
#, php-format
msgid "Delete"
msgstr "Borrar"
@@ -772,19 +783,37 @@ msgstr "ACLs"
msgid "ACLs which are part of this group"
msgstr "ACLs que son parte de este grupo"
-#: plugins/admin/acl/class_aclManagement.inc:38
+#: plugins/admin/acl/class_aclManagement.inc:31
+#: plugins/admin/acl/class_aclManagement.inc:32
+#: plugins/admin/acl/class_aclManagement.inc:45
+msgid "ACL assignment creation"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:33
+msgid "Create an ACL assignment on an arbitrary dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "Dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "DN you wish to add assignments for"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:135
msgid "ACL assignments"
msgstr "Gestionar ACLs"
-#: plugins/admin/acl/class_aclManagement.inc:39
+#: plugins/admin/acl/class_aclManagement.inc:136
msgid "ACL assignments management"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:40
+#: plugins/admin/acl/class_aclManagement.inc:137
msgid "Manage ACL roles assignments to users"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:78
+#: plugins/admin/acl/class_aclManagement.inc:199
#: plugins/admin/acl/class_aclAssignment.inc:263
msgid "ACL Assignment"
msgstr "Gestión de ACL"
@@ -900,7 +929,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:352
+#: plugins/personal/generic/class_user.inc:356
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -995,59 +1024,59 @@ msgstr "BÃper laboral"
msgid "Business fax number"
msgstr "Nro. Fax de trabajo"
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:336
+msgid "Homepage"
+msgstr "Página web"
+
+#: plugins/personal/generic/class_user.inc:336
+msgid "Personal homepage"
+msgstr "Página web personal"
+
+#: plugins/personal/generic/class_user.inc:342
msgid "Account information"
msgstr "Información de cuenta"
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
msgid "Login of this user"
msgstr "Cuenta de este usuario"
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:351
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr "Idioma preferido"
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
msgid "Password of the user"
msgstr "Contraseña del usuario"
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:362
msgid "Personal contact information"
msgstr "Información de contacto 'Personal'"
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
msgid "Display name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home address"
msgstr "Dirección personal"
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home postal address"
msgstr "Código postal personal"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:374
msgid "Private phone"
msgstr "Teléfono personal"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:374
msgid "Home phone number"
msgstr "Teléfono de domicilio personal"
-#: plugins/personal/generic/class_user.inc:374
-msgid "Homepage"
-msgstr "Página web"
-
-#: plugins/personal/generic/class_user.inc:374
-msgid "Personal homepage"
-msgstr "Página web personal"
-
#: plugins/personal/generic/class_user.inc:380
msgid "Organizational information"
msgstr "Información Profesional"
@@ -1280,33 +1309,33 @@ msgstr "Aún sin configurar"
msgid "automatic"
msgstr "automático"
-#: plugins/personal/posix/class_posixAccount.inc:309
+#: plugins/personal/posix/class_posixAccount.inc:310
msgid "expired"
msgstr "expirado"
-#: plugins/personal/posix/class_posixAccount.inc:311
+#: plugins/personal/posix/class_posixAccount.inc:312
msgid "grace time active"
msgstr "PerÃodo de gracia activo"
-#: plugins/personal/posix/class_posixAccount.inc:314
-#: plugins/personal/posix/class_posixAccount.inc:316
-#: plugins/personal/posix/class_posixAccount.inc:318
+#: plugins/personal/posix/class_posixAccount.inc:315
+#: plugins/personal/posix/class_posixAccount.inc:317
+#: plugins/personal/posix/class_posixAccount.inc:319
msgid "active"
msgstr "activo"
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:315
msgid "password expired"
msgstr "Contraseña expirada"
-#: plugins/personal/posix/class_posixAccount.inc:316
+#: plugins/personal/posix/class_posixAccount.inc:317
msgid "password not changeable"
msgstr "Contraseña no modificable"
-#: plugins/personal/posix/class_posixAccount.inc:400
+#: plugins/personal/posix/class_posixAccount.inc:407
msgid "UID"
msgstr "UID"
-#: plugins/personal/posix/class_posixAccount.inc:516
+#: plugins/personal/posix/class_posixAccount.inc:525
#, php-format
msgid "Group of user %s"
msgstr "Grupo del usuario %s"
@@ -1478,424 +1507,440 @@ msgid "Core settings"
msgstr "Configuración del 'Núcleo'"
#: plugins/config/class_configInLdap.inc:161
-msgid "Enable primary group filter"
-msgstr "Habilitar filtro de grupo primario"
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"It is time consuming to evaluate which groups are primary and which are not,"
-" so you may want to disable it if your group plugin is slow."
-msgstr "Consume mucho tiempo evaluar si los grupos son primarios o no, asà que tal vez usted quiera deshabilitar esto si su plugin de grupo está lento."
-
-#: plugins/config/class_configInLdap.inc:167
msgid "Display summary in listings"
msgstr "Muestra un resumen en los listados."
-#: plugins/config/class_configInLdap.inc:168
+#: 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:173
+#: plugins/config/class_configInLdap.inc:167
msgid "Edit locking"
msgstr "Editar bloqueo"
-#: plugins/config/class_configInLdap.inc:174
+#: 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:179
+#: plugins/config/class_configInLdap.inc:173
msgid "Enable logging"
msgstr "Habilitar escritura de logs"
-#: plugins/config/class_configInLdap.inc:180
+#: 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:185
+#: plugins/config/class_configInLdap.inc:179
msgid "LDAP size limit"
msgstr "Tamaño lÃmite LDAP"
-#: plugins/config/class_configInLdap.inc:185
+#: 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."
-#: plugins/config/class_configInLdap.inc:192
+#: plugins/config/class_configInLdap.inc:186
msgid "Login and session"
msgstr "Cuenta de Usuario y sesión"
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:189
msgid "Login attribute"
msgstr "Cuenta de Usuario"
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:190
msgid "Which LDAP attribute should be used as the login name during login."
msgstr "Que atributo LDAP deberÃa usarse como 'cuenta de usuario' en el inicio de sesión."
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:196
msgid "Enforce encrypted connections"
msgstr "Forzar las conexiones encriptadas"
-#: plugins/config/class_configInLdap.inc:203
+#: plugins/config/class_configInLdap.inc:197
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."
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:201
msgid "Warn if session is not encrypted"
msgstr "Alertar si la sesión no se encuentra encriptada"
-#: plugins/config/class_configInLdap.inc:208
+#: plugins/config/class_configInLdap.inc:202
msgid "will display a warning to the user when http is used instead of https."
msgstr "mostrará un mensaje de advertencia al usuario cuando se utilice http en vez de https."
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Session lifetime"
msgstr "Tiempo de vida de la sesión "
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Defines when a session will expire in seconds."
msgstr "Determina cuando una sesión va a expirar (en segundos)"
-#: plugins/config/class_configInLdap.inc:220
+#: plugins/config/class_configInLdap.inc:212
+msgid "HTTP authentication"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:212
+msgid "Use HTTP authentication protocol instead of the login form."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:219
#: include/class_SnapshotDialogs.inc:186
msgid "Snapshots"
msgstr "Snapshots"
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid "Enable snapshots"
msgstr "Habilitar snapshots"
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
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:228
+#: plugins/config/class_configInLdap.inc:227
msgid "Snapshot base"
msgstr "Base para Snapshot "
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
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:235
+#: plugins/config/class_configInLdap.inc:234
msgid "SSL"
msgstr "SSL"
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Key path"
msgstr "Ruta de la llave "
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Path to FusionDirectory private key. Unused for now."
msgstr "Ruta donde se encuentra la llave de FusionDirectory. Por el momento, sin uso."
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Certificate path"
msgstr "Ruta del certificado"
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
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:248
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:262
msgid "CA certificate path"
msgstr "Path del certificado CA"
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:247
msgid "Path to the CA certificate. Used for validating Argonaut Server host."
msgstr "Ruta del certificado CA. Se utiliza para validar el equipo con el 'Servidor Argonaut'."
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:254
msgid "CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "Enable CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "CAS login will be used instead of LDAP bind"
msgstr ""
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:262
msgid "Path to the CA certificate of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host"
msgstr "Equipo"
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port"
msgstr "Puerto"
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port the CAS server is listening on"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context to be used"
msgstr ""
-#: plugins/config/class_configInLdap.inc:285
+#: plugins/config/class_configInLdap.inc:284
msgid "People and group storage"
msgstr "Almacenamiento de 'Usuarios' y 'Grupos'"
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "People DN attribute"
msgstr "Atributo DN para 'Usuarios'"
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "Attribute to use at the beginning of users dn"
msgstr "Atributo al inicio del \"dn\" de los usuarios"
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "CN pattern"
msgstr "Patrón para CN"
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
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:299
+#: plugins/config/class_configInLdap.inc:298
msgid "Strict naming policy"
msgstr "Politica de nombres"
-#: plugins/config/class_configInLdap.inc:300
+#: plugins/config/class_configInLdap.inc:299
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:305
+#: plugins/config/class_configInLdap.inc:304
msgid "Group/user min id"
msgstr "Grupo/usuario min id"
-#: plugins/config/class_configInLdap.inc:306
+#: plugins/config/class_configInLdap.inc:305
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:311
+#: plugins/config/class_configInLdap.inc:310
msgid "Next id hook"
msgstr "Siguiente id hook"
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
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:315
+#: plugins/config/class_configInLdap.inc:314
msgid "Base number for user id"
msgstr "Número base para 'id' de usuario"
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:315
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:321
+#: plugins/config/class_configInLdap.inc:320
msgid "Base number for group id"
msgstr "Número base para 'id' de grupo"
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:321
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:327
+#: plugins/config/class_configInLdap.inc:326
msgid "Users RDN"
msgstr "Usuarios RDN"
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "The branch where users are stored."
msgstr "La rama donde los usuarios están guardados."
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "Groups RDN"
msgstr "Grupos RDN"
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "The branch where groups are stored."
msgstr "La rama donde se guardan los grupos."
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "ACL role RDN"
msgstr "ACL Rol RDN"
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "The branch where ACL roles are stored."
msgstr "La rama donde los rol ACL están almacenados."
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Id allocation method"
msgstr "Método para asignar 'ids'"
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Method to allocate user/group ids"
msgstr "Método para asignar 'ids' de grupo/usuario"
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Traditional"
msgstr "Tradicional"
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Samba unix id pool"
msgstr "Samba unix id pool"
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Pool user id min"
msgstr "Pool user id min"
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
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:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Pool user id max"
msgstr "Pool user id max"
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
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:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Pool group id min"
msgstr "Pool group id min"
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
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:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Pool group id max"
msgstr "Pool group id max"
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
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:370
+#: plugins/config/class_configInLdap.inc:367
+msgid "Restrict role members"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:367
+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:373
msgid "Debugging"
msgstr "Rastreo de errores"
-#: plugins/config/class_configInLdap.inc:373
+#: plugins/config/class_configInLdap.inc:376
msgid "Display errors"
msgstr "Mostrar errores"
-#: plugins/config/class_configInLdap.inc:374
+#: plugins/config/class_configInLdap.inc:377
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Ã."
-#: plugins/config/class_configInLdap.inc:378
+#: plugins/config/class_configInLdap.inc:381
msgid "Maximum LDAP query time"
msgstr "Tiempo máximo de consultas LDAP."
-#: plugins/config/class_configInLdap.inc:378
+#: plugins/config/class_configInLdap.inc:381
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."
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:386
msgid "Log LDAP statistics"
msgstr "Escribir logs de las estadÃsticas LDAP."
-#: plugins/config/class_configInLdap.inc:384
+#: plugins/config/class_configInLdap.inc:387
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."
-#: plugins/config/class_configInLdap.inc:389
+#: plugins/config/class_configInLdap.inc:392
msgid "Debug level"
msgstr "Nivel del 'Rastreo de Errores'"
-#: plugins/config/class_configInLdap.inc:390
+#: plugins/config/class_configInLdap.inc:393
msgid "Display certain information on each page load."
msgstr "Mostrar determinados datos en cada página de carga."
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:405
msgid "Miscellaneous"
msgstr "Miscelánea"
-#: plugins/config/class_configInLdap.inc:407
+#: 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:411
+#: plugins/config/class_configInLdap.inc:414
msgid "tab"
msgstr "Pestaña"
-#: plugins/config/class_configInLdap.inc:411
+#: 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:416
+#: plugins/config/class_configInLdap.inc:419
msgid "mode"
msgstr "modo"
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "When to call this command"
msgstr "Cuándo llamar este comando"
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "cmd"
msgstr "cmd"
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "The command that will be called"
msgstr "La lÃnea de comandos que será usada"
-#: plugins/config/class_configInLdap.inc:429
+#: plugins/config/class_configInLdap.inc:432
msgid "Hooks"
msgstr "Hooks"
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:439
msgid "Display hook output"
msgstr "Mostrar la salida del 'hook'"
-#: plugins/config/class_configInLdap.inc:437
+#: plugins/config/class_configInLdap.inc:440
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:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available shells"
msgstr "Shells disponibles"
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available POSIX shells for FD users."
msgstr "Shells POSIX disponibles para usuarios de FD."
-#: plugins/config/class_configInLdap.inc:449
+#: plugins/config/class_configInLdap.inc:452
msgid "Show ACL tab on all objects"
msgstr "Mostrar pestaña de ACL en todos los objetos."
-#: plugins/config/class_configInLdap.inc:450
+#: plugins/config/class_configInLdap.inc:453
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:464
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available department categories"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available categories in the departments dropdown"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:474
#: setup/class_setupStep_Language.inc:69
msgid "Automatic"
msgstr "Automático"
@@ -1912,80 +1957,80 @@ msgstr "Configuraciones para la caracterÃstica de recuperación de contraseña.
msgid "Password recovery settings"
msgstr "Configuración de \"Recuperación de Contraseña\""
-#: plugins/config/class_recoveryConfig.inc:44
+#: plugins/config/class_recoveryConfig.inc:45
msgid "Activate password recovery"
msgstr "Habilitar recuperación de contraseña."
-#: plugins/config/class_recoveryConfig.inc:45
+#: 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."
-#: plugins/config/class_recoveryConfig.inc:50
+#: plugins/config/class_recoveryConfig.inc:51
msgid "Sender email address"
msgstr "Correo del remitente"
-#: plugins/config/class_recoveryConfig.inc:51
+#: plugins/config/class_recoveryConfig.inc:52
msgid "Email address from which mails will be sent"
msgstr "Dirección desde donde se enviarán los correos."
-#: plugins/config/class_recoveryConfig.inc:57
+#: plugins/config/class_recoveryConfig.inc:58
msgid "Link validity (minutes)"
msgstr "Vigencia del 'Link' (minutos)"
-#: plugins/config/class_recoveryConfig.inc:58
+#: plugins/config/class_recoveryConfig.inc:59
msgid "Number of minutes before a recovery link expires"
msgstr "Cantidad de tiempo antes que el link para recuperar expire."
-#: plugins/config/class_recoveryConfig.inc:64
+#: plugins/config/class_recoveryConfig.inc:65
msgid "Salt for tokens"
msgstr "'Salt' para 'tokens''"
-#: plugins/config/class_recoveryConfig.inc:65
+#: plugins/config/class_recoveryConfig.inc:66
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."
-#: plugins/config/class_recoveryConfig.inc:71
+#: plugins/config/class_recoveryConfig.inc:72
msgid "Allow the use of alternate addresses"
msgstr "Habilitar el uso de correos alternativos"
-#: plugins/config/class_recoveryConfig.inc:72
+#: plugins/config/class_recoveryConfig.inc:73
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."
-#: plugins/config/class_recoveryConfig.inc:79
+#: plugins/config/class_recoveryConfig.inc:80
msgid "First email"
msgstr "Correo principal"
-#: plugins/config/class_recoveryConfig.inc:82
-#: plugins/config/class_recoveryConfig.inc:101
+#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:102
msgid "Subject"
msgstr "Asunto"
-#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:84
msgid "Subject of the first email"
msgstr "Asunto del correo principal"
-#: plugins/config/class_recoveryConfig.inc:86
+#: plugins/config/class_recoveryConfig.inc:87
msgid "[FusionDirectory] Password recovery link"
msgstr "[FusionDirectory] Enlace para recuperar contraseña"
-#: plugins/config/class_recoveryConfig.inc:89
+#: plugins/config/class_recoveryConfig.inc:90
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr "Mensaje (primer %s es Cuenta de usuario, el segundo es 'Enlace')"
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:91
#, 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 "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:93
+#: plugins/config/class_recoveryConfig.inc:94
#, php-format
msgid ""
"Hello,\n"
@@ -1997,31 +2042,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr "Hola, \n\nAquà están sus datos:\n- Cuenta de usuario: %s\n- Enlace: %s\n\nEste enlace solo será válido por 10 minutos."
-#: plugins/config/class_recoveryConfig.inc:98
+#: plugins/config/class_recoveryConfig.inc:99
msgid "Second email"
msgstr "Email secundario"
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:103
msgid "Subject of the second email"
msgstr "Asunto del email secundario"
-#: plugins/config/class_recoveryConfig.inc:105
+#: plugins/config/class_recoveryConfig.inc:106
msgid "[FusionDirectory] Password recovery successful"
msgstr "[FusionDirectory] ¡Recuperación de contraseña satisfactoria!"
-#: plugins/config/class_recoveryConfig.inc:108
+#: plugins/config/class_recoveryConfig.inc:109
#, php-format
msgid "Body (%s is login)"
msgstr "Mensaje (%s es cuenta de usuario)"
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:110
#, php-format
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."
-#: plugins/config/class_recoveryConfig.inc:112
+#: plugins/config/class_recoveryConfig.inc:113
#, php-format
msgid ""
"Hello,\n"
@@ -2089,13 +2134,13 @@ msgstr "Arriba"
msgid "Down"
msgstr "Abajo"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2633
-#: include/simpleplugin/class_attribute.inc:2634
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
+#: include/simpleplugin/class_attribute.inc:2648
msgid "Sort up"
msgstr "Ordenar "
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2646
-#: include/simpleplugin/class_attribute.inc:2647
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
+#: include/simpleplugin/class_attribute.inc:2661
msgid "Sort down"
msgstr "Ordenar de modo inverso"
@@ -2107,27 +2152,26 @@ msgstr "Seleccionar todo"
#: include/class_config.inc:479 include/class_msgPool.inc:215
#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3106
-#: include/functions.inc:3127 include/functions.inc:3157
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197 include/functions.inc:3259
+#: include/class_msgPool.inc:740 include/functions.inc:3107
+#: include/functions.inc:3128 include/functions.inc:3158
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3260
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1663 include/class_CopyPasteHandler.inc:278
-#: include/simpleplugin/class_dialogAttributes.inc:733
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
-#: include/simpleplugin/class_attribute.inc:1774
-#: include/simpleplugin/class_attribute.inc:1877
-#: include/simpleplugin/class_attribute.inc:1879
+#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
+#: include/simpleplugin/class_attribute.inc:1784
+#: include/simpleplugin/class_attribute.inc:1887
+#: include/simpleplugin/class_attribute.inc:1889
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: 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:437
#: include/password-methods/class_password-methods.inc:447
-#: include/class_SnapshotHandler.inc:415 html/index.php:434 html/index.php:444
+#: include/class_SnapshotHandler.inc:415 html/index.php:473 html/index.php:483
#: setup/class_setupStep_Migrate.inc:935
#: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
msgid "Error"
@@ -2166,44 +2210,44 @@ msgstr "Refrescar lista"
msgid "Submit"
msgstr "Enviar"
-#: include/class_listing.inc:1586 include/class_listing.inc:1640
+#: include/class_listing.inc:1590 include/class_listing.inc:1644
msgid "Copy"
msgstr "Copiar"
-#: include/class_listing.inc:1592 include/class_listing.inc:1628
+#: include/class_listing.inc:1596 include/class_listing.inc:1632
msgid "Cut"
msgstr "Cortar"
-#: include/class_listing.inc:1600 include/class_listing.inc:1602
+#: include/class_listing.inc:1604 include/class_listing.inc:1606
#: include/class_CopyPasteHandler.inc:370
msgid "Paste"
msgstr "Pegar"
-#: include/class_listing.inc:1628
+#: include/class_listing.inc:1632
msgid "Cut this entry"
msgstr "Cortar esta entrada"
-#: include/class_listing.inc:1640
+#: include/class_listing.inc:1644
msgid "Copy this entry"
msgstr "Copiar esta entrada"
-#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_listing.inc:1677 include/class_listing.inc:1679
msgid "Restore snapshots"
msgstr "Restaurar 'snapshots'"
-#: include/class_listing.inc:1689
+#: include/class_listing.inc:1693
msgid "Export list"
msgstr "Exportar lista"
-#: include/class_listing.inc:1724 include/class_listing.inc:1725
+#: include/class_listing.inc:1728 include/class_listing.inc:1729
msgid "Restore snapshot"
msgstr "Restaurar 'snapshot'"
-#: include/class_listing.inc:1734
+#: include/class_listing.inc:1738
msgid "Create snapshot"
msgstr "Crear 'snapshot'"
-#: include/class_listing.inc:1735
+#: include/class_listing.inc:1739
msgid "Create a new snapshot from this object"
msgstr "Crear un nuevo 'snapshot' de este objeto"
@@ -2246,7 +2290,7 @@ 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:162 include/class_config.inc:300
-#: include/class_config.inc:985 include/class_config.inc:998
+#: include/class_config.inc:915 include/class_config.inc:928
#: include/functions.inc:663 include/class_timezone.inc:51
#: include/password-methods/class_password-methods-sha.inc:71
#: include/password-methods/class_password-methods-ssha.inc:75
@@ -2263,17 +2307,17 @@ msgid ""
"while your passwords are not encrypted."
msgstr "Parece que usted intenta decodificar algo que no está codificado: %s<br/>\\nPor favor revise que no esté usando el archivo fusiondirectory.secrets mientras sus contraseñas no están encriptadas."
-#: include/class_config.inc:337 include/class_ldap.inc:917
-#: include/class_ldap.inc:1371 include/functions.inc:526
+#: include/class_config.inc:337 include/class_ldap.inc:918
+#: include/class_ldap.inc:1372 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2985 include/simpleplugin/class_simplePlugin.inc:545
-#: include/simpleplugin/class_attribute.inc:2895
+#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2909
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
#: include/class_SnapshotHandler.inc:422 include/class_SnapshotHandler.inc:425
-#: html/index.php:360 html/class_passwordRecovery.inc:497
+#: html/index.php:369 html/class_passwordRecovery.inc:497
#: setup/class_setupStep_Migrate.inc:451
#: setup/class_setupStep_Migrate.inc:1130
msgid "LDAP error"
@@ -2288,38 +2332,38 @@ msgstr "No se puede contactar a LDAP. Por favor contacte al adminsitrador del si
msgid "The selected mail method (class %s) is not available"
msgstr "El método de mail seleccionado (class%s) no está disponible."
-#: include/class_config.inc:986
+#: include/class_config.inc:916
#, 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."
-#: include/class_config.inc:999
+#: include/class_config.inc:929
#, 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'."
-#: include/class_config.inc:1104
+#: include/class_config.inc:1034
msgid "All categories"
msgstr "Todas las categorÃas"
-#: include/class_config.inc:1231
+#: include/class_config.inc:1161
msgid "My account"
msgstr "Mi cuenta"
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
msgid "Performance warning"
msgstr "Advertencia de Rendmiento"
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
#, 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:868 include/class_ldap.inc:904
+#: include/class_ldap.inc:869 include/class_ldap.inc:905
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
@@ -2329,39 +2373,39 @@ msgstr "LDAP tiene un desempeño lento: su última consulta tomó %.2fs!"
msgid "Internal error"
msgstr "Error Interno"
-#: include/class_ldap.inc:868
+#: include/class_ldap.inc:869
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:904
+#: include/class_ldap.inc:905
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1016
+#: include/class_ldap.inc:1017
#, 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:1018
+#: include/class_ldap.inc:1019
#, php-format
msgid "while operating on LDAP server %s"
msgstr "mientras se realizan operaciones en el servidor LDAP %s"
-#: include/class_ldap.inc:1108
+#: include/class_ldap.inc:1109
msgid "proc_open failed to execute ldapsearch"
msgstr "proc_open falló al ejecutar ldapsearch"
-#: include/class_ldap.inc:1220
+#: include/class_ldap.inc:1221
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr "Esto no es un DN válido: '%s'. Un bloque a importar deberÃa comenzar con 'dn: ...' en la lÃnea %s"
-#: include/class_ldap.inc:1231
+#: include/class_ldap.inc:1232
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2949,10 +2993,10 @@ 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."
-#: include/functions.inc:496 include/functions.inc:3294
-#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:263
-#: include/simpleplugin/class_simplePlugin.inc:268
-#: include/simpleplugin/class_simplePlugin.inc:280
+#: include/functions.inc:496 include/functions.inc:3295
+#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
+#: include/simpleplugin/class_simplePlugin.inc:269
+#: include/simpleplugin/class_simplePlugin.inc:281
#: html/class_passwordRecovery.inc:216
msgid "Fatal error"
msgstr "Error fatal"
@@ -3105,98 +3149,98 @@ msgstr ""
msgid "Cannot read to revision file!"
msgstr ""
-#: include/functions.inc:2548
+#: include/functions.inc:2549
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "LDAP warning"
msgstr "LDAP - Advertencia"
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "Cannot get schema information from server. No schema check possible!"
msgstr "No se puede traer información del 'schema' desde el servidor. ¡No se puede validar el schema'"
-#: include/functions.inc:2584
+#: include/functions.inc:2585
msgid ""
"Used to lock currently edited entries to avoid multiple changes at the same "
"time."
msgstr ""
-#: include/functions.inc:2596
+#: include/functions.inc:2597
#, php-format
msgid "Missing required object class '%s'!"
msgstr ""
-#: include/functions.inc:2599
+#: include/functions.inc:2600
#, php-format
msgid "Missing optional object class '%s'!"
msgstr ""
-#: include/functions.inc:2603
+#: include/functions.inc:2604
#, php-format
msgid "Class(es) available"
msgstr ""
-#: include/functions.inc:2623
+#: include/functions.inc:2624
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."
-#: include/functions.inc:2624
+#: include/functions.inc:2625
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2628
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:2628
+#: include/functions.inc:2629
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3106 include/functions.inc:3127
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3106
+#: include/functions.inc:3107
msgid "unknown idAllocation method!"
msgstr "¡método 'idAllocation' desconocido!"
-#: include/functions.inc:3127
+#: include/functions.inc:3128
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr "%sPoolMin >= %sPoolMax!"
-#: include/functions.inc:3157
+#: include/functions.inc:3158
msgid "Cannot create sambaUnixIdPool entry!"
msgstr "¡No se puede crear la entrada sambaUnixIdPool!"
-#: include/functions.inc:3165
+#: include/functions.inc:3166
msgid "sambaUnixIdPool is not unique!"
msgstr "!sambaUnixIdPool no es un valor único!"
-#: include/functions.inc:3177 include/functions.inc:3181
+#: include/functions.inc:3178 include/functions.inc:3182
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3197
+#: include/functions.inc:3198
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3259
+#: include/functions.inc:3260
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3295
+#: include/functions.inc:3296
#, 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."
@@ -3352,13 +3396,13 @@ msgstr "en lÃnea"
msgid "XML error"
msgstr "Erro XML"
-#: include/class_plugin.inc:554
+#: include/class_plugin.inc:553
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/class_plugin.inc:1466
+#: include/class_plugin.inc:1467
#, php-format
msgid "Tab \"%s\""
msgstr "Pestaña \"%s\""
@@ -3384,32 +3428,32 @@ msgstr "Nombre de la plantilla"
msgid "This is the name of the template"
msgstr "Este es el nombre de la plantilla"
-#: include/simpleplugin/class_simplePlugin.inc:263
+#: include/simpleplugin/class_simplePlugin.inc:264
msgid "Only main tab can compute dn"
msgstr "Solo la pestaña principal puede calcular dn"
-#: include/simpleplugin/class_simplePlugin.inc:270
+#: include/simpleplugin/class_simplePlugin.inc:271
#, 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:282
+#: include/simpleplugin/class_simplePlugin.inc:283
#, 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:638
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:644
+#: include/simpleplugin/class_simplePlugin.inc:652
msgid "Error when saving"
msgstr "Error al salvar"
-#: include/simpleplugin/class_simplePlugin.inc:638
+#: include/simpleplugin/class_simplePlugin.inc:644
#, 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:646
+#: include/simpleplugin/class_simplePlugin.inc:652
#, php-format
msgid "The entry %s is not existing"
msgstr "La entrada %s no existe"
@@ -3429,27 +3473,27 @@ msgstr "%s plantilla"
msgid "Show %s"
msgstr "Mostrar %s"
-#: include/simpleplugin/class_dialogAttributes.inc:409
+#: include/simpleplugin/class_dialogAttributes.inc:415
#, php-format
msgid "Group %s"
msgstr "Grupo %s"
-#: include/simpleplugin/class_dialogAttributes.inc:411
+#: include/simpleplugin/class_dialogAttributes.inc:417
#, php-format
msgid "Role %s"
msgstr "Rol %s"
-#: include/simpleplugin/class_dialogAttributes.inc:446
+#: include/simpleplugin/class_dialogAttributes.inc:452
msgid "Group of user"
msgstr "Grupo del usuario"
-#: include/simpleplugin/class_dialogAttributes.inc:615
+#: include/simpleplugin/class_dialogAttributes.inc:621
#: include/simpleplugin/class_attribute.inc:1090
#: include/simpleplugin/class_attribute.inc:1124
msgid "None"
msgstr "Ninguno"
-#: include/simpleplugin/class_dialogAttributes.inc:617
+#: include/simpleplugin/class_dialogAttributes.inc:623
msgid "Unknown"
msgstr "Desconocido"
@@ -3490,11 +3534,16 @@ msgid "days"
msgstr "dÃas"
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2161
+#: include/simpleplugin/class_attribute.inc:2171
#, php-format
msgid "%s (required)"
msgstr "%s (necesario)"
+#: include/simpleplugin/class_attribute.inc:1150
+#, php-format
+msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
+msgstr ""
+
#: include/simpleplugin/class_attribute.inc:1277
#, php-format
msgid "An integer between %d and %d"
@@ -3510,75 +3559,75 @@ msgstr "Un número entero mayor que %d"
msgid "An integer smaller than %d"
msgstr "Un número entero menor a %d"
-#: include/simpleplugin/class_attribute.inc:1379
+#: include/simpleplugin/class_attribute.inc:1383
#, php-format
msgid "A float between %f and %f"
msgstr "Un número flotante entre %f y %f"
-#: include/simpleplugin/class_attribute.inc:1381
+#: include/simpleplugin/class_attribute.inc:1385
#, php-format
msgid "A float larger than %f"
msgstr "Un número flotante mayor que %f"
-#: include/simpleplugin/class_attribute.inc:1383
+#: include/simpleplugin/class_attribute.inc:1387
#, php-format
msgid "A float smaller than %f"
msgstr "Un número flotante menor que %f"
-#: include/simpleplugin/class_attribute.inc:1490
+#: include/simpleplugin/class_attribute.inc:1500
msgid "Error, incorrect date: "
msgstr "Error, fecha incorrecta:"
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
#, php-format
msgid "Cannot read uploaded file: %s"
msgstr "No se puede leer el archivo subido: %s"
-#: include/simpleplugin/class_attribute.inc:1530
+#: include/simpleplugin/class_attribute.inc:1540
msgid "file is empty"
msgstr "el archivo está vacio"
-#: include/simpleplugin/class_attribute.inc:1533
+#: include/simpleplugin/class_attribute.inc:1543
msgid "file not found"
msgstr "archivo no encontrado"
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1546
msgid "file not readable"
msgstr "archivo sin privilegios de lectura"
-#: include/simpleplugin/class_attribute.inc:1569
+#: include/simpleplugin/class_attribute.inc:1579
#, php-format
msgid "%s (%d bytes)"
msgstr "%s (%d bytes)"
-#: include/simpleplugin/class_attribute.inc:1616
-#: include/simpleplugin/class_attribute.inc:1793
+#: include/simpleplugin/class_attribute.inc:1626
+#: include/simpleplugin/class_attribute.inc:1803
msgid "Upload"
msgstr "Subir"
-#: include/simpleplugin/class_attribute.inc:1621
-#: include/simpleplugin/class_attribute.inc:1622
+#: include/simpleplugin/class_attribute.inc:1631
+#: include/simpleplugin/class_attribute.inc:1632
msgid "Download"
msgstr "Descargar"
-#: include/simpleplugin/class_attribute.inc:1775
+#: include/simpleplugin/class_attribute.inc:1785
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr "No se puede salvar la imágen del usuario, ¡FusionDirectory necesita tener instaladoel paquete 'php5-imagick' !"
-#: include/simpleplugin/class_attribute.inc:1826
+#: include/simpleplugin/class_attribute.inc:1836
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr "Base"
-#: include/simpleplugin/class_attribute.inc:1829
+#: include/simpleplugin/class_attribute.inc:1839
msgid "Object base"
msgstr "Objeto base"
-#: include/simpleplugin/class_attribute.inc:2755
+#: include/simpleplugin/class_attribute.inc:2769
#, php-format
msgid "Invalid value for %s"
msgstr "Valor inválido para %s"
@@ -3712,17 +3761,17 @@ msgstr "Por favor verifique su combinación de usuario/contraseña"
msgid "Account locked. Please contact your system administrator!"
msgstr "Cuenta bloqueada. ¡Por favor contacte a su administrador!"
-#: html/index.php:436
+#: html/index.php:475
#, php-format
msgid "CAS user \"%s\" could not be found in the LDAP"
msgstr ""
-#: html/index.php:446
+#: html/index.php:485
#, php-format
msgid "CAS user \"%s\" match several users in the LDAP"
msgstr ""
-#: html/index.php:481
+#: html/index.php:522
msgid ""
"Your browser has cookies disabled. Please enable cookies and reload this "
"page before logging in!"
@@ -4045,7 +4094,7 @@ msgid "Checking for duplicated UID numbers"
msgstr ""
#: setup/class_setupStep_Migrate.inc:267
-msgid "Checking for duplicate GID numbers"
+msgid "Checking for duplicated GID numbers"
msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:487
@@ -4055,7 +4104,7 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:1179
#: setup/class_setupStep_Migrate.inc:1272
#: setup/class_setupStep_Migrate.inc:1351
-#: setup/class_setupStep_Migrate.inc:1390
+#: setup/class_setupStep_Migrate.inc:1395
msgid "LDAP query failed"
msgstr ""
@@ -4066,7 +4115,7 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:1180
#: setup/class_setupStep_Migrate.inc:1273
#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1391
+#: setup/class_setupStep_Migrate.inc:1396
msgid "Possibly the \"root object\" is missing."
msgstr ""
@@ -4221,15 +4270,15 @@ msgstr "Se encontraron %s Division(es) que no serán visibles en FusionDirectory
msgid "Department migration"
msgstr "Migración de Divisiones."
-#: setup/class_setupStep_Migrate.inc:1373
+#: setup/class_setupStep_Migrate.inc:1378
#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\"."
-msgstr "Se encontraron %s valores duplicados para el atributo 'uidNumber'."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
+msgstr ""
-#: setup/class_setupStep_Migrate.inc:1412
+#: setup/class_setupStep_Migrate.inc:1422
#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\"."
-msgstr "Se encontraron %s valores duplicados para el atributo \"gidNumber\"."
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
+msgstr ""
#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
msgid "Language setup"
diff --git a/locale/es_VE/fusiondirectory.po b/locale/es_VE/fusiondirectory.po
index 3ac290a8329e972edf78ad24201583479d937a19..dc5e1aa0b62c5080872ea304cd2ba32e2f8e5706 100644
--- a/locale/es_VE/fusiondirectory.po
+++ b/locale/es_VE/fusiondirectory.po
@@ -5,12 +5,12 @@
# Translators:
msgid ""
msgstr ""
-"Project-Id-Version: FusionDirectory-109\n"
+"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-01-22 11:26+0100\n"
-"PO-Revision-Date: 2016-01-22 10:24+0000\n"
+"POT-Creation-Date: 2016-03-14 12:07+0100\n"
+"PO-Revision-Date: 2016-03-07 12:09+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-109/language/es_VE/)\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -28,31 +28,31 @@ msgstr "¡Bienvenido %s!"
msgid "References"
msgstr "Referencias"
-#: plugins/admin/groups/class_roleGeneric.inc:30
-#: plugins/admin/groups/class_roleGeneric.inc:34
+#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:61
#: plugins/admin/groups/class_groupManagement.inc:71
#: plugins/admin/aclrole/class_aclRole.inc:78
#: plugins/admin/acl/class_aclAssignment.inc:49
msgid "Role"
msgstr "Rol"
-#: plugins/admin/groups/class_roleGeneric.inc:31
+#: plugins/admin/groups/class_roleGeneric.inc:58
msgid "Role information"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:35
+#: plugins/admin/groups/class_roleGeneric.inc:62
msgid "Organizational role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:84
msgid "Informations"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:158
+#: plugins/admin/departments/class_department.inc:174
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -62,13 +62,13 @@ msgstr ""
msgid "Name"
msgstr "Nombre"
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
msgid "Name of this group"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
#: plugins/admin/groups/class_group.inc:66
#: plugins/admin/groups/class_ogroup.inc:192
#: plugins/admin/groups/group-list.xml:41
@@ -81,26 +81,26 @@ msgstr ""
msgid "Description"
msgstr "Descripción"
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
msgid "Description of the role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:70
+#: plugins/admin/groups/class_roleGeneric.inc:97
msgid "Phone number"
msgstr "Número de teléfono"
-#: plugins/admin/groups/class_roleGeneric.inc:74
+#: plugins/admin/groups/class_roleGeneric.inc:101
msgid "Fax number"
msgstr "Número de Fax"
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
#: plugins/admin/users/class_userManagement.inc:42
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: setup/class_setupStep_Migrate.inc:871
msgid "Users"
msgstr "Usuarios"
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
msgid "Add users for the role"
msgstr ""
@@ -147,7 +147,7 @@ msgstr ""
#: plugins/admin/groups/class_group.inc:74
#: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:403
+#: plugins/personal/posix/class_posixAccount.inc:410
msgid "GID"
msgstr "GID"
@@ -204,23 +204,23 @@ msgid "Only allow this group to connect to this list of hosts"
msgstr ""
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458 include/functions.inc:794
-#: include/functions.inc:2548 include/class_xml.inc:55
+#: plugins/personal/posix/class_posixAccount.inc:465 include/functions.inc:794
+#: include/functions.inc:2549 include/class_xml.inc:55
#: include/simpleplugin/class_simpleTabs.inc:325 html/index.php:56
-#: html/index.php:62 html/index.php:481 html/class_passwordRecovery.inc:378
+#: html/index.php:62 html/index.php:522 html/class_passwordRecovery.inc:378
#: setup/class_setupStep_Migrate.inc:572
#: setup/class_setupStep_Migrate.inc:1083
#: setup/class_setupStep_Migrate.inc:1202
#: setup/class_setupStep_Migrate.inc:1313
-#: setup/class_setupStep_Migrate.inc:1372
-#: setup/class_setupStep_Migrate.inc:1411 plugins/admin/acl/remove.tpl.c:2
+#: setup/class_setupStep_Migrate.inc:1377
+#: setup/class_setupStep_Migrate.inc:1421 plugins/admin/acl/remove.tpl.c:2
#: ihtml/themes/default/islocked.tpl.c:5 ihtml/themes/default/remove.tpl.c:2
#: ihtml/themes/default/msg_dialog.tpl.c:5 setup/setup_checks.tpl.c:8
msgid "Warning"
msgstr "Aviso"
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458
+#: plugins/personal/posix/class_posixAccount.inc:465
msgid "Timeout while waiting for lock. Ignoring lock!"
msgstr "Tiempo de espera agotado esperando un bloqueo. ¡Ignorando bloqueo!"
@@ -250,7 +250,7 @@ msgstr "Objetos miembros"
msgid "Objects member of this group"
msgstr ""
-#: plugins/admin/groups/class_ogroup.inc:318
+#: plugins/admin/groups/class_ogroup.inc:313
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
@@ -279,10 +279,10 @@ msgstr "Crear"
#: plugins/admin/departments/dep-list.xml:79
#: plugins/admin/users/user-list.xml:105
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-#: include/simpleplugin/class_dialogAttributes.inc:626
-#: include/simpleplugin/class_dialogAttributes.inc:627
-#: include/simpleplugin/class_attribute.inc:2661
-#: include/simpleplugin/class_attribute.inc:2662
+#: include/simpleplugin/class_dialogAttributes.inc:632
+#: include/simpleplugin/class_dialogAttributes.inc:633
+#: include/simpleplugin/class_attribute.inc:2675
+#: include/simpleplugin/class_attribute.inc:2676
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -293,8 +293,8 @@ msgstr "Editar"
#: plugins/admin/departments/dep-list.xml:67
#: plugins/admin/departments/dep-list.xml:88
#: plugins/admin/users/user-list.xml:112
-#: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_dialogAttributes.inc:637
+#: include/simpleplugin/class_dialogAttributes.inc:642
+#: include/simpleplugin/class_dialogAttributes.inc:643
#: include/simpleplugin/simple-list.xml:75
#: include/simpleplugin/simple-list.xml:125
msgid "Remove"
@@ -343,7 +343,7 @@ msgid "Show application groups"
msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Show department groups"
+msgid "Show unidentified groups"
msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:137
@@ -432,51 +432,67 @@ msgid "Category of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:81
+msgid "Website"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:81
+#, php-format
+msgid "Website of this %s"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:85
#: plugins/personal/generic/class_user.inc:410
msgid "Manager"
msgstr "Gestor"
-#: plugins/admin/departments/class_department.inc:81
+#: plugins/admin/departments/class_department.inc:85
#, php-format
msgid "Manager of this %s"
msgstr ""
-#: plugins/admin/departments/class_department.inc:87
-#: plugins/admin/departments/class_department.inc:93
+#: plugins/admin/departments/class_department.inc:91
+#: plugins/admin/departments/class_department.inc:97
#: plugins/personal/generic/class_user.inc:304
msgid "Location"
msgstr "Localización"
-#: plugins/admin/departments/class_department.inc:90
+#: plugins/admin/departments/class_department.inc:94
#: plugins/personal/generic/class_user.inc:308
msgid "State"
msgstr "Provincia"
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_country.inc:29
+#: plugins/admin/departments/class_country.inc:30
+#: plugins/admin/departments/class_country.inc:33
+msgid "Country"
+msgstr "PaÃs"
+
+#: plugins/admin/departments/class_department.inc:103
#: plugins/personal/generic/class_user.inc:312
msgid "Address"
msgstr "Dirección"
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:103
#, php-format
msgid "A postal address for this %s"
msgstr ""
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
#: plugins/personal/generic/class_user.inc:320
msgid "Phone"
msgstr "Teléfono"
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
msgid "Telephone number"
msgstr "Número de teléfono"
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
#: plugins/personal/generic/class_user.inc:332
msgid "Fax"
msgstr "Fax"
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
msgid "Facsimile telephone number"
msgstr ""
@@ -504,12 +520,6 @@ msgstr "Localidad"
msgid "locality"
msgstr ""
-#: plugins/admin/departments/class_country.inc:29
-#: plugins/admin/departments/class_country.inc:30
-#: plugins/admin/departments/class_country.inc:33
-msgid "Country"
-msgstr "PaÃs"
-
#: plugins/admin/departments/class_country.inc:50
msgid "country"
msgstr ""
@@ -552,7 +562,8 @@ msgid "Given name"
msgstr "Nombre de pila"
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
+#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
msgid "Login"
@@ -665,8 +676,8 @@ msgid "Edit category ACL"
msgstr "Editar la categorÃa ACL"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2671
-#: include/simpleplugin/class_attribute.inc:2672
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
+#: include/simpleplugin/class_attribute.inc:2686
#, php-format
msgid "Delete"
msgstr "Eliminar"
@@ -771,19 +782,37 @@ msgstr ""
msgid "ACLs which are part of this group"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:38
+#: plugins/admin/acl/class_aclManagement.inc:31
+#: plugins/admin/acl/class_aclManagement.inc:32
+#: plugins/admin/acl/class_aclManagement.inc:45
+msgid "ACL assignment creation"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:33
+msgid "Create an ACL assignment on an arbitrary dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "Dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "DN you wish to add assignments for"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:135
msgid "ACL assignments"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:39
+#: plugins/admin/acl/class_aclManagement.inc:136
msgid "ACL assignments management"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:40
+#: plugins/admin/acl/class_aclManagement.inc:137
msgid "Manage ACL roles assignments to users"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:78
+#: plugins/admin/acl/class_aclManagement.inc:199
#: plugins/admin/acl/class_aclAssignment.inc:263
msgid "ACL Assignment"
msgstr "Asignación de ACL"
@@ -899,7 +928,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -994,59 +1023,59 @@ msgstr ""
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:336
+msgid "Homepage"
+msgstr "Página Web"
+
+#: plugins/personal/generic/class_user.inc:336
+msgid "Personal homepage"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:342
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:351
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr "Idioma preferido"
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:362
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
msgid "Display name"
msgstr "Nombre a Mostrar"
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home postal address"
msgstr "Dirección Postal personal"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:374
msgid "Private phone"
msgstr "Teléfono privado"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:374
msgid "Home phone number"
msgstr "Número de teléfono personal"
-#: plugins/personal/generic/class_user.inc:374
-msgid "Homepage"
-msgstr "Página Web"
-
-#: plugins/personal/generic/class_user.inc:374
-msgid "Personal homepage"
-msgstr ""
-
#: plugins/personal/generic/class_user.inc:380
msgid "Organizational information"
msgstr "Información corporativa"
@@ -1279,33 +1308,33 @@ msgstr "Sin configurar"
msgid "automatic"
msgstr "automático"
-#: plugins/personal/posix/class_posixAccount.inc:309
+#: plugins/personal/posix/class_posixAccount.inc:310
msgid "expired"
msgstr "expiró"
-#: plugins/personal/posix/class_posixAccount.inc:311
+#: plugins/personal/posix/class_posixAccount.inc:312
msgid "grace time active"
msgstr "Periodo de gracia activado"
-#: plugins/personal/posix/class_posixAccount.inc:314
-#: plugins/personal/posix/class_posixAccount.inc:316
-#: plugins/personal/posix/class_posixAccount.inc:318
+#: plugins/personal/posix/class_posixAccount.inc:315
+#: plugins/personal/posix/class_posixAccount.inc:317
+#: plugins/personal/posix/class_posixAccount.inc:319
msgid "active"
msgstr "activo"
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:315
msgid "password expired"
msgstr "la contraseña expiró"
-#: plugins/personal/posix/class_posixAccount.inc:316
+#: plugins/personal/posix/class_posixAccount.inc:317
msgid "password not changeable"
msgstr "no puede cambiar la contraseña"
-#: plugins/personal/posix/class_posixAccount.inc:400
+#: plugins/personal/posix/class_posixAccount.inc:407
msgid "UID"
msgstr "UID"
-#: plugins/personal/posix/class_posixAccount.inc:516
+#: plugins/personal/posix/class_posixAccount.inc:525
#, php-format
msgid "Group of user %s"
msgstr ""
@@ -1477,424 +1506,440 @@ msgid "Core settings"
msgstr ""
#: plugins/config/class_configInLdap.inc:161
-msgid "Enable primary group filter"
-msgstr "Activar filtro de grupo primario"
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"It is time consuming to evaluate which groups are primary and which are not,"
-" so you may want to disable it if your group plugin is slow."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:167
msgid "Display summary in listings"
msgstr "Mostrar resumen en listados"
-#: plugins/config/class_configInLdap.inc:168
+#: 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:173
+#: plugins/config/class_configInLdap.inc:167
msgid "Edit locking"
msgstr ""
-#: plugins/config/class_configInLdap.inc:174
+#: 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:179
+#: plugins/config/class_configInLdap.inc:173
msgid "Enable logging"
msgstr ""
-#: plugins/config/class_configInLdap.inc:180
+#: plugins/config/class_configInLdap.inc:174
msgid "Event logging on FusionDirectory side."
msgstr ""
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "LDAP size limit"
msgstr ""
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "Defines the number of entries to get from LDAP by default."
msgstr ""
-#: plugins/config/class_configInLdap.inc:192
+#: plugins/config/class_configInLdap.inc:186
msgid "Login and session"
msgstr "Inicio y sesión"
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:189
msgid "Login attribute"
msgstr "Atributo de inicio de sesión"
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:190
msgid "Which LDAP attribute should be used as the login name during login."
msgstr ""
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:196
msgid "Enforce encrypted connections"
msgstr "Forzar conexiones seguras"
-#: plugins/config/class_configInLdap.inc:203
+#: plugins/config/class_configInLdap.inc:197
msgid ""
"Enables PHP security checks to force encrypted access (https) to the web "
"interface."
msgstr ""
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:201
msgid "Warn if session is not encrypted"
msgstr "Avisar si la sesión no esta codificada"
-#: plugins/config/class_configInLdap.inc:208
+#: plugins/config/class_configInLdap.inc:202
msgid "will display a warning to the user when http is used instead of https."
msgstr ""
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Session lifetime"
msgstr "Duración de sesiones."
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Defines when a session will expire in seconds."
msgstr ""
-#: plugins/config/class_configInLdap.inc:220
+#: plugins/config/class_configInLdap.inc:212
+msgid "HTTP authentication"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:212
+msgid "Use HTTP authentication protocol instead of the login form."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:219
#: include/class_SnapshotDialogs.inc:186
msgid "Snapshots"
msgstr ""
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid "Enable snapshots"
msgstr "Activar instantaneas"
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid ""
"This enables you to save certain states of entries and restore them later "
"on."
msgstr ""
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
msgid "Snapshot base"
msgstr "Base de instantaneas"
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
msgid "The base where snapshots should be stored inside of the LDAP."
msgstr ""
-#: plugins/config/class_configInLdap.inc:235
+#: plugins/config/class_configInLdap.inc:234
msgid "SSL"
msgstr ""
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Key path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Path to FusionDirectory private key. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Certificate path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Path to FusionDirectory certificate. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:262
msgid "CA certificate path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:247
msgid "Path to the CA certificate. Used for validating Argonaut Server host."
msgstr ""
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:254
msgid "CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "Enable CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "CAS login will be used instead of LDAP bind"
msgstr ""
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:262
msgid "Path to the CA certificate of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host"
msgstr "Nombre de equipo"
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port"
msgstr "Puerto"
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port the CAS server is listening on"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context to be used"
msgstr ""
-#: plugins/config/class_configInLdap.inc:285
+#: plugins/config/class_configInLdap.inc:284
msgid "People and group storage"
msgstr "Almacén de grupos y usuarios"
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "People DN attribute"
msgstr "Atributo 'dn' de los usuarios"
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "Attribute to use at the beginning of users dn"
msgstr ""
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "CN pattern"
msgstr ""
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "The pattern to use to build the common name field"
msgstr ""
-#: plugins/config/class_configInLdap.inc:299
+#: plugins/config/class_configInLdap.inc:298
msgid "Strict naming policy"
msgstr ""
-#: plugins/config/class_configInLdap.inc:300
+#: plugins/config/class_configInLdap.inc:299
msgid "Enables strict checking of user and group names"
msgstr ""
-#: plugins/config/class_configInLdap.inc:305
+#: plugins/config/class_configInLdap.inc:304
msgid "Group/user min id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:306
+#: plugins/config/class_configInLdap.inc:305
msgid ""
"The minimum assignable user or group id to avoid security leaks with id 0 "
"accounts."
msgstr ""
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid "Next id hook"
msgstr ""
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid ""
"A script to be called for finding the next free id number for users or "
"groups."
msgstr ""
-#: plugins/config/class_configInLdap.inc:315
+#: plugins/config/class_configInLdap.inc:314
msgid "Base number for user id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:315
msgid "Where to start looking for a new free user id."
msgstr ""
-#: plugins/config/class_configInLdap.inc:321
+#: plugins/config/class_configInLdap.inc:320
msgid "Base number for group id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:321
msgid "Where to start looking for a new free group id."
msgstr ""
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "Users RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "The branch where users are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "Groups RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "The branch where groups are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "ACL role RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "The branch where ACL roles are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Id allocation method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Method to allocate user/group ids"
msgstr ""
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Traditional"
msgstr ""
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Samba unix id pool"
msgstr ""
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Pool user id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Minimum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Pool user id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Maximum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Pool group id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Minimum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Pool group id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Maximum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:370
+#: plugins/config/class_configInLdap.inc:367
+msgid "Restrict role members"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:367
+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:373
msgid "Debugging"
msgstr "Depurando"
-#: plugins/config/class_configInLdap.inc:373
+#: plugins/config/class_configInLdap.inc:376
msgid "Display errors"
msgstr ""
-#: plugins/config/class_configInLdap.inc:374
+#: plugins/config/class_configInLdap.inc:377
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:378
+#: plugins/config/class_configInLdap.inc:381
msgid "Maximum LDAP query time"
msgstr "Tiempo de consulta máxima de LDAP"
-#: plugins/config/class_configInLdap.inc:378
+#: plugins/config/class_configInLdap.inc:381
msgid ""
"Stop LDAP actions if there is no answer within the specified number of "
"seconds."
msgstr ""
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:386
msgid "Log LDAP statistics"
msgstr "Registrar estadÃsticas LDAP"
-#: plugins/config/class_configInLdap.inc:384
+#: plugins/config/class_configInLdap.inc:387
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:389
+#: plugins/config/class_configInLdap.inc:392
msgid "Debug level"
msgstr "Nivel de depuración"
-#: plugins/config/class_configInLdap.inc:390
+#: plugins/config/class_configInLdap.inc:393
msgid "Display certain information on each page load."
msgstr ""
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:405
msgid "Miscellaneous"
msgstr "Varios"
-#: plugins/config/class_configInLdap.inc:407
+#: plugins/config/class_configInLdap.inc:410
msgid "Hooks that are called when specific actions happens"
msgstr ""
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "tab"
msgstr ""
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "The tab that this hook concerns"
msgstr ""
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "mode"
msgstr "Modo"
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "When to call this command"
msgstr ""
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "cmd"
msgstr ""
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "The command that will be called"
msgstr ""
-#: plugins/config/class_configInLdap.inc:429
+#: plugins/config/class_configInLdap.inc:432
msgid "Hooks"
msgstr "Métodos"
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:439
msgid "Display hook output"
msgstr ""
-#: plugins/config/class_configInLdap.inc:437
+#: plugins/config/class_configInLdap.inc:440
msgid ""
"When enabled successful hook execution output is displayed to the user using"
" a dialog."
msgstr ""
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available shells"
msgstr ""
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available POSIX shells for FD users."
msgstr ""
-#: plugins/config/class_configInLdap.inc:449
+#: plugins/config/class_configInLdap.inc:452
msgid "Show ACL tab on all objects"
msgstr ""
-#: plugins/config/class_configInLdap.inc:450
+#: plugins/config/class_configInLdap.inc:453
msgid ""
"For very specific ACL rights setting where you might need to give right on a"
" single object."
msgstr ""
-#: plugins/config/class_configInLdap.inc:464
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available department categories"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available categories in the departments dropdown"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:474
#: setup/class_setupStep_Language.inc:69
msgid "Automatic"
msgstr "Automatico"
@@ -1911,80 +1956,80 @@ msgstr ""
msgid "Password recovery settings"
msgstr "Opciones de recuperación de clave"
-#: plugins/config/class_recoveryConfig.inc:44
+#: plugins/config/class_recoveryConfig.inc:45
msgid "Activate password recovery"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:45
+#: plugins/config/class_recoveryConfig.inc:46
msgid "Whether to activate or not password recovery feature"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:50
+#: plugins/config/class_recoveryConfig.inc:51
msgid "Sender email address"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:51
+#: plugins/config/class_recoveryConfig.inc:52
msgid "Email address from which mails will be sent"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:57
+#: plugins/config/class_recoveryConfig.inc:58
msgid "Link validity (minutes)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:58
+#: plugins/config/class_recoveryConfig.inc:59
msgid "Number of minutes before a recovery link expires"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:64
+#: plugins/config/class_recoveryConfig.inc:65
msgid "Salt for tokens"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:65
+#: plugins/config/class_recoveryConfig.inc:66
msgid ""
"Just a security measure, you can put anything in there, even random "
"characters"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:71
+#: plugins/config/class_recoveryConfig.inc:72
msgid "Allow the use of alternate addresses"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:72
+#: plugins/config/class_recoveryConfig.inc:73
msgid ""
"Users will also be able to enter one of theirs alternate addresses to "
"recover their password"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:79
+#: plugins/config/class_recoveryConfig.inc:80
msgid "First email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:82
-#: plugins/config/class_recoveryConfig.inc:101
+#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:102
msgid "Subject"
msgstr "Asunto"
-#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:84
msgid "Subject of the first email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:86
+#: plugins/config/class_recoveryConfig.inc:87
msgid "[FusionDirectory] Password recovery link"
msgstr "[FusionDirectory] Enlace de recuperación de clave"
-#: plugins/config/class_recoveryConfig.inc:89
+#: plugins/config/class_recoveryConfig.inc:90
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:91
#, 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 ""
-#: plugins/config/class_recoveryConfig.inc:93
+#: plugins/config/class_recoveryConfig.inc:94
#, php-format
msgid ""
"Hello,\n"
@@ -1996,31 +2041,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr "Saludos,\nAquà están los datos solicitados:\n\n- Usuario: %s\n- Enlace: %s\n\nEl enlace solo es valido por 10 minutos."
-#: plugins/config/class_recoveryConfig.inc:98
+#: plugins/config/class_recoveryConfig.inc:99
msgid "Second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:103
msgid "Subject of the second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:105
+#: plugins/config/class_recoveryConfig.inc:106
msgid "[FusionDirectory] Password recovery successful"
msgstr "[FusionDirectory] Recuperación de clave realizada con exito"
-#: plugins/config/class_recoveryConfig.inc:108
+#: plugins/config/class_recoveryConfig.inc:109
#, php-format
msgid "Body (%s is login)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:110
#, php-format
msgid ""
"Body of the second email, sent to confirm the password has been changed. Use"
" %s for the user login."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:112
+#: plugins/config/class_recoveryConfig.inc:113
#, php-format
msgid ""
"Hello,\n"
@@ -2088,13 +2133,13 @@ msgstr "Arriba"
msgid "Down"
msgstr "Abajo"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2633
-#: include/simpleplugin/class_attribute.inc:2634
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
+#: include/simpleplugin/class_attribute.inc:2648
msgid "Sort up"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2646
-#: include/simpleplugin/class_attribute.inc:2647
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
+#: include/simpleplugin/class_attribute.inc:2661
msgid "Sort down"
msgstr ""
@@ -2106,27 +2151,26 @@ msgstr "Seleccione todos"
#: include/class_config.inc:479 include/class_msgPool.inc:215
#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3106
-#: include/functions.inc:3127 include/functions.inc:3157
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197 include/functions.inc:3259
+#: include/class_msgPool.inc:740 include/functions.inc:3107
+#: include/functions.inc:3128 include/functions.inc:3158
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3260
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1663 include/class_CopyPasteHandler.inc:278
-#: include/simpleplugin/class_dialogAttributes.inc:733
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
-#: include/simpleplugin/class_attribute.inc:1774
-#: include/simpleplugin/class_attribute.inc:1877
-#: include/simpleplugin/class_attribute.inc:1879
+#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
+#: include/simpleplugin/class_attribute.inc:1784
+#: include/simpleplugin/class_attribute.inc:1887
+#: include/simpleplugin/class_attribute.inc:1889
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: 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:437
#: include/password-methods/class_password-methods.inc:447
-#: include/class_SnapshotHandler.inc:415 html/index.php:434 html/index.php:444
+#: include/class_SnapshotHandler.inc:415 html/index.php:473 html/index.php:483
#: setup/class_setupStep_Migrate.inc:935
#: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
msgid "Error"
@@ -2165,44 +2209,44 @@ msgstr "Recargar lista"
msgid "Submit"
msgstr "Enviar"
-#: include/class_listing.inc:1586 include/class_listing.inc:1640
+#: include/class_listing.inc:1590 include/class_listing.inc:1644
msgid "Copy"
msgstr "Copiar"
-#: include/class_listing.inc:1592 include/class_listing.inc:1628
+#: include/class_listing.inc:1596 include/class_listing.inc:1632
msgid "Cut"
msgstr "Mover"
-#: include/class_listing.inc:1600 include/class_listing.inc:1602
+#: include/class_listing.inc:1604 include/class_listing.inc:1606
#: include/class_CopyPasteHandler.inc:370
msgid "Paste"
msgstr "Pegar"
-#: include/class_listing.inc:1628
+#: include/class_listing.inc:1632
msgid "Cut this entry"
msgstr "Mover esta entrada"
-#: include/class_listing.inc:1640
+#: include/class_listing.inc:1644
msgid "Copy this entry"
msgstr "Copiar esta entrada"
-#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_listing.inc:1677 include/class_listing.inc:1679
msgid "Restore snapshots"
msgstr "Recuperar instantánea"
-#: include/class_listing.inc:1689
+#: include/class_listing.inc:1693
msgid "Export list"
msgstr "Exportar lista"
-#: include/class_listing.inc:1724 include/class_listing.inc:1725
+#: include/class_listing.inc:1728 include/class_listing.inc:1729
msgid "Restore snapshot"
msgstr "Recuperar instantanea"
-#: include/class_listing.inc:1734
+#: include/class_listing.inc:1738
msgid "Create snapshot"
msgstr "Crear instantánea"
-#: include/class_listing.inc:1735
+#: include/class_listing.inc:1739
msgid "Create a new snapshot from this object"
msgstr "¡Crear una nueva instantánea de este objeto!"
@@ -2245,7 +2289,7 @@ 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:162 include/class_config.inc:300
-#: include/class_config.inc:985 include/class_config.inc:998
+#: include/class_config.inc:915 include/class_config.inc:928
#: include/functions.inc:663 include/class_timezone.inc:51
#: include/password-methods/class_password-methods-sha.inc:71
#: include/password-methods/class_password-methods-ssha.inc:75
@@ -2262,17 +2306,17 @@ msgid ""
"while your passwords are not encrypted."
msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:917
-#: include/class_ldap.inc:1371 include/functions.inc:526
+#: include/class_config.inc:337 include/class_ldap.inc:918
+#: include/class_ldap.inc:1372 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2985 include/simpleplugin/class_simplePlugin.inc:545
-#: include/simpleplugin/class_attribute.inc:2895
+#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2909
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
#: include/class_SnapshotHandler.inc:422 include/class_SnapshotHandler.inc:425
-#: html/index.php:360 html/class_passwordRecovery.inc:497
+#: html/index.php:369 html/class_passwordRecovery.inc:497
#: setup/class_setupStep_Migrate.inc:451
#: setup/class_setupStep_Migrate.inc:1130
msgid "LDAP error"
@@ -2287,38 +2331,38 @@ msgstr "No se puede conectar a LDAP: Por favor consulte con el administrador de
msgid "The selected mail method (class %s) is not available"
msgstr ""
-#: include/class_config.inc:986
+#: include/class_config.inc:916
#, 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."
-#: include/class_config.inc:999
+#: include/class_config.inc:929
#, 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'."
-#: include/class_config.inc:1104
+#: include/class_config.inc:1034
msgid "All categories"
msgstr "Todas las categorÃas"
-#: include/class_config.inc:1231
+#: include/class_config.inc:1161
msgid "My account"
msgstr "Mi cuenta"
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
msgid "Performance warning"
msgstr "Aviso e rendimiento"
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
#, 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:868 include/class_ldap.inc:904
+#: include/class_ldap.inc:869 include/class_ldap.inc:905
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
@@ -2328,39 +2372,39 @@ msgstr "El rendimiento LDAP es bajo: ¡la última consulta tardó sobre %.2fs!"
msgid "Internal error"
msgstr "error interno"
-#: include/class_ldap.inc:868
+#: include/class_ldap.inc:869
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:904
+#: include/class_ldap.inc:905
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1016
+#: include/class_ldap.inc:1017
#, 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:1018
+#: include/class_ldap.inc:1019
#, php-format
msgid "while operating on LDAP server %s"
msgstr "mientras operaba en el servidor LDAP '%s'"
-#: include/class_ldap.inc:1108
+#: include/class_ldap.inc:1109
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1220
+#: include/class_ldap.inc:1221
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr "No es un DN válido: '%s': El bloque para importar debe empezar por 'dn: ...' en la linea %s"
-#: include/class_ldap.inc:1231
+#: include/class_ldap.inc:1232
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2948,10 +2992,10 @@ 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'"
-#: include/functions.inc:496 include/functions.inc:3294
-#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:263
-#: include/simpleplugin/class_simplePlugin.inc:268
-#: include/simpleplugin/class_simplePlugin.inc:280
+#: include/functions.inc:496 include/functions.inc:3295
+#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
+#: include/simpleplugin/class_simplePlugin.inc:269
+#: include/simpleplugin/class_simplePlugin.inc:281
#: html/class_passwordRecovery.inc:216
msgid "Fatal error"
msgstr "Error fatal"
@@ -3104,98 +3148,98 @@ msgstr "¡No se puede escribir en el archivo de revisión!"
msgid "Cannot read to revision file!"
msgstr "No se puede leer el archivo de revisión!"
-#: include/functions.inc:2548
+#: include/functions.inc:2549
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "LDAP warning"
msgstr "Aviso LDAP"
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "Cannot get schema information from server. No schema check possible!"
msgstr "No puedo obtener información de esquemas del servidor. ¡No es posible comprobar los esquemas!"
-#: include/functions.inc:2584
+#: include/functions.inc:2585
msgid ""
"Used to lock currently edited entries to avoid multiple changes at the same "
"time."
msgstr "Usado para bloquear entradas editadas actualmente y asà evitar múltiples cambios simultáneos."
-#: include/functions.inc:2596
+#: include/functions.inc:2597
#, php-format
msgid "Missing required object class '%s'!"
msgstr "¡No se ha encontrado la clase de objeto necesaria '%s'!"
-#: include/functions.inc:2599
+#: include/functions.inc:2600
#, php-format
msgid "Missing optional object class '%s'!"
msgstr "¡No se ha encontrado la clase de objeto opcional '%s'!"
-#: include/functions.inc:2603
+#: include/functions.inc:2604
#, php-format
msgid "Class(es) available"
msgstr "Clase(s) disponibles"
-#: include/functions.inc:2623
+#: include/functions.inc:2624
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2625
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2628
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2629
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3106 include/functions.inc:3127
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198
msgid "Cannot allocate a free ID:"
msgstr "No se puede asignar un identificador (ID) libre:"
-#: include/functions.inc:3106
+#: include/functions.inc:3107
msgid "unknown idAllocation method!"
msgstr "¡método de asignación de id desconocido!"
-#: include/functions.inc:3127
+#: include/functions.inc:3128
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr "¡%sPoolMin >= %sPoolMax!"
-#: include/functions.inc:3157
+#: include/functions.inc:3158
msgid "Cannot create sambaUnixIdPool entry!"
msgstr "¡No se puede crear la entrada sambaUnixIdPool!"
-#: include/functions.inc:3165
+#: include/functions.inc:3166
msgid "sambaUnixIdPool is not unique!"
msgstr "¡sambaUnixIdPool no es único!"
-#: include/functions.inc:3177 include/functions.inc:3181
+#: include/functions.inc:3178 include/functions.inc:3182
msgid "no ID available!"
msgstr "¡No hay ID disponibles!"
-#: include/functions.inc:3197
+#: include/functions.inc:3198
msgid "maximum tries exceeded!"
msgstr "¡Excedido el número de intentos máximo!"
-#: include/functions.inc:3259
+#: include/functions.inc:3260
msgid "Cannot allocate a free ID!"
msgstr "¡No se puede asignar un identificador (ID) libre!"
-#: include/functions.inc:3295
+#: include/functions.inc:3296
#, 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"
@@ -3351,13 +3395,13 @@ msgstr "En linea"
msgid "XML error"
msgstr "Error XML"
-#: include/class_plugin.inc:554
+#: include/class_plugin.inc:553
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/class_plugin.inc:1466
+#: include/class_plugin.inc:1467
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -3383,32 +3427,32 @@ msgstr "Nombre de la plantilla"
msgid "This is the name of the template"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:263
+#: include/simpleplugin/class_simplePlugin.inc:264
msgid "Only main tab can compute dn"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:270
+#: include/simpleplugin/class_simplePlugin.inc:271
#, php-format
msgid "Could not compute dn: no parent tab class for \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:282
+#: include/simpleplugin/class_simplePlugin.inc:283
#, php-format
msgid ""
"Could not compute dn: could not find objectType infos from tab class \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:638
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:644
+#: include/simpleplugin/class_simplePlugin.inc:652
msgid "Error when saving"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:638
+#: include/simpleplugin/class_simplePlugin.inc:644
#, php-format
msgid "There is already an entry with the same dn : %s"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:652
#, php-format
msgid "The entry %s is not existing"
msgstr ""
@@ -3428,27 +3472,27 @@ msgstr ""
msgid "Show %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:409
+#: include/simpleplugin/class_dialogAttributes.inc:415
#, php-format
msgid "Group %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:411
+#: include/simpleplugin/class_dialogAttributes.inc:417
#, php-format
msgid "Role %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:446
+#: include/simpleplugin/class_dialogAttributes.inc:452
msgid "Group of user"
msgstr "Grupo de usuarios"
-#: include/simpleplugin/class_dialogAttributes.inc:615
+#: include/simpleplugin/class_dialogAttributes.inc:621
#: include/simpleplugin/class_attribute.inc:1090
#: include/simpleplugin/class_attribute.inc:1124
msgid "None"
msgstr "Ninguno"
-#: include/simpleplugin/class_dialogAttributes.inc:617
+#: include/simpleplugin/class_dialogAttributes.inc:623
msgid "Unknown"
msgstr "Desconocido"
@@ -3489,11 +3533,16 @@ msgid "days"
msgstr "dÃas"
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2161
+#: include/simpleplugin/class_attribute.inc:2171
#, php-format
msgid "%s (required)"
msgstr ""
+#: include/simpleplugin/class_attribute.inc:1150
+#, php-format
+msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
+msgstr ""
+
#: include/simpleplugin/class_attribute.inc:1277
#, php-format
msgid "An integer between %d and %d"
@@ -3509,75 +3558,75 @@ msgstr ""
msgid "An integer smaller than %d"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1379
+#: include/simpleplugin/class_attribute.inc:1383
#, php-format
msgid "A float between %f and %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1381
+#: include/simpleplugin/class_attribute.inc:1385
#, php-format
msgid "A float larger than %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1383
+#: include/simpleplugin/class_attribute.inc:1387
#, php-format
msgid "A float smaller than %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1490
+#: include/simpleplugin/class_attribute.inc:1500
msgid "Error, incorrect date: "
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
#, php-format
msgid "Cannot read uploaded file: %s"
msgstr "No puedo leer el archivo: %s"
-#: include/simpleplugin/class_attribute.inc:1530
+#: include/simpleplugin/class_attribute.inc:1540
msgid "file is empty"
msgstr "el archivo está vacÃo"
-#: include/simpleplugin/class_attribute.inc:1533
+#: include/simpleplugin/class_attribute.inc:1543
msgid "file not found"
msgstr "archivo no encontrado"
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1546
msgid "file not readable"
msgstr "archivo no accesible"
-#: include/simpleplugin/class_attribute.inc:1569
+#: include/simpleplugin/class_attribute.inc:1579
#, php-format
msgid "%s (%d bytes)"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1616
-#: include/simpleplugin/class_attribute.inc:1793
+#: include/simpleplugin/class_attribute.inc:1626
+#: include/simpleplugin/class_attribute.inc:1803
msgid "Upload"
msgstr "Enviar"
-#: include/simpleplugin/class_attribute.inc:1621
-#: include/simpleplugin/class_attribute.inc:1622
+#: include/simpleplugin/class_attribute.inc:1631
+#: include/simpleplugin/class_attribute.inc:1632
msgid "Download"
msgstr "Descargar"
-#: include/simpleplugin/class_attribute.inc:1775
+#: include/simpleplugin/class_attribute.inc:1785
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr "No se puede guardar la foto del usuario, FusionDirectory requiere que este instalado el paquete 'php5-imagick'"
-#: include/simpleplugin/class_attribute.inc:1826
+#: include/simpleplugin/class_attribute.inc:1836
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr "Base"
-#: include/simpleplugin/class_attribute.inc:1829
+#: include/simpleplugin/class_attribute.inc:1839
msgid "Object base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:2755
+#: include/simpleplugin/class_attribute.inc:2769
#, php-format
msgid "Invalid value for %s"
msgstr ""
@@ -3711,17 +3760,17 @@ msgstr "Por favor compruebe la combinación nombre de usuario/contraseña"
msgid "Account locked. Please contact your system administrator!"
msgstr "Cuenta bloqueada. ¡Por favor contacte con su administrador de sistemas!"
-#: html/index.php:436
+#: html/index.php:475
#, php-format
msgid "CAS user \"%s\" could not be found in the LDAP"
msgstr ""
-#: html/index.php:446
+#: html/index.php:485
#, php-format
msgid "CAS user \"%s\" match several users in the LDAP"
msgstr ""
-#: html/index.php:481
+#: html/index.php:522
msgid ""
"Your browser has cookies disabled. Please enable cookies and reload this "
"page before logging in!"
@@ -4044,8 +4093,8 @@ msgid "Checking for duplicated UID numbers"
msgstr "Comprobando números UID duplicados"
#: setup/class_setupStep_Migrate.inc:267
-msgid "Checking for duplicate GID numbers"
-msgstr "Comprobando números GID duplicados"
+msgid "Checking for duplicated GID numbers"
+msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:487
#: setup/class_setupStep_Migrate.inc:564 setup/class_setupStep_Migrate.inc:702
@@ -4054,7 +4103,7 @@ msgstr "Comprobando números GID duplicados"
#: setup/class_setupStep_Migrate.inc:1179
#: setup/class_setupStep_Migrate.inc:1272
#: setup/class_setupStep_Migrate.inc:1351
-#: setup/class_setupStep_Migrate.inc:1390
+#: setup/class_setupStep_Migrate.inc:1395
msgid "LDAP query failed"
msgstr "La consulta LDAP ha fallado"
@@ -4065,7 +4114,7 @@ msgstr "La consulta LDAP ha fallado"
#: setup/class_setupStep_Migrate.inc:1180
#: setup/class_setupStep_Migrate.inc:1273
#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1391
+#: setup/class_setupStep_Migrate.inc:1396
msgid "Possibly the \"root object\" is missing."
msgstr ""
@@ -4220,14 +4269,14 @@ msgstr "Se encontraron %s departamentos que no serán visibles en FusionDirector
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1373
+#: setup/class_setupStep_Migrate.inc:1378
#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\"."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1412
+#: setup/class_setupStep_Migrate.inc:1422
#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\"."
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
diff --git a/locale/fa_IR/fusiondirectory.po b/locale/fa_IR/fusiondirectory.po
index 55ae898ab17ac9c2b683dfa4635604e2876759dd..b348fc439e1c40b583b1a0eef654327975016fc3 100644
--- a/locale/fa_IR/fusiondirectory.po
+++ b/locale/fa_IR/fusiondirectory.po
@@ -5,12 +5,12 @@
# Translators:
msgid ""
msgstr ""
-"Project-Id-Version: FusionDirectory-109\n"
+"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-01-22 11:26+0100\n"
-"PO-Revision-Date: 2016-01-22 10:24+0000\n"
+"POT-Creation-Date: 2016-03-14 12:07+0100\n"
+"PO-Revision-Date: 2016-03-07 12:09+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-109/language/fa_IR/)\n"
+"Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -28,31 +28,31 @@ msgstr ""
msgid "References"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:30
-#: plugins/admin/groups/class_roleGeneric.inc:34
+#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:61
#: plugins/admin/groups/class_groupManagement.inc:71
#: plugins/admin/aclrole/class_aclRole.inc:78
#: plugins/admin/acl/class_aclAssignment.inc:49
msgid "Role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:31
+#: plugins/admin/groups/class_roleGeneric.inc:58
msgid "Role information"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:35
+#: plugins/admin/groups/class_roleGeneric.inc:62
msgid "Organizational role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:84
msgid "Informations"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:158
+#: plugins/admin/departments/class_department.inc:174
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -62,13 +62,13 @@ msgstr ""
msgid "Name"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
msgid "Name of this group"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
#: plugins/admin/groups/class_group.inc:66
#: plugins/admin/groups/class_ogroup.inc:192
#: plugins/admin/groups/group-list.xml:41
@@ -81,26 +81,26 @@ msgstr ""
msgid "Description"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
msgid "Description of the role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:70
+#: plugins/admin/groups/class_roleGeneric.inc:97
msgid "Phone number"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:74
+#: plugins/admin/groups/class_roleGeneric.inc:101
msgid "Fax number"
msgstr "شماره Ùکس"
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
#: plugins/admin/users/class_userManagement.inc:42
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: setup/class_setupStep_Migrate.inc:871
msgid "Users"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
msgid "Add users for the role"
msgstr ""
@@ -147,7 +147,7 @@ msgstr ""
#: plugins/admin/groups/class_group.inc:74
#: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:403
+#: plugins/personal/posix/class_posixAccount.inc:410
msgid "GID"
msgstr ""
@@ -204,23 +204,23 @@ msgid "Only allow this group to connect to this list of hosts"
msgstr ""
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458 include/functions.inc:794
-#: include/functions.inc:2548 include/class_xml.inc:55
+#: plugins/personal/posix/class_posixAccount.inc:465 include/functions.inc:794
+#: include/functions.inc:2549 include/class_xml.inc:55
#: include/simpleplugin/class_simpleTabs.inc:325 html/index.php:56
-#: html/index.php:62 html/index.php:481 html/class_passwordRecovery.inc:378
+#: html/index.php:62 html/index.php:522 html/class_passwordRecovery.inc:378
#: setup/class_setupStep_Migrate.inc:572
#: setup/class_setupStep_Migrate.inc:1083
#: setup/class_setupStep_Migrate.inc:1202
#: setup/class_setupStep_Migrate.inc:1313
-#: setup/class_setupStep_Migrate.inc:1372
-#: setup/class_setupStep_Migrate.inc:1411 plugins/admin/acl/remove.tpl.c:2
+#: setup/class_setupStep_Migrate.inc:1377
+#: setup/class_setupStep_Migrate.inc:1421 plugins/admin/acl/remove.tpl.c:2
#: ihtml/themes/default/islocked.tpl.c:5 ihtml/themes/default/remove.tpl.c:2
#: ihtml/themes/default/msg_dialog.tpl.c:5 setup/setup_checks.tpl.c:8
msgid "Warning"
msgstr ""
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458
+#: plugins/personal/posix/class_posixAccount.inc:465
msgid "Timeout while waiting for lock. Ignoring lock!"
msgstr ""
@@ -250,7 +250,7 @@ msgstr ""
msgid "Objects member of this group"
msgstr ""
-#: plugins/admin/groups/class_ogroup.inc:318
+#: plugins/admin/groups/class_ogroup.inc:313
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
@@ -279,10 +279,10 @@ msgstr ""
#: plugins/admin/departments/dep-list.xml:79
#: plugins/admin/users/user-list.xml:105
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-#: include/simpleplugin/class_dialogAttributes.inc:626
-#: include/simpleplugin/class_dialogAttributes.inc:627
-#: include/simpleplugin/class_attribute.inc:2661
-#: include/simpleplugin/class_attribute.inc:2662
+#: include/simpleplugin/class_dialogAttributes.inc:632
+#: include/simpleplugin/class_dialogAttributes.inc:633
+#: include/simpleplugin/class_attribute.inc:2675
+#: include/simpleplugin/class_attribute.inc:2676
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -293,8 +293,8 @@ msgstr ""
#: plugins/admin/departments/dep-list.xml:67
#: plugins/admin/departments/dep-list.xml:88
#: plugins/admin/users/user-list.xml:112
-#: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_dialogAttributes.inc:637
+#: include/simpleplugin/class_dialogAttributes.inc:642
+#: include/simpleplugin/class_dialogAttributes.inc:643
#: include/simpleplugin/simple-list.xml:75
#: include/simpleplugin/simple-list.xml:125
msgid "Remove"
@@ -343,7 +343,7 @@ msgid "Show application groups"
msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Show department groups"
+msgid "Show unidentified groups"
msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:137
@@ -432,51 +432,67 @@ msgid "Category of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:81
+msgid "Website"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:81
+#, php-format
+msgid "Website of this %s"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:85
#: plugins/personal/generic/class_user.inc:410
msgid "Manager"
msgstr ""
-#: plugins/admin/departments/class_department.inc:81
+#: plugins/admin/departments/class_department.inc:85
#, php-format
msgid "Manager of this %s"
msgstr ""
-#: plugins/admin/departments/class_department.inc:87
-#: plugins/admin/departments/class_department.inc:93
+#: plugins/admin/departments/class_department.inc:91
+#: plugins/admin/departments/class_department.inc:97
#: plugins/personal/generic/class_user.inc:304
msgid "Location"
msgstr ""
-#: plugins/admin/departments/class_department.inc:90
+#: plugins/admin/departments/class_department.inc:94
#: plugins/personal/generic/class_user.inc:308
msgid "State"
msgstr ""
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_country.inc:29
+#: plugins/admin/departments/class_country.inc:30
+#: plugins/admin/departments/class_country.inc:33
+msgid "Country"
+msgstr "کشور"
+
+#: plugins/admin/departments/class_department.inc:103
#: plugins/personal/generic/class_user.inc:312
msgid "Address"
msgstr "آدرس"
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:103
#, php-format
msgid "A postal address for this %s"
msgstr ""
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
#: plugins/personal/generic/class_user.inc:320
msgid "Phone"
msgstr "تلÙÙ†"
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
msgid "Telephone number"
msgstr ""
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
#: plugins/personal/generic/class_user.inc:332
msgid "Fax"
msgstr ""
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
msgid "Facsimile telephone number"
msgstr ""
@@ -504,12 +520,6 @@ msgstr ""
msgid "locality"
msgstr ""
-#: plugins/admin/departments/class_country.inc:29
-#: plugins/admin/departments/class_country.inc:30
-#: plugins/admin/departments/class_country.inc:33
-msgid "Country"
-msgstr "کشور"
-
#: plugins/admin/departments/class_country.inc:50
msgid "country"
msgstr ""
@@ -552,7 +562,8 @@ msgid "Given name"
msgstr ""
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
+#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
msgid "Login"
@@ -665,8 +676,8 @@ msgid "Edit category ACL"
msgstr ""
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2671
-#: include/simpleplugin/class_attribute.inc:2672
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
+#: include/simpleplugin/class_attribute.inc:2686
#, php-format
msgid "Delete"
msgstr ""
@@ -771,19 +782,37 @@ msgstr ""
msgid "ACLs which are part of this group"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:38
+#: plugins/admin/acl/class_aclManagement.inc:31
+#: plugins/admin/acl/class_aclManagement.inc:32
+#: plugins/admin/acl/class_aclManagement.inc:45
+msgid "ACL assignment creation"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:33
+msgid "Create an ACL assignment on an arbitrary dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "Dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "DN you wish to add assignments for"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:135
msgid "ACL assignments"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:39
+#: plugins/admin/acl/class_aclManagement.inc:136
msgid "ACL assignments management"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:40
+#: plugins/admin/acl/class_aclManagement.inc:137
msgid "Manage ACL roles assignments to users"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:78
+#: plugins/admin/acl/class_aclManagement.inc:199
#: plugins/admin/acl/class_aclAssignment.inc:263
msgid "ACL Assignment"
msgstr ""
@@ -899,7 +928,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -994,59 +1023,59 @@ msgstr ""
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:336
+msgid "Homepage"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:336
+msgid "Personal homepage"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:342
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:351
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr ""
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:362
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
msgid "Display name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home postal address"
msgstr "آدرس پستی منزل"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:374
msgid "Private phone"
msgstr "شماره تماس خصوصی"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:374
msgid "Home phone number"
msgstr "شماره تلÙÙ† منزل"
-#: plugins/personal/generic/class_user.inc:374
-msgid "Homepage"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:374
-msgid "Personal homepage"
-msgstr ""
-
#: plugins/personal/generic/class_user.inc:380
msgid "Organizational information"
msgstr "اطلاعات سازمان"
@@ -1279,33 +1308,33 @@ msgstr ""
msgid "automatic"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:309
+#: plugins/personal/posix/class_posixAccount.inc:310
msgid "expired"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:311
+#: plugins/personal/posix/class_posixAccount.inc:312
msgid "grace time active"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:314
-#: plugins/personal/posix/class_posixAccount.inc:316
-#: plugins/personal/posix/class_posixAccount.inc:318
+#: plugins/personal/posix/class_posixAccount.inc:315
+#: plugins/personal/posix/class_posixAccount.inc:317
+#: plugins/personal/posix/class_posixAccount.inc:319
msgid "active"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:315
msgid "password expired"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:316
+#: plugins/personal/posix/class_posixAccount.inc:317
msgid "password not changeable"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:400
+#: plugins/personal/posix/class_posixAccount.inc:407
msgid "UID"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:516
+#: plugins/personal/posix/class_posixAccount.inc:525
#, php-format
msgid "Group of user %s"
msgstr ""
@@ -1477,424 +1506,440 @@ msgid "Core settings"
msgstr ""
#: plugins/config/class_configInLdap.inc:161
-msgid "Enable primary group filter"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"It is time consuming to evaluate which groups are primary and which are not,"
-" so you may want to disable it if your group plugin is slow."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:167
msgid "Display summary in listings"
msgstr ""
-#: plugins/config/class_configInLdap.inc:168
+#: 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:173
+#: plugins/config/class_configInLdap.inc:167
msgid "Edit locking"
msgstr ""
-#: plugins/config/class_configInLdap.inc:174
+#: 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:179
+#: plugins/config/class_configInLdap.inc:173
msgid "Enable logging"
msgstr ""
-#: plugins/config/class_configInLdap.inc:180
+#: plugins/config/class_configInLdap.inc:174
msgid "Event logging on FusionDirectory side."
msgstr ""
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "LDAP size limit"
msgstr ""
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "Defines the number of entries to get from LDAP by default."
msgstr ""
-#: plugins/config/class_configInLdap.inc:192
+#: plugins/config/class_configInLdap.inc:186
msgid "Login and session"
msgstr ""
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:189
msgid "Login attribute"
msgstr ""
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:190
msgid "Which LDAP attribute should be used as the login name during login."
msgstr ""
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:196
msgid "Enforce encrypted connections"
msgstr ""
-#: plugins/config/class_configInLdap.inc:203
+#: plugins/config/class_configInLdap.inc:197
msgid ""
"Enables PHP security checks to force encrypted access (https) to the web "
"interface."
msgstr ""
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:201
msgid "Warn if session is not encrypted"
msgstr ""
-#: plugins/config/class_configInLdap.inc:208
+#: plugins/config/class_configInLdap.inc:202
msgid "will display a warning to the user when http is used instead of https."
msgstr ""
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Session lifetime"
msgstr ""
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Defines when a session will expire in seconds."
msgstr ""
-#: plugins/config/class_configInLdap.inc:220
+#: plugins/config/class_configInLdap.inc:212
+msgid "HTTP authentication"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:212
+msgid "Use HTTP authentication protocol instead of the login form."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:219
#: include/class_SnapshotDialogs.inc:186
msgid "Snapshots"
msgstr ""
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid "Enable snapshots"
msgstr ""
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid ""
"This enables you to save certain states of entries and restore them later "
"on."
msgstr ""
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
msgid "Snapshot base"
msgstr ""
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
msgid "The base where snapshots should be stored inside of the LDAP."
msgstr ""
-#: plugins/config/class_configInLdap.inc:235
+#: plugins/config/class_configInLdap.inc:234
msgid "SSL"
msgstr ""
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Key path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Path to FusionDirectory private key. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Certificate path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Path to FusionDirectory certificate. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:262
msgid "CA certificate path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:247
msgid "Path to the CA certificate. Used for validating Argonaut Server host."
msgstr ""
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:254
msgid "CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "Enable CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "CAS login will be used instead of LDAP bind"
msgstr ""
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:262
msgid "Path to the CA certificate of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host"
msgstr ""
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port"
msgstr ""
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port the CAS server is listening on"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context to be used"
msgstr ""
-#: plugins/config/class_configInLdap.inc:285
+#: plugins/config/class_configInLdap.inc:284
msgid "People and group storage"
msgstr ""
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "People DN attribute"
msgstr ""
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "Attribute to use at the beginning of users dn"
msgstr ""
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "CN pattern"
msgstr ""
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "The pattern to use to build the common name field"
msgstr ""
-#: plugins/config/class_configInLdap.inc:299
+#: plugins/config/class_configInLdap.inc:298
msgid "Strict naming policy"
msgstr ""
-#: plugins/config/class_configInLdap.inc:300
+#: plugins/config/class_configInLdap.inc:299
msgid "Enables strict checking of user and group names"
msgstr ""
-#: plugins/config/class_configInLdap.inc:305
+#: plugins/config/class_configInLdap.inc:304
msgid "Group/user min id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:306
+#: plugins/config/class_configInLdap.inc:305
msgid ""
"The minimum assignable user or group id to avoid security leaks with id 0 "
"accounts."
msgstr ""
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid "Next id hook"
msgstr ""
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid ""
"A script to be called for finding the next free id number for users or "
"groups."
msgstr ""
-#: plugins/config/class_configInLdap.inc:315
+#: plugins/config/class_configInLdap.inc:314
msgid "Base number for user id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:315
msgid "Where to start looking for a new free user id."
msgstr ""
-#: plugins/config/class_configInLdap.inc:321
+#: plugins/config/class_configInLdap.inc:320
msgid "Base number for group id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:321
msgid "Where to start looking for a new free group id."
msgstr ""
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "Users RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "The branch where users are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "Groups RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "The branch where groups are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "ACL role RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "The branch where ACL roles are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Id allocation method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Method to allocate user/group ids"
msgstr ""
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Traditional"
msgstr ""
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Samba unix id pool"
msgstr ""
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Pool user id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Minimum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Pool user id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Maximum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Pool group id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Minimum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Pool group id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Maximum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:370
-msgid "Debugging"
+#: plugins/config/class_configInLdap.inc:367
+msgid "Restrict role members"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:367
+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:373
+msgid "Debugging"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:376
msgid "Display errors"
msgstr ""
-#: plugins/config/class_configInLdap.inc:374
+#: plugins/config/class_configInLdap.inc:377
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:378
+#: plugins/config/class_configInLdap.inc:381
msgid "Maximum LDAP query time"
msgstr ""
-#: plugins/config/class_configInLdap.inc:378
+#: plugins/config/class_configInLdap.inc:381
msgid ""
"Stop LDAP actions if there is no answer within the specified number of "
"seconds."
msgstr ""
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:386
msgid "Log LDAP statistics"
msgstr ""
-#: plugins/config/class_configInLdap.inc:384
+#: plugins/config/class_configInLdap.inc:387
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:389
+#: plugins/config/class_configInLdap.inc:392
msgid "Debug level"
msgstr ""
-#: plugins/config/class_configInLdap.inc:390
+#: plugins/config/class_configInLdap.inc:393
msgid "Display certain information on each page load."
msgstr ""
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:405
msgid "Miscellaneous"
msgstr ""
-#: plugins/config/class_configInLdap.inc:407
+#: plugins/config/class_configInLdap.inc:410
msgid "Hooks that are called when specific actions happens"
msgstr ""
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "tab"
msgstr ""
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "The tab that this hook concerns"
msgstr ""
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "mode"
msgstr ""
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "When to call this command"
msgstr ""
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "cmd"
msgstr ""
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "The command that will be called"
msgstr ""
-#: plugins/config/class_configInLdap.inc:429
+#: plugins/config/class_configInLdap.inc:432
msgid "Hooks"
msgstr ""
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:439
msgid "Display hook output"
msgstr ""
-#: plugins/config/class_configInLdap.inc:437
+#: plugins/config/class_configInLdap.inc:440
msgid ""
"When enabled successful hook execution output is displayed to the user using"
" a dialog."
msgstr ""
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available shells"
msgstr ""
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available POSIX shells for FD users."
msgstr ""
-#: plugins/config/class_configInLdap.inc:449
+#: plugins/config/class_configInLdap.inc:452
msgid "Show ACL tab on all objects"
msgstr ""
-#: plugins/config/class_configInLdap.inc:450
+#: plugins/config/class_configInLdap.inc:453
msgid ""
"For very specific ACL rights setting where you might need to give right on a"
" single object."
msgstr ""
-#: plugins/config/class_configInLdap.inc:464
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available department categories"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available categories in the departments dropdown"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:474
#: setup/class_setupStep_Language.inc:69
msgid "Automatic"
msgstr ""
@@ -1911,80 +1956,80 @@ msgstr ""
msgid "Password recovery settings"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:44
+#: plugins/config/class_recoveryConfig.inc:45
msgid "Activate password recovery"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:45
+#: plugins/config/class_recoveryConfig.inc:46
msgid "Whether to activate or not password recovery feature"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:50
+#: plugins/config/class_recoveryConfig.inc:51
msgid "Sender email address"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:51
+#: plugins/config/class_recoveryConfig.inc:52
msgid "Email address from which mails will be sent"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:57
+#: plugins/config/class_recoveryConfig.inc:58
msgid "Link validity (minutes)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:58
+#: plugins/config/class_recoveryConfig.inc:59
msgid "Number of minutes before a recovery link expires"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:64
+#: plugins/config/class_recoveryConfig.inc:65
msgid "Salt for tokens"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:65
+#: plugins/config/class_recoveryConfig.inc:66
msgid ""
"Just a security measure, you can put anything in there, even random "
"characters"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:71
+#: plugins/config/class_recoveryConfig.inc:72
msgid "Allow the use of alternate addresses"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:72
+#: plugins/config/class_recoveryConfig.inc:73
msgid ""
"Users will also be able to enter one of theirs alternate addresses to "
"recover their password"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:79
+#: plugins/config/class_recoveryConfig.inc:80
msgid "First email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:82
-#: plugins/config/class_recoveryConfig.inc:101
+#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:102
msgid "Subject"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:84
msgid "Subject of the first email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:86
+#: plugins/config/class_recoveryConfig.inc:87
msgid "[FusionDirectory] Password recovery link"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:89
+#: plugins/config/class_recoveryConfig.inc:90
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:91
#, 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 ""
-#: plugins/config/class_recoveryConfig.inc:93
+#: plugins/config/class_recoveryConfig.inc:94
#, php-format
msgid ""
"Hello,\n"
@@ -1996,31 +2041,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:98
+#: plugins/config/class_recoveryConfig.inc:99
msgid "Second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:103
msgid "Subject of the second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:105
+#: plugins/config/class_recoveryConfig.inc:106
msgid "[FusionDirectory] Password recovery successful"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:108
+#: plugins/config/class_recoveryConfig.inc:109
#, php-format
msgid "Body (%s is login)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:110
#, php-format
msgid ""
"Body of the second email, sent to confirm the password has been changed. Use"
" %s for the user login."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:112
+#: plugins/config/class_recoveryConfig.inc:113
#, php-format
msgid ""
"Hello,\n"
@@ -2088,13 +2133,13 @@ msgstr ""
msgid "Down"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2633
-#: include/simpleplugin/class_attribute.inc:2634
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
+#: include/simpleplugin/class_attribute.inc:2648
msgid "Sort up"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2646
-#: include/simpleplugin/class_attribute.inc:2647
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
+#: include/simpleplugin/class_attribute.inc:2661
msgid "Sort down"
msgstr ""
@@ -2106,27 +2151,26 @@ msgstr ""
#: include/class_config.inc:479 include/class_msgPool.inc:215
#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3106
-#: include/functions.inc:3127 include/functions.inc:3157
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197 include/functions.inc:3259
+#: include/class_msgPool.inc:740 include/functions.inc:3107
+#: include/functions.inc:3128 include/functions.inc:3158
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3260
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1663 include/class_CopyPasteHandler.inc:278
-#: include/simpleplugin/class_dialogAttributes.inc:733
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
-#: include/simpleplugin/class_attribute.inc:1774
-#: include/simpleplugin/class_attribute.inc:1877
-#: include/simpleplugin/class_attribute.inc:1879
+#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
+#: include/simpleplugin/class_attribute.inc:1784
+#: include/simpleplugin/class_attribute.inc:1887
+#: include/simpleplugin/class_attribute.inc:1889
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: 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:437
#: include/password-methods/class_password-methods.inc:447
-#: include/class_SnapshotHandler.inc:415 html/index.php:434 html/index.php:444
+#: include/class_SnapshotHandler.inc:415 html/index.php:473 html/index.php:483
#: setup/class_setupStep_Migrate.inc:935
#: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
msgid "Error"
@@ -2165,44 +2209,44 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: include/class_listing.inc:1586 include/class_listing.inc:1640
+#: include/class_listing.inc:1590 include/class_listing.inc:1644
msgid "Copy"
msgstr ""
-#: include/class_listing.inc:1592 include/class_listing.inc:1628
+#: include/class_listing.inc:1596 include/class_listing.inc:1632
msgid "Cut"
msgstr ""
-#: include/class_listing.inc:1600 include/class_listing.inc:1602
+#: include/class_listing.inc:1604 include/class_listing.inc:1606
#: include/class_CopyPasteHandler.inc:370
msgid "Paste"
msgstr ""
-#: include/class_listing.inc:1628
+#: include/class_listing.inc:1632
msgid "Cut this entry"
msgstr ""
-#: include/class_listing.inc:1640
+#: include/class_listing.inc:1644
msgid "Copy this entry"
msgstr ""
-#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_listing.inc:1677 include/class_listing.inc:1679
msgid "Restore snapshots"
msgstr ""
-#: include/class_listing.inc:1689
+#: include/class_listing.inc:1693
msgid "Export list"
msgstr ""
-#: include/class_listing.inc:1724 include/class_listing.inc:1725
+#: include/class_listing.inc:1728 include/class_listing.inc:1729
msgid "Restore snapshot"
msgstr ""
-#: include/class_listing.inc:1734
+#: include/class_listing.inc:1738
msgid "Create snapshot"
msgstr ""
-#: include/class_listing.inc:1735
+#: include/class_listing.inc:1739
msgid "Create a new snapshot from this object"
msgstr ""
@@ -2245,7 +2289,7 @@ msgid "XML error in fusiondirectory.conf: %s at line %d"
msgstr ""
#: include/class_config.inc:162 include/class_config.inc:300
-#: include/class_config.inc:985 include/class_config.inc:998
+#: include/class_config.inc:915 include/class_config.inc:928
#: include/functions.inc:663 include/class_timezone.inc:51
#: include/password-methods/class_password-methods-sha.inc:71
#: include/password-methods/class_password-methods-ssha.inc:75
@@ -2262,17 +2306,17 @@ msgid ""
"while your passwords are not encrypted."
msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:917
-#: include/class_ldap.inc:1371 include/functions.inc:526
+#: include/class_config.inc:337 include/class_ldap.inc:918
+#: include/class_ldap.inc:1372 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2985 include/simpleplugin/class_simplePlugin.inc:545
-#: include/simpleplugin/class_attribute.inc:2895
+#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2909
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
#: include/class_SnapshotHandler.inc:422 include/class_SnapshotHandler.inc:425
-#: html/index.php:360 html/class_passwordRecovery.inc:497
+#: html/index.php:369 html/class_passwordRecovery.inc:497
#: setup/class_setupStep_Migrate.inc:451
#: setup/class_setupStep_Migrate.inc:1130
msgid "LDAP error"
@@ -2287,38 +2331,38 @@ msgstr ""
msgid "The selected mail method (class %s) is not available"
msgstr ""
-#: include/class_config.inc:986
+#: include/class_config.inc:916
#, php-format
msgid ""
"The snapshot functionality is enabled, but the required variable '%s' is not"
" set."
msgstr ""
-#: include/class_config.inc:999
+#: include/class_config.inc:929
#, php-format
msgid ""
"The snapshot functionality is enabled, but the required compression module "
"is missing. Please install '%s'."
msgstr ""
-#: include/class_config.inc:1104
+#: include/class_config.inc:1034
msgid "All categories"
msgstr ""
-#: include/class_config.inc:1231
+#: include/class_config.inc:1161
msgid "My account"
msgstr ""
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
msgid "Performance warning"
msgstr ""
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
#, php-format
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr ""
-#: include/class_ldap.inc:868 include/class_ldap.inc:904
+#: include/class_ldap.inc:869 include/class_ldap.inc:905
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
@@ -2328,39 +2372,39 @@ msgstr ""
msgid "Internal error"
msgstr "خطای داخلی"
-#: include/class_ldap.inc:868
+#: include/class_ldap.inc:869
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:904
+#: include/class_ldap.inc:905
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1016
+#: include/class_ldap.inc:1017
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr ""
-#: include/class_ldap.inc:1018
+#: include/class_ldap.inc:1019
#, php-format
msgid "while operating on LDAP server %s"
msgstr ""
-#: include/class_ldap.inc:1108
+#: include/class_ldap.inc:1109
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1220
+#: include/class_ldap.inc:1221
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr ""
-#: include/class_ldap.inc:1231
+#: include/class_ldap.inc:1232
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2948,10 +2992,10 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr ""
-#: include/functions.inc:496 include/functions.inc:3294
-#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:263
-#: include/simpleplugin/class_simplePlugin.inc:268
-#: include/simpleplugin/class_simplePlugin.inc:280
+#: include/functions.inc:496 include/functions.inc:3295
+#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
+#: include/simpleplugin/class_simplePlugin.inc:269
+#: include/simpleplugin/class_simplePlugin.inc:281
#: html/class_passwordRecovery.inc:216
msgid "Fatal error"
msgstr "خطا"
@@ -3104,98 +3148,98 @@ msgstr ""
msgid "Cannot read to revision file!"
msgstr ""
-#: include/functions.inc:2548
+#: include/functions.inc:2549
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "LDAP warning"
msgstr ""
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "Cannot get schema information from server. No schema check possible!"
msgstr ""
-#: include/functions.inc:2584
+#: include/functions.inc:2585
msgid ""
"Used to lock currently edited entries to avoid multiple changes at the same "
"time."
msgstr ""
-#: include/functions.inc:2596
+#: include/functions.inc:2597
#, php-format
msgid "Missing required object class '%s'!"
msgstr ""
-#: include/functions.inc:2599
+#: include/functions.inc:2600
#, php-format
msgid "Missing optional object class '%s'!"
msgstr ""
-#: include/functions.inc:2603
+#: include/functions.inc:2604
#, php-format
msgid "Class(es) available"
msgstr ""
-#: include/functions.inc:2623
+#: include/functions.inc:2624
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2625
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2628
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2629
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3106 include/functions.inc:3127
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3106
+#: include/functions.inc:3107
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3127
+#: include/functions.inc:3128
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3157
+#: include/functions.inc:3158
msgid "Cannot create sambaUnixIdPool entry!"
msgstr ""
-#: include/functions.inc:3165
+#: include/functions.inc:3166
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3177 include/functions.inc:3181
+#: include/functions.inc:3178 include/functions.inc:3182
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3197
+#: include/functions.inc:3198
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3259
+#: include/functions.inc:3260
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3295
+#: include/functions.inc:3296
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr "Ùایل '%s' را نمی توانم پیدا کنم برای رÙع مشکل دستور '%s' را بزنید."
@@ -3351,13 +3395,13 @@ msgstr ""
msgid "XML error"
msgstr ""
-#: include/class_plugin.inc:554
+#: include/class_plugin.inc:553
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/class_plugin.inc:1466
+#: include/class_plugin.inc:1467
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -3383,32 +3427,32 @@ msgstr ""
msgid "This is the name of the template"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:263
+#: include/simpleplugin/class_simplePlugin.inc:264
msgid "Only main tab can compute dn"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:270
+#: include/simpleplugin/class_simplePlugin.inc:271
#, php-format
msgid "Could not compute dn: no parent tab class for \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:282
+#: include/simpleplugin/class_simplePlugin.inc:283
#, php-format
msgid ""
"Could not compute dn: could not find objectType infos from tab class \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:638
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:644
+#: include/simpleplugin/class_simplePlugin.inc:652
msgid "Error when saving"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:638
+#: include/simpleplugin/class_simplePlugin.inc:644
#, php-format
msgid "There is already an entry with the same dn : %s"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:652
#, php-format
msgid "The entry %s is not existing"
msgstr ""
@@ -3428,27 +3472,27 @@ msgstr ""
msgid "Show %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:409
+#: include/simpleplugin/class_dialogAttributes.inc:415
#, php-format
msgid "Group %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:411
+#: include/simpleplugin/class_dialogAttributes.inc:417
#, php-format
msgid "Role %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:446
+#: include/simpleplugin/class_dialogAttributes.inc:452
msgid "Group of user"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:615
+#: include/simpleplugin/class_dialogAttributes.inc:621
#: include/simpleplugin/class_attribute.inc:1090
#: include/simpleplugin/class_attribute.inc:1124
msgid "None"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:617
+#: include/simpleplugin/class_dialogAttributes.inc:623
msgid "Unknown"
msgstr ""
@@ -3489,11 +3533,16 @@ msgid "days"
msgstr ""
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2161
+#: include/simpleplugin/class_attribute.inc:2171
#, php-format
msgid "%s (required)"
msgstr ""
+#: include/simpleplugin/class_attribute.inc:1150
+#, php-format
+msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
+msgstr ""
+
#: include/simpleplugin/class_attribute.inc:1277
#, php-format
msgid "An integer between %d and %d"
@@ -3509,75 +3558,75 @@ msgstr ""
msgid "An integer smaller than %d"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1379
+#: include/simpleplugin/class_attribute.inc:1383
#, php-format
msgid "A float between %f and %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1381
+#: include/simpleplugin/class_attribute.inc:1385
#, php-format
msgid "A float larger than %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1383
+#: include/simpleplugin/class_attribute.inc:1387
#, php-format
msgid "A float smaller than %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1490
+#: include/simpleplugin/class_attribute.inc:1500
msgid "Error, incorrect date: "
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
#, php-format
msgid "Cannot read uploaded file: %s"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1530
+#: include/simpleplugin/class_attribute.inc:1540
msgid "file is empty"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1533
+#: include/simpleplugin/class_attribute.inc:1543
msgid "file not found"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1546
msgid "file not readable"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1569
+#: include/simpleplugin/class_attribute.inc:1579
#, php-format
msgid "%s (%d bytes)"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1616
-#: include/simpleplugin/class_attribute.inc:1793
+#: include/simpleplugin/class_attribute.inc:1626
+#: include/simpleplugin/class_attribute.inc:1803
msgid "Upload"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1621
-#: include/simpleplugin/class_attribute.inc:1622
+#: include/simpleplugin/class_attribute.inc:1631
+#: include/simpleplugin/class_attribute.inc:1632
msgid "Download"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1775
+#: include/simpleplugin/class_attribute.inc:1785
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1826
+#: include/simpleplugin/class_attribute.inc:1836
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1829
+#: include/simpleplugin/class_attribute.inc:1839
msgid "Object base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:2755
+#: include/simpleplugin/class_attribute.inc:2769
#, php-format
msgid "Invalid value for %s"
msgstr ""
@@ -3711,17 +3760,17 @@ msgstr ""
msgid "Account locked. Please contact your system administrator!"
msgstr ""
-#: html/index.php:436
+#: html/index.php:475
#, php-format
msgid "CAS user \"%s\" could not be found in the LDAP"
msgstr ""
-#: html/index.php:446
+#: html/index.php:485
#, php-format
msgid "CAS user \"%s\" match several users in the LDAP"
msgstr ""
-#: html/index.php:481
+#: html/index.php:522
msgid ""
"Your browser has cookies disabled. Please enable cookies and reload this "
"page before logging in!"
@@ -4044,7 +4093,7 @@ msgid "Checking for duplicated UID numbers"
msgstr ""
#: setup/class_setupStep_Migrate.inc:267
-msgid "Checking for duplicate GID numbers"
+msgid "Checking for duplicated GID numbers"
msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:487
@@ -4054,7 +4103,7 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:1179
#: setup/class_setupStep_Migrate.inc:1272
#: setup/class_setupStep_Migrate.inc:1351
-#: setup/class_setupStep_Migrate.inc:1390
+#: setup/class_setupStep_Migrate.inc:1395
msgid "LDAP query failed"
msgstr ""
@@ -4065,7 +4114,7 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:1180
#: setup/class_setupStep_Migrate.inc:1273
#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1391
+#: setup/class_setupStep_Migrate.inc:1396
msgid "Possibly the \"root object\" is missing."
msgstr ""
@@ -4220,14 +4269,14 @@ msgstr ""
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1373
+#: setup/class_setupStep_Migrate.inc:1378
#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\"."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1412
+#: setup/class_setupStep_Migrate.inc:1422
#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\"."
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
diff --git a/locale/fr/fusiondirectory.po b/locale/fr/fusiondirectory.po
index 9d70b221a4a994a6d2b6ac39256b35e7f64b249f..38da0fda52f5abf6a095b84efce972602ae42418 100644
--- a/locale/fr/fusiondirectory.po
+++ b/locale/fr/fusiondirectory.po
@@ -3,19 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2015-2016
-# MCMic, 2015-2016
-# fusiondirectory <contact@fusiondirectory.org>, 2014-2015
+# Benoit Mortier <benoit.mortier@opensides.be>, 2016
# fusiondirectory <contact@fusiondirectory.org>, 2014
# MCMic, 2015
msgid ""
msgstr ""
-"Project-Id-Version: FusionDirectory-109\n"
+"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-01-22 11:26+0100\n"
-"PO-Revision-Date: 2016-01-22 10:31+0000\n"
+"POT-Creation-Date: 2016-03-14 12:07+0100\n"
+"PO-Revision-Date: 2016-03-07 12:34+0000\n"
"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
-"Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-109/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -33,31 +31,31 @@ msgstr "Bienvenue %s !"
msgid "References"
msgstr "Références"
-#: plugins/admin/groups/class_roleGeneric.inc:30
-#: plugins/admin/groups/class_roleGeneric.inc:34
+#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:61
#: plugins/admin/groups/class_groupManagement.inc:71
#: plugins/admin/aclrole/class_aclRole.inc:78
#: plugins/admin/acl/class_aclAssignment.inc:49
msgid "Role"
msgstr "Rôle"
-#: plugins/admin/groups/class_roleGeneric.inc:31
+#: plugins/admin/groups/class_roleGeneric.inc:58
msgid "Role information"
msgstr "Information du rôle"
-#: plugins/admin/groups/class_roleGeneric.inc:35
+#: plugins/admin/groups/class_roleGeneric.inc:62
msgid "Organizational role"
msgstr "Rôle organisationnel"
-#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:84
msgid "Informations"
msgstr "Informations"
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:158
+#: plugins/admin/departments/class_department.inc:174
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -67,13 +65,13 @@ msgstr "Informations"
msgid "Name"
msgstr "Nom"
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
msgid "Name of this group"
msgstr "Nom du groupe"
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
#: plugins/admin/groups/class_group.inc:66
#: plugins/admin/groups/class_ogroup.inc:192
#: plugins/admin/groups/group-list.xml:41
@@ -86,26 +84,26 @@ msgstr "Nom du groupe"
msgid "Description"
msgstr "Description"
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
msgid "Description of the role"
msgstr "Description du rôle"
-#: plugins/admin/groups/class_roleGeneric.inc:70
+#: plugins/admin/groups/class_roleGeneric.inc:97
msgid "Phone number"
msgstr "Numéro de téléphone"
-#: plugins/admin/groups/class_roleGeneric.inc:74
+#: plugins/admin/groups/class_roleGeneric.inc:101
msgid "Fax number"
msgstr "Numéro de fax"
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
#: plugins/admin/users/class_userManagement.inc:42
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: setup/class_setupStep_Migrate.inc:871
msgid "Users"
msgstr "Utilisateurs"
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
msgid "Add users for the role"
msgstr "Ajouter des utilisateurs au rôle"
@@ -152,7 +150,7 @@ msgstr "Forcer la valeur du GID pour ce groupe"
#: plugins/admin/groups/class_group.inc:74
#: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:403
+#: plugins/personal/posix/class_posixAccount.inc:410
msgid "GID"
msgstr "GID"
@@ -209,23 +207,23 @@ 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_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458 include/functions.inc:794
-#: include/functions.inc:2548 include/class_xml.inc:55
+#: plugins/personal/posix/class_posixAccount.inc:465 include/functions.inc:794
+#: include/functions.inc:2549 include/class_xml.inc:55
#: include/simpleplugin/class_simpleTabs.inc:325 html/index.php:56
-#: html/index.php:62 html/index.php:481 html/class_passwordRecovery.inc:378
+#: html/index.php:62 html/index.php:522 html/class_passwordRecovery.inc:378
#: setup/class_setupStep_Migrate.inc:572
#: setup/class_setupStep_Migrate.inc:1083
#: setup/class_setupStep_Migrate.inc:1202
#: setup/class_setupStep_Migrate.inc:1313
-#: setup/class_setupStep_Migrate.inc:1372
-#: setup/class_setupStep_Migrate.inc:1411 plugins/admin/acl/remove.tpl.c:2
+#: setup/class_setupStep_Migrate.inc:1377
+#: setup/class_setupStep_Migrate.inc:1421 plugins/admin/acl/remove.tpl.c:2
#: ihtml/themes/default/islocked.tpl.c:5 ihtml/themes/default/remove.tpl.c:2
#: ihtml/themes/default/msg_dialog.tpl.c:5 setup/setup_checks.tpl.c:8
msgid "Warning"
msgstr "Avertissement"
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458
+#: plugins/personal/posix/class_posixAccount.inc:465
msgid "Timeout while waiting for lock. Ignoring lock!"
msgstr "Le temps d'attente du verrou a été dépassé. Verrou ignoré !"
@@ -255,7 +253,7 @@ msgstr "Objets membres"
msgid "Objects member of this group"
msgstr "Objets membres de ce groupe"
-#: plugins/admin/groups/class_ogroup.inc:318
+#: plugins/admin/groups/class_ogroup.inc:313
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"
@@ -284,10 +282,10 @@ msgstr "Créer"
#: plugins/admin/departments/dep-list.xml:79
#: plugins/admin/users/user-list.xml:105
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-#: include/simpleplugin/class_dialogAttributes.inc:626
-#: include/simpleplugin/class_dialogAttributes.inc:627
-#: include/simpleplugin/class_attribute.inc:2661
-#: include/simpleplugin/class_attribute.inc:2662
+#: include/simpleplugin/class_dialogAttributes.inc:632
+#: include/simpleplugin/class_dialogAttributes.inc:633
+#: include/simpleplugin/class_attribute.inc:2675
+#: include/simpleplugin/class_attribute.inc:2676
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -298,8 +296,8 @@ msgstr "Éditer"
#: plugins/admin/departments/dep-list.xml:67
#: plugins/admin/departments/dep-list.xml:88
#: plugins/admin/users/user-list.xml:112
-#: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_dialogAttributes.inc:637
+#: include/simpleplugin/class_dialogAttributes.inc:642
+#: include/simpleplugin/class_dialogAttributes.inc:643
#: include/simpleplugin/simple-list.xml:75
#: include/simpleplugin/simple-list.xml:125
msgid "Remove"
@@ -316,7 +314,7 @@ msgstr "Gérer les groupes et les rôles"
#: plugins/admin/groups/class_groupManagement.inc:33
msgid "Allows you to manage object groups, POSIX groups and roles"
-msgstr "Permet de gérer les groupes d'objets, groupes POSIX et rôles"
+msgstr "Permet de gérer des groupes d'objets, des groupes POSIX et des rôles "
#: plugins/admin/groups/class_groupManagement.inc:71
msgid "Edit role properties"
@@ -348,8 +346,8 @@ msgid "Show application groups"
msgstr "Afficher les groupes d’applications"
#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Show department groups"
-msgstr "Afficher les groupes de départements"
+msgid "Show unidentified groups"
+msgstr "Afficher des groupes non identifiés"
#: plugins/admin/groups/class_groupManagement.inc:137
#: include/select/groupSelect/group-filter.tpl.c:11
@@ -437,51 +435,67 @@ msgid "Category of this %s"
msgstr "Catégorie de ce %s"
#: plugins/admin/departments/class_department.inc:81
+msgid "Website"
+msgstr "Site Web"
+
+#: plugins/admin/departments/class_department.inc:81
+#, php-format
+msgid "Website of this %s"
+msgstr "Site Web de %s"
+
+#: plugins/admin/departments/class_department.inc:85
#: plugins/personal/generic/class_user.inc:410
msgid "Manager"
msgstr "Responsable"
-#: plugins/admin/departments/class_department.inc:81
+#: plugins/admin/departments/class_department.inc:85
#, php-format
msgid "Manager of this %s"
msgstr "Responsable de ce %s"
-#: plugins/admin/departments/class_department.inc:87
-#: plugins/admin/departments/class_department.inc:93
+#: plugins/admin/departments/class_department.inc:91
+#: plugins/admin/departments/class_department.inc:97
#: plugins/personal/generic/class_user.inc:304
msgid "Location"
msgstr "Lieu"
-#: plugins/admin/departments/class_department.inc:90
+#: plugins/admin/departments/class_department.inc:94
#: plugins/personal/generic/class_user.inc:308
msgid "State"
msgstr "État"
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_country.inc:29
+#: plugins/admin/departments/class_country.inc:30
+#: plugins/admin/departments/class_country.inc:33
+msgid "Country"
+msgstr "Pays"
+
+#: plugins/admin/departments/class_department.inc:103
#: plugins/personal/generic/class_user.inc:312
msgid "Address"
msgstr "Adresse"
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:103
#, php-format
msgid "A postal address for this %s"
msgstr "Adresse postale pour ce %s"
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
#: plugins/personal/generic/class_user.inc:320
msgid "Phone"
msgstr "Téléphone"
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
msgid "Telephone number"
msgstr "Numéro de téléphone"
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
#: plugins/personal/generic/class_user.inc:332
msgid "Fax"
msgstr "Fax"
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
msgid "Facsimile telephone number"
msgstr "Numéro de fax"
@@ -493,7 +507,7 @@ msgstr "Gérer les départements"
msgid ""
"Manage departments, countries, domain components, domains, localities and "
"organization nodes,"
-msgstr "Gérer les branches départements, pays, domaines, lieux et 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"
@@ -509,12 +523,6 @@ msgstr "Lieu"
msgid "locality"
msgstr "lieu"
-#: plugins/admin/departments/class_country.inc:29
-#: plugins/admin/departments/class_country.inc:30
-#: plugins/admin/departments/class_country.inc:33
-msgid "Country"
-msgstr "Pays"
-
#: plugins/admin/departments/class_country.inc:50
msgid "country"
msgstr "pays"
@@ -557,7 +565,8 @@ msgid "Given name"
msgstr "Prénom"
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
+#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
msgid "Login"
@@ -615,7 +624,7 @@ msgstr "Gérer les utilisateurs"
#: plugins/admin/users/class_userManagement.inc:44
msgid "Manage user accounts and their properties"
-msgstr "Gérer les comptes utilisateurs et leur propriétés"
+msgstr "Gérer les comptes utilisateurs et leurs propriétés"
#: plugins/admin/users/class_userManagement.inc:140
#: include/class_management.inc:341 include/class_management.inc:488
@@ -670,8 +679,8 @@ msgid "Edit category ACL"
msgstr "Éditer les catégories ACL"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2671
-#: include/simpleplugin/class_attribute.inc:2672
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
+#: include/simpleplugin/class_attribute.inc:2686
#, php-format
msgid "Delete"
msgstr "Supprimer"
@@ -692,7 +701,7 @@ msgstr "Tous les objets dans le sous arbre actuel"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:217
#, php-format
msgid "Edit ACL for \"%s\""
-msgstr "Éditer l’ACL pour \"%s\""
+msgstr "Modifier ACL pour \"%s\""
#: plugins/admin/aclrole/class_aclEditionDialog.inc:258
#: plugins/admin/aclrole/class_aclEditionDialog.inc:359
@@ -776,19 +785,37 @@ msgstr "ACLs"
msgid "ACLs which are part of this group"
msgstr "ACLs qui font partie de ce groupe"
-#: plugins/admin/acl/class_aclManagement.inc:38
+#: plugins/admin/acl/class_aclManagement.inc:31
+#: plugins/admin/acl/class_aclManagement.inc:32
+#: plugins/admin/acl/class_aclManagement.inc:45
+msgid "ACL assignment creation"
+msgstr "création d'affectation ACL"
+
+#: plugins/admin/acl/class_aclManagement.inc:33
+msgid "Create an ACL assignment on an arbitrary dn"
+msgstr "Créer une affectation d'ACL sur un dn arbitraire"
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "Dn"
+msgstr "Dn"
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "DN you wish to add assignments for"
+msgstr "DN auquel vous souhaitez ajouter des affectations"
+
+#: plugins/admin/acl/class_aclManagement.inc:135
msgid "ACL assignments"
msgstr "Affectations ACL"
-#: plugins/admin/acl/class_aclManagement.inc:39
+#: plugins/admin/acl/class_aclManagement.inc:136
msgid "ACL assignments management"
-msgstr "Gestion des affectations ACL"
+msgstr "gestion des affectations ACL "
-#: plugins/admin/acl/class_aclManagement.inc:40
+#: plugins/admin/acl/class_aclManagement.inc:137
msgid "Manage ACL roles assignments to users"
-msgstr "Gérer les affectations des rôles ACL aux utilisateurs"
+msgstr "Affectations des rôles ACL pour les utilisateurs"
-#: plugins/admin/acl/class_aclManagement.inc:78
+#: plugins/admin/acl/class_aclManagement.inc:199
#: plugins/admin/acl/class_aclAssignment.inc:263
msgid "ACL Assignment"
msgstr "Affectation ACL"
@@ -904,7 +931,7 @@ msgid "Password hash method to use"
msgstr "Méthode de chiffrement des mots de passe"
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -999,59 +1026,59 @@ msgstr "Numéro de bip professionnel"
msgid "Business fax number"
msgstr "Numéro de fax professionnel"
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:336
+msgid "Homepage"
+msgstr "Site web"
+
+#: plugins/personal/generic/class_user.inc:336
+msgid "Personal homepage"
+msgstr "Site web personnel"
+
+#: plugins/personal/generic/class_user.inc:342
msgid "Account information"
msgstr "Compte utilisateur"
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
msgid "Login of this user"
msgstr "Identifiant de l'utilisateur"
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:351
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr "Langue préférée"
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
msgid "Password of the user"
msgstr "Mot de passe de l'utilisateur"
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:362
msgid "Personal contact information"
msgstr "Informations de contact personnelles"
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
msgid "Display name"
msgstr "Nom à afficher"
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
msgid "Name this user should appear as. Used by Exchange."
msgstr "Nom de l'utilisateur tel qu'il devrait apparaître. Utilisé par le carnet d'adresse Exchange."
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home address"
msgstr "Adresse postale"
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home postal address"
msgstr "Adresse postale personnelle"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:374
msgid "Private phone"
msgstr "Numéro de téléphone privé"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:374
msgid "Home phone number"
msgstr "Numéro de téléphone privé"
-#: plugins/personal/generic/class_user.inc:374
-msgid "Homepage"
-msgstr "Site web"
-
-#: plugins/personal/generic/class_user.inc:374
-msgid "Personal homepage"
-msgstr "Site web personnel"
-
#: plugins/personal/generic/class_user.inc:380
msgid "Organizational information"
msgstr "Informations organisationnelles"
@@ -1284,33 +1311,33 @@ msgstr "non configuré"
msgid "automatic"
msgstr "automatique"
-#: plugins/personal/posix/class_posixAccount.inc:309
+#: plugins/personal/posix/class_posixAccount.inc:310
msgid "expired"
msgstr "expiré"
-#: plugins/personal/posix/class_posixAccount.inc:311
+#: plugins/personal/posix/class_posixAccount.inc:312
msgid "grace time active"
msgstr "temps de grâce actif"
-#: plugins/personal/posix/class_posixAccount.inc:314
-#: plugins/personal/posix/class_posixAccount.inc:316
-#: plugins/personal/posix/class_posixAccount.inc:318
+#: plugins/personal/posix/class_posixAccount.inc:315
+#: plugins/personal/posix/class_posixAccount.inc:317
+#: plugins/personal/posix/class_posixAccount.inc:319
msgid "active"
msgstr "actif"
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:315
msgid "password expired"
msgstr "mot de passe expiré"
-#: plugins/personal/posix/class_posixAccount.inc:316
+#: plugins/personal/posix/class_posixAccount.inc:317
msgid "password not changeable"
msgstr "mot de passe non modifiable"
-#: plugins/personal/posix/class_posixAccount.inc:400
+#: plugins/personal/posix/class_posixAccount.inc:407
msgid "UID"
msgstr "UID"
-#: plugins/personal/posix/class_posixAccount.inc:516
+#: plugins/personal/posix/class_posixAccount.inc:525
#, php-format
msgid "Group of user %s"
msgstr "Groupe de l'utilisateur %s"
@@ -1482,424 +1509,440 @@ msgid "Core settings"
msgstr "Paramétrage de base"
#: plugins/config/class_configInLdap.inc:161
-msgid "Enable primary group filter"
-msgstr "Activer le filtre sur les groupes principaux"
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"It is time consuming to evaluate which groups are primary and which are not,"
-" so you may want to disable it if your group plugin is slow."
-msgstr "Déterminer quels sont les groupes principaux est très consommateur en temps. Vous devriez désactivez cette fonctionnalités si le plugin Groupe est lent à l’exécution"
-
-#: plugins/config/class_configInLdap.inc:167
msgid "Display summary in listings"
msgstr "Afficher les sommaires dans les listes"
-#: plugins/config/class_configInLdap.inc:168
+#: 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:173
+#: plugins/config/class_configInLdap.inc:167
msgid "Edit locking"
msgstr "Verrouillage de l’édition"
-#: plugins/config/class_configInLdap.inc:174
+#: 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:179
+#: plugins/config/class_configInLdap.inc:173
msgid "Enable logging"
msgstr "Activer la journalisation"
-#: plugins/config/class_configInLdap.inc:180
+#: plugins/config/class_configInLdap.inc:174
msgid "Event logging on FusionDirectory side."
msgstr "Activer la journalisation coté FusionDirectory."
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "LDAP size limit"
msgstr "Limite de taille LDAP"
-#: plugins/config/class_configInLdap.inc:185
+#: 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."
-#: plugins/config/class_configInLdap.inc:192
+#: plugins/config/class_configInLdap.inc:186
msgid "Login and session"
msgstr "Connexion et session"
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:189
msgid "Login attribute"
msgstr "Attribut de connexion"
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:190
msgid "Which LDAP attribute should be used as the login name during login."
msgstr "Attribut LDAP utilisé comme identifiant lors de la connexion"
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:196
msgid "Enforce encrypted connections"
msgstr "Forcer les connexions chiffrées"
-#: plugins/config/class_configInLdap.inc:203
+#: plugins/config/class_configInLdap.inc:197
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."
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:201
msgid "Warn if session is not encrypted"
msgstr "Avertir si la session ne sera pas chiffrée"
-#: plugins/config/class_configInLdap.inc:208
+#: plugins/config/class_configInLdap.inc:202
msgid "will display a warning to the user when http is used instead of https."
msgstr "Affiche un avertissement pour indiquer l'usage du protocole HTTP au lieu de HTTPS."
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Session lifetime"
msgstr "Durée de vie de la session"
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Defines when a session will expire in seconds."
msgstr "Définit la durée d'une session en secondes."
-#: plugins/config/class_configInLdap.inc:220
+#: plugins/config/class_configInLdap.inc:212
+msgid "HTTP authentication"
+msgstr "Authentification http"
+
+#: plugins/config/class_configInLdap.inc:212
+msgid "Use HTTP authentication protocol instead of the login form."
+msgstr "Utiliser le protocole d'authentification HTTP au lieu du formulaire de connexion."
+
+#: plugins/config/class_configInLdap.inc:219
#: include/class_SnapshotDialogs.inc:186
msgid "Snapshots"
msgstr "Instantanés"
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid "Enable snapshots"
msgstr "Activer les instantanés"
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
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:228
+#: plugins/config/class_configInLdap.inc:227
msgid "Snapshot base"
msgstr "Base pour les instantanés"
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
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:235
+#: plugins/config/class_configInLdap.inc:234
msgid "SSL"
msgstr "SSL"
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Key path"
msgstr "Clé privée"
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Path to FusionDirectory private key. Unused for now."
msgstr "Chemin vers la clef privée de FusionDirectory. Inutilisé actuellement."
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Certificate path"
msgstr "Chemin du certificat"
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Path to FusionDirectory certificate. Unused for now."
msgstr "Chemin vers le certificat public de FusionDirectory. Inutilisé actuellement."
-#: plugins/config/class_configInLdap.inc:248
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:262
msgid "CA certificate path"
msgstr "Chemin du certificat CA"
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:247
msgid "Path to the CA certificate. Used for validating Argonaut Server host."
msgstr "Chemin d'accès au CA public. Utilisé pour valider l'hôte du serveur Argonaut."
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:254
msgid "CAS"
msgstr "CAS"
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "Enable CAS"
msgstr "Activer CAS"
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
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:263
+#: plugins/config/class_configInLdap.inc:262
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:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host"
msgstr "Hôte"
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host of the CAS server"
msgstr "Hôte du serveur CAS"
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port"
msgstr "Port"
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port the CAS server is listening on"
msgstr "Port d’écoute du serveur CAS"
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context"
msgstr "Contexte CAS"
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context to be used"
msgstr "Contexte CAS Ã utiliser"
-#: plugins/config/class_configInLdap.inc:285
+#: plugins/config/class_configInLdap.inc:284
msgid "People and group storage"
msgstr "Stockage des utilisateurs et groupes"
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "People DN attribute"
msgstr "Attribut pour le DN des utilisateurs"
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
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:294
+#: plugins/config/class_configInLdap.inc:293
msgid "CN pattern"
msgstr "Modèle CN"
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
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:299
+#: plugins/config/class_configInLdap.inc:298
msgid "Strict naming policy"
msgstr "Règles de de nommage strictes"
-#: plugins/config/class_configInLdap.inc:300
+#: plugins/config/class_configInLdap.inc:299
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:305
+#: plugins/config/class_configInLdap.inc:304
msgid "Group/user min id"
msgstr "Id minimum de groupe/utilisateur"
-#: plugins/config/class_configInLdap.inc:306
+#: plugins/config/class_configInLdap.inc:305
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:311
+#: plugins/config/class_configInLdap.inc:310
msgid "Next id hook"
msgstr "Hook de nouvel id"
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
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:315
+#: plugins/config/class_configInLdap.inc:314
msgid "Base number for user id"
msgstr "Départ pour les ids d’utilisateur"
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:315
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:321
+#: plugins/config/class_configInLdap.inc:320
msgid "Base number for group id"
msgstr "Départ pour les ids de groupe"
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:321
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:327
+#: plugins/config/class_configInLdap.inc:326
msgid "Users RDN"
msgstr "Branche des utilisateurs"
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "The branch where users are stored."
msgstr "Branche où sont stockés les utilisateurs."
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "Groups RDN"
msgstr "Branche des groupes"
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "The branch where groups are stored."
msgstr "Branche où sont stockés les groupes."
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "ACL role RDN"
msgstr "Branche des rôles ACL"
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "The branch where ACL roles are stored."
msgstr "Branche où sont stockés les rôles ACL."
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Id allocation method"
msgstr "Méthode d’allocation des ids"
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Method to allocate user/group ids"
msgstr "Méthode pour allouer les ids d’utilisateur et de groupe"
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Traditional"
msgstr "Traditionnel"
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Samba unix id pool"
msgstr "Réservoir d’ids Samba"
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Pool user id min"
msgstr "Minimum des ids d’utilisateur du réservoir"
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
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:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Pool user id max"
msgstr "Maximum des ids d’utilisateur du réservoir"
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
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:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Pool group id min"
msgstr "Minimum des ids de groupe du réservoir"
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
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:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Pool group id max"
msgstr "Maximum des ids de groupe du réservoir"
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Maximum value for group id when using pool method"
msgstr "Valeur maximum pour les ids de groupe du réservoir"
-#: plugins/config/class_configInLdap.inc:370
+#: plugins/config/class_configInLdap.inc:367
+msgid "Restrict role members"
+msgstr "Restreindre les membres du rôle"
+
+#: plugins/config/class_configInLdap.inc:367
+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."
+
+#: plugins/config/class_configInLdap.inc:373
msgid "Debugging"
msgstr "Débogage"
-#: plugins/config/class_configInLdap.inc:373
+#: plugins/config/class_configInLdap.inc:376
msgid "Display errors"
msgstr "Afficher les erreurs"
-#: plugins/config/class_configInLdap.inc:374
+#: plugins/config/class_configInLdap.inc:377
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."
-#: plugins/config/class_configInLdap.inc:378
+#: plugins/config/class_configInLdap.inc:381
msgid "Maximum LDAP query time"
msgstr "Durée maximale d'une requête LDAP"
-#: plugins/config/class_configInLdap.inc:378
+#: plugins/config/class_configInLdap.inc:381
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."
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:386
msgid "Log LDAP statistics"
msgstr "Journaliser les statistiques LDAP"
-#: plugins/config/class_configInLdap.inc:384
+#: plugins/config/class_configInLdap.inc:387
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."
-#: plugins/config/class_configInLdap.inc:389
+#: plugins/config/class_configInLdap.inc:392
msgid "Debug level"
msgstr "Niveau de débogage"
-#: plugins/config/class_configInLdap.inc:390
+#: plugins/config/class_configInLdap.inc:393
msgid "Display certain information on each page load."
msgstr "Afficher certaines informations à chaque chargement de page."
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:405
msgid "Miscellaneous"
msgstr "Divers"
-#: plugins/config/class_configInLdap.inc:407
+#: 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"
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "tab"
msgstr "onglet"
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "The tab that this hook concerns"
msgstr "Onglet concerné pas ce hook"
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "mode"
msgstr "mode"
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "When to call this command"
msgstr "Quand appeler cette commande"
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "cmd"
msgstr "cmd"
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "The command that will be called"
msgstr "Commande qui sera appelée"
-#: plugins/config/class_configInLdap.inc:429
+#: plugins/config/class_configInLdap.inc:432
msgid "Hooks"
msgstr "Hooks"
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:439
msgid "Display hook output"
msgstr "Montrer le résultat du hook"
-#: plugins/config/class_configInLdap.inc:437
+#: plugins/config/class_configInLdap.inc:440
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:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available shells"
msgstr "Shells disponibles"
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available POSIX shells for FD users."
msgstr "Shells POSIX disponibles pour les utilisateurs de FusionDirectory"
-#: plugins/config/class_configInLdap.inc:449
+#: plugins/config/class_configInLdap.inc:452
msgid "Show ACL tab on all objects"
msgstr "Afficher l’onglet ACL sur tous les objets"
-#: plugins/config/class_configInLdap.inc:450
+#: plugins/config/class_configInLdap.inc:453
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:464
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available department categories"
+msgstr "Liste des catégories de département"
+
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available categories in the departments dropdown"
+msgstr "Les catégories disponibles dans le menu déroulant départements"
+
+#: plugins/config/class_configInLdap.inc:474
#: setup/class_setupStep_Language.inc:69
msgid "Automatic"
msgstr "Automatique"
@@ -1916,80 +1959,80 @@ msgstr "Paramètres pour la fonction de récupération de mot de passe"
msgid "Password recovery settings"
msgstr "Paramètres de récupération de mot de passe"
-#: plugins/config/class_recoveryConfig.inc:44
+#: plugins/config/class_recoveryConfig.inc:45
msgid "Activate password recovery"
msgstr "Activer la récupération de mot de passe"
-#: plugins/config/class_recoveryConfig.inc:45
+#: plugins/config/class_recoveryConfig.inc:46
msgid "Whether to activate or not password recovery feature"
msgstr "Activer ou non la fonctionnalité de récupération de mot de passe"
-#: plugins/config/class_recoveryConfig.inc:50
+#: plugins/config/class_recoveryConfig.inc:51
msgid "Sender email address"
msgstr "Adresse de messagerie de l'émetteur"
-#: plugins/config/class_recoveryConfig.inc:51
+#: plugins/config/class_recoveryConfig.inc:52
msgid "Email address from which mails will be sent"
msgstr "Adresse de messagerie avec laquelle les messages seront envoyés"
-#: plugins/config/class_recoveryConfig.inc:57
+#: plugins/config/class_recoveryConfig.inc:58
msgid "Link validity (minutes)"
msgstr "Durée de validité du lien (minutes)"
-#: plugins/config/class_recoveryConfig.inc:58
+#: plugins/config/class_recoveryConfig.inc:59
msgid "Number of minutes before a recovery link expires"
msgstr "Nombre de minutes avant l'expiration du lien"
-#: plugins/config/class_recoveryConfig.inc:64
+#: plugins/config/class_recoveryConfig.inc:65
msgid "Salt for tokens"
msgstr "Chaine de caractères aléatoires pour les jetons"
-#: plugins/config/class_recoveryConfig.inc:65
+#: plugins/config/class_recoveryConfig.inc:66
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"
-#: plugins/config/class_recoveryConfig.inc:71
+#: plugins/config/class_recoveryConfig.inc:72
msgid "Allow the use of alternate addresses"
msgstr "Autoriser des adresses de messagerie alternatives"
-#: plugins/config/class_recoveryConfig.inc:72
+#: plugins/config/class_recoveryConfig.inc:73
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"
-#: plugins/config/class_recoveryConfig.inc:79
+#: plugins/config/class_recoveryConfig.inc:80
msgid "First email"
msgstr "Premier message"
-#: plugins/config/class_recoveryConfig.inc:82
-#: plugins/config/class_recoveryConfig.inc:101
+#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:102
msgid "Subject"
msgstr "Sujet"
-#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:84
msgid "Subject of the first email"
msgstr "Sujet du premier message"
-#: plugins/config/class_recoveryConfig.inc:86
+#: plugins/config/class_recoveryConfig.inc:87
msgid "[FusionDirectory] Password recovery link"
msgstr "[FusionDirectory] Lien de réinitialisation du mot de passe"
-#: plugins/config/class_recoveryConfig.inc:89
+#: plugins/config/class_recoveryConfig.inc:90
#, 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)"
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:91
#, 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."
-#: plugins/config/class_recoveryConfig.inc:93
+#: plugins/config/class_recoveryConfig.inc:94
#, php-format
msgid ""
"Hello,\n"
@@ -2001,31 +2044,31 @@ msgid ""
"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"
-#: plugins/config/class_recoveryConfig.inc:98
+#: plugins/config/class_recoveryConfig.inc:99
msgid "Second email"
msgstr "Second message"
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:103
msgid "Subject of the second email"
msgstr "Sujet du second message"
-#: plugins/config/class_recoveryConfig.inc:105
+#: plugins/config/class_recoveryConfig.inc:106
msgid "[FusionDirectory] Password recovery successful"
msgstr "[FusionDirectory] Réinitialisation du mot de passe réussie !"
-#: plugins/config/class_recoveryConfig.inc:108
+#: plugins/config/class_recoveryConfig.inc:109
#, php-format
msgid "Body (%s is login)"
msgstr "Corps du message (%s est l'identifiant)"
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:110
#, php-format
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."
-#: plugins/config/class_recoveryConfig.inc:112
+#: plugins/config/class_recoveryConfig.inc:113
#, php-format
msgid ""
"Hello,\n"
@@ -2093,13 +2136,13 @@ msgstr "Haut"
msgid "Down"
msgstr "Bas"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2633
-#: include/simpleplugin/class_attribute.inc:2634
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
+#: include/simpleplugin/class_attribute.inc:2648
msgid "Sort up"
msgstr "Trier vers le haut"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2646
-#: include/simpleplugin/class_attribute.inc:2647
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
+#: include/simpleplugin/class_attribute.inc:2661
msgid "Sort down"
msgstr "Trier vers le bas"
@@ -2111,27 +2154,26 @@ msgstr "Sélectionner tout"
#: include/class_config.inc:479 include/class_msgPool.inc:215
#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3106
-#: include/functions.inc:3127 include/functions.inc:3157
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197 include/functions.inc:3259
+#: include/class_msgPool.inc:740 include/functions.inc:3107
+#: include/functions.inc:3128 include/functions.inc:3158
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3260
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1663 include/class_CopyPasteHandler.inc:278
-#: include/simpleplugin/class_dialogAttributes.inc:733
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
-#: include/simpleplugin/class_attribute.inc:1774
-#: include/simpleplugin/class_attribute.inc:1877
-#: include/simpleplugin/class_attribute.inc:1879
+#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
+#: include/simpleplugin/class_attribute.inc:1784
+#: include/simpleplugin/class_attribute.inc:1887
+#: include/simpleplugin/class_attribute.inc:1889
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: 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:437
#: include/password-methods/class_password-methods.inc:447
-#: include/class_SnapshotHandler.inc:415 html/index.php:434 html/index.php:444
+#: include/class_SnapshotHandler.inc:415 html/index.php:473 html/index.php:483
#: setup/class_setupStep_Migrate.inc:935
#: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
msgid "Error"
@@ -2170,44 +2212,44 @@ msgstr "Recharger la liste"
msgid "Submit"
msgstr "Soumettre"
-#: include/class_listing.inc:1586 include/class_listing.inc:1640
+#: include/class_listing.inc:1590 include/class_listing.inc:1644
msgid "Copy"
msgstr "Copier"
-#: include/class_listing.inc:1592 include/class_listing.inc:1628
+#: include/class_listing.inc:1596 include/class_listing.inc:1632
msgid "Cut"
msgstr "Couper"
-#: include/class_listing.inc:1600 include/class_listing.inc:1602
+#: include/class_listing.inc:1604 include/class_listing.inc:1606
#: include/class_CopyPasteHandler.inc:370
msgid "Paste"
msgstr "Coller"
-#: include/class_listing.inc:1628
+#: include/class_listing.inc:1632
msgid "Cut this entry"
msgstr "Couper cette entrée"
-#: include/class_listing.inc:1640
+#: include/class_listing.inc:1644
msgid "Copy this entry"
msgstr "Copier cette entrée"
-#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_listing.inc:1677 include/class_listing.inc:1679
msgid "Restore snapshots"
msgstr "Restaurer des instantanés"
-#: include/class_listing.inc:1689
+#: include/class_listing.inc:1693
msgid "Export list"
msgstr "Exporter la liste"
-#: include/class_listing.inc:1724 include/class_listing.inc:1725
+#: include/class_listing.inc:1728 include/class_listing.inc:1729
msgid "Restore snapshot"
msgstr "Restaurer l’instantané"
-#: include/class_listing.inc:1734
+#: include/class_listing.inc:1738
msgid "Create snapshot"
msgstr "Créer un instantané"
-#: include/class_listing.inc:1735
+#: include/class_listing.inc:1739
msgid "Create a new snapshot from this object"
msgstr "Créer un nouvel instantané depuis cet objet"
@@ -2250,7 +2292,7 @@ msgid "XML error in fusiondirectory.conf: %s at line %d"
msgstr "Erreur XML dans fusiondirectory.conf : %s à la ligne %d"
#: include/class_config.inc:162 include/class_config.inc:300
-#: include/class_config.inc:985 include/class_config.inc:998
+#: include/class_config.inc:915 include/class_config.inc:928
#: include/functions.inc:663 include/class_timezone.inc:51
#: include/password-methods/class_password-methods-sha.inc:71
#: include/password-methods/class_password-methods-ssha.inc:75
@@ -2267,17 +2309,17 @@ msgid ""
"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."
-#: include/class_config.inc:337 include/class_ldap.inc:917
-#: include/class_ldap.inc:1371 include/functions.inc:526
+#: include/class_config.inc:337 include/class_ldap.inc:918
+#: include/class_ldap.inc:1372 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2985 include/simpleplugin/class_simplePlugin.inc:545
-#: include/simpleplugin/class_attribute.inc:2895
+#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2909
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
#: include/class_SnapshotHandler.inc:422 include/class_SnapshotHandler.inc:425
-#: html/index.php:360 html/class_passwordRecovery.inc:497
+#: html/index.php:369 html/class_passwordRecovery.inc:497
#: setup/class_setupStep_Migrate.inc:451
#: setup/class_setupStep_Migrate.inc:1130
msgid "LDAP error"
@@ -2292,38 +2334,38 @@ msgstr "Impossible de se connecter à l'annuaire LDAP. Veuillez contacter l'admi
msgid "The selected mail method (class %s) is not available"
msgstr "La méthode de messagerie sélectionnée (classe %s) n'est pas disponible"
-#: include/class_config.inc:986
+#: include/class_config.inc:916
#, 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."
-#: include/class_config.inc:999
+#: include/class_config.inc:929
#, 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'. "
-#: include/class_config.inc:1104
+#: include/class_config.inc:1034
msgid "All categories"
msgstr "Toutes les catégories"
-#: include/class_config.inc:1231
+#: include/class_config.inc:1161
msgid "My account"
msgstr "Mon compte"
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
msgid "Performance warning"
msgstr "Avertissement de performance"
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
#, php-format
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr "La performance de votre annuaire est faible : la dernière requête a duré %.2fs !"
-#: include/class_ldap.inc:868 include/class_ldap.inc:904
+#: include/class_ldap.inc:869 include/class_ldap.inc:905
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
@@ -2333,39 +2375,39 @@ msgstr "La performance de votre annuaire est faible : la dernière requête a
msgid "Internal error"
msgstr "Erreur interne"
-#: include/class_ldap.inc:868
+#: include/class_ldap.inc:869
#, 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 !"
-#: include/class_ldap.inc:904
+#: include/class_ldap.inc:905
#, 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é"
-#: include/class_ldap.inc:1016
+#: include/class_ldap.inc:1017
#, 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:1018
+#: include/class_ldap.inc:1019
#, php-format
msgid "while operating on LDAP server %s"
msgstr "lors de l'opération sur le serveur LDAP %s"
-#: include/class_ldap.inc:1108
+#: include/class_ldap.inc:1109
msgid "proc_open failed to execute ldapsearch"
msgstr "proc_open a échoué lors de l’exécution de ldapsearch"
-#: include/class_ldap.inc:1220
+#: include/class_ldap.inc:1221
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr "Ceci n'est pas un DN valide : '%s'. Le fichier d'importation doit commencer avec 'dn: ...' à la ligne %s"
-#: include/class_ldap.inc:1231
+#: include/class_ldap.inc:1232
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2953,10 +2995,10 @@ 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"
-#: include/functions.inc:496 include/functions.inc:3294
-#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:263
-#: include/simpleplugin/class_simplePlugin.inc:268
-#: include/simpleplugin/class_simplePlugin.inc:280
+#: include/functions.inc:496 include/functions.inc:3295
+#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
+#: include/simpleplugin/class_simplePlugin.inc:269
+#: include/simpleplugin/class_simplePlugin.inc:281
#: html/class_passwordRecovery.inc:216
msgid "Fatal error"
msgstr "Erreur fatale"
@@ -3109,98 +3151,98 @@ msgstr "Impossible d'écrire dans le fichier de révision !"
msgid "Cannot read to revision file!"
msgstr "Impossible de lire le fichier de révision !"
-#: include/functions.inc:2548
+#: include/functions.inc:2549
msgid "'nextIdHook' is not available. Using default base!"
msgstr "'nextIdHook' n'est pas disponible. Utilisation de la base par défaut !"
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "LDAP warning"
msgstr "Avertissement LDAP"
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "Cannot get schema information from server. No schema check possible!"
msgstr "Impossible de récupérer les informations sur les schémas depuis le serveur. Vérification des schémas impossible !"
-#: include/functions.inc:2584
+#: include/functions.inc:2585
msgid ""
"Used to lock currently edited entries to avoid multiple changes at the same "
"time."
msgstr "Utilisé pour verrouiller les entrées actuellement modifiées afin d'éviter de multiples changements simultanés."
-#: include/functions.inc:2596
+#: include/functions.inc:2597
#, php-format
msgid "Missing required object class '%s'!"
msgstr "Object class obligatoire '%s' manquante !"
-#: include/functions.inc:2599
+#: include/functions.inc:2600
#, php-format
msgid "Missing optional object class '%s'!"
msgstr "Object class facultative '%s' manquante !"
-#: include/functions.inc:2603
+#: include/functions.inc:2604
#, php-format
msgid "Class(es) available"
msgstr "Classe(s) disponible(s)"
-#: include/functions.inc:2623
+#: include/functions.inc:2624
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."
-#: include/functions.inc:2624
+#: include/functions.inc:2625
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»)"
-#: include/functions.inc:2627
+#: include/functions.inc:2628
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é."
-#: include/functions.inc:2628
+#: include/functions.inc:2629
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr "L’objectClass «posixGroup» doit être structurelle («STRUCTURAL»)"
-#: include/functions.inc:3106 include/functions.inc:3127
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198
msgid "Cannot allocate a free ID:"
msgstr "Impossible d'allouer un ID libre :"
-#: include/functions.inc:3106
+#: include/functions.inc:3107
msgid "unknown idAllocation method!"
msgstr "Méthode d'allocation des id inconnue !"
-#: include/functions.inc:3127
+#: include/functions.inc:3128
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr "%sPoolMin >= %sPoolMax !"
-#: include/functions.inc:3157
+#: include/functions.inc:3158
msgid "Cannot create sambaUnixIdPool entry!"
msgstr "Impossible de créer l'entrée sambaUnixIdPool !"
-#: include/functions.inc:3165
+#: include/functions.inc:3166
msgid "sambaUnixIdPool is not unique!"
msgstr "sambaUnixIdPool n'est pas unique !"
-#: include/functions.inc:3177 include/functions.inc:3181
+#: include/functions.inc:3178 include/functions.inc:3182
msgid "no ID available!"
msgstr "Pas d’ID disponibles !"
-#: include/functions.inc:3197
+#: include/functions.inc:3198
msgid "maximum tries exceeded!"
msgstr "Nombre maximum d'essais dépassé !"
-#: include/functions.inc:3259
+#: include/functions.inc:3260
msgid "Cannot allocate a free ID!"
msgstr "Impossible d'assigner un ID !"
-#: include/functions.inc:3295
+#: include/functions.inc:3296
#, 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"
@@ -3356,13 +3398,13 @@ msgstr "en ligne"
msgid "XML error"
msgstr "Erreur XML"
-#: include/class_plugin.inc:554
+#: include/class_plugin.inc:553
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 "Cet objet a été modifié depuis son ouverture dans FusionDirectory. Tous les changements effectués par d’autres seront perdus si vous sauvez 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/class_plugin.inc:1466
+#: include/class_plugin.inc:1467
#, php-format
msgid "Tab \"%s\""
msgstr "Onglet \"%s\""
@@ -3388,32 +3430,32 @@ msgstr "Nom du modèle"
msgid "This is the name of the template"
msgstr "Le nom de ce modèle "
-#: include/simpleplugin/class_simplePlugin.inc:263
+#: include/simpleplugin/class_simplePlugin.inc:264
msgid "Only main tab can compute dn"
msgstr "Seulement l'onglet principal peut générer un dn"
-#: include/simpleplugin/class_simplePlugin.inc:270
+#: include/simpleplugin/class_simplePlugin.inc:271
#, 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:282
+#: include/simpleplugin/class_simplePlugin.inc:283
#, 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:638
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:644
+#: include/simpleplugin/class_simplePlugin.inc:652
msgid "Error when saving"
msgstr "Erreur lors de la sauvegarde"
-#: include/simpleplugin/class_simplePlugin.inc:638
+#: include/simpleplugin/class_simplePlugin.inc:644
#, php-format
msgid "There is already an entry with the same dn : %s"
msgstr "Il existe déjà une entrée avec le même dn : %s"
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:652
#, php-format
msgid "The entry %s is not existing"
msgstr "L'entrée %s n'existe pas"
@@ -3433,27 +3475,27 @@ msgstr "%s modèle"
msgid "Show %s"
msgstr "Afficher les '%s'"
-#: include/simpleplugin/class_dialogAttributes.inc:409
+#: include/simpleplugin/class_dialogAttributes.inc:415
#, php-format
msgid "Group %s"
msgstr "Groupe %s"
-#: include/simpleplugin/class_dialogAttributes.inc:411
+#: include/simpleplugin/class_dialogAttributes.inc:417
#, php-format
msgid "Role %s"
msgstr "Rôle %s"
-#: include/simpleplugin/class_dialogAttributes.inc:446
+#: include/simpleplugin/class_dialogAttributes.inc:452
msgid "Group of user"
msgstr "Groupe de l’utilisateur"
-#: include/simpleplugin/class_dialogAttributes.inc:615
+#: include/simpleplugin/class_dialogAttributes.inc:621
#: include/simpleplugin/class_attribute.inc:1090
#: include/simpleplugin/class_attribute.inc:1124
msgid "None"
msgstr "Aucun"
-#: include/simpleplugin/class_dialogAttributes.inc:617
+#: include/simpleplugin/class_dialogAttributes.inc:623
msgid "Unknown"
msgstr "Inconnu"
@@ -3494,11 +3536,16 @@ msgid "days"
msgstr "jours"
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2161
+#: include/simpleplugin/class_attribute.inc:2171
#, php-format
msgid "%s (required)"
msgstr "%s (requis)"
+#: include/simpleplugin/class_attribute.inc:1150
+#, 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"
+
#: include/simpleplugin/class_attribute.inc:1277
#, php-format
msgid "An integer between %d and %d"
@@ -3514,75 +3561,75 @@ msgstr "Un nombre entier supérieur à %d"
msgid "An integer smaller than %d"
msgstr "Un nombre entier inférieur à %d"
-#: include/simpleplugin/class_attribute.inc:1379
+#: include/simpleplugin/class_attribute.inc:1383
#, php-format
msgid "A float between %f and %f"
msgstr "Un nombre à virgule entre %f et %f"
-#: include/simpleplugin/class_attribute.inc:1381
+#: include/simpleplugin/class_attribute.inc:1385
#, php-format
msgid "A float larger than %f"
msgstr "Un nombre à virgule supérieur à %f"
-#: include/simpleplugin/class_attribute.inc:1383
+#: include/simpleplugin/class_attribute.inc:1387
#, php-format
msgid "A float smaller than %f"
msgstr "Un nombre à virgule inférieur à %f"
-#: include/simpleplugin/class_attribute.inc:1490
+#: include/simpleplugin/class_attribute.inc:1500
msgid "Error, incorrect date: "
msgstr "Erreur, date incorrecte :"
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
#, php-format
msgid "Cannot read uploaded file: %s"
msgstr "Impossible de lire le fichier importé : '%s'"
-#: include/simpleplugin/class_attribute.inc:1530
+#: include/simpleplugin/class_attribute.inc:1540
msgid "file is empty"
msgstr "Le fichier est vide"
-#: include/simpleplugin/class_attribute.inc:1533
+#: include/simpleplugin/class_attribute.inc:1543
msgid "file not found"
msgstr "fichier non trouvé"
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1546
msgid "file not readable"
msgstr "le fichier n'est pas lisible"
-#: include/simpleplugin/class_attribute.inc:1569
+#: include/simpleplugin/class_attribute.inc:1579
#, php-format
msgid "%s (%d bytes)"
msgstr "%s (%d octets)"
-#: include/simpleplugin/class_attribute.inc:1616
-#: include/simpleplugin/class_attribute.inc:1793
+#: include/simpleplugin/class_attribute.inc:1626
+#: include/simpleplugin/class_attribute.inc:1803
msgid "Upload"
msgstr "Téléverser"
-#: include/simpleplugin/class_attribute.inc:1621
-#: include/simpleplugin/class_attribute.inc:1622
+#: include/simpleplugin/class_attribute.inc:1631
+#: include/simpleplugin/class_attribute.inc:1632
msgid "Download"
msgstr "Télécharger"
-#: include/simpleplugin/class_attribute.inc:1775
+#: include/simpleplugin/class_attribute.inc:1785
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr "Impossible de sauver la photo de l'utilisateur, FusionDirectory a besoin que la bibliothèque 'php5-imagick' soit installée pour cela."
-#: include/simpleplugin/class_attribute.inc:1826
+#: include/simpleplugin/class_attribute.inc:1836
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr "Base"
-#: include/simpleplugin/class_attribute.inc:1829
+#: include/simpleplugin/class_attribute.inc:1839
msgid "Object base"
msgstr "Base de l'objet"
-#: include/simpleplugin/class_attribute.inc:2755
+#: include/simpleplugin/class_attribute.inc:2769
#, php-format
msgid "Invalid value for %s"
msgstr "Valeur invalide pour %s"
@@ -3606,7 +3653,7 @@ msgstr "L'effacement a été interrompu par le plugin '%s': %s"
#: include/simpleplugin/class_simpleTabs.inc:405
#, php-format
msgid "Move from \"%s\" to \"%s\" failed"
-msgstr "La copie de \"%s\" vers \"%s\" à échoué :"
+msgstr "Déplacer de \"%s\" à \"%s\" a échoué"
#: include/class_timezone.inc:52
#, php-format
@@ -3716,17 +3763,17 @@ msgstr "Veuillez vérifier le nom d'utilisateur et le mot de passe."
msgid "Account locked. Please contact your system administrator!"
msgstr "Compte verrouillé. Veuillez contacter votre administrateur système !"
-#: html/index.php:436
+#: html/index.php:475
#, php-format
msgid "CAS user \"%s\" could not be found in the LDAP"
-msgstr "L’utilisateur CAS \"%s\" n’a pas été trouvé dans l’annuaire LDAP "
+msgstr "L'utilisateur CAS \"%s\" n'existe pas dans l'annuaire LDAP "
-#: html/index.php:446
+#: html/index.php:485
#, php-format
msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr "L’utilisateur CAS \"%s\" correspond à plusieurs utilisateurs dans l’annuaire LDAP "
+msgstr "L'utilisateur CAS \"%s\" correspond à plusieurs personnes dans l'annuaire LDAP "
-#: html/index.php:481
+#: html/index.php:522
msgid ""
"Your browser has cookies disabled. Please enable cookies and reload this "
"page before logging in!"
@@ -4049,7 +4096,7 @@ msgid "Checking for duplicated UID numbers"
msgstr "Recherche d’UID en double"
#: setup/class_setupStep_Migrate.inc:267
-msgid "Checking for duplicate GID numbers"
+msgid "Checking for duplicated GID numbers"
msgstr "Recherche de GID en double"
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:487
@@ -4059,7 +4106,7 @@ msgstr "Recherche de GID en double"
#: setup/class_setupStep_Migrate.inc:1179
#: setup/class_setupStep_Migrate.inc:1272
#: setup/class_setupStep_Migrate.inc:1351
-#: setup/class_setupStep_Migrate.inc:1390
+#: setup/class_setupStep_Migrate.inc:1395
msgid "LDAP query failed"
msgstr "La requête LDAP a échoué"
@@ -4070,7 +4117,7 @@ msgstr "La requête LDAP a échoué"
#: setup/class_setupStep_Migrate.inc:1180
#: setup/class_setupStep_Migrate.inc:1273
#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1391
+#: setup/class_setupStep_Migrate.inc:1396
msgid "Possibly the \"root object\" is missing."
msgstr "L'objet racine est probablement manquant."
@@ -4225,15 +4272,15 @@ msgstr "%s département(s) trouvé(s) qui ne seront pas visible dans FusionDirec
msgid "Department migration"
msgstr "Migration des départements"
-#: setup/class_setupStep_Migrate.inc:1373
+#: setup/class_setupStep_Migrate.inc:1378
#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\"."
-msgstr "%s valeurs dupliquées trouvées pour l'attribut 'uidNumber'."
+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:1412
+#: setup/class_setupStep_Migrate.inc:1422
#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\"."
-msgstr "%s valeurs dupliquées trouvées pour l'attribut 'gidNumber'."
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
+msgstr "%s valeurs dupliquées trouvées pour l'attribut \"gidNumber\" : %s"
#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
msgid "Language setup"
diff --git a/locale/hu_HU/fusiondirectory.po b/locale/hu_HU/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..bf8abde15479d08b3cbe744982352230bf36c0ce
--- /dev/null
+++ b/locale/hu_HU/fusiondirectory.po
@@ -0,0 +1,5116 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# Szabi Fekete <szabi@equio.co.uk>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-110\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2016-03-14 12:07+0100\n"
+"PO-Revision-Date: 2016-03-07 12:09+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
+"Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
+"MIME-Version: 1.0\n"
+"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"
+
+#: plugins/generic/welcome/main.inc:25
+#, php-format
+msgid "Welcome %s!"
+msgstr ""
+
+#: plugins/generic/references/class_reference.inc:26
+#: plugins/generic/references/class_reference.inc:27
+#: plugins/generic/references/class_reference.inc:44
+msgid "References"
+msgstr ""
+
+#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_groupManagement.inc:71
+#: plugins/admin/aclrole/class_aclRole.inc:78
+#: plugins/admin/acl/class_aclAssignment.inc:49
+msgid "Role"
+msgstr ""
+
+#: plugins/admin/groups/class_roleGeneric.inc:58
+msgid "Role information"
+msgstr ""
+
+#: plugins/admin/groups/class_roleGeneric.inc:62
+msgid "Organizational role"
+msgstr ""
+
+#: plugins/admin/groups/class_roleGeneric.inc:84
+msgid "Informations"
+msgstr ""
+
+#: plugins/admin/groups/class_roleGeneric.inc:88
+#: plugins/admin/groups/class_group.inc:61
+#: plugins/admin/groups/class_ogroup.inc:187
+#: plugins/admin/groups/group-list.xml:33
+#: plugins/admin/departments/class_department.inc:174
+#: plugins/admin/aclrole/class_aclRole.inc:101
+#: include/simpleplugin/simple-select-list.xml:32
+#: include/simpleplugin/simple-list.xml:32
+#: plugins/admin/users/user-filter.tpl.c:20
+#: include/select/groupSelect/group-filter.tpl.c:14
+#: setup/setup_migrate_adminAccount.tpl.c:8
+msgid "Name"
+msgstr "Név"
+
+#: plugins/admin/groups/class_roleGeneric.inc:88
+#: plugins/admin/groups/class_group.inc:61
+#: plugins/admin/groups/class_ogroup.inc:187
+msgid "Name of this group"
+msgstr "Csoport neve"
+
+#: plugins/admin/groups/class_roleGeneric.inc:93
+#: plugins/admin/groups/class_group.inc:66
+#: plugins/admin/groups/class_ogroup.inc:192
+#: plugins/admin/groups/group-list.xml:41
+#: plugins/admin/departments/class_department.inc:73
+#: plugins/admin/departments/dep-list.xml:29
+#: plugins/admin/aclrole/class_aclRole.inc:105
+#: plugins/personal/generic/class_user.inc:289
+#: include/simpleplugin/simple-select-list.xml:40
+#: include/simpleplugin/simple-list.xml:40
+msgid "Description"
+msgstr "LeÃrás"
+
+#: plugins/admin/groups/class_roleGeneric.inc:93
+msgid "Description of the role"
+msgstr ""
+
+#: plugins/admin/groups/class_roleGeneric.inc:97
+msgid "Phone number"
+msgstr "Telefonszám"
+
+#: plugins/admin/groups/class_roleGeneric.inc:101
+msgid "Fax number"
+msgstr "Faxszám"
+
+#: plugins/admin/groups/class_roleGeneric.inc:105
+#: plugins/admin/users/class_userManagement.inc:42
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
+#: setup/class_setupStep_Migrate.inc:871
+msgid "Users"
+msgstr "Felhasználók"
+
+#: plugins/admin/groups/class_roleGeneric.inc:105
+msgid "Add users for the role"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:34
+#: plugins/admin/groups/class_ogroup.inc:154
+#: plugins/admin/groups/class_ogroup.inc:155
+msgid "Group"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:35
+msgid "POSIX group information"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:38
+msgid "POSIX group"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:39
+msgid "POSIX user group"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:57
+#: plugins/admin/groups/class_ogroup.inc:183
+#: plugins/admin/groups/group-list.xml:49
+#: plugins/admin/departments/class_department.inc:64
+#: plugins/admin/users/user-list.xml:57
+#: plugins/admin/aclrole/class_aclRole.inc:97
+#: plugins/admin/acl/class_aclAssignment.inc:40
+msgid "Properties"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:66
+#: plugins/admin/groups/class_ogroup.inc:192
+msgid "Short description of this group"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:70
+msgid "Force GID"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:70
+msgid "Force GID value for this group"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:74
+#: plugins/admin/groups/class_group.inc:149
+#: plugins/personal/posix/class_posixAccount.inc:410
+msgid "GID"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:74
+msgid "GID value for this group"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:81
+#: plugins/admin/groups/class_group.inc:84
+msgid "Group members"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:91
+#: plugins/admin/groups/class_ogroup.inc:209
+#: plugins/personal/posix/class_posixAccount.inc:188
+msgid "System trust"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:95
+#: plugins/admin/groups/class_ogroup.inc:213
+#: plugins/personal/posix/class_posixAccount.inc:192
+msgid "Trust mode"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:95
+#: plugins/admin/groups/class_ogroup.inc:213
+#: plugins/personal/posix/class_posixAccount.inc:192
+msgid "Type of authorization for those hosts"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:99
+#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/personal/posix/class_posixAccount.inc:196
+#: plugins/personal/posix/class_posixAccount.inc:217
+msgid "disabled"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:99
+#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/personal/posix/class_posixAccount.inc:196
+#: plugins/personal/posix/class_posixAccount.inc:217
+msgid "full access"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:99
+#: plugins/admin/groups/class_ogroup.inc:217
+#: plugins/personal/posix/class_posixAccount.inc:196
+msgid "allow access to these hosts"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:102
+#: plugins/admin/groups/class_ogroup.inc:220
+msgid "Only allow this group to connect to this list of hosts"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:181
+#: plugins/personal/posix/class_posixAccount.inc:465 include/functions.inc:794
+#: include/functions.inc:2549 include/class_xml.inc:55
+#: include/simpleplugin/class_simpleTabs.inc:325 html/index.php:56
+#: html/index.php:62 html/index.php:522 html/class_passwordRecovery.inc:378
+#: setup/class_setupStep_Migrate.inc:572
+#: setup/class_setupStep_Migrate.inc:1083
+#: setup/class_setupStep_Migrate.inc:1202
+#: setup/class_setupStep_Migrate.inc:1313
+#: setup/class_setupStep_Migrate.inc:1377
+#: setup/class_setupStep_Migrate.inc:1421 plugins/admin/acl/remove.tpl.c:2
+#: ihtml/themes/default/islocked.tpl.c:5 ihtml/themes/default/remove.tpl.c:2
+#: ihtml/themes/default/msg_dialog.tpl.c:5 setup/setup_checks.tpl.c:8
+msgid "Warning"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:181
+#: plugins/personal/posix/class_posixAccount.inc:465
+msgid "Timeout while waiting for lock. Ignoring lock!"
+msgstr ""
+
+#: plugins/admin/groups/class_ogroup.inc:59
+#, php-format
+msgid "Unknown type : %s"
+msgstr ""
+
+#: plugins/admin/groups/class_ogroup.inc:63
+#, php-format
+msgid "Non existing dn: %s"
+msgstr ""
+
+#: plugins/admin/groups/class_ogroup.inc:149
+msgid "Object group"
+msgstr ""
+
+#: plugins/admin/groups/class_ogroup.inc:150
+msgid "Object group information"
+msgstr ""
+
+#: plugins/admin/groups/class_ogroup.inc:199
+msgid "Member objects"
+msgstr ""
+
+#: plugins/admin/groups/class_ogroup.inc:202
+msgid "Objects member of this group"
+msgstr ""
+
+#: plugins/admin/groups/class_ogroup.inc:313
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
+msgstr ""
+
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr ""
+
+#: plugins/admin/groups/group-list.xml:54
+#: plugins/admin/departments/dep-list.xml:37
+#: plugins/admin/users/user-list.xml:62 include/class_listing.inc:1284
+#: include/simpleplugin/simple-list.xml:48
+msgid "Actions"
+msgstr ""
+
+#: plugins/admin/groups/group-list.xml:66
+#: plugins/admin/departments/dep-list.xml:48
+#: plugins/admin/users/user-list.xml:73
+#: include/simpleplugin/simple-list.xml:59
+#: setup/class_setupStep_Migrate.inc:866 setup/class_setupStep_Migrate.inc:881
+msgid "Create"
+msgstr ""
+
+#: plugins/admin/groups/group-list.xml:74
+#: plugins/admin/groups/group-list.xml:119
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/users/user-list.xml:105
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
+#: include/simpleplugin/class_dialogAttributes.inc:632
+#: include/simpleplugin/class_dialogAttributes.inc:633
+#: include/simpleplugin/class_attribute.inc:2675
+#: include/simpleplugin/class_attribute.inc:2676
+#: include/simpleplugin/simple-list.xml:67
+#: include/simpleplugin/simple-list.xml:112
+msgid "Edit"
+msgstr ""
+
+#: plugins/admin/groups/group-list.xml:82
+#: plugins/admin/groups/group-list.xml:132
+#: plugins/admin/departments/dep-list.xml:67
+#: plugins/admin/departments/dep-list.xml:88
+#: plugins/admin/users/user-list.xml:112
+#: include/simpleplugin/class_dialogAttributes.inc:642
+#: include/simpleplugin/class_dialogAttributes.inc:643
+#: include/simpleplugin/simple-list.xml:75
+#: include/simpleplugin/simple-list.xml:125
+msgid "Remove"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/personal/roles/class_userRoles.inc:31
+msgid "Groups and roles"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:32
+msgid "Manage groups and roles"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:33
+msgid "Allows you to manage object groups, POSIX groups and roles"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:71
+msgid "Edit role properties"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:87
+msgid "Posix"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:87
+msgid "Edit posix properties"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:130
+msgid "Show user groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:131
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:132
+msgid "Show organizational roles"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:133
+msgid "Show application groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:134
+msgid "Show unidentified groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:137
+#: include/select/groupSelect/group-filter.tpl.c:11
+msgid "Show mail groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:140
+#: include/select/groupSelect/group-filter.tpl.c:8
+msgid "Show samba groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:146
+msgid "Show server groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:147
+msgid "Show workstation groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:148
+msgid "Show windows groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:149
+msgid "Show terminal groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:150
+msgid "Show printer groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:151
+msgid "Show phone groups"
+msgstr ""
+
+#: plugins/admin/departments/class_dcObject.inc:30
+#: plugins/admin/departments/class_dcObject.inc:31
+#: plugins/admin/departments/class_dcObject.inc:34
+msgid "Domain Component"
+msgstr ""
+
+#: plugins/admin/departments/class_dcObject.inc:51
+msgid "domain component"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:34
+#: plugins/admin/departments/class_department.inc:40
+#: plugins/admin/departments/dep-list.xml:21
+#: plugins/personal/generic/class_user.inc:394
+msgid "Department"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:35
+#: plugins/admin/departments/class_department.inc:36
+#: plugins/admin/departments/class_departmentManagement.inc:34
+msgid "Departments"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:58
+msgid "department"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:68
+#, php-format
+msgid "Name of %s"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:68
+#, php-format
+msgid "A name for this %s"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:73
+#, php-format
+msgid "Short description of this %s"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:77
+msgid "Category"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:77
+#, php-format
+msgid "Category of this %s"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:81
+msgid "Website"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:81
+#, php-format
+msgid "Website of this %s"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:85
+#: plugins/personal/generic/class_user.inc:410
+msgid "Manager"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:85
+#, php-format
+msgid "Manager of this %s"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:91
+#: plugins/admin/departments/class_department.inc:97
+#: plugins/personal/generic/class_user.inc:304
+msgid "Location"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:94
+#: plugins/personal/generic/class_user.inc:308
+msgid "State"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_country.inc:29
+#: plugins/admin/departments/class_country.inc:30
+#: plugins/admin/departments/class_country.inc:33
+msgid "Country"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:103
+#: plugins/personal/generic/class_user.inc:312
+msgid "Address"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:103
+#, php-format
+msgid "A postal address for this %s"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:107
+#: plugins/personal/generic/class_user.inc:320
+msgid "Phone"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:107
+msgid "Telephone number"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:111
+#: plugins/personal/generic/class_user.inc:332
+msgid "Fax"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:111
+msgid "Facsimile telephone number"
+msgstr ""
+
+#: plugins/admin/departments/class_departmentManagement.inc:35
+msgid "Manage departments"
+msgstr ""
+
+#: plugins/admin/departments/class_departmentManagement.inc:36
+msgid ""
+"Manage departments, countries, domain components, domains, localities and "
+"organization nodes,"
+msgstr ""
+
+#: plugins/admin/departments/class_departmentManagement.inc:38
+msgid "Users and groups"
+msgstr ""
+
+#: plugins/admin/departments/class_locality.inc:30
+#: plugins/admin/departments/class_locality.inc:31
+#: plugins/admin/departments/class_locality.inc:34
+msgid "Locality"
+msgstr ""
+
+#: plugins/admin/departments/class_locality.inc:51
+msgid "locality"
+msgstr ""
+
+#: plugins/admin/departments/class_country.inc:50
+msgid "country"
+msgstr ""
+
+#: plugins/admin/departments/class_domain.inc:30
+#: plugins/admin/departments/class_domain.inc:31
+#: plugins/admin/departments/class_domain.inc:34
+msgid "Domain"
+msgstr ""
+
+#: plugins/admin/departments/class_domain.inc:51
+msgid "domain"
+msgstr ""
+
+#: plugins/admin/departments/dep-list.xml:9
+msgid "List of departments"
+msgstr ""
+
+#: plugins/admin/departments/class_organization.inc:30
+#: plugins/admin/departments/class_organization.inc:31
+#: plugins/admin/departments/class_organization.inc:34
+#: plugins/personal/generic/class_user.inc:390
+msgid "Organization"
+msgstr ""
+
+#: plugins/admin/departments/class_organization.inc:51
+msgid "organization"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:11
+msgid "List of users"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:33
+msgid "Surname"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:41
+msgid "Given name"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:49
+#: plugins/personal/generic/class_user.inc:347
+#: include/select/userSelect/class_userSelect.inc:32
+#: plugins/personal/generic/paste_generic.tpl.c:11
+#: ihtml/themes/default/recovery.tpl.c:23
+msgid "Login"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:79
+#: plugins/personal/generic/class_user.inc:246
+#: plugins/personal/generic/class_user.inc:252
+msgid "User"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:86
+#: include/simpleplugin/class_simpleManagement.inc:217
+msgid "From template"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:93
+#: include/simpleplugin/class_simpleManagement.inc:211
+#: include/simpleplugin/class_simpleManagement.inc:407
+#: ihtml/themes/default/template.tpl.c:5
+msgid "Template"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:124
+msgid "Lock users"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:132
+msgid "Unlock users"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:143
+msgid "Apply template"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:174
+msgid "New user from template"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:187
+msgid "Edit user"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:196
+msgid "%{filter:lockLabel(userPassword)}"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:210
+msgid "Remove user"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:43
+msgid "Manage users"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:44
+msgid "Manage user accounts and their properties"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:140
+#: include/class_management.inc:341 include/class_management.inc:488
+#: include/class_management.inc:507 include/class_management.inc:524
+#: include/class_management.inc:571 include/class_CopyPasteHandler.inc:248
+#: include/simpleplugin/class_simpleManagement.inc:651
+#: include/simpleplugin/class_simpleManagement.inc:749
+#: include/simpleplugin/class_simpleManagement.inc:799
+msgid "Permission"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:178
+msgid "Account locking"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:179
+#, php-format
+msgid ""
+"Password method \"%s\" does not support locking. Account \"%s\" has not been"
+" locked!"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:207
+msgid "Unlock account"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:209
+msgid "Lock account"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:236
+#: plugins/personal/generic/class_user.inc:253
+msgid "User account"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:236
+#: plugins/personal/generic/class_user.inc:247
+msgid "User account information"
+msgstr ""
+
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:186
+msgid "No ACL settings for this category"
+msgstr ""
+
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:188
+#, php-format
+msgid "ACL for these objects: %s"
+msgstr ""
+
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
+msgid "Edit category ACL"
+msgstr ""
+
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
+#: include/simpleplugin/class_attribute.inc:2686
+#, php-format
+msgid "Delete"
+msgstr ""
+
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
+msgid "Reset category ACL"
+msgstr ""
+
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:202
+#: ihtml/themes/default/acl.tpl.c:41
+msgid "List of available ACL categories"
+msgstr ""
+
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:215
+msgid "All objects in current subtree"
+msgstr ""
+
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:217
+#, php-format
+msgid "Edit ACL for \"%s\""
+msgstr ""
+
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:258
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:359
+msgid "read"
+msgstr ""
+
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:260
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:360
+msgid "write"
+msgstr ""
+
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:343
+#: include/class_msgPool.inc:710 include/class_SnapshotDialogs.inc:33
+#: include/class_SnapshotDialogs.inc:182
+msgid "Object"
+msgstr ""
+
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:346
+msgid "Show/hide advanced settings"
+msgstr ""
+
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:351
+msgid "Create objects"
+msgstr ""
+
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:352
+msgid "Move objects"
+msgstr ""
+
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:353
+msgid "Remove objects"
+msgstr ""
+
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:355
+msgid "Grant permission to owner"
+msgstr ""
+
+#: plugins/admin/aclrole/class_aclEditionDialog.inc:364
+msgid "Complete object"
+msgstr ""
+
+#: plugins/admin/aclrole/class_aclRoleManagement.inc:34
+#: include/class_acl.inc:39
+msgid "ACL roles"
+msgstr ""
+
+#: plugins/admin/aclrole/class_aclRoleManagement.inc:35
+msgid "ACL roles management"
+msgstr ""
+
+#: plugins/admin/aclrole/class_aclRoleManagement.inc:36
+msgid "Manage ACL roles"
+msgstr ""
+
+#: plugins/admin/aclrole/class_aclRole.inc:38
+#, php-format
+msgid "Contains settings for these objects: %s"
+msgstr ""
+
+#: plugins/admin/aclrole/class_aclRole.inc:79
+msgid "Access control roles"
+msgstr ""
+
+#: plugins/admin/aclrole/class_aclRole.inc:82
+msgid "ACL role"
+msgstr ""
+
+#: plugins/admin/aclrole/class_aclRole.inc:101
+msgid "A name for this role"
+msgstr ""
+
+#: plugins/admin/aclrole/class_aclRole.inc:105
+msgid "Short description of this role"
+msgstr ""
+
+#: plugins/admin/aclrole/class_aclRole.inc:111
+msgid "ACLs"
+msgstr ""
+
+#: plugins/admin/aclrole/class_aclRole.inc:115
+msgid "ACLs which are part of this group"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:31
+#: plugins/admin/acl/class_aclManagement.inc:32
+#: plugins/admin/acl/class_aclManagement.inc:45
+msgid "ACL assignment creation"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:33
+msgid "Create an ACL assignment on an arbitrary dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "Dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "DN you wish to add assignments for"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:135
+msgid "ACL assignments"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:136
+msgid "ACL assignments management"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:137
+msgid "Manage ACL roles assignments to users"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:199
+#: plugins/admin/acl/class_aclAssignment.inc:263
+msgid "ACL Assignment"
+msgstr ""
+
+#: plugins/admin/acl/class_aclAssignment.inc:28
+msgid "ACL Assignment Dialog"
+msgstr ""
+
+#: plugins/admin/acl/class_aclAssignment.inc:29
+msgid "Access control roles assignment dialog"
+msgstr ""
+
+#: plugins/admin/acl/class_aclAssignment.inc:43
+msgid "Mode"
+msgstr ""
+
+#: plugins/admin/acl/class_aclAssignment.inc:43
+msgid "Is this applying on complete subtree or only the base?"
+msgstr ""
+
+#: plugins/admin/acl/class_aclAssignment.inc:46
+msgid "Subtree"
+msgstr ""
+
+#: plugins/admin/acl/class_aclAssignment.inc:46
+msgid "Base only"
+msgstr ""
+
+#: plugins/admin/acl/class_aclAssignment.inc:49
+msgid "Role to apply"
+msgstr ""
+
+#: plugins/admin/acl/class_aclAssignment.inc:54
+msgid "For all users"
+msgstr ""
+
+#: plugins/admin/acl/class_aclAssignment.inc:54
+msgid "Apply this ACL for all LDAP users"
+msgstr ""
+
+#: plugins/admin/acl/class_aclAssignment.inc:58
+#: ihtml/themes/default/acl.tpl.c:32
+msgid "Members"
+msgstr ""
+
+#: plugins/admin/acl/class_aclAssignment.inc:58
+msgid "Users or groups to assign this role to."
+msgstr ""
+
+#: plugins/admin/acl/class_aclAssignment.inc:249
+msgid "ACL assignment"
+msgstr ""
+
+#: plugins/admin/acl/class_aclAssignment.inc:264
+msgid "Access control roles assignment"
+msgstr ""
+
+#: plugins/admin/acl/class_aclAssignment.inc:283
+msgid "Assignments"
+msgstr ""
+
+#: plugins/admin/acl/class_aclAssignment.inc:287
+msgid "ACL role assignments for this base"
+msgstr ""
+
+#: plugins/admin/acl/class_aclAssignment.inc:298
+#, php-format
+msgid "Assignments on object or subtree %s"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoard.inc:27
+#: plugins/addons/dashboard/class_dashBoard.inc:28
+#: plugins/addons/dashboard/class_dashBoard.inc:33
+msgid "Dashboard"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoard.inc:29
+msgid "Statistics and various informations"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoard.inc:37
+msgid "Reporting"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoard.inc:48
+#: plugins/addons/dashboard/main_stats.tpl.c:2
+msgid "Statistics"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:28
+msgid "Statistics about users"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:39
+msgid "Users statistics"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:44
+msgid "Groups statistics"
+msgstr ""
+
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:49
+#: plugins/addons/dashboard/users_accounts.tpl.c:8
+msgid "Expired accounts"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:46
+msgid "Password method"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:46
+msgid "Password hash method to use"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:51
+#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/paste_generic.tpl.c:14
+#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
+#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
+#: ihtml/themes/default/login.tpl.c:23
+#: setup/setup_migrate_adminAccount.tpl.c:14
+msgid "Password"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:51
+msgid "Password (Leave empty if you do not wish to change it)"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:55
+msgid "Password again"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:55
+msgid "Same password as above, to avoid errors"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:274
+msgid "Personal information"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/paste_generic.tpl.c:5
+msgid "Last name"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:279
+msgid "Last name of this user"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/paste_generic.tpl.c:8
+msgid "First name"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:284
+msgid "First name of this user"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:289
+msgid "Short description of the user"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:293
+msgid "Picture"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:293
+msgid "The avatar for this user"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:300
+msgid "Organizational contact information"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:312
+msgid "Business postal address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:316
+msgid "Room No."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:316
+msgid "Room number"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:320
+msgid "Business phone number"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:324
+msgid "Mobile"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:324
+msgid "Business mobile number"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:328
+msgid "Pager"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:328
+msgid "Business pager number"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:332
+msgid "Business fax number"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:336
+msgid "Homepage"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:336
+msgid "Personal homepage"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:342
+msgid "Account information"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:347
+msgid "Login of this user"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:351
+#: setup/class_setupStep_Language.inc:30
+msgid "Preferred language"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:356
+msgid "Password of the user"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:362
+msgid "Personal contact information"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:366
+msgid "Display name"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:366
+msgid "Name this user should appear as. Used by Exchange."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:370
+msgid "Home address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:370
+msgid "Home postal address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:374
+msgid "Private phone"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:374
+msgid "Home phone number"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:380
+msgid "Organizational information"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:385
+msgid "Title"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:385
+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:398
+msgid "Department No."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:398
+msgid "Department number"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:402
+msgid "Employee No."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:402
+msgid "Employee number"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:406
+msgid "Employee type"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:568
+#, php-format
+msgid "Ppolicy \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:571
+msgid "You are not allowed to change your own password"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:581
+#, php-format
+msgid "You must wait %d seconds before changing your password again"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:595
+msgid "Password is in history of old passwords"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:600
+#: plugins/personal/generic/class_user.inc:604
+msgid "Password is not being changed from existing value"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:611
+msgid "You need to specify your current password in order to proceed."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:613
+msgid ""
+"The passwords you've entered as \"New password\" and \"Repeated new "
+"password\" do not match."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:615
+#: ihtml/themes/default/recovery.tpl.c:26
+#: ihtml/themes/default/recovery.tpl.c:29
+msgid "New password"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:617
+msgid "The password used as new and current are too similar."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:619
+msgid "The password used as new is to short."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:621
+msgid "The password contains possibly problematic Unicode characters!"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:76
+#: plugins/personal/posix/class_posixAccount.inc:104
+msgid "Unix"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:77
+msgid "Edit users POSIX settings"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:108
+msgid "Home directory"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:108
+msgid "The path to the home directory of this user"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:113
+msgid "Shell"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:113
+msgid "Which shell should be used when this user log in"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:117
+msgid "Primary group"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:117
+msgid "Primary group for this user"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:121
+#: setup/class_setupStep_Ldap.inc:83
+msgid "Status"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:121
+msgid "Status of this user unix account"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:125
+msgid "Force user/group id"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:125
+msgid "Force user id and group id values for this user"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:129
+msgid "User id"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:129
+msgid "User id value for this user"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:134
+msgid "Group id"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:134
+msgid "Group id value for this user"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:141
+#: plugins/personal/posix/class_posixAccount.inc:144
+msgid "Group membership"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:148
+msgid "Account"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:152
+msgid "User must change password on first login"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:152
+msgid ""
+"User must change password on first login (needs a value for Delay before "
+"forcing password change)"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:156
+msgid "Delay before locking password (days)"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:156
+msgid ""
+"The user won't be able to change his password after this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:161
+msgid "Delay before forcing password change (days)"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:161
+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:166
+msgid "Password expiration date"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:166
+msgid ""
+"Date after which this user password will expire (leave empty to disable)"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:171
+msgid "Delay of inactivity before disabling user (days)"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:171
+msgid ""
+"Maximum delay of inactivity after password expiration before the user is "
+"disabled (leave empty to disable)"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:176
+msgid "Delay for user warning before password expiry (days)"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:176
+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
+msgid "Only allow this user to connect to this list of hosts"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:279
+#: include/class_management.inc:40 include/class_management.inc:41
+msgid "unconfigured"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:291
+msgid "automatic"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:310
+msgid "expired"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:312
+msgid "grace time active"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:315
+#: plugins/personal/posix/class_posixAccount.inc:317
+#: plugins/personal/posix/class_posixAccount.inc:319
+msgid "active"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:315
+msgid "password expired"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:317
+msgid "password not changeable"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:407
+msgid "UID"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:525
+#, php-format
+msgid "Group of user %s"
+msgstr ""
+
+#: plugins/personal/roles/class_userRoles.inc:32
+msgid "Edit user's groups and roles"
+msgstr ""
+
+#: plugins/personal/roles/class_userRoles.inc:47
+#: plugins/personal/roles/class_userRoles.inc:51
+msgid "Groups membership"
+msgstr ""
+
+#: plugins/personal/roles/class_userRoles.inc:58
+#: plugins/personal/roles/class_userRoles.inc:62
+msgid "Roles membership"
+msgstr ""
+
+#: plugins/config/class_mainPluginsConfig.inc:28
+msgid "Plugins configuration"
+msgstr ""
+
+#: plugins/config/class_mainPluginsConfig.inc:29
+msgid "FusionDirectory plugins configuration"
+msgstr ""
+
+#: plugins/config/class_mainPluginsConfig.inc:42
+msgid "Object groups"
+msgstr ""
+
+#: plugins/config/class_mainPluginsConfig.inc:45
+msgid "OGroup RDN"
+msgstr ""
+
+#: plugins/config/class_mainPluginsConfig.inc:45
+msgid "Branch in which object groups will be stored"
+msgstr ""
+
+#: plugins/config/class_mainPluginsConfig.inc:52
+msgid "SASL"
+msgstr ""
+
+#: plugins/config/class_mainPluginsConfig.inc:55
+msgid "Force to ask for password"
+msgstr ""
+
+#: plugins/config/class_mainPluginsConfig.inc:55
+msgid ""
+"Useful if you add a hook using password value when SASL user passwords are "
+"edited"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:57
+#: plugins/config/class_configInLdap.inc:70
+msgid "Configuration"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:58
+#: plugins/config/class_configInLdap.inc:63
+msgid "FusionDirectory configuration"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:59
+msgid "Configuration screen of FusionDirectory"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:88
+msgid "Look and feel"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:91
+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."
+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 "Schema setup"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "Schema validation"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:114
+msgid "Enables schema checking during login."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:121
+msgid "Password settings"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:124
+msgid "Password default hash"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:124
+msgid "Default hash to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:129
+msgid "Force default hash"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:129
+msgid "Force the use of the default password hash"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:133
+msgid "Password minimum length"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:133
+msgid "Minimum length of user passwords"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:138
+msgid "Password minimum differs"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:138
+msgid "Minimum number of different characters from last password"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:143
+msgid "Use account expiration"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:144
+msgid ""
+"Enables shadow attribute tests during the login to FusionDirectory and "
+"forces password renewal or account locking"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:148
+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"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:179
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:186
+msgid "Login and session"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:189
+msgid "Login attribute"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:190
+msgid "Which LDAP attribute should be used as the login name during login."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:196
+msgid "Enforce encrypted connections"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:197
+msgid ""
+"Enables PHP security checks to force encrypted access (https) to the web "
+"interface."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:201
+msgid "Warn if session is not encrypted"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:202
+msgid "will display a warning to the user when http is used instead of https."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:207
+msgid "Session lifetime"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:207
+msgid "Defines when a session will expire in seconds."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:212
+msgid "HTTP authentication"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:212
+msgid "Use HTTP authentication protocol instead of the login form."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:219
+#: include/class_SnapshotDialogs.inc:186
+msgid "Snapshots"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:222
+msgid "Enable snapshots"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:222
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:227
+msgid "Snapshot base"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:227
+msgid "The base where snapshots should be stored inside of the LDAP."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:234
+msgid "SSL"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:237
+msgid "Key path"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:237
+msgid "Path to FusionDirectory private key. Unused for now."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:242
+msgid "Certificate path"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:242
+msgid "Path to FusionDirectory certificate. Unused for now."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:262
+msgid "CA certificate path"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:247
+msgid "Path to the CA certificate. Used for validating Argonaut Server host."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:254
+msgid "CAS"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:257
+msgid "Enable CAS"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:257
+msgid "CAS login will be used instead of LDAP bind"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:262
+msgid "Path to the CA certificate of the CAS server"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:267
+msgid "Host"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:267
+msgid "Host of the CAS server"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:272
+msgid "Port"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:272
+msgid "Port the CAS server is listening on"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:277
+msgid "CAS context"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:277
+msgid "CAS context to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:284
+msgid "People and group storage"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:288
+msgid "People DN attribute"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:288
+msgid "Attribute to use at the beginning of users dn"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:293
+msgid "CN pattern"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:293
+msgid "The pattern to use to build the common name field"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:298
+msgid "Strict naming policy"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:299
+msgid "Enables strict checking of user and group names"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:304
+msgid "Group/user min id"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:305
+msgid ""
+"The minimum assignable user or group id to avoid security leaks with id 0 "
+"accounts."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:310
+msgid "Next id hook"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:310
+msgid ""
+"A script to be called for finding the next free id number for users or "
+"groups."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:314
+msgid "Base number for user id"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:315
+msgid "Where to start looking for a new free user id."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:320
+msgid "Base number for group id"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:321
+msgid "Where to start looking for a new free group id."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:326
+msgid "Users RDN"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:326
+msgid "The branch where users are stored."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:331
+msgid "Groups RDN"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:331
+msgid "The branch where groups are stored."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:336
+msgid "ACL role RDN"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:336
+msgid "The branch where ACL roles are stored."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:341
+msgid "Id allocation method"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:341
+msgid "Method to allocate user/group ids"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:344
+msgid "Traditional"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:344
+msgid "Samba unix id pool"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:347
+msgid "Pool user id min"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:347
+msgid "Minimum value for user id when using pool method"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:352
+msgid "Pool user id max"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:352
+msgid "Maximum value for user id when using pool method"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:357
+msgid "Pool group id min"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:357
+msgid "Minimum value for group id when using pool method"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:362
+msgid "Pool group id max"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:362
+msgid "Maximum value for group id when using pool method"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:367
+msgid "Restrict role members"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:367
+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:373
+msgid "Debugging"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:376
+msgid "Display errors"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:377
+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:381
+msgid "Maximum LDAP query time"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:381
+msgid ""
+"Stop LDAP actions if there is no answer within the specified number of "
+"seconds."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:386
+msgid "Log LDAP statistics"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:387
+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:392
+msgid "Debug level"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:393
+msgid "Display certain information on each page load."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:405
+msgid "Miscellaneous"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:410
+msgid "Hooks that are called when specific actions happens"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:414
+msgid "tab"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:414
+msgid "The tab that this hook concerns"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:419
+msgid "mode"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:419
+msgid "When to call this command"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:425
+msgid "cmd"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:425
+msgid "The command that will be called"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:432
+msgid "Hooks"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:439
+msgid "Display hook output"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:440
+msgid ""
+"When enabled successful hook execution output is displayed to the user using"
+" a dialog."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:445
+msgid "Available shells"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:445
+msgid "Available POSIX shells for FD users."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:452
+msgid "Show ACL tab on all objects"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:453
+msgid ""
+"For very specific ACL rights setting where you might need to give right on a"
+" single object."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available department categories"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available categories in the departments dropdown"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:474
+#: setup/class_setupStep_Language.inc:69
+msgid "Automatic"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:28
+msgid "Password recovery"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:29
+msgid "Settings for the password recovery feature"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:40
+msgid "Password recovery settings"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:45
+msgid "Activate password recovery"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:46
+msgid "Whether to activate or not password recovery feature"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:51
+msgid "Sender email address"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:52
+msgid "Email address from which mails will be sent"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:58
+msgid "Link validity (minutes)"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:59
+msgid "Number of minutes before a recovery link expires"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:65
+msgid "Salt for tokens"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:66
+msgid ""
+"Just a security measure, you can put anything in there, even random "
+"characters"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:72
+msgid "Allow the use of alternate addresses"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:73
+msgid ""
+"Users will also be able to enter one of theirs alternate addresses to "
+"recover their password"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:80
+msgid "First email"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:102
+msgid "Subject"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:84
+msgid "Subject of the first email"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:87
+msgid "[FusionDirectory] Password recovery link"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:90
+#, php-format
+msgid "Body (first %s is login, second is link)"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:91
+#, 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 ""
+
+#: plugins/config/class_recoveryConfig.inc:94
+#, php-format
+msgid ""
+"Hello,\n"
+"\n"
+"Here are your informations : \n"
+" - Login : %s\n"
+" - Link : %s\n"
+"\n"
+"This link is only valid for 10 minutes."
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:99
+msgid "Second email"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:103
+msgid "Subject of the second email"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:106
+msgid "[FusionDirectory] Password recovery successful"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:109
+#, php-format
+msgid "Body (%s is login)"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:110
+#, php-format
+msgid ""
+"Body of the second email, sent to confirm the password has been changed. Use"
+" %s for the user login."
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:113
+#, php-format
+msgid ""
+"Hello,\n"
+"\n"
+"Your password has been changed.\n"
+"Your login is still %s."
+msgstr ""
+
+#: plugins/config/class_dashBoardConfig.inc:28
+msgid "Dashboard configuration"
+msgstr ""
+
+#: plugins/config/class_dashBoardConfig.inc:29
+msgid "FusionDirectory dashboard plugin configuration"
+msgstr ""
+
+#: plugins/config/class_dashBoardConfig.inc:42
+msgid "Dashboard name schema"
+msgstr ""
+
+#: plugins/config/class_dashBoardConfig.inc:45
+msgid "Number of digits"
+msgstr ""
+
+#: plugins/config/class_dashBoardConfig.inc:45
+msgid "Number of digits to use after prefix"
+msgstr ""
+
+#: plugins/config/class_dashBoardConfig.inc:51
+msgid "Prefixes"
+msgstr ""
+
+#: plugins/config/class_dashBoardConfig.inc:51
+msgid "Prefixes to be used for computer ids"
+msgstr ""
+
+#: plugins/config/class_dashBoardConfig.inc:59
+msgid "Dashboard expired users"
+msgstr ""
+
+#: plugins/config/class_dashBoardConfig.inc:62
+msgid "Number of days"
+msgstr ""
+
+#: plugins/config/class_dashBoardConfig.inc:62
+msgid ""
+"Number of days before expiration needed for an account to show in the "
+"dashboard next expired accounts list"
+msgstr ""
+
+#: plugins/config/class_pluginsConfigInLdap.inc:29
+msgid "Plugins"
+msgstr ""
+
+#: plugins/config/class_pluginsConfigInLdap.inc:30
+msgid "Configuration for plugins"
+msgstr ""
+
+#: include/class_listing.inc:306 include/class_listing.inc:1154
+#: include/class_listing.inc:1156
+msgid "Up"
+msgstr ""
+
+#: include/class_listing.inc:306
+msgid "Down"
+msgstr ""
+
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
+#: include/simpleplugin/class_attribute.inc:2648
+msgid "Sort up"
+msgstr ""
+
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
+#: include/simpleplugin/class_attribute.inc:2661
+msgid "Sort down"
+msgstr ""
+
+#: include/class_listing.inc:367 setup/setup_migrate_gosaAccounts.tpl.c:23
+msgid "Select all"
+msgstr ""
+
+#: include/class_listing.inc:537 include/class_management.inc:679
+#: include/class_config.inc:479 include/class_msgPool.inc:215
+#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
+#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
+#: include/class_msgPool.inc:740 include/functions.inc:3107
+#: include/functions.inc:3128 include/functions.inc:3158
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3260
+#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
+#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
+#: include/simpleplugin/class_attribute.inc:1784
+#: include/simpleplugin/class_attribute.inc:1887
+#: include/simpleplugin/class_attribute.inc:1889
+#: include/simpleplugin/class_simpleTabs.inc:90
+#: include/simpleplugin/class_simpleTabs.inc:405
+#: 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:437
+#: include/password-methods/class_password-methods.inc:447
+#: include/class_SnapshotHandler.inc:415 html/index.php:473 html/index.php:483
+#: setup/class_setupStep_Migrate.inc:935
+#: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
+msgid "Error"
+msgstr ""
+
+#: include/class_listing.inc:578
+msgid "created by"
+msgstr ""
+
+#: include/class_listing.inc:1146
+msgid "Go to root department"
+msgstr ""
+
+#: include/class_listing.inc:1146 include/class_listing.inc:1148
+#: include/class_baseSelector.inc:210
+msgid "Root"
+msgstr ""
+
+#: include/class_listing.inc:1154
+msgid "Go up one department"
+msgstr ""
+
+#: include/class_listing.inc:1162
+msgid "Go to user's department"
+msgstr ""
+
+#: include/class_listing.inc:1162 include/class_listing.inc:1164
+msgid "Home"
+msgstr ""
+
+#: include/class_listing.inc:1169
+msgid "Reload list"
+msgstr ""
+
+#: include/class_listing.inc:1169 include/class_baseSelector.inc:262
+msgid "Submit"
+msgstr ""
+
+#: include/class_listing.inc:1590 include/class_listing.inc:1644
+msgid "Copy"
+msgstr ""
+
+#: include/class_listing.inc:1596 include/class_listing.inc:1632
+msgid "Cut"
+msgstr ""
+
+#: include/class_listing.inc:1604 include/class_listing.inc:1606
+#: include/class_CopyPasteHandler.inc:370
+msgid "Paste"
+msgstr ""
+
+#: include/class_listing.inc:1632
+msgid "Cut this entry"
+msgstr ""
+
+#: include/class_listing.inc:1644
+msgid "Copy this entry"
+msgstr ""
+
+#: include/class_listing.inc:1677 include/class_listing.inc:1679
+msgid "Restore snapshots"
+msgstr ""
+
+#: include/class_listing.inc:1693
+msgid "Export list"
+msgstr ""
+
+#: include/class_listing.inc:1728 include/class_listing.inc:1729
+msgid "Restore snapshot"
+msgstr ""
+
+#: include/class_listing.inc:1738
+msgid "Create snapshot"
+msgstr ""
+
+#: include/class_listing.inc:1739
+msgid "Create a new snapshot from this object"
+msgstr ""
+
+#: include/class_management.inc:164
+msgid "Filter error"
+msgstr ""
+
+#: include/class_management.inc:164
+msgid "The filter is incomplete!"
+msgstr ""
+
+#: include/class_management.inc:412
+#: include/simpleplugin/class_simpleManagement.inc:716
+msgid "Permission error"
+msgstr ""
+
+#: include/class_management.inc:488
+#: include/simpleplugin/class_simpleManagement.inc:749
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr ""
+
+#: include/class_management.inc:507 include/class_management.inc:524
+#: include/class_management.inc:571
+#: include/simpleplugin/class_simpleManagement.inc:799
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr ""
+
+#: include/class_management.inc:679
+#, php-format
+msgid ""
+"No tab declaration for '%s' found in your configuration file. Cannot create "
+"plugin instance!"
+msgstr ""
+
+#: include/class_config.inc:159
+#, php-format
+msgid "XML error in fusiondirectory.conf: %s at line %d"
+msgstr ""
+
+#: include/class_config.inc:162 include/class_config.inc:300
+#: include/class_config.inc:915 include/class_config.inc:928
+#: include/functions.inc:663 include/class_timezone.inc:51
+#: include/password-methods/class_password-methods-sha.inc:71
+#: include/password-methods/class_password-methods-ssha.inc:75
+#: include/password-methods/class_password-methods-ssha.inc:91
+#: html/index.php:149 html/main.php:205 html/class_passwordRecovery.inc:259
+msgid "Configuration error"
+msgstr ""
+
+#: include/class_config.inc:296
+#, php-format
+msgid ""
+"It seems you are trying to decode something which is not encoded : "
+"%s<br/>\\nPlease check you are not using a fusiondirectory.secrets file "
+"while your passwords are not encrypted."
+msgstr ""
+
+#: include/class_config.inc:337 include/class_ldap.inc:918
+#: include/class_ldap.inc:1372 include/functions.inc:526
+#: include/functions.inc:678 include/functions.inc:725
+#: include/functions.inc:786 include/functions.inc:841
+#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2909
+#: include/password-methods/class_password-methods.inc:199
+#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
+#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
+#: include/class_SnapshotHandler.inc:422 include/class_SnapshotHandler.inc:425
+#: html/index.php:369 html/class_passwordRecovery.inc:497
+#: setup/class_setupStep_Migrate.inc:451
+#: setup/class_setupStep_Migrate.inc:1130
+msgid "LDAP error"
+msgstr ""
+
+#: include/class_config.inc:337
+msgid "Cannot bind to LDAP. Please contact the system administrator."
+msgstr ""
+
+#: include/class_config.inc:480
+#, php-format
+msgid "The selected mail method (class %s) is not available"
+msgstr ""
+
+#: include/class_config.inc:916
+#, php-format
+msgid ""
+"The snapshot functionality is enabled, but the required variable '%s' is not"
+" set."
+msgstr ""
+
+#: include/class_config.inc:929
+#, php-format
+msgid ""
+"The snapshot functionality is enabled, but the required compression module "
+"is missing. Please install '%s'."
+msgstr ""
+
+#: include/class_config.inc:1034
+msgid "All categories"
+msgstr ""
+
+#: include/class_config.inc:1161
+msgid "My account"
+msgstr ""
+
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
+msgid "Performance warning"
+msgstr ""
+
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
+#, php-format
+msgid "LDAP performance is poor: last query took about %.2fs!"
+msgstr ""
+
+#: include/class_ldap.inc:869 include/class_ldap.inc:905
+#: include/functions.inc:568 include/functions.inc:653
+#: include/functions.inc:773 include/functions.inc:1192
+#: include/functions.inc:2275 include/functions.inc:2317
+#: include/functions.inc:2346 include/class_session.inc:50
+#: include/class_session.inc:87 include/class_session.inc:125
+#: include/class_log.inc:96 include/class_acl.inc:118
+msgid "Internal error"
+msgstr ""
+
+#: include/class_ldap.inc:869
+#, php-format
+msgid ""
+"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
+msgstr ""
+
+#: include/class_ldap.inc:905
+#, php-format
+msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
+msgstr ""
+
+#: include/class_ldap.inc:1017
+#, php-format
+msgid "while operating on '%s' using LDAP server '%s'"
+msgstr ""
+
+#: include/class_ldap.inc:1019
+#, php-format
+msgid "while operating on LDAP server %s"
+msgstr ""
+
+#: include/class_ldap.inc:1109
+msgid "proc_open failed to execute ldapsearch"
+msgstr ""
+
+#: include/class_ldap.inc:1221
+#, php-format
+msgid ""
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
+" in line %s"
+msgstr ""
+
+#: include/class_ldap.inc:1232
+#, php-format
+msgid ""
+"Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgstr ""
+
+#: include/class_msgPool.inc:43
+#, php-format
+msgid "Select to list objects of type '%s'."
+msgstr ""
+
+#: include/class_msgPool.inc:45
+#, php-format
+msgid "Select to list objects containig '%s'."
+msgstr ""
+
+#: include/class_msgPool.inc:47
+#, php-format
+msgid "Select to list objects that have '%s' enabled"
+msgstr ""
+
+#: include/class_msgPool.inc:49
+msgid "Select to search within subtrees"
+msgstr ""
+
+#: include/class_msgPool.inc:51 include/class_filter.inc:364
+msgid "Search in subtrees"
+msgstr ""
+
+#: include/class_msgPool.inc:67
+msgid "This object will be deleted!"
+msgstr ""
+
+#: include/class_msgPool.inc:69
+#, php-format
+msgid "This '%s' object will be deleted!"
+msgstr ""
+
+#: include/class_msgPool.inc:74
+#, php-format
+msgid "This object will be deleted: %s"
+msgstr ""
+
+#: include/class_msgPool.inc:76
+#, php-format
+msgid "This '%s' object will be deleted: %s"
+msgstr ""
+
+#: include/class_msgPool.inc:81
+msgid "This object will be deleted:"
+msgstr ""
+
+#: include/class_msgPool.inc:83
+#, php-format
+msgid "This '%s' object will be deleted:"
+msgstr ""
+
+#: include/class_msgPool.inc:87
+#, php-format
+msgid "These objects will be deleted: %s"
+msgstr ""
+
+#: include/class_msgPool.inc:89
+#, php-format
+msgid "These '%s' objects will be deleted: %s"
+msgstr ""
+
+#: include/class_msgPool.inc:101
+msgid "You have no permission to delete this object!"
+msgstr ""
+
+#: include/class_msgPool.inc:105 include/class_msgPool.inc:109
+msgid "You have no permission to delete the object:"
+msgstr ""
+
+#: include/class_msgPool.inc:112
+msgid "You have no permission to delete these objects:"
+msgstr ""
+
+#: include/class_msgPool.inc:123
+msgid "You have no permission to create this object!"
+msgstr ""
+
+#: include/class_msgPool.inc:127 include/class_msgPool.inc:131
+msgid "You have no permission to create the object:"
+msgstr ""
+
+#: include/class_msgPool.inc:134
+msgid "You have no permission to create these objects:"
+msgstr ""
+
+#: include/class_msgPool.inc:145
+msgid "You have no permission to modify this object!"
+msgstr ""
+
+#: include/class_msgPool.inc:149 include/class_msgPool.inc:153
+msgid "You have no permission to modify the object:"
+msgstr ""
+
+#: include/class_msgPool.inc:156
+msgid "You have no permission to modify these objects:"
+msgstr ""
+
+#: include/class_msgPool.inc:167
+msgid "You have no permission to view this object!"
+msgstr ""
+
+#: include/class_msgPool.inc:171 include/class_msgPool.inc:175
+msgid "You have no permission to view the object:"
+msgstr ""
+
+#: include/class_msgPool.inc:178
+msgid "You have no permission to view these objects:"
+msgstr ""
+
+#: include/class_msgPool.inc:189
+msgid "You have no permission to move this object!"
+msgstr ""
+
+#: include/class_msgPool.inc:193 include/class_msgPool.inc:197
+msgid "You have no permission to move the object:"
+msgstr ""
+
+#: include/class_msgPool.inc:200
+msgid "You have no permission to move these objects:"
+msgstr ""
+
+#: include/class_msgPool.inc:218 include/class_msgPool.inc:238
+#: include/class_msgPool.inc:268
+msgid "Connection information"
+msgstr ""
+
+#: include/class_msgPool.inc:220
+#, php-format
+msgid "Cannot connect to %s database!"
+msgstr ""
+
+#: include/class_msgPool.inc:240
+#, php-format
+msgid "Cannot select %s database!"
+msgstr ""
+
+#: include/class_msgPool.inc:250
+#, php-format
+msgid "No %s server defined!"
+msgstr ""
+
+#: include/class_msgPool.inc:270
+#, php-format
+msgid "Cannot query %s database!"
+msgstr ""
+
+#: include/class_msgPool.inc:280
+#, php-format
+msgid "The field '%s' contains a reserved keyword!"
+msgstr ""
+
+#: include/class_msgPool.inc:292
+#, php-format
+msgid "Command specified as %s hook for plugin '%s' does not exist!"
+msgstr ""
+
+#: include/class_msgPool.inc:308
+#, php-format
+msgid "'%s' command is invalid!"
+msgstr ""
+
+#: include/class_msgPool.inc:310
+#, php-format
+msgid "'%s' command for plugin %s is invalid!"
+msgstr ""
+
+#: include/class_msgPool.inc:314
+#, php-format
+msgid "'%s' command (%s) is invalid!"
+msgstr ""
+
+#: include/class_msgPool.inc:316
+#, php-format
+msgid "'%s' command (%s) for plugin %s is invalid!"
+msgstr ""
+
+#: include/class_msgPool.inc:334
+#, php-format
+msgid "Cannot execute '%s' command!"
+msgstr ""
+
+#: include/class_msgPool.inc:336
+#, php-format
+msgid "Cannot execute '%s' command for plugin %s!"
+msgstr ""
+
+#: include/class_msgPool.inc:340
+#, php-format
+msgid "Cannot execute '%s' command (%s)!"
+msgstr ""
+
+#: include/class_msgPool.inc:342
+#, php-format
+msgid "Cannot execute '%s' command (%s) for plugin %s!"
+msgstr ""
+
+#: include/class_msgPool.inc:357
+#, php-format
+msgid "Value for '%s' is too large!"
+msgstr ""
+
+#: include/class_msgPool.inc:359
+#, php-format
+msgid "'%s' must be smaller than %s!"
+msgstr ""
+
+#: include/class_msgPool.inc:373
+#, php-format
+msgid "Value for '%s' is too small!"
+msgstr ""
+
+#: include/class_msgPool.inc:375
+#, php-format
+msgid "'%s' must be %d or above!"
+msgstr ""
+
+#: include/class_msgPool.inc:388
+#, php-format
+msgid "'%s' depends on '%s' - please provide both values!"
+msgstr ""
+
+#: include/class_msgPool.inc:399
+#, php-format
+msgid "There is already an entry with this '%s' attribute in the system!"
+msgstr ""
+
+#: include/class_msgPool.inc:401
+#, php-format
+msgid "The entry '%s' already use this '%s' attribute!"
+msgstr ""
+
+#: include/class_msgPool.inc:412
+#, php-format
+msgid "The required field '%s' is empty!"
+msgstr ""
+
+#: include/class_msgPool.inc:430
+msgid "Example:"
+msgstr ""
+
+#: include/class_msgPool.inc:450 include/class_msgPool.inc:454
+#, php-format
+msgid "The field '%s' contains invalid characters"
+msgstr ""
+
+#: include/class_msgPool.inc:451
+#, php-format
+msgid "'%s' is not allowed:"
+msgstr ""
+
+#: include/class_msgPool.inc:451
+#, php-format
+msgid "'%s' are not allowed!"
+msgstr ""
+
+#: include/class_msgPool.inc:465
+#, php-format
+msgid "Missing %s PHP extension!"
+msgstr ""
+
+#: include/class_msgPool.inc:473 ihtml/themes/default/islocked.tpl.c:14
+#: ihtml/themes/default/remove.tpl.c:11 ihtml/themes/default/acl.tpl.c:53
+#: ihtml/themes/default/acl.tpl.c:59
+#: ihtml/themes/default/copyPasteDialog.tpl.c:17
+#: ihtml/themes/default/msg_dialog.tpl.c:17
+#: setup/setup_migrate_adminAccount.tpl.c:23
+#: setup/setup_migrate_gosaAccounts.tpl.c:32
+msgid "Cancel"
+msgstr ""
+
+#: include/class_msgPool.inc:481 setup/class_setupStep_Migrate.inc:133
+#: ihtml/themes/default/msg_dialog.tpl.c:14 setup/setup_checks.tpl.c:2
+msgid "Ok"
+msgstr ""
+
+#: include/class_msgPool.inc:489 ihtml/themes/default/acl.tpl.c:50
+#: ihtml/themes/default/acl.tpl.c:56 setup/setup_migrate_adminAccount.tpl.c:20
+#: setup/setup_migrate_gosaAccounts.tpl.c:29
+msgid "Apply"
+msgstr ""
+
+#: include/class_msgPool.inc:497 ihtml/themes/default/copyPasteDialog.tpl.c:14
+msgid "Save"
+msgstr ""
+
+#: include/class_msgPool.inc:507
+#, php-format
+msgid "Add"
+msgstr ""
+
+#: include/class_msgPool.inc:507
+#, php-format
+msgid "Add %s"
+msgstr ""
+
+#: include/class_msgPool.inc:517
+#, php-format
+msgid "Delete %s"
+msgstr ""
+
+#: include/class_msgPool.inc:527
+#, php-format
+msgid "Edit..."
+msgstr ""
+
+#: include/class_msgPool.inc:527
+#, php-format
+msgid "Edit %s..."
+msgstr ""
+
+#: include/class_msgPool.inc:535
+msgid "Back"
+msgstr ""
+
+#: include/class_msgPool.inc:564
+#, php-format
+msgid "This account has no valid %s extensions!"
+msgstr ""
+
+#: include/class_msgPool.inc:577
+#, php-format
+msgid ""
+"This account has %s settings enabled. You can disable them by clicking "
+"below."
+msgstr ""
+
+#: include/class_msgPool.inc:583 include/class_msgPool.inc:590
+#, php-format
+msgid ""
+"This account has %s settings enabled. To disable them, you'll need to remove"
+" the %s settings first!"
+msgstr ""
+
+#: include/class_msgPool.inc:605
+#, php-format
+msgid ""
+"This account has %s settings disabled. You can enable them by clicking "
+"below."
+msgstr ""
+
+#: include/class_msgPool.inc:611 include/class_msgPool.inc:618
+#, 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:630
+#, php-format
+msgid "Add %s settings"
+msgstr ""
+
+#: include/class_msgPool.inc:641
+#, php-format
+msgid "Remove %s settings"
+msgstr ""
+
+#: include/class_msgPool.inc:649
+msgid "Click the 'Edit' button below to change informations in this dialog"
+msgstr ""
+
+#: include/class_msgPool.inc:657
+msgid "January"
+msgstr ""
+
+#: include/class_msgPool.inc:657
+msgid "February"
+msgstr ""
+
+#: include/class_msgPool.inc:657
+msgid "March"
+msgstr ""
+
+#: include/class_msgPool.inc:657
+msgid "April"
+msgstr ""
+
+#: include/class_msgPool.inc:658
+msgid "May"
+msgstr ""
+
+#: include/class_msgPool.inc:658
+msgid "June"
+msgstr ""
+
+#: include/class_msgPool.inc:658
+msgid "July"
+msgstr ""
+
+#: include/class_msgPool.inc:658
+msgid "August"
+msgstr ""
+
+#: include/class_msgPool.inc:658
+msgid "September"
+msgstr ""
+
+#: include/class_msgPool.inc:659
+msgid "October"
+msgstr ""
+
+#: include/class_msgPool.inc:659
+msgid "November"
+msgstr ""
+
+#: include/class_msgPool.inc:659
+msgid "December"
+msgstr ""
+
+#: include/class_msgPool.inc:668
+msgid "Sunday"
+msgstr ""
+
+#: include/class_msgPool.inc:668
+msgid "Monday"
+msgstr ""
+
+#: include/class_msgPool.inc:668
+msgid "Tuesday"
+msgstr ""
+
+#: include/class_msgPool.inc:668
+msgid "Wednesday"
+msgstr ""
+
+#: include/class_msgPool.inc:668
+msgid "Thursday"
+msgstr ""
+
+#: include/class_msgPool.inc:668
+msgid "Friday"
+msgstr ""
+
+#: include/class_msgPool.inc:668
+msgid "Saturday"
+msgstr ""
+
+#: include/class_msgPool.inc:681
+msgid "Database operation failed!"
+msgstr ""
+
+#: include/class_msgPool.inc:699
+msgid "read operation"
+msgstr ""
+
+#: include/class_msgPool.inc:699
+msgid "add operation"
+msgstr ""
+
+#: include/class_msgPool.inc:699
+msgid "modify operation"
+msgstr ""
+
+#: include/class_msgPool.inc:700
+msgid "delete operation"
+msgstr ""
+
+#: include/class_msgPool.inc:700
+msgid "search operation"
+msgstr ""
+
+#: include/class_msgPool.inc:700
+msgid "authentication"
+msgstr ""
+
+#: include/class_msgPool.inc:703
+#, php-format
+msgid "LDAP %s failed!"
+msgstr ""
+
+#: include/class_msgPool.inc:705
+msgid "LDAP operation failed!"
+msgstr ""
+
+#: include/class_msgPool.inc:724
+msgid "Upload failed!"
+msgstr ""
+
+#: include/class_msgPool.inc:727
+#, php-format
+msgid "Upload failed: %s"
+msgstr ""
+
+#: include/class_msgPool.inc:738
+msgid "Communication failure with the infrastructure service!"
+msgstr ""
+
+#: include/class_msgPool.inc:740
+#, php-format
+msgid "Communication failure with the infrastructure service: %s"
+msgstr ""
+
+#: include/class_msgPool.inc:753 include/class_msgPool.inc:756
+#, php-format
+msgid "This '%s' is still in use by this object: %s"
+msgstr ""
+
+#: include/class_msgPool.inc:759
+#, php-format
+msgid "This '%s' is still in use."
+msgstr ""
+
+#: include/class_msgPool.inc:761
+#, php-format
+msgid "This '%s' is still in use by these objects: %s"
+msgstr ""
+
+#: include/class_msgPool.inc:771
+#, php-format
+msgid "File '%s' does not exist!"
+msgstr ""
+
+#: include/class_msgPool.inc:781
+#, php-format
+msgid "Cannot open file '%s' for reading!"
+msgstr ""
+
+#: include/class_msgPool.inc:791
+#, php-format
+msgid "Cannot open file '%s' for writing!"
+msgstr ""
+
+#: include/class_msgPool.inc:801
+#, php-format
+msgid ""
+"The value for '%s' is currently unconfigured or invalid, please check your "
+"configuration file!"
+msgstr ""
+
+#: include/class_msgPool.inc:811
+#, php-format
+msgid "Cannot delete file '%s'!"
+msgstr ""
+
+#: include/class_msgPool.inc:821
+#, php-format
+msgid "Cannot create folder '%s'!"
+msgstr ""
+
+#: include/class_msgPool.inc:831
+#, php-format
+msgid "Cannot delete folder '%s'!"
+msgstr ""
+
+#: include/class_msgPool.inc:841
+#, php-format
+msgid "Checking for %s support"
+msgstr ""
+
+#: include/class_msgPool.inc:851
+#, php-format
+msgid "Install and activate the %s PHP module."
+msgstr ""
+
+#: include/class_msgPool.inc:861
+#, php-format
+msgid "Install and activate the %s Pear module."
+msgstr ""
+
+#: include/class_msgPool.inc:871
+#, php-format
+msgid ""
+"Cannot initialize class '%s'! Maybe there is a plugin missing in your "
+"FusionDirectory setup?"
+msgstr ""
+
+#: include/class_msgPool.inc:879
+msgid ""
+"The supplied base is not valid and has been reset to the previous value!"
+msgstr ""
+
+#: include/functions.inc:123
+#, php-format
+msgid "Fatal error: no class locations defined - please run '%s' to fix this"
+msgstr ""
+
+#: include/functions.inc:137
+#, php-format
+msgid ""
+"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
+msgstr ""
+
+#: include/functions.inc:496 include/functions.inc:3295
+#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
+#: include/simpleplugin/class_simplePlugin.inc:269
+#: include/simpleplugin/class_simplePlugin.inc:281
+#: html/class_passwordRecovery.inc:216
+msgid "Fatal error"
+msgstr ""
+
+#: include/functions.inc:497
+#, php-format
+msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgstr ""
+
+#: include/functions.inc:568
+msgid ""
+"Login (uid) is not unique inside the LDAP tree. Please contact your "
+"administrator."
+msgstr ""
+
+#: include/functions.inc:601
+msgid "Authentication error"
+msgstr ""
+
+#: include/functions.inc:602
+msgid ""
+"It seems your user password has expired. Please use <a "
+"href=\"recovery.php\">password recovery</a> to change it."
+msgstr ""
+
+#: include/functions.inc:653 include/functions.inc:773
+msgid "Error while adding a lock. Contact the developers!"
+msgstr ""
+
+#: include/functions.inc:663
+#, php-format
+msgid ""
+"Cannot create locking information in LDAP tree. Please contact your "
+"administrator!"
+msgstr ""
+
+#: include/functions.inc:663
+#, php-format
+msgid "LDAP server returned: %s"
+msgstr ""
+
+#: include/functions.inc:794
+msgid ""
+"Found multiple locks for object to be locked. This should not happen - "
+"cleaning up multiple references."
+msgstr ""
+
+#: include/functions.inc:1112
+#, php-format
+msgid "The size limit of %d entries is exceed!"
+msgstr ""
+
+#: include/functions.inc:1114
+#, php-format
+msgid ""
+"Set the new size limit to %s and show me this message if the limit still "
+"exceeds"
+msgstr ""
+
+#: include/functions.inc:1131
+msgid "Configure"
+msgstr ""
+
+#: include/functions.inc:1136
+msgid "incomplete"
+msgstr ""
+
+#: include/functions.inc:1541
+msgid "Continue anyway"
+msgstr ""
+
+#: include/functions.inc:1543
+msgid "Edit anyway"
+msgstr ""
+
+#: include/functions.inc:1545
+#, php-format
+msgid "You're going to edit the LDAP entry/entries %s"
+msgstr ""
+
+#: include/functions.inc:1799
+msgid "Entries per page"
+msgstr ""
+
+#: include/functions.inc:1830 include/class_filter.inc:353
+msgid "Apply filter"
+msgstr ""
+
+#: include/functions.inc:2098
+#, php-format
+msgid "%sB"
+msgstr ""
+
+#: include/functions.inc:2099
+#, php-format
+msgid "%sKiB"
+msgstr ""
+
+#: include/functions.inc:2100
+#, php-format
+msgid "%sMiB"
+msgstr ""
+
+#: include/functions.inc:2101
+#, php-format
+msgid "%sGiB"
+msgstr ""
+
+#: include/functions.inc:2102
+#, php-format
+msgid "%sTiB"
+msgstr ""
+
+#: include/functions.inc:2103
+#, php-format
+msgid "%sPiB"
+msgstr ""
+
+#: include/functions.inc:2104
+#, php-format
+msgid "%sEiB"
+msgstr ""
+
+#: include/functions.inc:2105
+#, php-format
+msgid "%sZiB"
+msgstr ""
+
+#: include/functions.inc:2106
+#, php-format
+msgid "%sYiB"
+msgstr ""
+
+#: include/functions.inc:2138 include/class_filter.inc:315
+msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+msgstr ""
+
+#: include/functions.inc:2275
+#, php-format
+msgid ""
+"File '%s' could not be deleted. Try fusiondirectory-setup --check-"
+"directories to fix permissions."
+msgstr ""
+
+#: include/functions.inc:2317
+msgid "Cannot write to revision file!"
+msgstr ""
+
+#: include/functions.inc:2346
+msgid "Cannot read to revision file!"
+msgstr ""
+
+#: include/functions.inc:2549
+msgid "'nextIdHook' is not available. Using default base!"
+msgstr ""
+
+#: include/functions.inc:2567
+msgid "LDAP warning"
+msgstr ""
+
+#: include/functions.inc:2567
+msgid "Cannot get schema information from server. No schema check possible!"
+msgstr ""
+
+#: include/functions.inc:2585
+msgid ""
+"Used to lock currently edited entries to avoid multiple changes at the same "
+"time."
+msgstr ""
+
+#: include/functions.inc:2597
+#, php-format
+msgid "Missing required object class '%s'!"
+msgstr ""
+
+#: include/functions.inc:2600
+#, php-format
+msgid "Missing optional object class '%s'!"
+msgstr ""
+
+#: include/functions.inc:2604
+#, php-format
+msgid "Class(es) available"
+msgstr ""
+
+#: include/functions.inc:2624
+msgid ""
+"You have installed the mixed groups plugin, but your schema configuration "
+"does not support this."
+msgstr ""
+
+#: include/functions.inc:2625
+msgid ""
+"In order to use mixed groups the objectClass \"posixGroup\" must be "
+"AUXILIARY"
+msgstr ""
+
+#: include/functions.inc:2628
+msgid ""
+"Your schema is configured to support mixed groups, but this plugin is not "
+"present."
+msgstr ""
+
+#: include/functions.inc:2629
+msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
+msgstr ""
+
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198
+msgid "Cannot allocate a free ID:"
+msgstr ""
+
+#: include/functions.inc:3107
+msgid "unknown idAllocation method!"
+msgstr ""
+
+#: include/functions.inc:3128
+#, php-format
+msgid "%sPoolMin >= %sPoolMax!"
+msgstr ""
+
+#: include/functions.inc:3158
+msgid "Cannot create sambaUnixIdPool entry!"
+msgstr ""
+
+#: include/functions.inc:3166
+msgid "sambaUnixIdPool is not unique!"
+msgstr ""
+
+#: include/functions.inc:3178 include/functions.inc:3182
+msgid "no ID available!"
+msgstr ""
+
+#: include/functions.inc:3198
+msgid "maximum tries exceeded!"
+msgstr ""
+
+#: include/functions.inc:3260
+msgid "Cannot allocate a free ID!"
+msgstr ""
+
+#: include/functions.inc:3296
+#, php-format
+msgid "Cannot locate file '%s' - please run '%s' to fix this"
+msgstr ""
+
+#: include/class_session.inc:50 include/class_session.inc:87
+#: include/class_session.inc:125
+msgid "Requested channel does not exist! Please contact your Administrator."
+msgstr ""
+
+#: include/class_pluglist.inc:173
+msgid "All objects in this category"
+msgstr ""
+
+#: include/class_log.inc:96
+#, php-format
+msgid "Logging failed: %s"
+msgstr ""
+
+#: include/class_log.inc:115
+#, php-format
+msgid "Invalid option '%s' specified!"
+msgstr ""
+
+#: include/class_log.inc:119
+msgid "Specified objectType is empty or invalid!"
+msgstr ""
+
+#: include/php_setup.inc:36
+msgid "PHP error"
+msgstr ""
+
+#: include/php_setup.inc:43
+msgid "class"
+msgstr ""
+
+#: include/php_setup.inc:49
+msgid "function"
+msgstr ""
+
+#: include/php_setup.inc:54
+msgid "static"
+msgstr ""
+
+#: include/php_setup.inc:58
+msgid "method"
+msgstr ""
+
+#: include/php_setup.inc:101 ihtml/themes/default/msg_dialog.tpl.c:11
+msgid "Trace"
+msgstr ""
+
+#: include/php_setup.inc:102
+msgid "File"
+msgstr ""
+
+#: include/php_setup.inc:102
+msgid "Line"
+msgstr ""
+
+#: include/php_setup.inc:102
+msgid "Type"
+msgstr ""
+
+#: include/php_setup.inc:103
+msgid "Arguments"
+msgstr ""
+
+#: include/php_setup.inc:201
+msgid "Generating this page caused the PHP interpreter to raise some errors!"
+msgstr ""
+
+#: include/php_setup.inc:206
+msgid "Send bug report to the FusionDirectory Team"
+msgstr ""
+
+#: include/php_setup.inc:207
+msgid "Send bugreport"
+msgstr ""
+
+#: include/php_setup.inc:212
+msgid "Toggle information"
+msgstr ""
+
+#: include/class_msg_dialog.inc:167
+msgid "Please fix the above error and reload the page."
+msgstr ""
+
+#: include/class_SnapshotDialogs.inc:30
+msgid "Creating an object snapshot"
+msgstr ""
+
+#: include/class_SnapshotDialogs.inc:33 include/class_SnapshotDialogs.inc:182
+msgid "DN of the object you are creating a snapshot of"
+msgstr ""
+
+#: include/class_SnapshotDialogs.inc:37
+msgid "Timestamp"
+msgstr ""
+
+#: include/class_SnapshotDialogs.inc:37
+msgid "Timestamp of this snapshot creation"
+msgstr ""
+
+#: include/class_SnapshotDialogs.inc:41
+msgid "Reason"
+msgstr ""
+
+#: include/class_SnapshotDialogs.inc:41
+msgid "Reason for creating this snapshot"
+msgstr ""
+
+#: include/class_SnapshotDialogs.inc:60 include/class_SnapshotDialogs.inc:118
+msgid "Y-m-d, H:i:s"
+msgstr ""
+
+#: include/class_SnapshotDialogs.inc:135 include/class_SnapshotDialogs.inc:136
+msgid "Restore"
+msgstr ""
+
+#: include/class_SnapshotDialogs.inc:178
+msgid "Restoring snapshots"
+msgstr ""
+
+#: include/class_SnapshotDialogs.inc:186
+msgid "Existing snapshots for this object"
+msgstr ""
+
+#: include/exporter/class_PDF.php:61
+msgid "Page"
+msgstr ""
+
+#: include/exporter/class_cvsExporter.inc:93
+msgid "CSV"
+msgstr ""
+
+#: include/exporter/class_pdfExporter.inc:58
+msgid "No PDF export possible: there is no FPDF library installed."
+msgstr ""
+
+#: include/exporter/class_pdfExporter.inc:196
+msgid "PDF"
+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/class_plugin.inc:553
+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/class_plugin.inc:1467
+#, php-format
+msgid "Tab \"%s\""
+msgstr ""
+
+#: include/class_CopyPasteHandler.inc:305
+#: ihtml/themes/default/copyPasteDialog.tpl.c:20
+msgid "Cancel all"
+msgstr ""
+
+#: include/class_CopyPasteHandler.inc:372
+msgid "Cannot paste"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:162
+msgid "Template settings"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:165
+msgid "Template name"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:165
+msgid "This is the name of the template"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:264
+msgid "Only main tab can compute dn"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:271
+#, php-format
+msgid "Could not compute dn: no parent tab class for \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:283
+#, php-format
+msgid ""
+"Could not compute dn: could not find objectType infos from tab class \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:644
+#: include/simpleplugin/class_simplePlugin.inc:652
+msgid "Error when saving"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:644
+#, php-format
+msgid "There is already an entry with the same dn : %s"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:652
+#, php-format
+msgid "The entry %s is not existing"
+msgstr ""
+
+#: include/simpleplugin/simple-select-list.xml:11
+msgid "Please select the desired entries"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:244
+#, php-format
+msgid "%s template"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:401
+#: include/simpleplugin/class_simpleManagement.inc:407
+#, php-format
+msgid "Show %s"
+msgstr ""
+
+#: include/simpleplugin/class_dialogAttributes.inc:415
+#, php-format
+msgid "Group %s"
+msgstr ""
+
+#: include/simpleplugin/class_dialogAttributes.inc:417
+#, php-format
+msgid "Role %s"
+msgstr ""
+
+#: include/simpleplugin/class_dialogAttributes.inc:452
+msgid "Group of user"
+msgstr ""
+
+#: include/simpleplugin/class_dialogAttributes.inc:621
+#: include/simpleplugin/class_attribute.inc:1090
+#: include/simpleplugin/class_attribute.inc:1124
+msgid "None"
+msgstr ""
+
+#: include/simpleplugin/class_dialogAttributes.inc:623
+msgid "Unknown"
+msgstr ""
+
+#: include/simpleplugin/class_helpersAttribute.inc:260
+msgid "B"
+msgstr ""
+
+#: include/simpleplugin/class_helpersAttribute.inc:261
+msgid "KiB"
+msgstr ""
+
+#: include/simpleplugin/class_helpersAttribute.inc:262
+msgid "MiB"
+msgstr ""
+
+#: include/simpleplugin/class_helpersAttribute.inc:263
+msgid "GiB"
+msgstr ""
+
+#: include/simpleplugin/class_helpersAttribute.inc:264
+msgid "TiB"
+msgstr ""
+
+#: include/simpleplugin/class_helpersAttribute.inc:275
+msgid "seconds"
+msgstr ""
+
+#: include/simpleplugin/class_helpersAttribute.inc:276
+msgid "minutes"
+msgstr ""
+
+#: include/simpleplugin/class_helpersAttribute.inc:277
+msgid "hours"
+msgstr ""
+
+#: include/simpleplugin/class_helpersAttribute.inc:278
+msgid "days"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:543
+#: include/simpleplugin/class_attribute.inc:2171
+#, php-format
+msgid "%s (required)"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:1150
+#, php-format
+msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:1277
+#, php-format
+msgid "An integer between %d and %d"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:1279
+#, php-format
+msgid "An integer larger than %d"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:1281
+#, php-format
+msgid "An integer smaller than %d"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:1383
+#, php-format
+msgid "A float between %f and %f"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:1385
+#, php-format
+msgid "A float larger than %f"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:1387
+#, php-format
+msgid "A float smaller than %f"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:1500
+msgid "Error, incorrect date: "
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
+#, php-format
+msgid "Cannot read uploaded file: %s"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:1540
+msgid "file is empty"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:1543
+msgid "file not found"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:1546
+msgid "file not readable"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:1579
+#, php-format
+msgid "%s (%d bytes)"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:1626
+#: include/simpleplugin/class_attribute.inc:1803
+msgid "Upload"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:1631
+#: include/simpleplugin/class_attribute.inc:1632
+msgid "Download"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:1785
+msgid ""
+"Cannot save user picture, FusionDirectory requires the package "
+"'php5-imagick' to be installed!"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:1836
+#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
+msgid "Base"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:1839
+msgid "Object base"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:2769
+#, php-format
+msgid "Invalid value for %s"
+msgstr ""
+
+#: include/simpleplugin/simple-list.xml:11
+msgid "NO LABEL"
+msgstr ""
+
+#: include/simpleplugin/class_simpleTabs.inc:91
+#, php-format
+msgid ""
+"No plugin definitions found to initialize '%s', please check your "
+"configuration file."
+msgstr ""
+
+#: include/simpleplugin/class_simpleTabs.inc:325
+#, php-format
+msgid "Delete process has been canceled by plugin '%s': %s"
+msgstr ""
+
+#: include/simpleplugin/class_simpleTabs.inc:405
+#, php-format
+msgid "Move from \"%s\" to \"%s\" failed"
+msgstr ""
+
+#: include/class_timezone.inc:52
+#, php-format
+msgid "The timezone setting \"%s\" in your configuration is not valid."
+msgstr ""
+
+#: include/class_acl.inc:35 include/class_acl.inc:39
+msgid "ACL"
+msgstr ""
+
+#: include/class_acl.inc:36
+msgid "Manage access control lists"
+msgstr ""
+
+#: include/class_acl.inc:118
+#, php-format
+msgid ""
+"Unkown ACL type '%s'!\n"
+"You might need to run \"fusiondirectory-setup --migrate-acls\" to migrate your acls to the new format."
+msgstr ""
+
+#: include/class_acl.inc:165
+#, php-format
+msgid "Unknown entry '%s'!"
+msgstr ""
+
+#: include/class_acl.inc:168
+#, php-format
+msgid "All users"
+msgstr ""
+
+#: include/password-methods/class_password-methods-sasl.inc:60
+#, php-format
+msgid "Cannot change password, unknown user '%s'"
+msgstr ""
+
+#: include/password-methods/class_password-methods-sasl.inc:86
+msgid ""
+"You need to fill saslRealm or saslExop in the configuration screen in order "
+"to use SASL"
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:415
+msgid "There was a problem uncompressing snapshot data"
+msgstr ""
+
+#: html/index.php:56
+msgid "Session is not encrypted!"
+msgstr ""
+
+#: html/index.php:63
+msgid ""
+"The session lifetime configured in your fusiondirectory.conf will be "
+"overridden by php.ini settings."
+msgstr ""
+
+#: html/index.php:151
+#, php-format
+msgid ""
+"FusionDirectory configuration %s/%s is not readable. Please run "
+"fusiondirectory-setup --check-config to fix this."
+msgstr ""
+
+#: html/index.php:171
+msgid "Smarty error"
+msgstr ""
+
+#: html/index.php:173
+#, php-format
+msgid "Directory \"%s\" specified as compile directory is not accessible!"
+msgstr ""
+
+#: html/index.php:208
+msgid "Your FusionDirectory session has expired!"
+msgstr ""
+
+#: html/index.php:211
+msgid "Your IP has changed!"
+msgstr ""
+
+#: html/index.php:214
+#, php-format
+msgid "Invalid plugin parameter \"%s\"!"
+msgstr ""
+
+#: html/index.php:217
+msgid "No session found!"
+msgstr ""
+
+#: html/index.php:252
+msgid "LDAP schema check reported errors:"
+msgstr ""
+
+#: html/index.php:278
+msgid "Please specify a valid username!"
+msgstr ""
+
+#: html/index.php:281
+msgid "Please specify your password!"
+msgstr ""
+
+#: html/index.php:300
+msgid "Please check the username/password combination."
+msgstr ""
+
+#: html/index.php:333
+msgid "Account locked. Please contact your system administrator!"
+msgstr ""
+
+#: html/index.php:475
+#, php-format
+msgid "CAS user \"%s\" could not be found in the LDAP"
+msgstr ""
+
+#: html/index.php:485
+#, php-format
+msgid "CAS user \"%s\" match several users in the LDAP"
+msgstr ""
+
+#: html/index.php:522
+msgid ""
+"Your browser has cookies disabled. Please enable cookies and reload this "
+"page before logging in!"
+msgstr ""
+
+#: html/main.php:113
+msgid "PHP configuration"
+msgstr ""
+
+#: html/main.php:114
+msgid ""
+"Fatal error: Register globals is on. FusionDirectory will refuse to login "
+"unless this is fixed by an administrator."
+msgstr ""
+
+#: html/main.php:140
+msgid "Password change"
+msgstr ""
+
+#: html/main.php:140
+msgid "Your password is about to expire, please change your password!"
+msgstr ""
+
+#: html/main.php:205
+msgid "Running out of memory!"
+msgstr ""
+
+#: html/main.php:248
+msgid "User ACL checks disabled"
+msgstr ""
+
+#: html/main.php:286
+msgid "Plugin"
+msgstr ""
+
+#: html/main.php:287
+#, php-format
+msgid ""
+"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
+" a file)!"
+msgstr ""
+
+#: html/main.php:302
+msgid "Configuration Error"
+msgstr ""
+
+#: html/main.php:303
+#, php-format
+msgid ""
+"Fatal error: not all POST variables have been transfered by PHP - please "
+"inform your administrator!"
+msgstr ""
+
+#: html/class_passwordRecovery.inc:217
+#, php-format
+msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
+msgstr ""
+
+#: html/class_passwordRecovery.inc:260 html/setup.php:59
+#, php-format
+msgid "Directory '%s' specified as compile directory is not accessible!"
+msgstr ""
+
+#: html/class_passwordRecovery.inc:379
+msgid "Session will not be encrypted."
+msgstr ""
+
+#: html/class_passwordRecovery.inc:381
+msgid "Enter SSL session"
+msgstr ""
+
+#: html/class_passwordRecovery.inc:430
+#, php-format
+msgid "Did not find an account with login \"%s\""
+msgstr ""
+
+#: html/class_passwordRecovery.inc:433
+#, php-format
+msgid "Found multiple accounts with login \"%s\""
+msgstr ""
+
+#: html/class_passwordRecovery.inc:446 ihtml/themes/default/recovery.tpl.c:68
+msgid "Email address"
+msgstr ""
+
+#: html/class_passwordRecovery.inc:469
+#, php-format
+msgid "There is no account using email %s"
+msgstr ""
+
+#: html/class_passwordRecovery.inc:472
+#, php-format
+msgid "There are several accounts using email %s"
+msgstr ""
+
+#: html/class_passwordRecovery.inc:520
+msgid "Contact your administrator, there was a problem with mail server"
+msgstr ""
+
+#: html/class_passwordRecovery.inc:531
+msgid "This token is invalid"
+msgstr ""
+
+#: html/class_passwordRecovery.inc:591
+msgid "There was a problem with mail server, confirmation email not sent"
+msgstr ""
+
+#: html/setup.php:59
+msgid "Smarty"
+msgstr ""
+
+#: setup/class_setupStep_Ldap.inc:33
+msgid "LDAP connexion"
+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
+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: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_Finish.inc:30 setup/class_setupStep_Welcome.inc:30
+#: setup/class_setupStep_Welcome.inc:50
+msgid "Welcome"
+msgstr ""
+
+#: setup/class_setupStep_Finish.inc:40
+#: ihtml/themes/default/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_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+msgid "Migrate"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:206 setup/class_setupStep_Checks.inc:30
+msgid "PHP module and extension checks"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+msgid "LDAP inspection"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:225
+msgid "Analyze your current LDAP for FusionDirectory compatibility"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:233
+msgid "Give all rights on users in the given branch"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.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
+msgid "Allow users to edit their own password (use only on base)"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:258
+msgid "Inspecting object classes in root object"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:259
+msgid "Checking permission for LDAP database"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:260
+msgid "Checking for invisible users"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:261
+msgid "Checking for super administrator"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:262
+msgid "Checking for default ACL roles and groups"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:263
+msgid "Checking for users outside the people tree"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:264
+msgid "Checking for groups outside the groups tree"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:265
+msgid "Checking for invisible departments"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:266
+msgid "Checking for duplicated UID numbers"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:267
+msgid "Checking for duplicated GID numbers"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:487
+#: setup/class_setupStep_Migrate.inc:564 setup/class_setupStep_Migrate.inc:702
+#: setup/class_setupStep_Migrate.inc:980
+#: setup/class_setupStep_Migrate.inc:1056
+#: setup/class_setupStep_Migrate.inc:1179
+#: setup/class_setupStep_Migrate.inc:1272
+#: setup/class_setupStep_Migrate.inc:1351
+#: setup/class_setupStep_Migrate.inc:1395
+msgid "LDAP query failed"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:488
+#: setup/class_setupStep_Migrate.inc:565 setup/class_setupStep_Migrate.inc:703
+#: 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
+msgid "Possibly the \"root object\" is missing."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:368
+#: setup/class_setupStep_Migrate.inc:419 setup/class_setupStep_Migrate.inc:499
+#: setup/class_setupStep_Migrate.inc:510 setup/class_setupStep_Migrate.inc:864
+#: setup/class_setupStep_Migrate.inc:879
+msgid "Failed"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:347
+#, php-format
+msgid "Missing FusionDirectory object class '%s'!"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:348
+msgid "Please check your installation."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:369
+#, 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:500
+#, php-format
+msgid "The specified user \"%s\" does not have full access to your LDAP database."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:511
+#, php-format
+msgid "The specified user \"%s\" does not have full access to your ldap database."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:574
+#, php-format
+msgid ""
+"Found %s user(s) that will not be visible in FusionDirectory or which are "
+"incomplete."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:583 setup/class_setupStep_Migrate.inc:588
+msgid "User migration"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:671
+#: setup/class_setupStep_Migrate.inc:1027
+msgid "Migration error"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:673
+#, php-format
+msgid "Cannot migrate entry \"%s\":"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:857
+#, php-format
+msgid "FD 1.0.7 administrative accounts found: %s"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:860
+#, php-format
+msgid "FD 1.0.7 administrative groups found: %s"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:862
+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:865
+msgid ""
+"There is no valid FusionDirectory 1.0.8 administrator account inside your "
+"LDAP."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:874
+msgid "Groups"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:880
+msgid "There is no FusionDirectory administrator account inside your LDAP."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:918
+msgid "Gives all rights on all objects"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:995
+msgid "Default ACL roles have not been inserted"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:997
+msgid "Some default ACL roles are missing"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:999
+msgid "Default ACL roles have been inserted"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1029
+#, php-format
+msgid "Cannot add ACL role \"%s\":"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1084
+#, php-format
+msgid "Found %s user(s) outside the configured tree \"%s\"."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1098
+#: setup/class_setupStep_Migrate.inc:1112
+msgid "Move users into configured user tree"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1130
+msgid "Cannot move entries to the requested department!"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1142
+msgid "Entry will be moved from"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1142
+msgid "to"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1152
+msgid "The following references will be updated"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1203
+#, php-format
+msgid "Found %s groups outside the configured tree '%s'."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1217
+#: setup/class_setupStep_Migrate.inc:1231
+msgid "Move groups into configured groups tree"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1314
+#, php-format
+msgid "Found %s department(s) that will not be visible in FusionDirectory."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1323
+#: setup/class_setupStep_Migrate.inc:1328
+msgid "Department migration"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1378
+#, php-format
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1422
+#, php-format
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
+msgstr ""
+
+#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+msgid "Language setup"
+msgstr ""
+
+#: setup/class_setupStep_Language.inc:61
+msgid "This step allows you to select your preferred language."
+msgstr ""
+
+#: setup/class_setupStep_Language.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_Welcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
+msgstr ""
+
+#: setup/class_setupStep_Welcome.inc:52
+msgid "The welcome message"
+msgstr ""
+
+#: setup/class_setupStep_Checks.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
+msgid "Installation check"
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:50
+msgid "Basic checks for PHP compatibility and extensions"
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:67
+msgid "Checking PHP version"
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:68
+#, php-format
+msgid "PHP must be of version %s or above."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:69
+msgid "Please upgrade to a supported version."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:76
+msgid "FusionDirectory requires this module to talk with your LDAP server."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:84
+msgid ""
+"FusionDirectory requires this module for an internationalized interface."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:92
+msgid ""
+"FusionDirectory requires this module to communicate with different types of "
+"servers and protocols."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:100
+msgid "FusionDirectory requires this module for the samba integration."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:108
+msgid ""
+"FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
+"SSHA encryption."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:116
+msgid "FusionDirectory requires this module to talk to an IMAP server."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:123
+msgid "mbstring"
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:124
+msgid "FusionDirectory requires this module to handle unicode strings."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:130
+msgid "imagick"
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:131
+msgid "FusionDirectory requires this extension to handle images."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:145
+msgid "compression module"
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:146
+msgid "FusionDirectory requires this extension to handle snapshots."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:156
+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:157
+msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:164
+msgid "PHP uses this value for the garbage collector to delete old sessions."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:165
+msgid ""
+"Setting this value to one day will prevent loosing session and cookies "
+"before they really timeout."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:166
+msgid ""
+"Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
+"higher."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:173 setup/class_setupStep_Checks.inc:189
+#: setup/class_setupStep_Checks.inc:205 setup/class_setupStep_Checks.inc:213
+msgid "Off"
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:174
+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:175
+msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:182
+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:183
+msgid ""
+"Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:190
+msgid ""
+"This option influences the PHP output handling. Turn this Option off, to "
+"increase performance."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:191
+msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:198
+msgid "The Execution time should be at least 30 seconds."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:199
+msgid ""
+"Search for 'max_execution_time' in your php.ini and set it to '30' or "
+"higher."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:206
+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:207
+msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:214
+msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:215
+msgid ""
+"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
+"'Off'."
+msgstr ""
+
+#: setup/class_setup.inc:130
+msgid "Setup error"
+msgstr ""
+
+#: setup/class_setup.inc:210
+msgid "Completed"
+msgstr ""
+
+#: setup/class_setup.inc:253
+msgid "Next"
+msgstr ""
+
+#: plugins/generic/welcome/welcome.tpl.c:2
+msgid "The FusionDirectory team"
+msgstr ""
+
+#: plugins/generic/references/contents.tpl.c:2
+msgid "<strong>%1</strong> references our <strong>%3</strong>"
+msgstr ""
+
+#: plugins/generic/references/contents.tpl.c:5
+msgid ""
+"<strong>%1</strong> references our field <strong>%3</strong> from tab "
+"<strong>%2</strong>"
+msgstr ""
+
+#: plugins/generic/references/contents.tpl.c:8
+msgid "This object has no relationship to other objects."
+msgstr ""
+
+#: plugins/admin/users/user-filter.tpl.c:2
+#: ihtml/themes/default/simple-filter.tpl.c:2
+#: include/select/groupSelect/group-filter.tpl.c:2
+msgid "Filter"
+msgstr ""
+
+#: plugins/admin/users/user-filter.tpl.c:5
+msgid "Show templates"
+msgstr ""
+
+#: plugins/admin/users/user-filter.tpl.c:8
+msgid "Show functional users"
+msgstr ""
+
+#: plugins/admin/users/user-filter.tpl.c:11
+msgid "Show POSIX users"
+msgstr ""
+
+#: plugins/admin/users/user-filter.tpl.c:14
+msgid "Show Mail users"
+msgstr ""
+
+#: plugins/admin/users/user-filter.tpl.c:17
+msgid "Show Samba users"
+msgstr ""
+
+#: 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 ""
+
+#: plugins/admin/acl/remove.tpl.c:8
+msgid "Press 'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+
+#: plugins/addons/dashboard/users_accounts.tpl.c:2
+msgid "There is one expired account"
+msgid_plural "There are %1 expired accounts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: plugins/addons/dashboard/users_accounts.tpl.c:5
+msgid "There is no expired account"
+msgstr ""
+
+#: plugins/addons/dashboard/users_accounts.tpl.c:11
+#: plugins/addons/dashboard/users_accounts.tpl.c:44
+msgid "Manager concerned"
+msgstr ""
+
+#: plugins/addons/dashboard/users_accounts.tpl.c:14
+#: plugins/addons/dashboard/users_accounts.tpl.c:47
+msgid "uid"
+msgstr ""
+
+#: plugins/addons/dashboard/users_accounts.tpl.c:17
+#: plugins/addons/dashboard/users_accounts.tpl.c:50
+msgid "cn"
+msgstr ""
+
+#: plugins/addons/dashboard/users_accounts.tpl.c:20
+#: plugins/addons/dashboard/users_accounts.tpl.c:32
+#: plugins/addons/dashboard/users_accounts.tpl.c:53
+#: plugins/addons/dashboard/users_accounts.tpl.c:65
+msgid "telephoneNumber"
+msgstr ""
+
+#: plugins/addons/dashboard/users_accounts.tpl.c:23
+#: plugins/addons/dashboard/users_accounts.tpl.c:56
+msgid "shadowExpire"
+msgstr ""
+
+#: plugins/addons/dashboard/users_accounts.tpl.c:26
+#: plugins/addons/dashboard/users_accounts.tpl.c:59
+msgid "manager"
+msgstr ""
+
+#: plugins/addons/dashboard/users_accounts.tpl.c:29
+#: plugins/addons/dashboard/users_accounts.tpl.c:62
+msgid "mail"
+msgstr ""
+
+#: 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] ""
+msgstr[1] ""
+
+#: plugins/addons/dashboard/users_accounts.tpl.c:38
+msgid "There is no account expiring in the next %1 days"
+msgstr ""
+
+#: plugins/addons/dashboard/users_accounts.tpl.c:41
+msgid "Next expired accounts"
+msgstr ""
+
+#: plugins/addons/dashboard/groups_stats.tpl.c:2
+msgid "There is 1 group:"
+msgid_plural "There are %1 groups:"
+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] ""
+msgstr[1] ""
+
+#: plugins/addons/dashboard/groups_stats.tpl.c:8
+msgid "There is no %1 group"
+msgstr ""
+
+#: plugins/addons/dashboard/users_stats.tpl.c:2
+msgid "There is 1 user:"
+msgid_plural "There are %1 users:"
+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] ""
+msgstr[1] ""
+
+#: plugins/addons/dashboard/users_stats.tpl.c:8
+msgid "None of them have a %1 account"
+msgstr ""
+
+#: plugins/addons/dashboard/users_stats.tpl.c:11
+msgid "One of them is locked"
+msgid_plural "%1 of them are locked"
+msgstr[0] ""
+msgstr[1] ""
+
+#: plugins/addons/dashboard/users_stats.tpl.c:14
+msgid "None of them is locked"
+msgstr ""
+
+#: 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 ""
+
+#: plugins/personal/generic/paste_generic.tpl.c:2
+msgid "User settings"
+msgstr ""
+
+#: plugins/personal/generic/paste_generic.tpl.c:17
+msgid "Clear password"
+msgstr ""
+
+#: plugins/personal/generic/paste_generic.tpl.c:20
+msgid "Set new password"
+msgstr ""
+
+#: plugins/personal/generic/paste_generic.tpl.c:23
+msgid "Personal picture"
+msgstr ""
+
+#: plugins/personal/generic/paste_generic.tpl.c:26
+msgid "User picture"
+msgstr ""
+
+#: plugins/personal/generic/paste_generic.tpl.c:29
+msgid "Remove picture"
+msgstr ""
+
+#: plugins/personal/generic/nochange.tpl.c:2
+msgid "You have no permission to change your password at this time"
+msgstr ""
+
+#: plugins/personal/generic/nochange.tpl.c:5
+msgid "Your password hash method will not be changed!"
+msgstr ""
+
+#: ihtml/themes/default/islocked.tpl.c:2
+msgid "Locking conflict detected"
+msgstr ""
+
+#: ihtml/themes/default/islocked.tpl.c:8
+msgid ""
+"If this lock detection is false, the other person has obviously closed the "
+"webbrowser during the edit operation. You may want to take over the lock by "
+"pressing the 'Edit anyway' button."
+msgstr ""
+
+#: ihtml/themes/default/islocked.tpl.c:11
+msgid "Read only"
+msgstr ""
+
+#: ihtml/themes/default/template.tpl.c:2
+msgid "Creating a new object using templates"
+msgstr ""
+
+#: ihtml/themes/default/template.tpl.c:8
+#: ihtml/themes/default/restore-confirm.tpl.c:14
+msgid "Continue"
+msgstr ""
+
+#: ihtml/themes/default/sizelimit.tpl.c:2
+msgid ""
+"The size limit option makes LDAP operations faster and saves the LDAP server"
+" 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 ""
+
+#: ihtml/themes/default/sizelimit.tpl.c:5
+msgid "Please choose the way to react for this session"
+msgstr ""
+
+#: ihtml/themes/default/sizelimit.tpl.c:8
+msgid "ignore this error and show all entries the LDAP server returns"
+msgstr ""
+
+#: ihtml/themes/default/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 ""
+
+#: ihtml/themes/default/sizelimit.tpl.c:14
+msgid "Set"
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:2
+msgid "FusionDirectory password recovery"
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:11
+msgid "Lost password"
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:14
+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 ""
+
+#: ihtml/themes/default/recovery.tpl.c:17
+#: ihtml/themes/default/recovery.tpl.c:20
+#: ihtml/themes/default/recovery.tpl.c:62
+#: ihtml/themes/default/recovery.tpl.c:65 ihtml/themes/default/login.tpl.c:29
+#: ihtml/themes/default/login.tpl.c:32 ihtml/themes/default/login.tpl.c:35
+msgid "Directory"
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:32
+#: ihtml/themes/default/recovery.tpl.c:35
+msgid "New password repeated"
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:38
+msgid "Password strength"
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:41
+#: ihtml/themes/default/recovery.tpl.c:74
+msgid "Change"
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:44
+#: ihtml/themes/default/recovery.tpl.c:77
+msgid "Click here to change your password"
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:47
+#: ihtml/themes/default/recovery.tpl.c:50
+msgid "Success"
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:53
+msgid "Your password has been changed successfully."
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:56
+msgid ""
+"Enter your current e-mail address in the field below and press the 'Change' "
+"button."
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:59
+msgid ""
+"=> Use your e-mail in the long format, e.g : John Doe => john.doe@ibcp.fr"
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:71
+msgid "Mail"
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:80
+msgid ""
+"Password recovery is not activated. If you have lost your password, please "
+"contact your administrator"
+msgstr ""
+
+#: ihtml/themes/default/remove.tpl.c:5
+msgid ""
+"This may be used by several groups. Please double check if your really want "
+"to do this since there is no way for FusionDirectory to get your data back."
+msgstr ""
+
+#: ihtml/themes/default/remove.tpl.c:8
+#: ihtml/themes/default/simple-remove.tpl.c:8
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+
+#: ihtml/themes/default/login.tpl.c:2
+msgid "Login screen"
+msgstr ""
+
+#: ihtml/themes/default/login.tpl.c:5
+msgid ""
+"Please use your username and your password to log into the site "
+"administration system."
+msgstr ""
+
+#: ihtml/themes/default/login.tpl.c:8 ihtml/themes/default/login.tpl.c:11
+#: ihtml/themes/default/login.tpl.c:14
+msgid "Username"
+msgstr ""
+
+#: ihtml/themes/default/login.tpl.c:26
+msgid "I forgot my password"
+msgstr ""
+
+#: ihtml/themes/default/login.tpl.c:38 ihtml/themes/default/login.tpl.c:44
+msgid "Sign in"
+msgstr ""
+
+#: ihtml/themes/default/login.tpl.c:41
+msgid "Click here to log in"
+msgstr ""
+
+#: ihtml/themes/default/restore-confirm.tpl.c:2
+msgid "Warning: you are about to restore the following snapshot"
+msgstr ""
+
+#: ihtml/themes/default/restore-confirm.tpl.c:5
+msgid "Any modification made to the object since this snapshot will be lost."
+msgstr ""
+
+#: ihtml/themes/default/restore-confirm.tpl.c:8
+#: ihtml/themes/default/simple-remove.tpl.c:5
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"FusionDirectory to get your data back."
+msgstr ""
+
+#: ihtml/themes/default/restore-confirm.tpl.c:11
+msgid ""
+"So - if you're sure - press 'Continue' to continue or 'Cancel' to abort."
+msgstr ""
+
+#: ihtml/themes/default/acl.tpl.c:2
+msgid "Assigned ACL for current entry"
+msgstr ""
+
+#: ihtml/themes/default/acl.tpl.c:5
+msgid "New ACL"
+msgstr ""
+
+#: ihtml/themes/default/acl.tpl.c:8
+msgid "ACL type"
+msgstr ""
+
+#: ihtml/themes/default/acl.tpl.c:11 ihtml/themes/default/acl.tpl.c:14
+msgid "Select an acl type"
+msgstr ""
+
+#: ihtml/themes/default/acl.tpl.c:17
+msgid "Additional filter options"
+msgstr ""
+
+#: ihtml/themes/default/acl.tpl.c:20
+msgid "Use members from"
+msgstr ""
+
+#: ihtml/themes/default/acl.tpl.c:23
+msgid "Available members"
+msgstr ""
+
+#: ihtml/themes/default/acl.tpl.c:26 ihtml/themes/default/acl.tpl.c:29
+msgid "List message possible targets"
+msgstr ""
+
+#: ihtml/themes/default/acl.tpl.c:35 ihtml/themes/default/acl.tpl.c:38
+msgid "List message recipients"
+msgstr ""
+
+#: ihtml/themes/default/acl.tpl.c:44
+msgid "ACL for this object"
+msgstr ""
+
+#: ihtml/themes/default/acl.tpl.c:47
+msgid "Available roles"
+msgstr ""
+
+#: ihtml/themes/default/simple-remove.tpl.c:2
+msgid "Warning: you are about to delete the following objects"
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl.c:2
+msgid "Copy & paste wizard"
+msgstr ""
+
+#: ihtml/themes/default/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 ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl.c:8
+msgid "Remember that some properties like taken snapshots will not be copied!"
+msgstr ""
+
+#: ihtml/themes/default/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 ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl.c:23
+msgid "Operation complete"
+msgstr ""
+
+#: ihtml/themes/default/msg_dialog.tpl.c:8
+msgid "Information"
+msgstr ""
+
+#: ihtml/themes/default/framework.tpl.c:2
+msgid "Main"
+msgstr ""
+
+#: ihtml/themes/default/framework.tpl.c:5
+msgid "Sign out"
+msgstr ""
+
+#: ihtml/themes/default/framework.tpl.c:8
+msgid "Signed in:"
+msgstr ""
+
+#: ihtml/themes/default/framework.tpl.c:11
+#, c-format
+msgid "Session expires in %d!"
+msgstr ""
+
+#: setup/setup_migrate_baseOC.tpl.c:2
+msgid "Add required object classes to the LDAP base"
+msgstr ""
+
+#: setup/setup_migrate_baseOC.tpl.c:5
+#: setup/setup_migrate_gosaAccounts.tpl.c:17
+msgid "Current"
+msgstr ""
+
+#: setup/setup_migrate_baseOC.tpl.c:8
+#: setup/setup_migrate_gosaAccounts.tpl.c:20
+msgid "After migration"
+msgstr ""
+
+#: setup/setup_migrate_baseOC.tpl.c:14
+msgid "Close"
+msgstr ""
+
+#: setup/setup_finish.tpl.c:2
+msgid "Create your configuration file"
+msgstr ""
+
+#: setup/setup_finish.tpl.c:5
+msgid "Run %1 to put the correct right on fusiondirectory.conf"
+msgstr ""
+
+#: setup/setup_finish.tpl.c:8
+msgid "Download configuration"
+msgstr ""
+
+#: setup/setup_finish.tpl.c:11
+msgid "Status: "
+msgstr ""
+
+#: setup/setup_migrate_adminAccount.tpl.c:2
+msgid "Create a new FusionDirectory administrator account"
+msgstr ""
+
+#: setup/setup_migrate_adminAccount.tpl.c:5
+msgid ""
+"This dialog will automatically add a new super administrator to your LDAP "
+"tree."
+msgstr ""
+
+#: setup/setup_migrate_adminAccount.tpl.c:11
+msgid "User ID"
+msgstr ""
+
+#: setup/setup_migrate_adminAccount.tpl.c:17
+msgid "Password (again)"
+msgstr ""
+
+#: 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 ""
+
+#: setup/setup_welcome.tpl.c:5
+msgid "What will the wizard do for you?"
+msgstr ""
+
+#: setup/setup_welcome.tpl.c:8
+msgid "Create a basic, single site configuration"
+msgstr ""
+
+#: setup/setup_welcome.tpl.c:11
+msgid "Tries to find problems within your PHP and LDAP setup"
+msgstr ""
+
+#: setup/setup_welcome.tpl.c:14
+msgid "Let you choose from a set of basic and advanced configuration switches"
+msgstr ""
+
+#: setup/setup_welcome.tpl.c:17
+msgid "Guided migration of existing LDAP trees"
+msgstr ""
+
+#: setup/setup_welcome.tpl.c:20
+msgid "What will the wizard NOT do for you?"
+msgstr ""
+
+#: setup/setup_welcome.tpl.c:23
+msgid "Find every possible configuration error"
+msgstr ""
+
+#: setup/setup_welcome.tpl.c:26
+msgid "Migrate every possible LDAP setup - create backup dumps!"
+msgstr ""
+
+#: setup/setup_welcome.tpl.c:29
+msgid "To continue:"
+msgstr ""
+
+#: setup/setup_welcome.tpl.c:32
+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 ""
+
+#: setup/setup_welcome.tpl.c:35
+msgid "Click the 'Next' button when you've finished."
+msgstr ""
+
+#: setup/setup_checks.tpl.c:11
+msgid "FusionDirectory will NOT run without fixing this."
+msgstr ""
+
+#: setup/setup_checks.tpl.c:14
+msgid "FusionDirectory will run without fixing this."
+msgstr ""
+
+#: setup/setup_migrate_gosaAccounts.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
+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
+msgid "Move selected entries into this tree"
+msgstr ""
+
+#: setup/setup_migrate_gosaAccounts.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
+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
+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 ""
diff --git a/locale/id/fusiondirectory.po b/locale/id/fusiondirectory.po
index 3562752f3f56a8d7cfc9f580df2643efae3aa770..1fe05646bb72daa415484efbe97a68798e99f289 100644
--- a/locale/id/fusiondirectory.po
+++ b/locale/id/fusiondirectory.po
@@ -5,12 +5,12 @@
# Translators:
msgid ""
msgstr ""
-"Project-Id-Version: FusionDirectory-109\n"
+"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-01-22 11:26+0100\n"
-"PO-Revision-Date: 2016-01-22 10:24+0000\n"
+"POT-Creation-Date: 2016-03-14 12:07+0100\n"
+"PO-Revision-Date: 2016-03-07 12:09+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-109/language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -28,31 +28,31 @@ msgstr ""
msgid "References"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:30
-#: plugins/admin/groups/class_roleGeneric.inc:34
+#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:61
#: plugins/admin/groups/class_groupManagement.inc:71
#: plugins/admin/aclrole/class_aclRole.inc:78
#: plugins/admin/acl/class_aclAssignment.inc:49
msgid "Role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:31
+#: plugins/admin/groups/class_roleGeneric.inc:58
msgid "Role information"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:35
+#: plugins/admin/groups/class_roleGeneric.inc:62
msgid "Organizational role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:84
msgid "Informations"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:158
+#: plugins/admin/departments/class_department.inc:174
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -62,13 +62,13 @@ msgstr ""
msgid "Name"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
msgid "Name of this group"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
#: plugins/admin/groups/class_group.inc:66
#: plugins/admin/groups/class_ogroup.inc:192
#: plugins/admin/groups/group-list.xml:41
@@ -81,26 +81,26 @@ msgstr ""
msgid "Description"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
msgid "Description of the role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:70
+#: plugins/admin/groups/class_roleGeneric.inc:97
msgid "Phone number"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:74
+#: plugins/admin/groups/class_roleGeneric.inc:101
msgid "Fax number"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
#: plugins/admin/users/class_userManagement.inc:42
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: setup/class_setupStep_Migrate.inc:871
msgid "Users"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
msgid "Add users for the role"
msgstr ""
@@ -147,7 +147,7 @@ msgstr ""
#: plugins/admin/groups/class_group.inc:74
#: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:403
+#: plugins/personal/posix/class_posixAccount.inc:410
msgid "GID"
msgstr ""
@@ -204,23 +204,23 @@ msgid "Only allow this group to connect to this list of hosts"
msgstr ""
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458 include/functions.inc:794
-#: include/functions.inc:2548 include/class_xml.inc:55
+#: plugins/personal/posix/class_posixAccount.inc:465 include/functions.inc:794
+#: include/functions.inc:2549 include/class_xml.inc:55
#: include/simpleplugin/class_simpleTabs.inc:325 html/index.php:56
-#: html/index.php:62 html/index.php:481 html/class_passwordRecovery.inc:378
+#: html/index.php:62 html/index.php:522 html/class_passwordRecovery.inc:378
#: setup/class_setupStep_Migrate.inc:572
#: setup/class_setupStep_Migrate.inc:1083
#: setup/class_setupStep_Migrate.inc:1202
#: setup/class_setupStep_Migrate.inc:1313
-#: setup/class_setupStep_Migrate.inc:1372
-#: setup/class_setupStep_Migrate.inc:1411 plugins/admin/acl/remove.tpl.c:2
+#: setup/class_setupStep_Migrate.inc:1377
+#: setup/class_setupStep_Migrate.inc:1421 plugins/admin/acl/remove.tpl.c:2
#: ihtml/themes/default/islocked.tpl.c:5 ihtml/themes/default/remove.tpl.c:2
#: ihtml/themes/default/msg_dialog.tpl.c:5 setup/setup_checks.tpl.c:8
msgid "Warning"
msgstr ""
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458
+#: plugins/personal/posix/class_posixAccount.inc:465
msgid "Timeout while waiting for lock. Ignoring lock!"
msgstr ""
@@ -250,7 +250,7 @@ msgstr ""
msgid "Objects member of this group"
msgstr ""
-#: plugins/admin/groups/class_ogroup.inc:318
+#: plugins/admin/groups/class_ogroup.inc:313
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
@@ -279,10 +279,10 @@ msgstr ""
#: plugins/admin/departments/dep-list.xml:79
#: plugins/admin/users/user-list.xml:105
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-#: include/simpleplugin/class_dialogAttributes.inc:626
-#: include/simpleplugin/class_dialogAttributes.inc:627
-#: include/simpleplugin/class_attribute.inc:2661
-#: include/simpleplugin/class_attribute.inc:2662
+#: include/simpleplugin/class_dialogAttributes.inc:632
+#: include/simpleplugin/class_dialogAttributes.inc:633
+#: include/simpleplugin/class_attribute.inc:2675
+#: include/simpleplugin/class_attribute.inc:2676
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -293,8 +293,8 @@ msgstr ""
#: plugins/admin/departments/dep-list.xml:67
#: plugins/admin/departments/dep-list.xml:88
#: plugins/admin/users/user-list.xml:112
-#: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_dialogAttributes.inc:637
+#: include/simpleplugin/class_dialogAttributes.inc:642
+#: include/simpleplugin/class_dialogAttributes.inc:643
#: include/simpleplugin/simple-list.xml:75
#: include/simpleplugin/simple-list.xml:125
msgid "Remove"
@@ -343,7 +343,7 @@ msgid "Show application groups"
msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Show department groups"
+msgid "Show unidentified groups"
msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:137
@@ -432,51 +432,67 @@ msgid "Category of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:81
+msgid "Website"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:81
+#, php-format
+msgid "Website of this %s"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:85
#: plugins/personal/generic/class_user.inc:410
msgid "Manager"
msgstr ""
-#: plugins/admin/departments/class_department.inc:81
+#: plugins/admin/departments/class_department.inc:85
#, php-format
msgid "Manager of this %s"
msgstr ""
-#: plugins/admin/departments/class_department.inc:87
-#: plugins/admin/departments/class_department.inc:93
+#: plugins/admin/departments/class_department.inc:91
+#: plugins/admin/departments/class_department.inc:97
#: plugins/personal/generic/class_user.inc:304
msgid "Location"
msgstr ""
-#: plugins/admin/departments/class_department.inc:90
+#: plugins/admin/departments/class_department.inc:94
#: plugins/personal/generic/class_user.inc:308
msgid "State"
msgstr ""
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_country.inc:29
+#: plugins/admin/departments/class_country.inc:30
+#: plugins/admin/departments/class_country.inc:33
+msgid "Country"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:103
#: plugins/personal/generic/class_user.inc:312
msgid "Address"
msgstr ""
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:103
#, php-format
msgid "A postal address for this %s"
msgstr ""
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
#: plugins/personal/generic/class_user.inc:320
msgid "Phone"
msgstr ""
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
msgid "Telephone number"
msgstr ""
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
#: plugins/personal/generic/class_user.inc:332
msgid "Fax"
msgstr ""
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
msgid "Facsimile telephone number"
msgstr ""
@@ -504,12 +520,6 @@ msgstr ""
msgid "locality"
msgstr ""
-#: plugins/admin/departments/class_country.inc:29
-#: plugins/admin/departments/class_country.inc:30
-#: plugins/admin/departments/class_country.inc:33
-msgid "Country"
-msgstr ""
-
#: plugins/admin/departments/class_country.inc:50
msgid "country"
msgstr ""
@@ -552,7 +562,8 @@ msgid "Given name"
msgstr ""
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
+#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
msgid "Login"
@@ -665,8 +676,8 @@ msgid "Edit category ACL"
msgstr ""
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2671
-#: include/simpleplugin/class_attribute.inc:2672
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
+#: include/simpleplugin/class_attribute.inc:2686
#, php-format
msgid "Delete"
msgstr ""
@@ -771,19 +782,37 @@ msgstr ""
msgid "ACLs which are part of this group"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:38
+#: plugins/admin/acl/class_aclManagement.inc:31
+#: plugins/admin/acl/class_aclManagement.inc:32
+#: plugins/admin/acl/class_aclManagement.inc:45
+msgid "ACL assignment creation"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:33
+msgid "Create an ACL assignment on an arbitrary dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "Dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "DN you wish to add assignments for"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:135
msgid "ACL assignments"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:39
+#: plugins/admin/acl/class_aclManagement.inc:136
msgid "ACL assignments management"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:40
+#: plugins/admin/acl/class_aclManagement.inc:137
msgid "Manage ACL roles assignments to users"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:78
+#: plugins/admin/acl/class_aclManagement.inc:199
#: plugins/admin/acl/class_aclAssignment.inc:263
msgid "ACL Assignment"
msgstr ""
@@ -899,7 +928,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -994,57 +1023,57 @@ msgstr ""
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:336
+msgid "Homepage"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:336
+msgid "Personal homepage"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:342
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:351
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr ""
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:358
-msgid "Personal contact information"
-msgstr ""
-
#: plugins/personal/generic/class_user.inc:362
-msgid "Display name"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:362
-msgid "Name this user should appear as. Used by Exchange."
+msgid "Personal contact information"
msgstr ""
#: plugins/personal/generic/class_user.inc:366
-msgid "Home address"
+msgid "Display name"
msgstr ""
#: plugins/personal/generic/class_user.inc:366
-msgid "Home postal address"
+msgid "Name this user should appear as. Used by Exchange."
msgstr ""
#: plugins/personal/generic/class_user.inc:370
-msgid "Private phone"
+msgid "Home address"
msgstr ""
#: plugins/personal/generic/class_user.inc:370
-msgid "Home phone number"
+msgid "Home postal address"
msgstr ""
#: plugins/personal/generic/class_user.inc:374
-msgid "Homepage"
+msgid "Private phone"
msgstr ""
#: plugins/personal/generic/class_user.inc:374
-msgid "Personal homepage"
+msgid "Home phone number"
msgstr ""
#: plugins/personal/generic/class_user.inc:380
@@ -1279,33 +1308,33 @@ msgstr ""
msgid "automatic"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:309
+#: plugins/personal/posix/class_posixAccount.inc:310
msgid "expired"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:311
+#: plugins/personal/posix/class_posixAccount.inc:312
msgid "grace time active"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:314
-#: plugins/personal/posix/class_posixAccount.inc:316
-#: plugins/personal/posix/class_posixAccount.inc:318
+#: plugins/personal/posix/class_posixAccount.inc:315
+#: plugins/personal/posix/class_posixAccount.inc:317
+#: plugins/personal/posix/class_posixAccount.inc:319
msgid "active"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:315
msgid "password expired"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:316
+#: plugins/personal/posix/class_posixAccount.inc:317
msgid "password not changeable"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:400
+#: plugins/personal/posix/class_posixAccount.inc:407
msgid "UID"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:516
+#: plugins/personal/posix/class_posixAccount.inc:525
#, php-format
msgid "Group of user %s"
msgstr ""
@@ -1477,424 +1506,440 @@ msgid "Core settings"
msgstr ""
#: plugins/config/class_configInLdap.inc:161
-msgid "Enable primary group filter"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"It is time consuming to evaluate which groups are primary and which are not,"
-" so you may want to disable it if your group plugin is slow."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:167
msgid "Display summary in listings"
msgstr ""
-#: plugins/config/class_configInLdap.inc:168
+#: 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:173
+#: plugins/config/class_configInLdap.inc:167
msgid "Edit locking"
msgstr ""
-#: plugins/config/class_configInLdap.inc:174
+#: 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:179
+#: plugins/config/class_configInLdap.inc:173
msgid "Enable logging"
msgstr ""
-#: plugins/config/class_configInLdap.inc:180
+#: plugins/config/class_configInLdap.inc:174
msgid "Event logging on FusionDirectory side."
msgstr ""
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "LDAP size limit"
msgstr ""
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "Defines the number of entries to get from LDAP by default."
msgstr ""
-#: plugins/config/class_configInLdap.inc:192
+#: plugins/config/class_configInLdap.inc:186
msgid "Login and session"
msgstr ""
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:189
msgid "Login attribute"
msgstr ""
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:190
msgid "Which LDAP attribute should be used as the login name during login."
msgstr ""
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:196
msgid "Enforce encrypted connections"
msgstr ""
-#: plugins/config/class_configInLdap.inc:203
+#: plugins/config/class_configInLdap.inc:197
msgid ""
"Enables PHP security checks to force encrypted access (https) to the web "
"interface."
msgstr ""
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:201
msgid "Warn if session is not encrypted"
msgstr ""
-#: plugins/config/class_configInLdap.inc:208
+#: plugins/config/class_configInLdap.inc:202
msgid "will display a warning to the user when http is used instead of https."
msgstr ""
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Session lifetime"
msgstr ""
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Defines when a session will expire in seconds."
msgstr ""
-#: plugins/config/class_configInLdap.inc:220
+#: plugins/config/class_configInLdap.inc:212
+msgid "HTTP authentication"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:212
+msgid "Use HTTP authentication protocol instead of the login form."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:219
#: include/class_SnapshotDialogs.inc:186
msgid "Snapshots"
msgstr ""
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid "Enable snapshots"
msgstr ""
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid ""
"This enables you to save certain states of entries and restore them later "
"on."
msgstr ""
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
msgid "Snapshot base"
msgstr ""
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
msgid "The base where snapshots should be stored inside of the LDAP."
msgstr ""
-#: plugins/config/class_configInLdap.inc:235
+#: plugins/config/class_configInLdap.inc:234
msgid "SSL"
msgstr ""
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Key path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Path to FusionDirectory private key. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Certificate path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Path to FusionDirectory certificate. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:262
msgid "CA certificate path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:247
msgid "Path to the CA certificate. Used for validating Argonaut Server host."
msgstr ""
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:254
msgid "CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "Enable CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "CAS login will be used instead of LDAP bind"
msgstr ""
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:262
msgid "Path to the CA certificate of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host"
msgstr ""
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port"
msgstr ""
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port the CAS server is listening on"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context to be used"
msgstr ""
-#: plugins/config/class_configInLdap.inc:285
+#: plugins/config/class_configInLdap.inc:284
msgid "People and group storage"
msgstr ""
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "People DN attribute"
msgstr ""
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "Attribute to use at the beginning of users dn"
msgstr ""
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "CN pattern"
msgstr ""
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "The pattern to use to build the common name field"
msgstr ""
-#: plugins/config/class_configInLdap.inc:299
+#: plugins/config/class_configInLdap.inc:298
msgid "Strict naming policy"
msgstr ""
-#: plugins/config/class_configInLdap.inc:300
+#: plugins/config/class_configInLdap.inc:299
msgid "Enables strict checking of user and group names"
msgstr ""
-#: plugins/config/class_configInLdap.inc:305
+#: plugins/config/class_configInLdap.inc:304
msgid "Group/user min id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:306
+#: plugins/config/class_configInLdap.inc:305
msgid ""
"The minimum assignable user or group id to avoid security leaks with id 0 "
"accounts."
msgstr ""
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid "Next id hook"
msgstr ""
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid ""
"A script to be called for finding the next free id number for users or "
"groups."
msgstr ""
-#: plugins/config/class_configInLdap.inc:315
+#: plugins/config/class_configInLdap.inc:314
msgid "Base number for user id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:315
msgid "Where to start looking for a new free user id."
msgstr ""
-#: plugins/config/class_configInLdap.inc:321
+#: plugins/config/class_configInLdap.inc:320
msgid "Base number for group id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:321
msgid "Where to start looking for a new free group id."
msgstr ""
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "Users RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "The branch where users are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "Groups RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "The branch where groups are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "ACL role RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "The branch where ACL roles are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Id allocation method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Method to allocate user/group ids"
msgstr ""
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Traditional"
msgstr ""
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Samba unix id pool"
msgstr ""
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Pool user id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Minimum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Pool user id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Maximum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Pool group id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Minimum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Pool group id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Maximum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:370
-msgid "Debugging"
+#: plugins/config/class_configInLdap.inc:367
+msgid "Restrict role members"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:367
+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:373
+msgid "Debugging"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:376
msgid "Display errors"
msgstr ""
-#: plugins/config/class_configInLdap.inc:374
+#: plugins/config/class_configInLdap.inc:377
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:378
+#: plugins/config/class_configInLdap.inc:381
msgid "Maximum LDAP query time"
msgstr ""
-#: plugins/config/class_configInLdap.inc:378
+#: plugins/config/class_configInLdap.inc:381
msgid ""
"Stop LDAP actions if there is no answer within the specified number of "
"seconds."
msgstr ""
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:386
msgid "Log LDAP statistics"
msgstr ""
-#: plugins/config/class_configInLdap.inc:384
+#: plugins/config/class_configInLdap.inc:387
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:389
+#: plugins/config/class_configInLdap.inc:392
msgid "Debug level"
msgstr ""
-#: plugins/config/class_configInLdap.inc:390
+#: plugins/config/class_configInLdap.inc:393
msgid "Display certain information on each page load."
msgstr ""
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:405
msgid "Miscellaneous"
msgstr ""
-#: plugins/config/class_configInLdap.inc:407
+#: plugins/config/class_configInLdap.inc:410
msgid "Hooks that are called when specific actions happens"
msgstr ""
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "tab"
msgstr ""
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "The tab that this hook concerns"
msgstr ""
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "mode"
msgstr ""
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "When to call this command"
msgstr ""
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "cmd"
msgstr ""
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "The command that will be called"
msgstr ""
-#: plugins/config/class_configInLdap.inc:429
+#: plugins/config/class_configInLdap.inc:432
msgid "Hooks"
msgstr ""
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:439
msgid "Display hook output"
msgstr ""
-#: plugins/config/class_configInLdap.inc:437
+#: plugins/config/class_configInLdap.inc:440
msgid ""
"When enabled successful hook execution output is displayed to the user using"
" a dialog."
msgstr ""
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available shells"
msgstr ""
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available POSIX shells for FD users."
msgstr ""
-#: plugins/config/class_configInLdap.inc:449
+#: plugins/config/class_configInLdap.inc:452
msgid "Show ACL tab on all objects"
msgstr ""
-#: plugins/config/class_configInLdap.inc:450
+#: plugins/config/class_configInLdap.inc:453
msgid ""
"For very specific ACL rights setting where you might need to give right on a"
" single object."
msgstr ""
-#: plugins/config/class_configInLdap.inc:464
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available department categories"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available categories in the departments dropdown"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:474
#: setup/class_setupStep_Language.inc:69
msgid "Automatic"
msgstr ""
@@ -1911,80 +1956,80 @@ msgstr ""
msgid "Password recovery settings"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:44
+#: plugins/config/class_recoveryConfig.inc:45
msgid "Activate password recovery"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:45
+#: plugins/config/class_recoveryConfig.inc:46
msgid "Whether to activate or not password recovery feature"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:50
+#: plugins/config/class_recoveryConfig.inc:51
msgid "Sender email address"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:51
+#: plugins/config/class_recoveryConfig.inc:52
msgid "Email address from which mails will be sent"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:57
+#: plugins/config/class_recoveryConfig.inc:58
msgid "Link validity (minutes)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:58
+#: plugins/config/class_recoveryConfig.inc:59
msgid "Number of minutes before a recovery link expires"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:64
+#: plugins/config/class_recoveryConfig.inc:65
msgid "Salt for tokens"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:65
+#: plugins/config/class_recoveryConfig.inc:66
msgid ""
"Just a security measure, you can put anything in there, even random "
"characters"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:71
+#: plugins/config/class_recoveryConfig.inc:72
msgid "Allow the use of alternate addresses"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:72
+#: plugins/config/class_recoveryConfig.inc:73
msgid ""
"Users will also be able to enter one of theirs alternate addresses to "
"recover their password"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:79
+#: plugins/config/class_recoveryConfig.inc:80
msgid "First email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:82
-#: plugins/config/class_recoveryConfig.inc:101
+#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:102
msgid "Subject"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:84
msgid "Subject of the first email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:86
+#: plugins/config/class_recoveryConfig.inc:87
msgid "[FusionDirectory] Password recovery link"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:89
+#: plugins/config/class_recoveryConfig.inc:90
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:91
#, 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 ""
-#: plugins/config/class_recoveryConfig.inc:93
+#: plugins/config/class_recoveryConfig.inc:94
#, php-format
msgid ""
"Hello,\n"
@@ -1996,31 +2041,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:98
+#: plugins/config/class_recoveryConfig.inc:99
msgid "Second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:103
msgid "Subject of the second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:105
+#: plugins/config/class_recoveryConfig.inc:106
msgid "[FusionDirectory] Password recovery successful"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:108
+#: plugins/config/class_recoveryConfig.inc:109
#, php-format
msgid "Body (%s is login)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:110
#, php-format
msgid ""
"Body of the second email, sent to confirm the password has been changed. Use"
" %s for the user login."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:112
+#: plugins/config/class_recoveryConfig.inc:113
#, php-format
msgid ""
"Hello,\n"
@@ -2088,13 +2133,13 @@ msgstr ""
msgid "Down"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2633
-#: include/simpleplugin/class_attribute.inc:2634
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
+#: include/simpleplugin/class_attribute.inc:2648
msgid "Sort up"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2646
-#: include/simpleplugin/class_attribute.inc:2647
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
+#: include/simpleplugin/class_attribute.inc:2661
msgid "Sort down"
msgstr ""
@@ -2106,27 +2151,26 @@ msgstr ""
#: include/class_config.inc:479 include/class_msgPool.inc:215
#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3106
-#: include/functions.inc:3127 include/functions.inc:3157
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197 include/functions.inc:3259
+#: include/class_msgPool.inc:740 include/functions.inc:3107
+#: include/functions.inc:3128 include/functions.inc:3158
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3260
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1663 include/class_CopyPasteHandler.inc:278
-#: include/simpleplugin/class_dialogAttributes.inc:733
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
-#: include/simpleplugin/class_attribute.inc:1774
-#: include/simpleplugin/class_attribute.inc:1877
-#: include/simpleplugin/class_attribute.inc:1879
+#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
+#: include/simpleplugin/class_attribute.inc:1784
+#: include/simpleplugin/class_attribute.inc:1887
+#: include/simpleplugin/class_attribute.inc:1889
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: 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:437
#: include/password-methods/class_password-methods.inc:447
-#: include/class_SnapshotHandler.inc:415 html/index.php:434 html/index.php:444
+#: include/class_SnapshotHandler.inc:415 html/index.php:473 html/index.php:483
#: setup/class_setupStep_Migrate.inc:935
#: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
msgid "Error"
@@ -2165,44 +2209,44 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: include/class_listing.inc:1586 include/class_listing.inc:1640
+#: include/class_listing.inc:1590 include/class_listing.inc:1644
msgid "Copy"
msgstr ""
-#: include/class_listing.inc:1592 include/class_listing.inc:1628
+#: include/class_listing.inc:1596 include/class_listing.inc:1632
msgid "Cut"
msgstr ""
-#: include/class_listing.inc:1600 include/class_listing.inc:1602
+#: include/class_listing.inc:1604 include/class_listing.inc:1606
#: include/class_CopyPasteHandler.inc:370
msgid "Paste"
msgstr ""
-#: include/class_listing.inc:1628
+#: include/class_listing.inc:1632
msgid "Cut this entry"
msgstr ""
-#: include/class_listing.inc:1640
+#: include/class_listing.inc:1644
msgid "Copy this entry"
msgstr ""
-#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_listing.inc:1677 include/class_listing.inc:1679
msgid "Restore snapshots"
msgstr ""
-#: include/class_listing.inc:1689
+#: include/class_listing.inc:1693
msgid "Export list"
msgstr ""
-#: include/class_listing.inc:1724 include/class_listing.inc:1725
+#: include/class_listing.inc:1728 include/class_listing.inc:1729
msgid "Restore snapshot"
msgstr ""
-#: include/class_listing.inc:1734
+#: include/class_listing.inc:1738
msgid "Create snapshot"
msgstr ""
-#: include/class_listing.inc:1735
+#: include/class_listing.inc:1739
msgid "Create a new snapshot from this object"
msgstr ""
@@ -2245,7 +2289,7 @@ msgid "XML error in fusiondirectory.conf: %s at line %d"
msgstr ""
#: include/class_config.inc:162 include/class_config.inc:300
-#: include/class_config.inc:985 include/class_config.inc:998
+#: include/class_config.inc:915 include/class_config.inc:928
#: include/functions.inc:663 include/class_timezone.inc:51
#: include/password-methods/class_password-methods-sha.inc:71
#: include/password-methods/class_password-methods-ssha.inc:75
@@ -2262,17 +2306,17 @@ msgid ""
"while your passwords are not encrypted."
msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:917
-#: include/class_ldap.inc:1371 include/functions.inc:526
+#: include/class_config.inc:337 include/class_ldap.inc:918
+#: include/class_ldap.inc:1372 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2985 include/simpleplugin/class_simplePlugin.inc:545
-#: include/simpleplugin/class_attribute.inc:2895
+#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2909
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
#: include/class_SnapshotHandler.inc:422 include/class_SnapshotHandler.inc:425
-#: html/index.php:360 html/class_passwordRecovery.inc:497
+#: html/index.php:369 html/class_passwordRecovery.inc:497
#: setup/class_setupStep_Migrate.inc:451
#: setup/class_setupStep_Migrate.inc:1130
msgid "LDAP error"
@@ -2287,38 +2331,38 @@ msgstr ""
msgid "The selected mail method (class %s) is not available"
msgstr ""
-#: include/class_config.inc:986
+#: include/class_config.inc:916
#, php-format
msgid ""
"The snapshot functionality is enabled, but the required variable '%s' is not"
" set."
msgstr ""
-#: include/class_config.inc:999
+#: include/class_config.inc:929
#, php-format
msgid ""
"The snapshot functionality is enabled, but the required compression module "
"is missing. Please install '%s'."
msgstr ""
-#: include/class_config.inc:1104
+#: include/class_config.inc:1034
msgid "All categories"
msgstr ""
-#: include/class_config.inc:1231
+#: include/class_config.inc:1161
msgid "My account"
msgstr ""
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
msgid "Performance warning"
msgstr ""
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
#, php-format
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr ""
-#: include/class_ldap.inc:868 include/class_ldap.inc:904
+#: include/class_ldap.inc:869 include/class_ldap.inc:905
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
@@ -2328,39 +2372,39 @@ msgstr ""
msgid "Internal error"
msgstr ""
-#: include/class_ldap.inc:868
+#: include/class_ldap.inc:869
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:904
+#: include/class_ldap.inc:905
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1016
+#: include/class_ldap.inc:1017
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr ""
-#: include/class_ldap.inc:1018
+#: include/class_ldap.inc:1019
#, php-format
msgid "while operating on LDAP server %s"
msgstr ""
-#: include/class_ldap.inc:1108
+#: include/class_ldap.inc:1109
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1220
+#: include/class_ldap.inc:1221
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr ""
-#: include/class_ldap.inc:1231
+#: include/class_ldap.inc:1232
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2948,10 +2992,10 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr ""
-#: include/functions.inc:496 include/functions.inc:3294
-#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:263
-#: include/simpleplugin/class_simplePlugin.inc:268
-#: include/simpleplugin/class_simplePlugin.inc:280
+#: include/functions.inc:496 include/functions.inc:3295
+#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
+#: include/simpleplugin/class_simplePlugin.inc:269
+#: include/simpleplugin/class_simplePlugin.inc:281
#: html/class_passwordRecovery.inc:216
msgid "Fatal error"
msgstr ""
@@ -3104,98 +3148,98 @@ msgstr ""
msgid "Cannot read to revision file!"
msgstr ""
-#: include/functions.inc:2548
+#: include/functions.inc:2549
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "LDAP warning"
msgstr ""
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "Cannot get schema information from server. No schema check possible!"
msgstr ""
-#: include/functions.inc:2584
+#: include/functions.inc:2585
msgid ""
"Used to lock currently edited entries to avoid multiple changes at the same "
"time."
msgstr ""
-#: include/functions.inc:2596
+#: include/functions.inc:2597
#, php-format
msgid "Missing required object class '%s'!"
msgstr ""
-#: include/functions.inc:2599
+#: include/functions.inc:2600
#, php-format
msgid "Missing optional object class '%s'!"
msgstr ""
-#: include/functions.inc:2603
+#: include/functions.inc:2604
#, php-format
msgid "Class(es) available"
msgstr ""
-#: include/functions.inc:2623
+#: include/functions.inc:2624
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2625
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2628
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2629
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3106 include/functions.inc:3127
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3106
+#: include/functions.inc:3107
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3127
+#: include/functions.inc:3128
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3157
+#: include/functions.inc:3158
msgid "Cannot create sambaUnixIdPool entry!"
msgstr ""
-#: include/functions.inc:3165
+#: include/functions.inc:3166
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3177 include/functions.inc:3181
+#: include/functions.inc:3178 include/functions.inc:3182
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3197
+#: include/functions.inc:3198
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3259
+#: include/functions.inc:3260
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3295
+#: include/functions.inc:3296
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
@@ -3351,13 +3395,13 @@ msgstr ""
msgid "XML error"
msgstr ""
-#: include/class_plugin.inc:554
+#: include/class_plugin.inc:553
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/class_plugin.inc:1466
+#: include/class_plugin.inc:1467
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -3383,32 +3427,32 @@ msgstr ""
msgid "This is the name of the template"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:263
+#: include/simpleplugin/class_simplePlugin.inc:264
msgid "Only main tab can compute dn"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:270
+#: include/simpleplugin/class_simplePlugin.inc:271
#, php-format
msgid "Could not compute dn: no parent tab class for \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:282
+#: include/simpleplugin/class_simplePlugin.inc:283
#, php-format
msgid ""
"Could not compute dn: could not find objectType infos from tab class \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:638
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:644
+#: include/simpleplugin/class_simplePlugin.inc:652
msgid "Error when saving"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:638
+#: include/simpleplugin/class_simplePlugin.inc:644
#, php-format
msgid "There is already an entry with the same dn : %s"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:652
#, php-format
msgid "The entry %s is not existing"
msgstr ""
@@ -3428,27 +3472,27 @@ msgstr ""
msgid "Show %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:409
+#: include/simpleplugin/class_dialogAttributes.inc:415
#, php-format
msgid "Group %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:411
+#: include/simpleplugin/class_dialogAttributes.inc:417
#, php-format
msgid "Role %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:446
+#: include/simpleplugin/class_dialogAttributes.inc:452
msgid "Group of user"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:615
+#: include/simpleplugin/class_dialogAttributes.inc:621
#: include/simpleplugin/class_attribute.inc:1090
#: include/simpleplugin/class_attribute.inc:1124
msgid "None"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:617
+#: include/simpleplugin/class_dialogAttributes.inc:623
msgid "Unknown"
msgstr ""
@@ -3489,11 +3533,16 @@ msgid "days"
msgstr ""
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2161
+#: include/simpleplugin/class_attribute.inc:2171
#, php-format
msgid "%s (required)"
msgstr ""
+#: include/simpleplugin/class_attribute.inc:1150
+#, php-format
+msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
+msgstr ""
+
#: include/simpleplugin/class_attribute.inc:1277
#, php-format
msgid "An integer between %d and %d"
@@ -3509,75 +3558,75 @@ msgstr ""
msgid "An integer smaller than %d"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1379
+#: include/simpleplugin/class_attribute.inc:1383
#, php-format
msgid "A float between %f and %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1381
+#: include/simpleplugin/class_attribute.inc:1385
#, php-format
msgid "A float larger than %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1383
+#: include/simpleplugin/class_attribute.inc:1387
#, php-format
msgid "A float smaller than %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1490
+#: include/simpleplugin/class_attribute.inc:1500
msgid "Error, incorrect date: "
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
#, php-format
msgid "Cannot read uploaded file: %s"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1530
+#: include/simpleplugin/class_attribute.inc:1540
msgid "file is empty"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1533
+#: include/simpleplugin/class_attribute.inc:1543
msgid "file not found"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1546
msgid "file not readable"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1569
+#: include/simpleplugin/class_attribute.inc:1579
#, php-format
msgid "%s (%d bytes)"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1616
-#: include/simpleplugin/class_attribute.inc:1793
+#: include/simpleplugin/class_attribute.inc:1626
+#: include/simpleplugin/class_attribute.inc:1803
msgid "Upload"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1621
-#: include/simpleplugin/class_attribute.inc:1622
+#: include/simpleplugin/class_attribute.inc:1631
+#: include/simpleplugin/class_attribute.inc:1632
msgid "Download"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1775
+#: include/simpleplugin/class_attribute.inc:1785
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1826
+#: include/simpleplugin/class_attribute.inc:1836
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1829
+#: include/simpleplugin/class_attribute.inc:1839
msgid "Object base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:2755
+#: include/simpleplugin/class_attribute.inc:2769
#, php-format
msgid "Invalid value for %s"
msgstr ""
@@ -3711,17 +3760,17 @@ msgstr ""
msgid "Account locked. Please contact your system administrator!"
msgstr ""
-#: html/index.php:436
+#: html/index.php:475
#, php-format
msgid "CAS user \"%s\" could not be found in the LDAP"
msgstr ""
-#: html/index.php:446
+#: html/index.php:485
#, php-format
msgid "CAS user \"%s\" match several users in the LDAP"
msgstr ""
-#: html/index.php:481
+#: html/index.php:522
msgid ""
"Your browser has cookies disabled. Please enable cookies and reload this "
"page before logging in!"
@@ -4044,7 +4093,7 @@ msgid "Checking for duplicated UID numbers"
msgstr ""
#: setup/class_setupStep_Migrate.inc:267
-msgid "Checking for duplicate GID numbers"
+msgid "Checking for duplicated GID numbers"
msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:487
@@ -4054,7 +4103,7 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:1179
#: setup/class_setupStep_Migrate.inc:1272
#: setup/class_setupStep_Migrate.inc:1351
-#: setup/class_setupStep_Migrate.inc:1390
+#: setup/class_setupStep_Migrate.inc:1395
msgid "LDAP query failed"
msgstr ""
@@ -4065,7 +4114,7 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:1180
#: setup/class_setupStep_Migrate.inc:1273
#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1391
+#: setup/class_setupStep_Migrate.inc:1396
msgid "Possibly the \"root object\" is missing."
msgstr ""
@@ -4220,14 +4269,14 @@ msgstr ""
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1373
+#: setup/class_setupStep_Migrate.inc:1378
#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\"."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1412
+#: setup/class_setupStep_Migrate.inc:1422
#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\"."
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
diff --git a/locale/it_IT/fusiondirectory.po b/locale/it_IT/fusiondirectory.po
index 3f161d59ef2e967aae6df2850cefe6d340bd8e74..e04391e4fbe2f497d547e18251b84f32770c5745 100644
--- a/locale/it_IT/fusiondirectory.po
+++ b/locale/it_IT/fusiondirectory.po
@@ -4,15 +4,15 @@
#
# Translators:
# Ilaria Montaruli <Ilaria.Montaruli@gmail.com>, 2015
-# Penati <penati@avaya.com>, 2015-2016
+# Penati <penati@avaya.com>, 2016
msgid ""
msgstr ""
-"Project-Id-Version: FusionDirectory-109\n"
+"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-01-22 11:26+0100\n"
-"PO-Revision-Date: 2016-01-22 10:24+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-109/language/it_IT/)\n"
+"POT-Creation-Date: 2016-03-14 12:07+0100\n"
+"PO-Revision-Date: 2016-03-07 13:09+0000\n"
+"Last-Translator: Penati <penati@avaya.com>\n"
+"Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -30,31 +30,31 @@ msgstr "Benvenuto %s!"
msgid "References"
msgstr "Riferimenti"
-#: plugins/admin/groups/class_roleGeneric.inc:30
-#: plugins/admin/groups/class_roleGeneric.inc:34
+#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:61
#: plugins/admin/groups/class_groupManagement.inc:71
#: plugins/admin/aclrole/class_aclRole.inc:78
#: plugins/admin/acl/class_aclAssignment.inc:49
msgid "Role"
msgstr "Ruolo"
-#: plugins/admin/groups/class_roleGeneric.inc:31
+#: plugins/admin/groups/class_roleGeneric.inc:58
msgid "Role information"
msgstr "Informazioni sul ruolo"
-#: plugins/admin/groups/class_roleGeneric.inc:35
+#: plugins/admin/groups/class_roleGeneric.inc:62
msgid "Organizational role"
msgstr "Ruolo organizzativo"
-#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:84
msgid "Informations"
msgstr "Informazioni"
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:158
+#: plugins/admin/departments/class_department.inc:174
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -64,13 +64,13 @@ msgstr "Informazioni"
msgid "Name"
msgstr "Nome"
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
msgid "Name of this group"
msgstr "Nome del gruppo"
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
#: plugins/admin/groups/class_group.inc:66
#: plugins/admin/groups/class_ogroup.inc:192
#: plugins/admin/groups/group-list.xml:41
@@ -83,26 +83,26 @@ msgstr "Nome del gruppo"
msgid "Description"
msgstr "Descrizione"
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
msgid "Description of the role"
msgstr "Descrizione del ruolo"
-#: plugins/admin/groups/class_roleGeneric.inc:70
+#: plugins/admin/groups/class_roleGeneric.inc:97
msgid "Phone number"
msgstr "Numero di telefono"
-#: plugins/admin/groups/class_roleGeneric.inc:74
+#: plugins/admin/groups/class_roleGeneric.inc:101
msgid "Fax number"
msgstr "Numero di Fax"
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
#: plugins/admin/users/class_userManagement.inc:42
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: setup/class_setupStep_Migrate.inc:871
msgid "Users"
msgstr "Utenti"
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
msgid "Add users for the role"
msgstr "Aggiungi degli utenti per il ruolo"
@@ -149,7 +149,7 @@ msgstr "Forzare il valore GID per questo gruppo"
#: plugins/admin/groups/class_group.inc:74
#: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:403
+#: plugins/personal/posix/class_posixAccount.inc:410
msgid "GID"
msgstr "GID"
@@ -206,23 +206,23 @@ 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_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458 include/functions.inc:794
-#: include/functions.inc:2548 include/class_xml.inc:55
+#: plugins/personal/posix/class_posixAccount.inc:465 include/functions.inc:794
+#: include/functions.inc:2549 include/class_xml.inc:55
#: include/simpleplugin/class_simpleTabs.inc:325 html/index.php:56
-#: html/index.php:62 html/index.php:481 html/class_passwordRecovery.inc:378
+#: html/index.php:62 html/index.php:522 html/class_passwordRecovery.inc:378
#: setup/class_setupStep_Migrate.inc:572
#: setup/class_setupStep_Migrate.inc:1083
#: setup/class_setupStep_Migrate.inc:1202
#: setup/class_setupStep_Migrate.inc:1313
-#: setup/class_setupStep_Migrate.inc:1372
-#: setup/class_setupStep_Migrate.inc:1411 plugins/admin/acl/remove.tpl.c:2
+#: setup/class_setupStep_Migrate.inc:1377
+#: setup/class_setupStep_Migrate.inc:1421 plugins/admin/acl/remove.tpl.c:2
#: ihtml/themes/default/islocked.tpl.c:5 ihtml/themes/default/remove.tpl.c:2
#: ihtml/themes/default/msg_dialog.tpl.c:5 setup/setup_checks.tpl.c:8
msgid "Warning"
msgstr "Avvertimento"
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458
+#: plugins/personal/posix/class_posixAccount.inc:465
msgid "Timeout while waiting for lock. Ignoring lock!"
msgstr "Il tempo d'attesa per il blocco è scaduto. Blocco ignorato !"
@@ -252,7 +252,7 @@ msgstr "Oggetti membri"
msgid "Objects member of this group"
msgstr "Oggetti membro di questo gruppo"
-#: plugins/admin/groups/class_ogroup.inc:318
+#: plugins/admin/groups/class_ogroup.inc:313
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr "Non é consentito mettre workstations e terminali nello stesso gruppo"
@@ -281,10 +281,10 @@ msgstr "Crea"
#: plugins/admin/departments/dep-list.xml:79
#: plugins/admin/users/user-list.xml:105
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-#: include/simpleplugin/class_dialogAttributes.inc:626
-#: include/simpleplugin/class_dialogAttributes.inc:627
-#: include/simpleplugin/class_attribute.inc:2661
-#: include/simpleplugin/class_attribute.inc:2662
+#: include/simpleplugin/class_dialogAttributes.inc:632
+#: include/simpleplugin/class_dialogAttributes.inc:633
+#: include/simpleplugin/class_attribute.inc:2675
+#: include/simpleplugin/class_attribute.inc:2676
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -295,8 +295,8 @@ msgstr "Modifica"
#: plugins/admin/departments/dep-list.xml:67
#: plugins/admin/departments/dep-list.xml:88
#: plugins/admin/users/user-list.xml:112
-#: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_dialogAttributes.inc:637
+#: include/simpleplugin/class_dialogAttributes.inc:642
+#: include/simpleplugin/class_dialogAttributes.inc:643
#: include/simpleplugin/simple-list.xml:75
#: include/simpleplugin/simple-list.xml:125
msgid "Remove"
@@ -313,7 +313,7 @@ msgstr "Gestione dei gruppi e dei ruoli"
#: plugins/admin/groups/class_groupManagement.inc:33
msgid "Allows you to manage object groups, POSIX groups and roles"
-msgstr "Permette di gestire gli oggetti dei gruppi, i gruppi POSIX ed i ruoli"
+msgstr "Vi permette di gestire gruppi di oggetti, gruppi e ruoli POSIX"
#: plugins/admin/groups/class_groupManagement.inc:71
msgid "Edit role properties"
@@ -345,8 +345,8 @@ msgid "Show application groups"
msgstr "Mostra i gruppi di applicazioni"
#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Show department groups"
-msgstr "Mostra i gruppi di dipartimenti"
+msgid "Show unidentified groups"
+msgstr "Mostra gruppi non identificati"
#: plugins/admin/groups/class_groupManagement.inc:137
#: include/select/groupSelect/group-filter.tpl.c:11
@@ -434,51 +434,67 @@ msgid "Category of this %s"
msgstr "Categoria di questo %s "
#: plugins/admin/departments/class_department.inc:81
+msgid "Website"
+msgstr "Sito Web"
+
+#: plugins/admin/departments/class_department.inc:81
+#, php-format
+msgid "Website of this %s"
+msgstr "Sito Web di questo %s"
+
+#: plugins/admin/departments/class_department.inc:85
#: plugins/personal/generic/class_user.inc:410
msgid "Manager"
msgstr "Manager"
-#: plugins/admin/departments/class_department.inc:81
+#: plugins/admin/departments/class_department.inc:85
#, php-format
msgid "Manager of this %s"
msgstr "Responsabile di questo %s "
-#: plugins/admin/departments/class_department.inc:87
-#: plugins/admin/departments/class_department.inc:93
+#: plugins/admin/departments/class_department.inc:91
+#: plugins/admin/departments/class_department.inc:97
#: plugins/personal/generic/class_user.inc:304
msgid "Location"
msgstr "Località "
-#: plugins/admin/departments/class_department.inc:90
+#: plugins/admin/departments/class_department.inc:94
#: plugins/personal/generic/class_user.inc:308
msgid "State"
msgstr "Regione"
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_country.inc:29
+#: plugins/admin/departments/class_country.inc:30
+#: plugins/admin/departments/class_country.inc:33
+msgid "Country"
+msgstr "Stato"
+
+#: plugins/admin/departments/class_department.inc:103
#: plugins/personal/generic/class_user.inc:312
msgid "Address"
msgstr "Indirizzo"
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:103
#, php-format
msgid "A postal address for this %s"
msgstr "Indirizzo postale di questo %s "
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
#: plugins/personal/generic/class_user.inc:320
msgid "Phone"
msgstr "Telefono"
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
msgid "Telephone number"
msgstr "Numero di telefono"
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
#: plugins/personal/generic/class_user.inc:332
msgid "Fax"
msgstr "Fax"
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
msgid "Facsimile telephone number"
msgstr "Facsimile di numero di telefono"
@@ -490,7 +506,7 @@ msgstr "Gestisci i dipartimenti"
msgid ""
"Manage departments, countries, domain components, domains, localities and "
"organization nodes,"
-msgstr "Gestione di dipartimenti, paesi, componenti di dominio, domini , \nlocalità e nodi 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"
@@ -506,12 +522,6 @@ msgstr "Nome della località "
msgid "locality"
msgstr "Località "
-#: plugins/admin/departments/class_country.inc:29
-#: plugins/admin/departments/class_country.inc:30
-#: plugins/admin/departments/class_country.inc:33
-msgid "Country"
-msgstr "Stato"
-
#: plugins/admin/departments/class_country.inc:50
msgid "country"
msgstr "Paese"
@@ -554,7 +564,8 @@ msgid "Given name"
msgstr "Nome"
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
+#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
msgid "Login"
@@ -612,7 +623,7 @@ msgstr "Gestisci gli utenti"
#: plugins/admin/users/class_userManagement.inc:44
msgid "Manage user accounts and their properties"
-msgstr "Gestione degli account utente e delle loro proprietà "
+msgstr "Gestire gli account utente e le loro proprietà "
#: plugins/admin/users/class_userManagement.inc:140
#: include/class_management.inc:341 include/class_management.inc:488
@@ -667,8 +678,8 @@ msgid "Edit category ACL"
msgstr "Modifica la categoria di ACL"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2671
-#: include/simpleplugin/class_attribute.inc:2672
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
+#: include/simpleplugin/class_attribute.inc:2686
#, php-format
msgid "Delete"
msgstr "Elimina"
@@ -689,7 +700,7 @@ msgstr "Tutti gli oggetti nell'attuale sottostruttura"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:217
#, php-format
msgid "Edit ACL for \"%s\""
-msgstr "Modifica ACL per '%s'"
+msgstr "Modifica ACL per \"%s\""
#: plugins/admin/aclrole/class_aclEditionDialog.inc:258
#: plugins/admin/aclrole/class_aclEditionDialog.inc:359
@@ -742,7 +753,7 @@ msgstr "Gestione dei ruoli ACL"
#: plugins/admin/aclrole/class_aclRoleManagement.inc:36
msgid "Manage ACL roles"
-msgstr "Gestione ruoli ACL"
+msgstr "Gestire i ruoli ACL"
#: plugins/admin/aclrole/class_aclRole.inc:38
#, php-format
@@ -773,19 +784,37 @@ msgstr "ACL"
msgid "ACLs which are part of this group"
msgstr "ACL appartenenti a questo gruppo"
-#: plugins/admin/acl/class_aclManagement.inc:38
+#: plugins/admin/acl/class_aclManagement.inc:31
+#: plugins/admin/acl/class_aclManagement.inc:32
+#: plugins/admin/acl/class_aclManagement.inc:45
+msgid "ACL assignment creation"
+msgstr "Creazione assegnazione ACL"
+
+#: plugins/admin/acl/class_aclManagement.inc:33
+msgid "Create an ACL assignment on an arbitrary dn"
+msgstr "Crea assegnazione ACL su un dn arbitrario"
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "Dn"
+msgstr "Dn"
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "DN you wish to add assignments for"
+msgstr "DN per il quale si desiderano aggiungere assegnazioni"
+
+#: plugins/admin/acl/class_aclManagement.inc:135
msgid "ACL assignments"
msgstr "Assegnazioni ACL"
-#: plugins/admin/acl/class_aclManagement.inc:39
+#: plugins/admin/acl/class_aclManagement.inc:136
msgid "ACL assignments management"
-msgstr "Gestione delle assegnazioni ACL"
+msgstr "Gestione delle assagnazioni ACL"
-#: plugins/admin/acl/class_aclManagement.inc:40
+#: plugins/admin/acl/class_aclManagement.inc:137
msgid "Manage ACL roles assignments to users"
-msgstr "Gestione delle assegnazioni dei ruoli ACL agli utenti"
+msgstr "Gestione delle assegnazioni dei ruoli ACL per gli utenti"
-#: plugins/admin/acl/class_aclManagement.inc:78
+#: plugins/admin/acl/class_aclManagement.inc:199
#: plugins/admin/acl/class_aclAssignment.inc:263
msgid "ACL Assignment"
msgstr "Gestione delle ACL"
@@ -901,7 +930,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:352
+#: plugins/personal/generic/class_user.inc:356
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -996,59 +1025,59 @@ msgstr "Numero pager ufficio"
msgid "Business fax number"
msgstr "Numero fax ufficio"
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:336
+msgid "Homepage"
+msgstr "Home Page"
+
+#: plugins/personal/generic/class_user.inc:336
+msgid "Personal homepage"
+msgstr "Pagina Web personale"
+
+#: plugins/personal/generic/class_user.inc:342
msgid "Account information"
msgstr "Informazioni account utente"
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
msgid "Login of this user"
msgstr "Login utente"
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:351
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr "Lingua preferita"
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
msgid "Password of the user"
msgstr "Password dell'utente"
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:362
msgid "Personal contact information"
msgstr "Informazioni personali utente"
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
msgid "Display name"
msgstr "Mostra il nome"
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
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:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home address"
msgstr "Indirizzo di casa"
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home postal address"
msgstr "Indirizzo postale di casa"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:374
msgid "Private phone"
msgstr "Numero di telefono privato"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:374
msgid "Home phone number"
msgstr "Numero di telefono di casa"
-#: plugins/personal/generic/class_user.inc:374
-msgid "Homepage"
-msgstr "Home Page"
-
-#: plugins/personal/generic/class_user.inc:374
-msgid "Personal homepage"
-msgstr "Pagina Web personale"
-
#: plugins/personal/generic/class_user.inc:380
msgid "Organizational information"
msgstr "Informazioni organizzazione"
@@ -1281,33 +1310,33 @@ msgstr "non configurato"
msgid "automatic"
msgstr "automatico"
-#: plugins/personal/posix/class_posixAccount.inc:309
+#: plugins/personal/posix/class_posixAccount.inc:310
msgid "expired"
msgstr "Scaduto"
-#: plugins/personal/posix/class_posixAccount.inc:311
+#: plugins/personal/posix/class_posixAccount.inc:312
msgid "grace time active"
msgstr "Il tempo di grazia è attivo"
-#: plugins/personal/posix/class_posixAccount.inc:314
-#: plugins/personal/posix/class_posixAccount.inc:316
-#: plugins/personal/posix/class_posixAccount.inc:318
+#: plugins/personal/posix/class_posixAccount.inc:315
+#: plugins/personal/posix/class_posixAccount.inc:317
+#: plugins/personal/posix/class_posixAccount.inc:319
msgid "active"
msgstr "Attivo"
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:315
msgid "password expired"
msgstr "Password scaduta"
-#: plugins/personal/posix/class_posixAccount.inc:316
+#: plugins/personal/posix/class_posixAccount.inc:317
msgid "password not changeable"
msgstr "Password non modificabile"
-#: plugins/personal/posix/class_posixAccount.inc:400
+#: plugins/personal/posix/class_posixAccount.inc:407
msgid "UID"
msgstr "UID"
-#: plugins/personal/posix/class_posixAccount.inc:516
+#: plugins/personal/posix/class_posixAccount.inc:525
#, php-format
msgid "Group of user %s"
msgstr "Gruppo di utenti %s"
@@ -1372,7 +1401,7 @@ msgstr "Configurazione di FusionDirectory"
#: plugins/config/class_configInLdap.inc:59
msgid "Configuration screen of FusionDirectory"
-msgstr "Schermo di configurazione di FusionDirectory"
+msgstr "Schermo di configirazione di FusionDirectory"
#: plugins/config/class_configInLdap.inc:88
msgid "Look and feel"
@@ -1479,424 +1508,440 @@ msgid "Core settings"
msgstr "Impostazioni di base"
#: plugins/config/class_configInLdap.inc:161
-msgid "Enable primary group filter"
-msgstr "Abilita il filtro per il gruppo primario"
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"It is time consuming to evaluate which groups are primary and which are not,"
-" so you may want to disable it if your group plugin is slow."
-msgstr "É il tempo impiegato per valutare quali sono i gruppi primari e quali no, quindi potresti volerlo disattivare se il tuo plugin dei gruppi è molto lento."
-
-#: plugins/config/class_configInLdap.inc:167
msgid "Display summary in listings"
msgstr "Mostra il riepilogo negli elenchi"
-#: plugins/config/class_configInLdap.inc:168
+#: 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:173
+#: plugins/config/class_configInLdap.inc:167
msgid "Edit locking"
msgstr "Blocco modifica"
-#: plugins/config/class_configInLdap.inc:174
+#: 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:179
+#: plugins/config/class_configInLdap.inc:173
msgid "Enable logging"
msgstr "Attiva il debugging"
-#: plugins/config/class_configInLdap.inc:180
+#: 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:185
+#: plugins/config/class_configInLdap.inc:179
msgid "LDAP size limit"
msgstr "Dimensione massima dell'annuario LDAP"
-#: plugins/config/class_configInLdap.inc:185
+#: 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."
-#: plugins/config/class_configInLdap.inc:192
+#: plugins/config/class_configInLdap.inc:186
msgid "Login and session"
msgstr "Connessione e sessione"
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:189
msgid "Login attribute"
msgstr "Attributo di connessione"
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:190
msgid "Which LDAP attribute should be used as the login name during login."
msgstr "Quale attributo LDAP deve essere utilizzato come nome di login durante il login."
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:196
msgid "Enforce encrypted connections"
msgstr "Forza le connessioni criptate"
-#: plugins/config/class_configInLdap.inc:203
+#: plugins/config/class_configInLdap.inc:197
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."
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:201
msgid "Warn if session is not encrypted"
msgstr "Mostra un avvertimento quando la sessione non è criptata"
-#: plugins/config/class_configInLdap.inc:208
+#: plugins/config/class_configInLdap.inc:202
msgid "will display a warning to the user when http is used instead of https."
msgstr "verrà visualizzato un avvertimento all'utente quando si utilizza http invece di https."
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Session lifetime"
msgstr "Durata di vita della sessione"
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Defines when a session will expire in seconds."
msgstr "Definisce, in secondi, quando una sessione scade"
-#: plugins/config/class_configInLdap.inc:220
+#: plugins/config/class_configInLdap.inc:212
+msgid "HTTP authentication"
+msgstr "Autentificazione HTTP"
+
+#: plugins/config/class_configInLdap.inc:212
+msgid "Use HTTP authentication protocol instead of the login form."
+msgstr "Utilizzare protocollo di autenticazione HTTP al posto del modulo di login ."
+
+#: plugins/config/class_configInLdap.inc:219
#: include/class_SnapshotDialogs.inc:186
msgid "Snapshots"
msgstr "Copie istantanee"
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid "Enable snapshots"
msgstr "Attiva le copie istantanee"
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
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:228
+#: plugins/config/class_configInLdap.inc:227
msgid "Snapshot base"
msgstr "Base per le copie istantanee"
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
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:235
+#: plugins/config/class_configInLdap.inc:234
msgid "SSL"
msgstr "SSL"
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Key path"
msgstr "Percorso della chiave"
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Path to FusionDirectory private key. Unused for now."
msgstr "Percorso a chiave privata FusionDirectory . Inutilizzato per ora."
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Certificate path"
msgstr "Percorso del Certificato"
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Path to FusionDirectory certificate. Unused for now."
msgstr "Percorso al certificato di FusionDirectory; Inutilizzato per ora."
-#: plugins/config/class_configInLdap.inc:248
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:262
msgid "CA certificate path"
msgstr "Percorso del certificato CA"
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:247
msgid "Path to the CA certificate. Used for validating Argonaut Server host."
msgstr "Percorso al certificato CA. Usato per convalidare l'host del Server Argonaut."
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:254
msgid "CAS"
msgstr "CAS"
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "Enable CAS"
msgstr "Abilita CAS"
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
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:263
+#: plugins/config/class_configInLdap.inc:262
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:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host"
msgstr "Host"
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host of the CAS server"
msgstr "Host del server CAS"
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port"
msgstr "Porta"
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port the CAS server is listening on"
msgstr "Porta sulla quale il server CAS è all'ascolto"
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context"
msgstr "Contesto CAS"
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context to be used"
msgstr "Contesto CAS da utilizzare"
-#: plugins/config/class_configInLdap.inc:285
+#: plugins/config/class_configInLdap.inc:284
msgid "People and group storage"
msgstr "Ramo dell'annuario dove sono immagazzinate le informazioni sugli utenti e i gruppi"
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "People DN attribute"
msgstr "Tipo di attributo DN degli utenti"
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
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:294
+#: plugins/config/class_configInLdap.inc:293
msgid "CN pattern"
msgstr "Modello CN"
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
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:299
+#: plugins/config/class_configInLdap.inc:298
msgid "Strict naming policy"
msgstr "Regola di denominazione rigorosa"
-#: plugins/config/class_configInLdap.inc:300
+#: plugins/config/class_configInLdap.inc:299
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:305
+#: plugins/config/class_configInLdap.inc:304
msgid "Group/user min id"
msgstr "Gruppo/utente minimo ID"
-#: plugins/config/class_configInLdap.inc:306
+#: plugins/config/class_configInLdap.inc:305
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:311
+#: plugins/config/class_configInLdap.inc:310
msgid "Next id hook"
msgstr "Id hook successivo"
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
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:315
+#: plugins/config/class_configInLdap.inc:314
msgid "Base number for user id"
msgstr "Numero base per questo ID utente"
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:315
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:321
+#: plugins/config/class_configInLdap.inc:320
msgid "Base number for group id"
msgstr "Numero base per questo id gruppo"
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:321
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:327
+#: plugins/config/class_configInLdap.inc:326
msgid "Users RDN"
msgstr "RDN utenti"
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "The branch where users are stored."
msgstr "Ramo nel quale gli utenti sono immagazzinati"
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "Groups RDN"
msgstr "RDN gruppi"
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "The branch where groups are stored."
msgstr "Il ramo nel quale i gruppi saranno immagazzinati."
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "ACL role RDN"
msgstr "Ruolo ACL RDN"
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "The branch where ACL roles are stored."
msgstr "Ramo nel quale i ruoli ACL sono immagazzinati"
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Id allocation method"
msgstr "Metodo di assegnazione Id"
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Method to allocate user/group ids"
msgstr "Metodo per allocare utente / gruppo id"
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Traditional"
msgstr "Tradizionale"
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Samba unix id pool"
msgstr "Id del pool di Samba unix"
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Pool user id min"
msgstr "Minimo pool id dell'utente"
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
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:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Pool user id max"
msgstr "Id utente pool max"
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
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:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Pool group id min"
msgstr "Id utente pool min"
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
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:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Pool group id max"
msgstr "Id gruppo pool min"
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
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:370
+#: plugins/config/class_configInLdap.inc:367
+msgid "Restrict role members"
+msgstr "Limitare i membri del ruolo"
+
+#: plugins/config/class_configInLdap.inc:367
+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."
+
+#: plugins/config/class_configInLdap.inc:373
msgid "Debugging"
msgstr "Debugging"
-#: plugins/config/class_configInLdap.inc:373
+#: plugins/config/class_configInLdap.inc:376
msgid "Display errors"
msgstr "Mostra gli errori"
-#: plugins/config/class_configInLdap.inc:374
+#: plugins/config/class_configInLdap.inc:377
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."
-#: plugins/config/class_configInLdap.inc:378
+#: plugins/config/class_configInLdap.inc:381
msgid "Maximum LDAP query time"
msgstr "Durata massima di una richiesta LDAP"
-#: plugins/config/class_configInLdap.inc:378
+#: plugins/config/class_configInLdap.inc:381
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."
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:386
msgid "Log LDAP statistics"
msgstr "Inserisci le statistiche dell'annuario LDAP nel giornale di sistema"
-#: plugins/config/class_configInLdap.inc:384
+#: plugins/config/class_configInLdap.inc:387
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."
-#: plugins/config/class_configInLdap.inc:389
+#: plugins/config/class_configInLdap.inc:392
msgid "Debug level"
msgstr "Livello per il debug"
-#: plugins/config/class_configInLdap.inc:390
+#: plugins/config/class_configInLdap.inc:393
msgid "Display certain information on each page load."
msgstr "Mostra alcune informazioni su ogni caricamento della pagina."
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:405
msgid "Miscellaneous"
msgstr "Altro"
-#: plugins/config/class_configInLdap.inc:407
+#: 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:411
+#: plugins/config/class_configInLdap.inc:414
msgid "tab"
msgstr "tab"
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "The tab that this hook concerns"
msgstr "Il tab concernente questo hook"
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "mode"
msgstr "Modalità "
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "When to call this command"
msgstr "Quando chiamare questo comando"
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "cmd"
msgstr "comando"
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "The command that will be called"
msgstr "Il comando che sarà chiamato"
-#: plugins/config/class_configInLdap.inc:429
+#: plugins/config/class_configInLdap.inc:432
msgid "Hooks"
msgstr "Connessioni"
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:439
msgid "Display hook output"
msgstr "Mostra hook di uscita"
-#: plugins/config/class_configInLdap.inc:437
+#: plugins/config/class_configInLdap.inc:440
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:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available shells"
msgstr "Shell disponibili"
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available POSIX shells for FD users."
msgstr "Shell POSIX disponibili per gli utenti FD"
-#: plugins/config/class_configInLdap.inc:449
+#: plugins/config/class_configInLdap.inc:452
msgid "Show ACL tab on all objects"
msgstr "Mostra tab ACL su tutti gli oggetti"
-#: plugins/config/class_configInLdap.inc:450
+#: plugins/config/class_configInLdap.inc:453
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:464
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available department categories"
+msgstr "Categorie di reparto disponibili"
+
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available categories in the departments dropdown"
+msgstr "Categorie disponibili nel menu a discesa"
+
+#: plugins/config/class_configInLdap.inc:474
#: setup/class_setupStep_Language.inc:69
msgid "Automatic"
msgstr "Automatico"
@@ -1913,80 +1958,80 @@ msgstr "Gestione delle impostazioni per il recupero della password"
msgid "Password recovery settings"
msgstr "Impostazioni per il recupero della password"
-#: plugins/config/class_recoveryConfig.inc:44
+#: plugins/config/class_recoveryConfig.inc:45
msgid "Activate password recovery"
msgstr "Attivare il recupero della password"
-#: plugins/config/class_recoveryConfig.inc:45
+#: plugins/config/class_recoveryConfig.inc:46
msgid "Whether to activate or not password recovery feature"
msgstr "Sia che si attivi o no la funzione di recupero password"
-#: plugins/config/class_recoveryConfig.inc:50
+#: plugins/config/class_recoveryConfig.inc:51
msgid "Sender email address"
msgstr "Indirizzo email del mittente"
-#: plugins/config/class_recoveryConfig.inc:51
+#: plugins/config/class_recoveryConfig.inc:52
msgid "Email address from which mails will be sent"
msgstr "Indirizzo e-mail da cui la mail sarà inviata"
-#: plugins/config/class_recoveryConfig.inc:57
+#: plugins/config/class_recoveryConfig.inc:58
msgid "Link validity (minutes)"
msgstr "Durata del link (minuti)"
-#: plugins/config/class_recoveryConfig.inc:58
+#: plugins/config/class_recoveryConfig.inc:59
msgid "Number of minutes before a recovery link expires"
msgstr "Numero di minuti prima che il link di recupero scada"
-#: plugins/config/class_recoveryConfig.inc:64
+#: plugins/config/class_recoveryConfig.inc:65
msgid "Salt for tokens"
msgstr "Stringa aleatoria per il tokens"
-#: plugins/config/class_recoveryConfig.inc:65
+#: plugins/config/class_recoveryConfig.inc:66
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"
-#: plugins/config/class_recoveryConfig.inc:71
+#: plugins/config/class_recoveryConfig.inc:72
msgid "Allow the use of alternate addresses"
msgstr "Consentire l'uso di indirizzi alternativi"
-#: plugins/config/class_recoveryConfig.inc:72
+#: plugins/config/class_recoveryConfig.inc:73
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"
-#: plugins/config/class_recoveryConfig.inc:79
+#: plugins/config/class_recoveryConfig.inc:80
msgid "First email"
msgstr "Prima email"
-#: plugins/config/class_recoveryConfig.inc:82
-#: plugins/config/class_recoveryConfig.inc:101
+#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:102
msgid "Subject"
msgstr "Oggetto"
-#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:84
msgid "Subject of the first email"
msgstr "Soggetto della prima email"
-#: plugins/config/class_recoveryConfig.inc:86
+#: plugins/config/class_recoveryConfig.inc:87
msgid "[FusionDirectory] Password recovery link"
msgstr "[FusionDirectory] link verso il recupero della password"
-#: plugins/config/class_recoveryConfig.inc:89
+#: plugins/config/class_recoveryConfig.inc:90
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr "Corpo del messaggio (il primo %s è il login, il secondo è il link)"
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:91
#, 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 "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:93
+#: plugins/config/class_recoveryConfig.inc:94
#, php-format
msgid ""
"Hello,\n"
@@ -1998,31 +2043,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr "Salve,\n\necco le informazioni sul tuo account : \n - Login : %s\n - Link : %s\n\nQuesto link sarà valido solo per 10 minuti."
-#: plugins/config/class_recoveryConfig.inc:98
+#: plugins/config/class_recoveryConfig.inc:99
msgid "Second email"
msgstr "Seconda email"
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:103
msgid "Subject of the second email"
msgstr "Soggetto della seconda email"
-#: plugins/config/class_recoveryConfig.inc:105
+#: plugins/config/class_recoveryConfig.inc:106
msgid "[FusionDirectory] Password recovery successful"
msgstr "[FusionDirectory] Il recupero della password è stato eseguito con successo"
-#: plugins/config/class_recoveryConfig.inc:108
+#: plugins/config/class_recoveryConfig.inc:109
#, php-format
msgid "Body (%s is login)"
msgstr "Corpo del messaggio (%s è il login utente)"
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:110
#, php-format
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."
-#: plugins/config/class_recoveryConfig.inc:112
+#: plugins/config/class_recoveryConfig.inc:113
#, php-format
msgid ""
"Hello,\n"
@@ -2090,13 +2135,13 @@ msgstr "Sopra"
msgid "Down"
msgstr "Sotto"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2633
-#: include/simpleplugin/class_attribute.inc:2634
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
+#: include/simpleplugin/class_attribute.inc:2648
msgid "Sort up"
msgstr "Ordina in modo crescente"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2646
-#: include/simpleplugin/class_attribute.inc:2647
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
+#: include/simpleplugin/class_attribute.inc:2661
msgid "Sort down"
msgstr "Ordina in modo decrescente"
@@ -2108,27 +2153,26 @@ msgstr "Seleziona tutto"
#: include/class_config.inc:479 include/class_msgPool.inc:215
#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3106
-#: include/functions.inc:3127 include/functions.inc:3157
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197 include/functions.inc:3259
+#: include/class_msgPool.inc:740 include/functions.inc:3107
+#: include/functions.inc:3128 include/functions.inc:3158
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3260
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1663 include/class_CopyPasteHandler.inc:278
-#: include/simpleplugin/class_dialogAttributes.inc:733
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
-#: include/simpleplugin/class_attribute.inc:1774
-#: include/simpleplugin/class_attribute.inc:1877
-#: include/simpleplugin/class_attribute.inc:1879
+#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
+#: include/simpleplugin/class_attribute.inc:1784
+#: include/simpleplugin/class_attribute.inc:1887
+#: include/simpleplugin/class_attribute.inc:1889
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: 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:437
#: include/password-methods/class_password-methods.inc:447
-#: include/class_SnapshotHandler.inc:415 html/index.php:434 html/index.php:444
+#: include/class_SnapshotHandler.inc:415 html/index.php:473 html/index.php:483
#: setup/class_setupStep_Migrate.inc:935
#: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
msgid "Error"
@@ -2167,44 +2211,44 @@ msgstr "Ricarica la lista"
msgid "Submit"
msgstr "Invia"
-#: include/class_listing.inc:1586 include/class_listing.inc:1640
+#: include/class_listing.inc:1590 include/class_listing.inc:1644
msgid "Copy"
msgstr "Copia"
-#: include/class_listing.inc:1592 include/class_listing.inc:1628
+#: include/class_listing.inc:1596 include/class_listing.inc:1632
msgid "Cut"
msgstr "Taglia"
-#: include/class_listing.inc:1600 include/class_listing.inc:1602
+#: include/class_listing.inc:1604 include/class_listing.inc:1606
#: include/class_CopyPasteHandler.inc:370
msgid "Paste"
msgstr "Incolla"
-#: include/class_listing.inc:1628
+#: include/class_listing.inc:1632
msgid "Cut this entry"
msgstr "Taglia questa voce"
-#: include/class_listing.inc:1640
+#: include/class_listing.inc:1644
msgid "Copy this entry"
msgstr "Copia questa voce"
-#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_listing.inc:1677 include/class_listing.inc:1679
msgid "Restore snapshots"
msgstr "Restaura le 'copie istantanee'"
-#: include/class_listing.inc:1689
+#: include/class_listing.inc:1693
msgid "Export list"
msgstr "Lista d'esportazione"
-#: include/class_listing.inc:1724 include/class_listing.inc:1725
+#: include/class_listing.inc:1728 include/class_listing.inc:1729
msgid "Restore snapshot"
msgstr "Restaura la 'copia istantanea'"
-#: include/class_listing.inc:1734
+#: include/class_listing.inc:1738
msgid "Create snapshot"
msgstr "Crea una 'copia istantanea'"
-#: include/class_listing.inc:1735
+#: include/class_listing.inc:1739
msgid "Create a new snapshot from this object"
msgstr "Crea una nuova 'copia istantanea a partire da questi oggetti"
@@ -2247,7 +2291,7 @@ 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:162 include/class_config.inc:300
-#: include/class_config.inc:985 include/class_config.inc:998
+#: include/class_config.inc:915 include/class_config.inc:928
#: include/functions.inc:663 include/class_timezone.inc:51
#: include/password-methods/class_password-methods-sha.inc:71
#: include/password-methods/class_password-methods-ssha.inc:75
@@ -2264,17 +2308,17 @@ msgid ""
"while your passwords are not encrypted."
msgstr "Sembrerebbe che stiate provando a decodificare qualcosa che non é codificato : %s<br/>\\nSi prega di controllare che non si stia utilizzando un file fusiondirectory.secrets mentre le password non sono crittografate."
-#: include/class_config.inc:337 include/class_ldap.inc:917
-#: include/class_ldap.inc:1371 include/functions.inc:526
+#: include/class_config.inc:337 include/class_ldap.inc:918
+#: include/class_ldap.inc:1372 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2985 include/simpleplugin/class_simplePlugin.inc:545
-#: include/simpleplugin/class_attribute.inc:2895
+#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2909
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
#: include/class_SnapshotHandler.inc:422 include/class_SnapshotHandler.inc:425
-#: html/index.php:360 html/class_passwordRecovery.inc:497
+#: html/index.php:369 html/class_passwordRecovery.inc:497
#: setup/class_setupStep_Migrate.inc:451
#: setup/class_setupStep_Migrate.inc:1130
msgid "LDAP error"
@@ -2289,38 +2333,38 @@ msgstr "Errore di connessione al server LDAP. Contatta l'amministratore del sist
msgid "The selected mail method (class %s) is not available"
msgstr "Il metodo mail (classe %s) selezionato non è disponibile "
-#: include/class_config.inc:986
+#: include/class_config.inc:916
#, 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."
-#: include/class_config.inc:999
+#: include/class_config.inc:929
#, 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'."
-#: include/class_config.inc:1104
+#: include/class_config.inc:1034
msgid "All categories"
msgstr "Tutte le categorie"
-#: include/class_config.inc:1231
+#: include/class_config.inc:1161
msgid "My account"
msgstr "Identità personale"
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
msgid "Performance warning"
msgstr "Avvertimento sul rendimento"
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
#, php-format
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr "Il rendimento del tuo annuario LDAP è scarso: l'ultima richiesta è durata %.2fs !"
-#: include/class_ldap.inc:868 include/class_ldap.inc:904
+#: include/class_ldap.inc:869 include/class_ldap.inc:905
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
@@ -2330,39 +2374,39 @@ msgstr "Il rendimento del tuo annuario LDAP è scarso: l'ultima richiesta è dur
msgid "Internal error"
msgstr "Errore interno"
-#: include/class_ldap.inc:868
+#: include/class_ldap.inc:869
#, 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!"
-#: include/class_ldap.inc:904
+#: include/class_ldap.inc:905
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr "Impossibile creare automaticamente delle sottostrutture con RDN \"%s\": non supportato"
-#: include/class_ldap.inc:1016
+#: include/class_ldap.inc:1017
#, 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:1018
+#: include/class_ldap.inc:1019
#, php-format
msgid "while operating on LDAP server %s"
msgstr "durante l'operazione sul server LDAP %s"
-#: include/class_ldap.inc:1108
+#: include/class_ldap.inc:1109
msgid "proc_open failed to execute ldapsearch"
msgstr "proc_open non é riuscito ad eseguire la ricerca LDAP"
-#: include/class_ldap.inc:1220
+#: include/class_ldap.inc:1221
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr "Questo non è un DN valido: '%s'. Il file da importare deve cominciare con 'dn: ...' alla linea %s "
-#: include/class_ldap.inc:1231
+#: include/class_ldap.inc:1232
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2950,10 +2994,10 @@ 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"
-#: include/functions.inc:496 include/functions.inc:3294
-#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:263
-#: include/simpleplugin/class_simplePlugin.inc:268
-#: include/simpleplugin/class_simplePlugin.inc:280
+#: include/functions.inc:496 include/functions.inc:3295
+#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
+#: include/simpleplugin/class_simplePlugin.inc:269
+#: include/simpleplugin/class_simplePlugin.inc:281
#: html/class_passwordRecovery.inc:216
msgid "Fatal error"
msgstr "Errore fatale"
@@ -3106,98 +3150,98 @@ msgstr "Impossibile scrivere il file di revisione !"
msgid "Cannot read to revision file!"
msgstr "Impossibile leggere il file di revisione !"
-#: include/functions.inc:2548
+#: include/functions.inc:2549
msgid "'nextIdHook' is not available. Using default base!"
msgstr "'prossimo Hook ID\" non é disponibile. Usa una base predefinita!"
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "LDAP warning"
msgstr "Avvertimento LDAP"
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "Cannot get schema information from server. No schema check possible!"
msgstr "Impossibile trovare informazioni sugli schemi a partire dal server. Nessuna verifica degli schemi è stata effettuata !"
-#: include/functions.inc:2584
+#: include/functions.inc:2585
msgid ""
"Used to lock currently edited entries to avoid multiple changes at the same "
"time."
msgstr "Usato per bloccare le entries attualmente modificate, al fine di evitare possibili cambiamenti multipli simultanei."
-#: include/functions.inc:2596
+#: include/functions.inc:2597
#, php-format
msgid "Missing required object class '%s'!"
msgstr "L'oggetto di classe '%s' richiesto è mancante !"
-#: include/functions.inc:2599
+#: include/functions.inc:2600
#, php-format
msgid "Missing optional object class '%s'!"
msgstr "L'oggetto di classe '%s' opzionale è mancante !"
-#: include/functions.inc:2603
+#: include/functions.inc:2604
#, php-format
msgid "Class(es) available"
msgstr "Classe(i) disponibile(i)"
-#: include/functions.inc:2623
+#: include/functions.inc:2624
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."
-#: include/functions.inc:2624
+#: include/functions.inc:2625
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:2627
+#: include/functions.inc:2628
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."
-#: include/functions.inc:2628
+#: include/functions.inc:2629
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr "L'objectClass \"posixGroup\" deve essere STRUTTURALE"
-#: include/functions.inc:3106 include/functions.inc:3127
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198
msgid "Cannot allocate a free ID:"
msgstr "Impossibile assegnare un ID libero:"
-#: include/functions.inc:3106
+#: include/functions.inc:3107
msgid "unknown idAllocation method!"
msgstr "Metodo idAllocation sconosciuto !"
-#: include/functions.inc:3127
+#: include/functions.inc:3128
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr "%sPoolMin >= %sPoolMax!"
-#: include/functions.inc:3157
+#: include/functions.inc:3158
msgid "Cannot create sambaUnixIdPool entry!"
msgstr "Impossibile creare la voce sambaUnixIdPool !"
-#: include/functions.inc:3165
+#: include/functions.inc:3166
msgid "sambaUnixIdPool is not unique!"
msgstr "sambaUnixIdPool non è univoco !"
-#: include/functions.inc:3177 include/functions.inc:3181
+#: include/functions.inc:3178 include/functions.inc:3182
msgid "no ID available!"
msgstr "nessun ID disponibile !"
-#: include/functions.inc:3197
+#: include/functions.inc:3198
msgid "maximum tries exceeded!"
msgstr "Il numero massimo di tentativi è stato superato"
-#: include/functions.inc:3259
+#: include/functions.inc:3260
msgid "Cannot allocate a free ID!"
msgstr "Impossibile assegnare un ID libero!"
-#: include/functions.inc:3295
+#: include/functions.inc:3296
#, 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"
@@ -3353,13 +3397,13 @@ msgstr "on line"
msgid "XML error"
msgstr "Errore XML"
-#: include/class_plugin.inc:554
+#: include/class_plugin.inc:553
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 da quando aperto in FusionDirectory. Tutte le modifiche che possono essere effettuate 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/class_plugin.inc:1466
+#: include/class_plugin.inc:1467
#, php-format
msgid "Tab \"%s\""
msgstr "Tab \"%s\""
@@ -3385,32 +3429,32 @@ msgstr "Nome del modello"
msgid "This is the name of the template"
msgstr "Questo è il nome del template"
-#: include/simpleplugin/class_simplePlugin.inc:263
+#: include/simpleplugin/class_simplePlugin.inc:264
msgid "Only main tab can compute dn"
msgstr "Solo la scheda principale puo' calcolare il dn"
-#: include/simpleplugin/class_simplePlugin.inc:270
+#: include/simpleplugin/class_simplePlugin.inc:271
#, 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:282
+#: include/simpleplugin/class_simplePlugin.inc:283
#, 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:638
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:644
+#: include/simpleplugin/class_simplePlugin.inc:652
msgid "Error when saving"
msgstr "Errore durante il salvataggio"
-#: include/simpleplugin/class_simplePlugin.inc:638
+#: include/simpleplugin/class_simplePlugin.inc:644
#, 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:646
+#: include/simpleplugin/class_simplePlugin.inc:652
#, php-format
msgid "The entry %s is not existing"
msgstr "La voce %s non esiste"
@@ -3430,27 +3474,27 @@ msgstr "Modello %s"
msgid "Show %s"
msgstr "Mostra %s"
-#: include/simpleplugin/class_dialogAttributes.inc:409
+#: include/simpleplugin/class_dialogAttributes.inc:415
#, php-format
msgid "Group %s"
msgstr "Raggruppa %s"
-#: include/simpleplugin/class_dialogAttributes.inc:411
+#: include/simpleplugin/class_dialogAttributes.inc:417
#, php-format
msgid "Role %s"
msgstr "Ruolo %s"
-#: include/simpleplugin/class_dialogAttributes.inc:446
+#: include/simpleplugin/class_dialogAttributes.inc:452
msgid "Group of user"
msgstr "Gruppo di utenti"
-#: include/simpleplugin/class_dialogAttributes.inc:615
+#: include/simpleplugin/class_dialogAttributes.inc:621
#: include/simpleplugin/class_attribute.inc:1090
#: include/simpleplugin/class_attribute.inc:1124
msgid "None"
msgstr "Nessuno"
-#: include/simpleplugin/class_dialogAttributes.inc:617
+#: include/simpleplugin/class_dialogAttributes.inc:623
msgid "Unknown"
msgstr "Sconosciuto"
@@ -3491,11 +3535,16 @@ msgid "days"
msgstr "giorni"
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2161
+#: include/simpleplugin/class_attribute.inc:2171
#, php-format
msgid "%s (required)"
msgstr "%s (necessario)"
+#: include/simpleplugin/class_attribute.inc:1150
+#, php-format
+msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
+msgstr "Il valore \"%s\" per il campo \"%s\" non si trova nella lista delle scelte possibili"
+
#: include/simpleplugin/class_attribute.inc:1277
#, php-format
msgid "An integer between %d and %d"
@@ -3511,75 +3560,75 @@ msgstr "Un numero intero più grande di %d"
msgid "An integer smaller than %d"
msgstr "Un numero intero più piccolo di %d"
-#: include/simpleplugin/class_attribute.inc:1379
+#: include/simpleplugin/class_attribute.inc:1383
#, php-format
msgid "A float between %f and %f"
msgstr "Un numero con la virgola compreso tra %f e %f"
-#: include/simpleplugin/class_attribute.inc:1381
+#: include/simpleplugin/class_attribute.inc:1385
#, php-format
msgid "A float larger than %f"
msgstr "Un numero con la virgola più grande di %f"
-#: include/simpleplugin/class_attribute.inc:1383
+#: include/simpleplugin/class_attribute.inc:1387
#, php-format
msgid "A float smaller than %f"
msgstr "Un numero con la virgola più piccolo di %f"
-#: include/simpleplugin/class_attribute.inc:1490
+#: include/simpleplugin/class_attribute.inc:1500
msgid "Error, incorrect date: "
msgstr "Errore, la dta non è corretta: "
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
#, php-format
msgid "Cannot read uploaded file: %s"
msgstr "Impossibile leggere il file importato : %s"
-#: include/simpleplugin/class_attribute.inc:1530
+#: include/simpleplugin/class_attribute.inc:1540
msgid "file is empty"
msgstr "il file è vuoto"
-#: include/simpleplugin/class_attribute.inc:1533
+#: include/simpleplugin/class_attribute.inc:1543
msgid "file not found"
msgstr "Il file non è stato trovato"
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1546
msgid "file not readable"
msgstr "Il file non puó essere letto"
-#: include/simpleplugin/class_attribute.inc:1569
+#: include/simpleplugin/class_attribute.inc:1579
#, php-format
msgid "%s (%d bytes)"
msgstr "%s (%d bytes)"
-#: include/simpleplugin/class_attribute.inc:1616
-#: include/simpleplugin/class_attribute.inc:1793
+#: include/simpleplugin/class_attribute.inc:1626
+#: include/simpleplugin/class_attribute.inc:1803
msgid "Upload"
msgstr "Caricare"
-#: include/simpleplugin/class_attribute.inc:1621
-#: include/simpleplugin/class_attribute.inc:1622
+#: include/simpleplugin/class_attribute.inc:1631
+#: include/simpleplugin/class_attribute.inc:1632
msgid "Download"
msgstr "Scarica"
-#: include/simpleplugin/class_attribute.inc:1775
+#: include/simpleplugin/class_attribute.inc:1785
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr "Impossibile salvare la foto dell'utente, FusionDirectory richiede che il pacchetto 'php5-imagick' sia installato!"
-#: include/simpleplugin/class_attribute.inc:1826
+#: include/simpleplugin/class_attribute.inc:1836
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr "Base"
-#: include/simpleplugin/class_attribute.inc:1829
+#: include/simpleplugin/class_attribute.inc:1839
msgid "Object base"
msgstr "Base dell'oggetto"
-#: include/simpleplugin/class_attribute.inc:2755
+#: include/simpleplugin/class_attribute.inc:2769
#, php-format
msgid "Invalid value for %s"
msgstr "Valore non valido per %s"
@@ -3603,7 +3652,7 @@ msgstr "La cancellazione è stata interrotta dall'estensione '%s': %s"
#: include/simpleplugin/class_simpleTabs.inc:405
#, php-format
msgid "Move from \"%s\" to \"%s\" failed"
-msgstr ""
+msgstr "Passare da \"%s\" a \"%s\" non riuscito"
#: include/class_timezone.inc:52
#, php-format
@@ -3713,17 +3762,17 @@ msgstr "Verifica il nome utente e la password."
msgid "Account locked. Please contact your system administrator!"
msgstr "Conto bloccato. Contatta l'amministratore del sistema!"
-#: html/index.php:436
+#: html/index.php:475
#, 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:446
+#: html/index.php:485
#, 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:481
+#: html/index.php:522
msgid ""
"Your browser has cookies disabled. Please enable cookies and reload this "
"page before logging in!"
@@ -4046,7 +4095,7 @@ msgid "Checking for duplicated UID numbers"
msgstr "Verifica dei possibili doppioni UID"
#: setup/class_setupStep_Migrate.inc:267
-msgid "Checking for duplicate GID numbers"
+msgid "Checking for duplicated GID numbers"
msgstr "Verifica dei possibili doppioni GID"
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:487
@@ -4056,7 +4105,7 @@ msgstr "Verifica dei possibili doppioni GID"
#: setup/class_setupStep_Migrate.inc:1179
#: setup/class_setupStep_Migrate.inc:1272
#: setup/class_setupStep_Migrate.inc:1351
-#: setup/class_setupStep_Migrate.inc:1390
+#: setup/class_setupStep_Migrate.inc:1395
msgid "LDAP query failed"
msgstr "La richiesta al database LDAP è fallita!"
@@ -4067,7 +4116,7 @@ msgstr "La richiesta al database LDAP è fallita!"
#: setup/class_setupStep_Migrate.inc:1180
#: setup/class_setupStep_Migrate.inc:1273
#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1391
+#: setup/class_setupStep_Migrate.inc:1396
msgid "Possibly the \"root object\" is missing."
msgstr "Forse l'\"oggetto radice\" é mancante"
@@ -4222,15 +4271,15 @@ msgstr "Ho trovato %s departimenti(o) che non saranno visibili in FusionDirector
msgid "Department migration"
msgstr "Migrazione Dipartilento"
-#: setup/class_setupStep_Migrate.inc:1373
+#: setup/class_setupStep_Migrate.inc:1378
#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\"."
-msgstr "Trovato valori duplicati %s per l'attributo \"uidNumber\""
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
+msgstr "Trovati %s valori duplicati per l'attributo \"uidNumber\":%s"
-#: setup/class_setupStep_Migrate.inc:1412
+#: setup/class_setupStep_Migrate.inc:1422
#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\"."
-msgstr "Trovato valori duplicati %s per l'attributo \"gidNumber\""
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
+msgstr "Trovati %s valori duplicati per l'attributo \"gidNumber\":%s"
#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
msgid "Language setup"
diff --git a/locale/lv/fusiondirectory.po b/locale/lv/fusiondirectory.po
index 1f15a8a91b028345c2fba58a2e258222d84702aa..e57f838ae0b331cf09960e4df3e21ad6c07d0881 100644
--- a/locale/lv/fusiondirectory.po
+++ b/locale/lv/fusiondirectory.po
@@ -5,12 +5,12 @@
# Translators:
msgid ""
msgstr ""
-"Project-Id-Version: FusionDirectory-109\n"
+"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-01-22 11:26+0100\n"
-"PO-Revision-Date: 2016-01-22 10:24+0000\n"
+"POT-Creation-Date: 2016-03-14 12:07+0100\n"
+"PO-Revision-Date: 2016-03-07 12:09+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-109/language/lv/)\n"
+"Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -28,31 +28,31 @@ msgstr ""
msgid "References"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:30
-#: plugins/admin/groups/class_roleGeneric.inc:34
+#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:61
#: plugins/admin/groups/class_groupManagement.inc:71
#: plugins/admin/aclrole/class_aclRole.inc:78
#: plugins/admin/acl/class_aclAssignment.inc:49
msgid "Role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:31
+#: plugins/admin/groups/class_roleGeneric.inc:58
msgid "Role information"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:35
+#: plugins/admin/groups/class_roleGeneric.inc:62
msgid "Organizational role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:84
msgid "Informations"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:158
+#: plugins/admin/departments/class_department.inc:174
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -62,13 +62,13 @@ msgstr ""
msgid "Name"
msgstr "VÄrds "
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
msgid "Name of this group"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
#: plugins/admin/groups/class_group.inc:66
#: plugins/admin/groups/class_ogroup.inc:192
#: plugins/admin/groups/group-list.xml:41
@@ -81,26 +81,26 @@ msgstr ""
msgid "Description"
msgstr "Apraksts"
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
msgid "Description of the role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:70
+#: plugins/admin/groups/class_roleGeneric.inc:97
msgid "Phone number"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:74
+#: plugins/admin/groups/class_roleGeneric.inc:101
msgid "Fax number"
msgstr "Faksa numurs"
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
#: plugins/admin/users/class_userManagement.inc:42
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: setup/class_setupStep_Migrate.inc:871
msgid "Users"
msgstr "LietotÄji"
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
msgid "Add users for the role"
msgstr ""
@@ -147,7 +147,7 @@ msgstr ""
#: plugins/admin/groups/class_group.inc:74
#: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:403
+#: plugins/personal/posix/class_posixAccount.inc:410
msgid "GID"
msgstr ""
@@ -204,23 +204,23 @@ msgid "Only allow this group to connect to this list of hosts"
msgstr ""
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458 include/functions.inc:794
-#: include/functions.inc:2548 include/class_xml.inc:55
+#: plugins/personal/posix/class_posixAccount.inc:465 include/functions.inc:794
+#: include/functions.inc:2549 include/class_xml.inc:55
#: include/simpleplugin/class_simpleTabs.inc:325 html/index.php:56
-#: html/index.php:62 html/index.php:481 html/class_passwordRecovery.inc:378
+#: html/index.php:62 html/index.php:522 html/class_passwordRecovery.inc:378
#: setup/class_setupStep_Migrate.inc:572
#: setup/class_setupStep_Migrate.inc:1083
#: setup/class_setupStep_Migrate.inc:1202
#: setup/class_setupStep_Migrate.inc:1313
-#: setup/class_setupStep_Migrate.inc:1372
-#: setup/class_setupStep_Migrate.inc:1411 plugins/admin/acl/remove.tpl.c:2
+#: setup/class_setupStep_Migrate.inc:1377
+#: setup/class_setupStep_Migrate.inc:1421 plugins/admin/acl/remove.tpl.c:2
#: ihtml/themes/default/islocked.tpl.c:5 ihtml/themes/default/remove.tpl.c:2
#: ihtml/themes/default/msg_dialog.tpl.c:5 setup/setup_checks.tpl.c:8
msgid "Warning"
msgstr "BrÄ«dinÄjums"
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458
+#: plugins/personal/posix/class_posixAccount.inc:465
msgid "Timeout while waiting for lock. Ignoring lock!"
msgstr ""
@@ -250,7 +250,7 @@ msgstr ""
msgid "Objects member of this group"
msgstr ""
-#: plugins/admin/groups/class_ogroup.inc:318
+#: plugins/admin/groups/class_ogroup.inc:313
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
@@ -279,10 +279,10 @@ msgstr "Izveidot"
#: plugins/admin/departments/dep-list.xml:79
#: plugins/admin/users/user-list.xml:105
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-#: include/simpleplugin/class_dialogAttributes.inc:626
-#: include/simpleplugin/class_dialogAttributes.inc:627
-#: include/simpleplugin/class_attribute.inc:2661
-#: include/simpleplugin/class_attribute.inc:2662
+#: include/simpleplugin/class_dialogAttributes.inc:632
+#: include/simpleplugin/class_dialogAttributes.inc:633
+#: include/simpleplugin/class_attribute.inc:2675
+#: include/simpleplugin/class_attribute.inc:2676
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -293,8 +293,8 @@ msgstr "Labot"
#: plugins/admin/departments/dep-list.xml:67
#: plugins/admin/departments/dep-list.xml:88
#: plugins/admin/users/user-list.xml:112
-#: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_dialogAttributes.inc:637
+#: include/simpleplugin/class_dialogAttributes.inc:642
+#: include/simpleplugin/class_dialogAttributes.inc:643
#: include/simpleplugin/simple-list.xml:75
#: include/simpleplugin/simple-list.xml:125
msgid "Remove"
@@ -343,7 +343,7 @@ msgid "Show application groups"
msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Show department groups"
+msgid "Show unidentified groups"
msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:137
@@ -432,51 +432,67 @@ msgid "Category of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:81
+msgid "Website"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:81
+#, php-format
+msgid "Website of this %s"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:85
#: plugins/personal/generic/class_user.inc:410
msgid "Manager"
msgstr ""
-#: plugins/admin/departments/class_department.inc:81
+#: plugins/admin/departments/class_department.inc:85
#, php-format
msgid "Manager of this %s"
msgstr ""
-#: plugins/admin/departments/class_department.inc:87
-#: plugins/admin/departments/class_department.inc:93
+#: plugins/admin/departments/class_department.inc:91
+#: plugins/admin/departments/class_department.inc:97
#: plugins/personal/generic/class_user.inc:304
msgid "Location"
msgstr "AtraÅ¡anÄs vieta"
-#: plugins/admin/departments/class_department.inc:90
+#: plugins/admin/departments/class_department.inc:94
#: plugins/personal/generic/class_user.inc:308
msgid "State"
msgstr "Valsts"
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_country.inc:29
+#: plugins/admin/departments/class_country.inc:30
+#: plugins/admin/departments/class_country.inc:33
+msgid "Country"
+msgstr "Valsts"
+
+#: plugins/admin/departments/class_department.inc:103
#: plugins/personal/generic/class_user.inc:312
msgid "Address"
msgstr "Adrese"
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:103
#, php-format
msgid "A postal address for this %s"
msgstr ""
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
#: plugins/personal/generic/class_user.inc:320
msgid "Phone"
msgstr "TÄlrunis"
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
msgid "Telephone number"
msgstr "TÄlruņa numurs"
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
#: plugins/personal/generic/class_user.inc:332
msgid "Fax"
msgstr "Fakss"
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
msgid "Facsimile telephone number"
msgstr ""
@@ -504,12 +520,6 @@ msgstr ""
msgid "locality"
msgstr ""
-#: plugins/admin/departments/class_country.inc:29
-#: plugins/admin/departments/class_country.inc:30
-#: plugins/admin/departments/class_country.inc:33
-msgid "Country"
-msgstr "Valsts"
-
#: plugins/admin/departments/class_country.inc:50
msgid "country"
msgstr ""
@@ -552,7 +562,8 @@ msgid "Given name"
msgstr "VÄrds"
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
+#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
msgid "Login"
@@ -665,8 +676,8 @@ msgid "Edit category ACL"
msgstr ""
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2671
-#: include/simpleplugin/class_attribute.inc:2672
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
+#: include/simpleplugin/class_attribute.inc:2686
#, php-format
msgid "Delete"
msgstr ""
@@ -771,19 +782,37 @@ msgstr ""
msgid "ACLs which are part of this group"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:38
+#: plugins/admin/acl/class_aclManagement.inc:31
+#: plugins/admin/acl/class_aclManagement.inc:32
+#: plugins/admin/acl/class_aclManagement.inc:45
+msgid "ACL assignment creation"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:33
+msgid "Create an ACL assignment on an arbitrary dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "Dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "DN you wish to add assignments for"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:135
msgid "ACL assignments"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:39
+#: plugins/admin/acl/class_aclManagement.inc:136
msgid "ACL assignments management"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:40
+#: plugins/admin/acl/class_aclManagement.inc:137
msgid "Manage ACL roles assignments to users"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:78
+#: plugins/admin/acl/class_aclManagement.inc:199
#: plugins/admin/acl/class_aclAssignment.inc:263
msgid "ACL Assignment"
msgstr ""
@@ -899,7 +928,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -994,59 +1023,59 @@ msgstr ""
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:336
+msgid "Homepage"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:336
+msgid "Personal homepage"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:342
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:351
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr ""
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:362
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
msgid "Display name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home postal address"
msgstr "MÄjas pasta adrese"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:374
msgid "Private phone"
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:374
msgid "Home phone number"
msgstr "MÄjas tÄlruņa numurs"
-#: plugins/personal/generic/class_user.inc:374
-msgid "Homepage"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:374
-msgid "Personal homepage"
-msgstr ""
-
#: plugins/personal/generic/class_user.inc:380
msgid "Organizational information"
msgstr ""
@@ -1279,33 +1308,33 @@ msgstr ""
msgid "automatic"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:309
+#: plugins/personal/posix/class_posixAccount.inc:310
msgid "expired"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:311
+#: plugins/personal/posix/class_posixAccount.inc:312
msgid "grace time active"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:314
-#: plugins/personal/posix/class_posixAccount.inc:316
-#: plugins/personal/posix/class_posixAccount.inc:318
+#: plugins/personal/posix/class_posixAccount.inc:315
+#: plugins/personal/posix/class_posixAccount.inc:317
+#: plugins/personal/posix/class_posixAccount.inc:319
msgid "active"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:315
msgid "password expired"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:316
+#: plugins/personal/posix/class_posixAccount.inc:317
msgid "password not changeable"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:400
+#: plugins/personal/posix/class_posixAccount.inc:407
msgid "UID"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:516
+#: plugins/personal/posix/class_posixAccount.inc:525
#, php-format
msgid "Group of user %s"
msgstr ""
@@ -1477,424 +1506,440 @@ msgid "Core settings"
msgstr ""
#: plugins/config/class_configInLdap.inc:161
-msgid "Enable primary group filter"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"It is time consuming to evaluate which groups are primary and which are not,"
-" so you may want to disable it if your group plugin is slow."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:167
msgid "Display summary in listings"
msgstr ""
-#: plugins/config/class_configInLdap.inc:168
+#: 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:173
+#: plugins/config/class_configInLdap.inc:167
msgid "Edit locking"
msgstr ""
-#: plugins/config/class_configInLdap.inc:174
+#: 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:179
+#: plugins/config/class_configInLdap.inc:173
msgid "Enable logging"
msgstr ""
-#: plugins/config/class_configInLdap.inc:180
+#: plugins/config/class_configInLdap.inc:174
msgid "Event logging on FusionDirectory side."
msgstr ""
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "LDAP size limit"
msgstr ""
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "Defines the number of entries to get from LDAP by default."
msgstr ""
-#: plugins/config/class_configInLdap.inc:192
+#: plugins/config/class_configInLdap.inc:186
msgid "Login and session"
msgstr ""
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:189
msgid "Login attribute"
msgstr ""
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:190
msgid "Which LDAP attribute should be used as the login name during login."
msgstr ""
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:196
msgid "Enforce encrypted connections"
msgstr ""
-#: plugins/config/class_configInLdap.inc:203
+#: plugins/config/class_configInLdap.inc:197
msgid ""
"Enables PHP security checks to force encrypted access (https) to the web "
"interface."
msgstr ""
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:201
msgid "Warn if session is not encrypted"
msgstr ""
-#: plugins/config/class_configInLdap.inc:208
+#: plugins/config/class_configInLdap.inc:202
msgid "will display a warning to the user when http is used instead of https."
msgstr ""
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Session lifetime"
msgstr ""
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Defines when a session will expire in seconds."
msgstr ""
-#: plugins/config/class_configInLdap.inc:220
+#: plugins/config/class_configInLdap.inc:212
+msgid "HTTP authentication"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:212
+msgid "Use HTTP authentication protocol instead of the login form."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:219
#: include/class_SnapshotDialogs.inc:186
msgid "Snapshots"
msgstr ""
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid "Enable snapshots"
msgstr ""
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid ""
"This enables you to save certain states of entries and restore them later "
"on."
msgstr ""
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
msgid "Snapshot base"
msgstr ""
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
msgid "The base where snapshots should be stored inside of the LDAP."
msgstr ""
-#: plugins/config/class_configInLdap.inc:235
+#: plugins/config/class_configInLdap.inc:234
msgid "SSL"
msgstr ""
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Key path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Path to FusionDirectory private key. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Certificate path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Path to FusionDirectory certificate. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:262
msgid "CA certificate path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:247
msgid "Path to the CA certificate. Used for validating Argonaut Server host."
msgstr ""
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:254
msgid "CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "Enable CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "CAS login will be used instead of LDAP bind"
msgstr ""
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:262
msgid "Path to the CA certificate of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host"
msgstr ""
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port"
msgstr ""
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port the CAS server is listening on"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context to be used"
msgstr ""
-#: plugins/config/class_configInLdap.inc:285
+#: plugins/config/class_configInLdap.inc:284
msgid "People and group storage"
msgstr ""
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "People DN attribute"
msgstr ""
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "Attribute to use at the beginning of users dn"
msgstr ""
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "CN pattern"
msgstr ""
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "The pattern to use to build the common name field"
msgstr ""
-#: plugins/config/class_configInLdap.inc:299
+#: plugins/config/class_configInLdap.inc:298
msgid "Strict naming policy"
msgstr ""
-#: plugins/config/class_configInLdap.inc:300
+#: plugins/config/class_configInLdap.inc:299
msgid "Enables strict checking of user and group names"
msgstr ""
-#: plugins/config/class_configInLdap.inc:305
+#: plugins/config/class_configInLdap.inc:304
msgid "Group/user min id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:306
+#: plugins/config/class_configInLdap.inc:305
msgid ""
"The minimum assignable user or group id to avoid security leaks with id 0 "
"accounts."
msgstr ""
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid "Next id hook"
msgstr ""
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid ""
"A script to be called for finding the next free id number for users or "
"groups."
msgstr ""
-#: plugins/config/class_configInLdap.inc:315
+#: plugins/config/class_configInLdap.inc:314
msgid "Base number for user id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:315
msgid "Where to start looking for a new free user id."
msgstr ""
-#: plugins/config/class_configInLdap.inc:321
+#: plugins/config/class_configInLdap.inc:320
msgid "Base number for group id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:321
msgid "Where to start looking for a new free group id."
msgstr ""
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "Users RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "The branch where users are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "Groups RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "The branch where groups are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "ACL role RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "The branch where ACL roles are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Id allocation method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Method to allocate user/group ids"
msgstr ""
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Traditional"
msgstr ""
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Samba unix id pool"
msgstr ""
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Pool user id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Minimum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Pool user id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Maximum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Pool group id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Minimum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Pool group id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Maximum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:370
-msgid "Debugging"
+#: plugins/config/class_configInLdap.inc:367
+msgid "Restrict role members"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:367
+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:373
+msgid "Debugging"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:376
msgid "Display errors"
msgstr ""
-#: plugins/config/class_configInLdap.inc:374
+#: plugins/config/class_configInLdap.inc:377
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:378
+#: plugins/config/class_configInLdap.inc:381
msgid "Maximum LDAP query time"
msgstr ""
-#: plugins/config/class_configInLdap.inc:378
+#: plugins/config/class_configInLdap.inc:381
msgid ""
"Stop LDAP actions if there is no answer within the specified number of "
"seconds."
msgstr ""
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:386
msgid "Log LDAP statistics"
msgstr ""
-#: plugins/config/class_configInLdap.inc:384
+#: plugins/config/class_configInLdap.inc:387
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:389
+#: plugins/config/class_configInLdap.inc:392
msgid "Debug level"
msgstr ""
-#: plugins/config/class_configInLdap.inc:390
+#: plugins/config/class_configInLdap.inc:393
msgid "Display certain information on each page load."
msgstr ""
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:405
msgid "Miscellaneous"
msgstr ""
-#: plugins/config/class_configInLdap.inc:407
+#: plugins/config/class_configInLdap.inc:410
msgid "Hooks that are called when specific actions happens"
msgstr ""
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "tab"
msgstr ""
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "The tab that this hook concerns"
msgstr ""
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "mode"
msgstr ""
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "When to call this command"
msgstr ""
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "cmd"
msgstr ""
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "The command that will be called"
msgstr ""
-#: plugins/config/class_configInLdap.inc:429
+#: plugins/config/class_configInLdap.inc:432
msgid "Hooks"
msgstr ""
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:439
msgid "Display hook output"
msgstr ""
-#: plugins/config/class_configInLdap.inc:437
+#: plugins/config/class_configInLdap.inc:440
msgid ""
"When enabled successful hook execution output is displayed to the user using"
" a dialog."
msgstr ""
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available shells"
msgstr ""
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available POSIX shells for FD users."
msgstr ""
-#: plugins/config/class_configInLdap.inc:449
+#: plugins/config/class_configInLdap.inc:452
msgid "Show ACL tab on all objects"
msgstr ""
-#: plugins/config/class_configInLdap.inc:450
+#: plugins/config/class_configInLdap.inc:453
msgid ""
"For very specific ACL rights setting where you might need to give right on a"
" single object."
msgstr ""
-#: plugins/config/class_configInLdap.inc:464
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available department categories"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available categories in the departments dropdown"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:474
#: setup/class_setupStep_Language.inc:69
msgid "Automatic"
msgstr ""
@@ -1911,80 +1956,80 @@ msgstr ""
msgid "Password recovery settings"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:44
+#: plugins/config/class_recoveryConfig.inc:45
msgid "Activate password recovery"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:45
+#: plugins/config/class_recoveryConfig.inc:46
msgid "Whether to activate or not password recovery feature"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:50
+#: plugins/config/class_recoveryConfig.inc:51
msgid "Sender email address"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:51
+#: plugins/config/class_recoveryConfig.inc:52
msgid "Email address from which mails will be sent"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:57
+#: plugins/config/class_recoveryConfig.inc:58
msgid "Link validity (minutes)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:58
+#: plugins/config/class_recoveryConfig.inc:59
msgid "Number of minutes before a recovery link expires"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:64
+#: plugins/config/class_recoveryConfig.inc:65
msgid "Salt for tokens"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:65
+#: plugins/config/class_recoveryConfig.inc:66
msgid ""
"Just a security measure, you can put anything in there, even random "
"characters"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:71
+#: plugins/config/class_recoveryConfig.inc:72
msgid "Allow the use of alternate addresses"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:72
+#: plugins/config/class_recoveryConfig.inc:73
msgid ""
"Users will also be able to enter one of theirs alternate addresses to "
"recover their password"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:79
+#: plugins/config/class_recoveryConfig.inc:80
msgid "First email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:82
-#: plugins/config/class_recoveryConfig.inc:101
+#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:102
msgid "Subject"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:84
msgid "Subject of the first email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:86
+#: plugins/config/class_recoveryConfig.inc:87
msgid "[FusionDirectory] Password recovery link"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:89
+#: plugins/config/class_recoveryConfig.inc:90
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:91
#, 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 ""
-#: plugins/config/class_recoveryConfig.inc:93
+#: plugins/config/class_recoveryConfig.inc:94
#, php-format
msgid ""
"Hello,\n"
@@ -1996,31 +2041,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:98
+#: plugins/config/class_recoveryConfig.inc:99
msgid "Second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:103
msgid "Subject of the second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:105
+#: plugins/config/class_recoveryConfig.inc:106
msgid "[FusionDirectory] Password recovery successful"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:108
+#: plugins/config/class_recoveryConfig.inc:109
#, php-format
msgid "Body (%s is login)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:110
#, php-format
msgid ""
"Body of the second email, sent to confirm the password has been changed. Use"
" %s for the user login."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:112
+#: plugins/config/class_recoveryConfig.inc:113
#, php-format
msgid ""
"Hello,\n"
@@ -2088,13 +2133,13 @@ msgstr ""
msgid "Down"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2633
-#: include/simpleplugin/class_attribute.inc:2634
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
+#: include/simpleplugin/class_attribute.inc:2648
msgid "Sort up"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2646
-#: include/simpleplugin/class_attribute.inc:2647
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
+#: include/simpleplugin/class_attribute.inc:2661
msgid "Sort down"
msgstr ""
@@ -2106,27 +2151,26 @@ msgstr ""
#: include/class_config.inc:479 include/class_msgPool.inc:215
#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3106
-#: include/functions.inc:3127 include/functions.inc:3157
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197 include/functions.inc:3259
+#: include/class_msgPool.inc:740 include/functions.inc:3107
+#: include/functions.inc:3128 include/functions.inc:3158
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3260
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1663 include/class_CopyPasteHandler.inc:278
-#: include/simpleplugin/class_dialogAttributes.inc:733
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
-#: include/simpleplugin/class_attribute.inc:1774
-#: include/simpleplugin/class_attribute.inc:1877
-#: include/simpleplugin/class_attribute.inc:1879
+#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
+#: include/simpleplugin/class_attribute.inc:1784
+#: include/simpleplugin/class_attribute.inc:1887
+#: include/simpleplugin/class_attribute.inc:1889
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: 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:437
#: include/password-methods/class_password-methods.inc:447
-#: include/class_SnapshotHandler.inc:415 html/index.php:434 html/index.php:444
+#: include/class_SnapshotHandler.inc:415 html/index.php:473 html/index.php:483
#: setup/class_setupStep_Migrate.inc:935
#: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
msgid "Error"
@@ -2165,44 +2209,44 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: include/class_listing.inc:1586 include/class_listing.inc:1640
+#: include/class_listing.inc:1590 include/class_listing.inc:1644
msgid "Copy"
msgstr ""
-#: include/class_listing.inc:1592 include/class_listing.inc:1628
+#: include/class_listing.inc:1596 include/class_listing.inc:1632
msgid "Cut"
msgstr ""
-#: include/class_listing.inc:1600 include/class_listing.inc:1602
+#: include/class_listing.inc:1604 include/class_listing.inc:1606
#: include/class_CopyPasteHandler.inc:370
msgid "Paste"
msgstr ""
-#: include/class_listing.inc:1628
+#: include/class_listing.inc:1632
msgid "Cut this entry"
msgstr ""
-#: include/class_listing.inc:1640
+#: include/class_listing.inc:1644
msgid "Copy this entry"
msgstr ""
-#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_listing.inc:1677 include/class_listing.inc:1679
msgid "Restore snapshots"
msgstr ""
-#: include/class_listing.inc:1689
+#: include/class_listing.inc:1693
msgid "Export list"
msgstr ""
-#: include/class_listing.inc:1724 include/class_listing.inc:1725
+#: include/class_listing.inc:1728 include/class_listing.inc:1729
msgid "Restore snapshot"
msgstr ""
-#: include/class_listing.inc:1734
+#: include/class_listing.inc:1738
msgid "Create snapshot"
msgstr ""
-#: include/class_listing.inc:1735
+#: include/class_listing.inc:1739
msgid "Create a new snapshot from this object"
msgstr ""
@@ -2245,7 +2289,7 @@ msgid "XML error in fusiondirectory.conf: %s at line %d"
msgstr ""
#: include/class_config.inc:162 include/class_config.inc:300
-#: include/class_config.inc:985 include/class_config.inc:998
+#: include/class_config.inc:915 include/class_config.inc:928
#: include/functions.inc:663 include/class_timezone.inc:51
#: include/password-methods/class_password-methods-sha.inc:71
#: include/password-methods/class_password-methods-ssha.inc:75
@@ -2262,17 +2306,17 @@ msgid ""
"while your passwords are not encrypted."
msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:917
-#: include/class_ldap.inc:1371 include/functions.inc:526
+#: include/class_config.inc:337 include/class_ldap.inc:918
+#: include/class_ldap.inc:1372 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2985 include/simpleplugin/class_simplePlugin.inc:545
-#: include/simpleplugin/class_attribute.inc:2895
+#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2909
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
#: include/class_SnapshotHandler.inc:422 include/class_SnapshotHandler.inc:425
-#: html/index.php:360 html/class_passwordRecovery.inc:497
+#: html/index.php:369 html/class_passwordRecovery.inc:497
#: setup/class_setupStep_Migrate.inc:451
#: setup/class_setupStep_Migrate.inc:1130
msgid "LDAP error"
@@ -2287,38 +2331,38 @@ msgstr ""
msgid "The selected mail method (class %s) is not available"
msgstr ""
-#: include/class_config.inc:986
+#: include/class_config.inc:916
#, php-format
msgid ""
"The snapshot functionality is enabled, but the required variable '%s' is not"
" set."
msgstr ""
-#: include/class_config.inc:999
+#: include/class_config.inc:929
#, php-format
msgid ""
"The snapshot functionality is enabled, but the required compression module "
"is missing. Please install '%s'."
msgstr ""
-#: include/class_config.inc:1104
+#: include/class_config.inc:1034
msgid "All categories"
msgstr ""
-#: include/class_config.inc:1231
+#: include/class_config.inc:1161
msgid "My account"
msgstr ""
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
msgid "Performance warning"
msgstr ""
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
#, php-format
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr ""
-#: include/class_ldap.inc:868 include/class_ldap.inc:904
+#: include/class_ldap.inc:869 include/class_ldap.inc:905
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
@@ -2328,39 +2372,39 @@ msgstr ""
msgid "Internal error"
msgstr "IekÅ¡Ä“jÄ kļūda"
-#: include/class_ldap.inc:868
+#: include/class_ldap.inc:869
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:904
+#: include/class_ldap.inc:905
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1016
+#: include/class_ldap.inc:1017
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr ""
-#: include/class_ldap.inc:1018
+#: include/class_ldap.inc:1019
#, php-format
msgid "while operating on LDAP server %s"
msgstr ""
-#: include/class_ldap.inc:1108
+#: include/class_ldap.inc:1109
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1220
+#: include/class_ldap.inc:1221
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr ""
-#: include/class_ldap.inc:1231
+#: include/class_ldap.inc:1232
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2948,10 +2992,10 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr ""
-#: include/functions.inc:496 include/functions.inc:3294
-#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:263
-#: include/simpleplugin/class_simplePlugin.inc:268
-#: include/simpleplugin/class_simplePlugin.inc:280
+#: include/functions.inc:496 include/functions.inc:3295
+#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
+#: include/simpleplugin/class_simplePlugin.inc:269
+#: include/simpleplugin/class_simplePlugin.inc:281
#: html/class_passwordRecovery.inc:216
msgid "Fatal error"
msgstr ""
@@ -3104,98 +3148,98 @@ msgstr ""
msgid "Cannot read to revision file!"
msgstr ""
-#: include/functions.inc:2548
+#: include/functions.inc:2549
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "LDAP warning"
msgstr ""
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "Cannot get schema information from server. No schema check possible!"
msgstr ""
-#: include/functions.inc:2584
+#: include/functions.inc:2585
msgid ""
"Used to lock currently edited entries to avoid multiple changes at the same "
"time."
msgstr ""
-#: include/functions.inc:2596
+#: include/functions.inc:2597
#, php-format
msgid "Missing required object class '%s'!"
msgstr ""
-#: include/functions.inc:2599
+#: include/functions.inc:2600
#, php-format
msgid "Missing optional object class '%s'!"
msgstr ""
-#: include/functions.inc:2603
+#: include/functions.inc:2604
#, php-format
msgid "Class(es) available"
msgstr ""
-#: include/functions.inc:2623
+#: include/functions.inc:2624
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2625
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2628
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2629
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3106 include/functions.inc:3127
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3106
+#: include/functions.inc:3107
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3127
+#: include/functions.inc:3128
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3157
+#: include/functions.inc:3158
msgid "Cannot create sambaUnixIdPool entry!"
msgstr ""
-#: include/functions.inc:3165
+#: include/functions.inc:3166
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3177 include/functions.inc:3181
+#: include/functions.inc:3178 include/functions.inc:3182
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3197
+#: include/functions.inc:3198
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3259
+#: include/functions.inc:3260
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3295
+#: include/functions.inc:3296
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
@@ -3351,13 +3395,13 @@ msgstr ""
msgid "XML error"
msgstr ""
-#: include/class_plugin.inc:554
+#: include/class_plugin.inc:553
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/class_plugin.inc:1466
+#: include/class_plugin.inc:1467
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -3383,32 +3427,32 @@ msgstr ""
msgid "This is the name of the template"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:263
+#: include/simpleplugin/class_simplePlugin.inc:264
msgid "Only main tab can compute dn"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:270
+#: include/simpleplugin/class_simplePlugin.inc:271
#, php-format
msgid "Could not compute dn: no parent tab class for \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:282
+#: include/simpleplugin/class_simplePlugin.inc:283
#, php-format
msgid ""
"Could not compute dn: could not find objectType infos from tab class \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:638
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:644
+#: include/simpleplugin/class_simplePlugin.inc:652
msgid "Error when saving"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:638
+#: include/simpleplugin/class_simplePlugin.inc:644
#, php-format
msgid "There is already an entry with the same dn : %s"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:652
#, php-format
msgid "The entry %s is not existing"
msgstr ""
@@ -3428,27 +3472,27 @@ msgstr ""
msgid "Show %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:409
+#: include/simpleplugin/class_dialogAttributes.inc:415
#, php-format
msgid "Group %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:411
+#: include/simpleplugin/class_dialogAttributes.inc:417
#, php-format
msgid "Role %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:446
+#: include/simpleplugin/class_dialogAttributes.inc:452
msgid "Group of user"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:615
+#: include/simpleplugin/class_dialogAttributes.inc:621
#: include/simpleplugin/class_attribute.inc:1090
#: include/simpleplugin/class_attribute.inc:1124
msgid "None"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:617
+#: include/simpleplugin/class_dialogAttributes.inc:623
msgid "Unknown"
msgstr ""
@@ -3489,11 +3533,16 @@ msgid "days"
msgstr ""
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2161
+#: include/simpleplugin/class_attribute.inc:2171
#, php-format
msgid "%s (required)"
msgstr ""
+#: include/simpleplugin/class_attribute.inc:1150
+#, php-format
+msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
+msgstr ""
+
#: include/simpleplugin/class_attribute.inc:1277
#, php-format
msgid "An integer between %d and %d"
@@ -3509,75 +3558,75 @@ msgstr ""
msgid "An integer smaller than %d"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1379
+#: include/simpleplugin/class_attribute.inc:1383
#, php-format
msgid "A float between %f and %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1381
+#: include/simpleplugin/class_attribute.inc:1385
#, php-format
msgid "A float larger than %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1383
+#: include/simpleplugin/class_attribute.inc:1387
#, php-format
msgid "A float smaller than %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1490
+#: include/simpleplugin/class_attribute.inc:1500
msgid "Error, incorrect date: "
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
#, php-format
msgid "Cannot read uploaded file: %s"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1530
+#: include/simpleplugin/class_attribute.inc:1540
msgid "file is empty"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1533
+#: include/simpleplugin/class_attribute.inc:1543
msgid "file not found"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1546
msgid "file not readable"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1569
+#: include/simpleplugin/class_attribute.inc:1579
#, php-format
msgid "%s (%d bytes)"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1616
-#: include/simpleplugin/class_attribute.inc:1793
+#: include/simpleplugin/class_attribute.inc:1626
+#: include/simpleplugin/class_attribute.inc:1803
msgid "Upload"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1621
-#: include/simpleplugin/class_attribute.inc:1622
+#: include/simpleplugin/class_attribute.inc:1631
+#: include/simpleplugin/class_attribute.inc:1632
msgid "Download"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1775
+#: include/simpleplugin/class_attribute.inc:1785
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1826
+#: include/simpleplugin/class_attribute.inc:1836
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1829
+#: include/simpleplugin/class_attribute.inc:1839
msgid "Object base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:2755
+#: include/simpleplugin/class_attribute.inc:2769
#, php-format
msgid "Invalid value for %s"
msgstr ""
@@ -3711,17 +3760,17 @@ msgstr ""
msgid "Account locked. Please contact your system administrator!"
msgstr ""
-#: html/index.php:436
+#: html/index.php:475
#, php-format
msgid "CAS user \"%s\" could not be found in the LDAP"
msgstr ""
-#: html/index.php:446
+#: html/index.php:485
#, php-format
msgid "CAS user \"%s\" match several users in the LDAP"
msgstr ""
-#: html/index.php:481
+#: html/index.php:522
msgid ""
"Your browser has cookies disabled. Please enable cookies and reload this "
"page before logging in!"
@@ -4044,7 +4093,7 @@ msgid "Checking for duplicated UID numbers"
msgstr ""
#: setup/class_setupStep_Migrate.inc:267
-msgid "Checking for duplicate GID numbers"
+msgid "Checking for duplicated GID numbers"
msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:487
@@ -4054,7 +4103,7 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:1179
#: setup/class_setupStep_Migrate.inc:1272
#: setup/class_setupStep_Migrate.inc:1351
-#: setup/class_setupStep_Migrate.inc:1390
+#: setup/class_setupStep_Migrate.inc:1395
msgid "LDAP query failed"
msgstr ""
@@ -4065,7 +4114,7 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:1180
#: setup/class_setupStep_Migrate.inc:1273
#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1391
+#: setup/class_setupStep_Migrate.inc:1396
msgid "Possibly the \"root object\" is missing."
msgstr ""
@@ -4220,14 +4269,14 @@ msgstr ""
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1373
+#: setup/class_setupStep_Migrate.inc:1378
#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\"."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1412
+#: setup/class_setupStep_Migrate.inc:1422
#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\"."
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
diff --git a/locale/nb/fusiondirectory.po b/locale/nb/fusiondirectory.po
index ab7f2f832a434fde173a943e9053bd465b5cc9f9..a4e3843e1b3cf87d11f9e2d5c07b7e3107982960 100644
--- a/locale/nb/fusiondirectory.po
+++ b/locale/nb/fusiondirectory.po
@@ -5,12 +5,12 @@
# Translators:
msgid ""
msgstr ""
-"Project-Id-Version: FusionDirectory-109\n"
+"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-01-22 11:26+0100\n"
-"PO-Revision-Date: 2016-01-22 10:24+0000\n"
+"POT-Creation-Date: 2016-03-14 12:07+0100\n"
+"PO-Revision-Date: 2016-03-07 12:09+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-109/language/nb/)\n"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -28,31 +28,31 @@ msgstr ""
msgid "References"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:30
-#: plugins/admin/groups/class_roleGeneric.inc:34
+#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:61
#: plugins/admin/groups/class_groupManagement.inc:71
#: plugins/admin/aclrole/class_aclRole.inc:78
#: plugins/admin/acl/class_aclAssignment.inc:49
msgid "Role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:31
+#: plugins/admin/groups/class_roleGeneric.inc:58
msgid "Role information"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:35
+#: plugins/admin/groups/class_roleGeneric.inc:62
msgid "Organizational role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:84
msgid "Informations"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:158
+#: plugins/admin/departments/class_department.inc:174
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -62,13 +62,13 @@ msgstr ""
msgid "Name"
msgstr "Navn"
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
msgid "Name of this group"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
#: plugins/admin/groups/class_group.inc:66
#: plugins/admin/groups/class_ogroup.inc:192
#: plugins/admin/groups/group-list.xml:41
@@ -81,26 +81,26 @@ msgstr ""
msgid "Description"
msgstr "Beskrivelse"
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
msgid "Description of the role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:70
+#: plugins/admin/groups/class_roleGeneric.inc:97
msgid "Phone number"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:74
+#: plugins/admin/groups/class_roleGeneric.inc:101
msgid "Fax number"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
#: plugins/admin/users/class_userManagement.inc:42
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: setup/class_setupStep_Migrate.inc:871
msgid "Users"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
msgid "Add users for the role"
msgstr ""
@@ -147,7 +147,7 @@ msgstr ""
#: plugins/admin/groups/class_group.inc:74
#: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:403
+#: plugins/personal/posix/class_posixAccount.inc:410
msgid "GID"
msgstr ""
@@ -204,23 +204,23 @@ msgid "Only allow this group to connect to this list of hosts"
msgstr ""
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458 include/functions.inc:794
-#: include/functions.inc:2548 include/class_xml.inc:55
+#: plugins/personal/posix/class_posixAccount.inc:465 include/functions.inc:794
+#: include/functions.inc:2549 include/class_xml.inc:55
#: include/simpleplugin/class_simpleTabs.inc:325 html/index.php:56
-#: html/index.php:62 html/index.php:481 html/class_passwordRecovery.inc:378
+#: html/index.php:62 html/index.php:522 html/class_passwordRecovery.inc:378
#: setup/class_setupStep_Migrate.inc:572
#: setup/class_setupStep_Migrate.inc:1083
#: setup/class_setupStep_Migrate.inc:1202
#: setup/class_setupStep_Migrate.inc:1313
-#: setup/class_setupStep_Migrate.inc:1372
-#: setup/class_setupStep_Migrate.inc:1411 plugins/admin/acl/remove.tpl.c:2
+#: setup/class_setupStep_Migrate.inc:1377
+#: setup/class_setupStep_Migrate.inc:1421 plugins/admin/acl/remove.tpl.c:2
#: ihtml/themes/default/islocked.tpl.c:5 ihtml/themes/default/remove.tpl.c:2
#: ihtml/themes/default/msg_dialog.tpl.c:5 setup/setup_checks.tpl.c:8
msgid "Warning"
msgstr ""
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458
+#: plugins/personal/posix/class_posixAccount.inc:465
msgid "Timeout while waiting for lock. Ignoring lock!"
msgstr ""
@@ -250,7 +250,7 @@ msgstr ""
msgid "Objects member of this group"
msgstr ""
-#: plugins/admin/groups/class_ogroup.inc:318
+#: plugins/admin/groups/class_ogroup.inc:313
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
@@ -279,10 +279,10 @@ msgstr "Opprett"
#: plugins/admin/departments/dep-list.xml:79
#: plugins/admin/users/user-list.xml:105
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-#: include/simpleplugin/class_dialogAttributes.inc:626
-#: include/simpleplugin/class_dialogAttributes.inc:627
-#: include/simpleplugin/class_attribute.inc:2661
-#: include/simpleplugin/class_attribute.inc:2662
+#: include/simpleplugin/class_dialogAttributes.inc:632
+#: include/simpleplugin/class_dialogAttributes.inc:633
+#: include/simpleplugin/class_attribute.inc:2675
+#: include/simpleplugin/class_attribute.inc:2676
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -293,8 +293,8 @@ msgstr "Endre"
#: plugins/admin/departments/dep-list.xml:67
#: plugins/admin/departments/dep-list.xml:88
#: plugins/admin/users/user-list.xml:112
-#: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_dialogAttributes.inc:637
+#: include/simpleplugin/class_dialogAttributes.inc:642
+#: include/simpleplugin/class_dialogAttributes.inc:643
#: include/simpleplugin/simple-list.xml:75
#: include/simpleplugin/simple-list.xml:125
msgid "Remove"
@@ -343,7 +343,7 @@ msgid "Show application groups"
msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Show department groups"
+msgid "Show unidentified groups"
msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:137
@@ -432,51 +432,67 @@ msgid "Category of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:81
+msgid "Website"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:81
+#, php-format
+msgid "Website of this %s"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:85
#: plugins/personal/generic/class_user.inc:410
msgid "Manager"
msgstr ""
-#: plugins/admin/departments/class_department.inc:81
+#: plugins/admin/departments/class_department.inc:85
#, php-format
msgid "Manager of this %s"
msgstr ""
-#: plugins/admin/departments/class_department.inc:87
-#: plugins/admin/departments/class_department.inc:93
+#: plugins/admin/departments/class_department.inc:91
+#: plugins/admin/departments/class_department.inc:97
#: plugins/personal/generic/class_user.inc:304
msgid "Location"
msgstr ""
-#: plugins/admin/departments/class_department.inc:90
+#: plugins/admin/departments/class_department.inc:94
#: plugins/personal/generic/class_user.inc:308
msgid "State"
msgstr ""
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_country.inc:29
+#: plugins/admin/departments/class_country.inc:30
+#: plugins/admin/departments/class_country.inc:33
+msgid "Country"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:103
#: plugins/personal/generic/class_user.inc:312
msgid "Address"
msgstr ""
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:103
#, php-format
msgid "A postal address for this %s"
msgstr ""
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
#: plugins/personal/generic/class_user.inc:320
msgid "Phone"
msgstr ""
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
msgid "Telephone number"
msgstr ""
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
#: plugins/personal/generic/class_user.inc:332
msgid "Fax"
msgstr ""
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
msgid "Facsimile telephone number"
msgstr ""
@@ -504,12 +520,6 @@ msgstr ""
msgid "locality"
msgstr ""
-#: plugins/admin/departments/class_country.inc:29
-#: plugins/admin/departments/class_country.inc:30
-#: plugins/admin/departments/class_country.inc:33
-msgid "Country"
-msgstr ""
-
#: plugins/admin/departments/class_country.inc:50
msgid "country"
msgstr ""
@@ -552,7 +562,8 @@ msgid "Given name"
msgstr ""
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
+#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
msgid "Login"
@@ -665,8 +676,8 @@ msgid "Edit category ACL"
msgstr ""
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2671
-#: include/simpleplugin/class_attribute.inc:2672
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
+#: include/simpleplugin/class_attribute.inc:2686
#, php-format
msgid "Delete"
msgstr ""
@@ -771,19 +782,37 @@ msgstr ""
msgid "ACLs which are part of this group"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:38
+#: plugins/admin/acl/class_aclManagement.inc:31
+#: plugins/admin/acl/class_aclManagement.inc:32
+#: plugins/admin/acl/class_aclManagement.inc:45
+msgid "ACL assignment creation"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:33
+msgid "Create an ACL assignment on an arbitrary dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "Dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "DN you wish to add assignments for"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:135
msgid "ACL assignments"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:39
+#: plugins/admin/acl/class_aclManagement.inc:136
msgid "ACL assignments management"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:40
+#: plugins/admin/acl/class_aclManagement.inc:137
msgid "Manage ACL roles assignments to users"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:78
+#: plugins/admin/acl/class_aclManagement.inc:199
#: plugins/admin/acl/class_aclAssignment.inc:263
msgid "ACL Assignment"
msgstr ""
@@ -899,7 +928,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -994,57 +1023,57 @@ msgstr ""
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:336
+msgid "Homepage"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:336
+msgid "Personal homepage"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:342
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:351
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr ""
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:358
-msgid "Personal contact information"
-msgstr ""
-
#: plugins/personal/generic/class_user.inc:362
-msgid "Display name"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:362
-msgid "Name this user should appear as. Used by Exchange."
+msgid "Personal contact information"
msgstr ""
#: plugins/personal/generic/class_user.inc:366
-msgid "Home address"
+msgid "Display name"
msgstr ""
#: plugins/personal/generic/class_user.inc:366
-msgid "Home postal address"
+msgid "Name this user should appear as. Used by Exchange."
msgstr ""
#: plugins/personal/generic/class_user.inc:370
-msgid "Private phone"
+msgid "Home address"
msgstr ""
#: plugins/personal/generic/class_user.inc:370
-msgid "Home phone number"
+msgid "Home postal address"
msgstr ""
#: plugins/personal/generic/class_user.inc:374
-msgid "Homepage"
+msgid "Private phone"
msgstr ""
#: plugins/personal/generic/class_user.inc:374
-msgid "Personal homepage"
+msgid "Home phone number"
msgstr ""
#: plugins/personal/generic/class_user.inc:380
@@ -1279,33 +1308,33 @@ msgstr ""
msgid "automatic"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:309
+#: plugins/personal/posix/class_posixAccount.inc:310
msgid "expired"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:311
+#: plugins/personal/posix/class_posixAccount.inc:312
msgid "grace time active"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:314
-#: plugins/personal/posix/class_posixAccount.inc:316
-#: plugins/personal/posix/class_posixAccount.inc:318
+#: plugins/personal/posix/class_posixAccount.inc:315
+#: plugins/personal/posix/class_posixAccount.inc:317
+#: plugins/personal/posix/class_posixAccount.inc:319
msgid "active"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:315
msgid "password expired"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:316
+#: plugins/personal/posix/class_posixAccount.inc:317
msgid "password not changeable"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:400
+#: plugins/personal/posix/class_posixAccount.inc:407
msgid "UID"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:516
+#: plugins/personal/posix/class_posixAccount.inc:525
#, php-format
msgid "Group of user %s"
msgstr ""
@@ -1477,424 +1506,440 @@ msgid "Core settings"
msgstr ""
#: plugins/config/class_configInLdap.inc:161
-msgid "Enable primary group filter"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"It is time consuming to evaluate which groups are primary and which are not,"
-" so you may want to disable it if your group plugin is slow."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:167
msgid "Display summary in listings"
msgstr ""
-#: plugins/config/class_configInLdap.inc:168
+#: 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:173
+#: plugins/config/class_configInLdap.inc:167
msgid "Edit locking"
msgstr ""
-#: plugins/config/class_configInLdap.inc:174
+#: 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:179
+#: plugins/config/class_configInLdap.inc:173
msgid "Enable logging"
msgstr ""
-#: plugins/config/class_configInLdap.inc:180
+#: plugins/config/class_configInLdap.inc:174
msgid "Event logging on FusionDirectory side."
msgstr ""
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "LDAP size limit"
msgstr ""
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "Defines the number of entries to get from LDAP by default."
msgstr ""
-#: plugins/config/class_configInLdap.inc:192
+#: plugins/config/class_configInLdap.inc:186
msgid "Login and session"
msgstr ""
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:189
msgid "Login attribute"
msgstr ""
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:190
msgid "Which LDAP attribute should be used as the login name during login."
msgstr ""
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:196
msgid "Enforce encrypted connections"
msgstr ""
-#: plugins/config/class_configInLdap.inc:203
+#: plugins/config/class_configInLdap.inc:197
msgid ""
"Enables PHP security checks to force encrypted access (https) to the web "
"interface."
msgstr ""
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:201
msgid "Warn if session is not encrypted"
msgstr ""
-#: plugins/config/class_configInLdap.inc:208
+#: plugins/config/class_configInLdap.inc:202
msgid "will display a warning to the user when http is used instead of https."
msgstr ""
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Session lifetime"
msgstr ""
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Defines when a session will expire in seconds."
msgstr ""
-#: plugins/config/class_configInLdap.inc:220
+#: plugins/config/class_configInLdap.inc:212
+msgid "HTTP authentication"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:212
+msgid "Use HTTP authentication protocol instead of the login form."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:219
#: include/class_SnapshotDialogs.inc:186
msgid "Snapshots"
msgstr ""
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid "Enable snapshots"
msgstr ""
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid ""
"This enables you to save certain states of entries and restore them later "
"on."
msgstr ""
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
msgid "Snapshot base"
msgstr ""
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
msgid "The base where snapshots should be stored inside of the LDAP."
msgstr ""
-#: plugins/config/class_configInLdap.inc:235
+#: plugins/config/class_configInLdap.inc:234
msgid "SSL"
msgstr ""
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Key path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Path to FusionDirectory private key. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Certificate path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Path to FusionDirectory certificate. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:262
msgid "CA certificate path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:247
msgid "Path to the CA certificate. Used for validating Argonaut Server host."
msgstr ""
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:254
msgid "CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "Enable CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "CAS login will be used instead of LDAP bind"
msgstr ""
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:262
msgid "Path to the CA certificate of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host"
msgstr "Vert"
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port"
msgstr ""
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port the CAS server is listening on"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context to be used"
msgstr ""
-#: plugins/config/class_configInLdap.inc:285
+#: plugins/config/class_configInLdap.inc:284
msgid "People and group storage"
msgstr ""
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "People DN attribute"
msgstr ""
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "Attribute to use at the beginning of users dn"
msgstr ""
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "CN pattern"
msgstr ""
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "The pattern to use to build the common name field"
msgstr ""
-#: plugins/config/class_configInLdap.inc:299
+#: plugins/config/class_configInLdap.inc:298
msgid "Strict naming policy"
msgstr ""
-#: plugins/config/class_configInLdap.inc:300
+#: plugins/config/class_configInLdap.inc:299
msgid "Enables strict checking of user and group names"
msgstr ""
-#: plugins/config/class_configInLdap.inc:305
+#: plugins/config/class_configInLdap.inc:304
msgid "Group/user min id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:306
+#: plugins/config/class_configInLdap.inc:305
msgid ""
"The minimum assignable user or group id to avoid security leaks with id 0 "
"accounts."
msgstr ""
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid "Next id hook"
msgstr ""
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid ""
"A script to be called for finding the next free id number for users or "
"groups."
msgstr ""
-#: plugins/config/class_configInLdap.inc:315
+#: plugins/config/class_configInLdap.inc:314
msgid "Base number for user id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:315
msgid "Where to start looking for a new free user id."
msgstr ""
-#: plugins/config/class_configInLdap.inc:321
+#: plugins/config/class_configInLdap.inc:320
msgid "Base number for group id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:321
msgid "Where to start looking for a new free group id."
msgstr ""
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "Users RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "The branch where users are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "Groups RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "The branch where groups are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "ACL role RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "The branch where ACL roles are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Id allocation method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Method to allocate user/group ids"
msgstr ""
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Traditional"
msgstr ""
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Samba unix id pool"
msgstr ""
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Pool user id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Minimum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Pool user id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Maximum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Pool group id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Minimum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Pool group id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Maximum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:370
-msgid "Debugging"
+#: plugins/config/class_configInLdap.inc:367
+msgid "Restrict role members"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:367
+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:373
+msgid "Debugging"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:376
msgid "Display errors"
msgstr ""
-#: plugins/config/class_configInLdap.inc:374
+#: plugins/config/class_configInLdap.inc:377
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:378
+#: plugins/config/class_configInLdap.inc:381
msgid "Maximum LDAP query time"
msgstr ""
-#: plugins/config/class_configInLdap.inc:378
+#: plugins/config/class_configInLdap.inc:381
msgid ""
"Stop LDAP actions if there is no answer within the specified number of "
"seconds."
msgstr ""
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:386
msgid "Log LDAP statistics"
msgstr ""
-#: plugins/config/class_configInLdap.inc:384
+#: plugins/config/class_configInLdap.inc:387
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:389
+#: plugins/config/class_configInLdap.inc:392
msgid "Debug level"
msgstr ""
-#: plugins/config/class_configInLdap.inc:390
+#: plugins/config/class_configInLdap.inc:393
msgid "Display certain information on each page load."
msgstr ""
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:405
msgid "Miscellaneous"
msgstr ""
-#: plugins/config/class_configInLdap.inc:407
+#: plugins/config/class_configInLdap.inc:410
msgid "Hooks that are called when specific actions happens"
msgstr ""
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "tab"
msgstr ""
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "The tab that this hook concerns"
msgstr ""
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "mode"
msgstr ""
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "When to call this command"
msgstr ""
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "cmd"
msgstr ""
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "The command that will be called"
msgstr ""
-#: plugins/config/class_configInLdap.inc:429
+#: plugins/config/class_configInLdap.inc:432
msgid "Hooks"
msgstr ""
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:439
msgid "Display hook output"
msgstr ""
-#: plugins/config/class_configInLdap.inc:437
+#: plugins/config/class_configInLdap.inc:440
msgid ""
"When enabled successful hook execution output is displayed to the user using"
" a dialog."
msgstr ""
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available shells"
msgstr ""
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available POSIX shells for FD users."
msgstr ""
-#: plugins/config/class_configInLdap.inc:449
+#: plugins/config/class_configInLdap.inc:452
msgid "Show ACL tab on all objects"
msgstr ""
-#: plugins/config/class_configInLdap.inc:450
+#: plugins/config/class_configInLdap.inc:453
msgid ""
"For very specific ACL rights setting where you might need to give right on a"
" single object."
msgstr ""
-#: plugins/config/class_configInLdap.inc:464
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available department categories"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available categories in the departments dropdown"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:474
#: setup/class_setupStep_Language.inc:69
msgid "Automatic"
msgstr ""
@@ -1911,80 +1956,80 @@ msgstr ""
msgid "Password recovery settings"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:44
+#: plugins/config/class_recoveryConfig.inc:45
msgid "Activate password recovery"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:45
+#: plugins/config/class_recoveryConfig.inc:46
msgid "Whether to activate or not password recovery feature"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:50
+#: plugins/config/class_recoveryConfig.inc:51
msgid "Sender email address"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:51
+#: plugins/config/class_recoveryConfig.inc:52
msgid "Email address from which mails will be sent"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:57
+#: plugins/config/class_recoveryConfig.inc:58
msgid "Link validity (minutes)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:58
+#: plugins/config/class_recoveryConfig.inc:59
msgid "Number of minutes before a recovery link expires"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:64
+#: plugins/config/class_recoveryConfig.inc:65
msgid "Salt for tokens"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:65
+#: plugins/config/class_recoveryConfig.inc:66
msgid ""
"Just a security measure, you can put anything in there, even random "
"characters"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:71
+#: plugins/config/class_recoveryConfig.inc:72
msgid "Allow the use of alternate addresses"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:72
+#: plugins/config/class_recoveryConfig.inc:73
msgid ""
"Users will also be able to enter one of theirs alternate addresses to "
"recover their password"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:79
+#: plugins/config/class_recoveryConfig.inc:80
msgid "First email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:82
-#: plugins/config/class_recoveryConfig.inc:101
+#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:102
msgid "Subject"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:84
msgid "Subject of the first email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:86
+#: plugins/config/class_recoveryConfig.inc:87
msgid "[FusionDirectory] Password recovery link"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:89
+#: plugins/config/class_recoveryConfig.inc:90
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:91
#, 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 ""
-#: plugins/config/class_recoveryConfig.inc:93
+#: plugins/config/class_recoveryConfig.inc:94
#, php-format
msgid ""
"Hello,\n"
@@ -1996,31 +2041,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:98
+#: plugins/config/class_recoveryConfig.inc:99
msgid "Second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:103
msgid "Subject of the second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:105
+#: plugins/config/class_recoveryConfig.inc:106
msgid "[FusionDirectory] Password recovery successful"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:108
+#: plugins/config/class_recoveryConfig.inc:109
#, php-format
msgid "Body (%s is login)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:110
#, php-format
msgid ""
"Body of the second email, sent to confirm the password has been changed. Use"
" %s for the user login."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:112
+#: plugins/config/class_recoveryConfig.inc:113
#, php-format
msgid ""
"Hello,\n"
@@ -2088,13 +2133,13 @@ msgstr ""
msgid "Down"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2633
-#: include/simpleplugin/class_attribute.inc:2634
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
+#: include/simpleplugin/class_attribute.inc:2648
msgid "Sort up"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2646
-#: include/simpleplugin/class_attribute.inc:2647
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
+#: include/simpleplugin/class_attribute.inc:2661
msgid "Sort down"
msgstr ""
@@ -2106,27 +2151,26 @@ msgstr ""
#: include/class_config.inc:479 include/class_msgPool.inc:215
#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3106
-#: include/functions.inc:3127 include/functions.inc:3157
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197 include/functions.inc:3259
+#: include/class_msgPool.inc:740 include/functions.inc:3107
+#: include/functions.inc:3128 include/functions.inc:3158
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3260
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1663 include/class_CopyPasteHandler.inc:278
-#: include/simpleplugin/class_dialogAttributes.inc:733
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
-#: include/simpleplugin/class_attribute.inc:1774
-#: include/simpleplugin/class_attribute.inc:1877
-#: include/simpleplugin/class_attribute.inc:1879
+#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
+#: include/simpleplugin/class_attribute.inc:1784
+#: include/simpleplugin/class_attribute.inc:1887
+#: include/simpleplugin/class_attribute.inc:1889
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: 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:437
#: include/password-methods/class_password-methods.inc:447
-#: include/class_SnapshotHandler.inc:415 html/index.php:434 html/index.php:444
+#: include/class_SnapshotHandler.inc:415 html/index.php:473 html/index.php:483
#: setup/class_setupStep_Migrate.inc:935
#: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
msgid "Error"
@@ -2165,44 +2209,44 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: include/class_listing.inc:1586 include/class_listing.inc:1640
+#: include/class_listing.inc:1590 include/class_listing.inc:1644
msgid "Copy"
msgstr ""
-#: include/class_listing.inc:1592 include/class_listing.inc:1628
+#: include/class_listing.inc:1596 include/class_listing.inc:1632
msgid "Cut"
msgstr ""
-#: include/class_listing.inc:1600 include/class_listing.inc:1602
+#: include/class_listing.inc:1604 include/class_listing.inc:1606
#: include/class_CopyPasteHandler.inc:370
msgid "Paste"
msgstr ""
-#: include/class_listing.inc:1628
+#: include/class_listing.inc:1632
msgid "Cut this entry"
msgstr ""
-#: include/class_listing.inc:1640
+#: include/class_listing.inc:1644
msgid "Copy this entry"
msgstr ""
-#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_listing.inc:1677 include/class_listing.inc:1679
msgid "Restore snapshots"
msgstr ""
-#: include/class_listing.inc:1689
+#: include/class_listing.inc:1693
msgid "Export list"
msgstr ""
-#: include/class_listing.inc:1724 include/class_listing.inc:1725
+#: include/class_listing.inc:1728 include/class_listing.inc:1729
msgid "Restore snapshot"
msgstr ""
-#: include/class_listing.inc:1734
+#: include/class_listing.inc:1738
msgid "Create snapshot"
msgstr ""
-#: include/class_listing.inc:1735
+#: include/class_listing.inc:1739
msgid "Create a new snapshot from this object"
msgstr ""
@@ -2245,7 +2289,7 @@ msgid "XML error in fusiondirectory.conf: %s at line %d"
msgstr ""
#: include/class_config.inc:162 include/class_config.inc:300
-#: include/class_config.inc:985 include/class_config.inc:998
+#: include/class_config.inc:915 include/class_config.inc:928
#: include/functions.inc:663 include/class_timezone.inc:51
#: include/password-methods/class_password-methods-sha.inc:71
#: include/password-methods/class_password-methods-ssha.inc:75
@@ -2262,17 +2306,17 @@ msgid ""
"while your passwords are not encrypted."
msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:917
-#: include/class_ldap.inc:1371 include/functions.inc:526
+#: include/class_config.inc:337 include/class_ldap.inc:918
+#: include/class_ldap.inc:1372 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2985 include/simpleplugin/class_simplePlugin.inc:545
-#: include/simpleplugin/class_attribute.inc:2895
+#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2909
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
#: include/class_SnapshotHandler.inc:422 include/class_SnapshotHandler.inc:425
-#: html/index.php:360 html/class_passwordRecovery.inc:497
+#: html/index.php:369 html/class_passwordRecovery.inc:497
#: setup/class_setupStep_Migrate.inc:451
#: setup/class_setupStep_Migrate.inc:1130
msgid "LDAP error"
@@ -2287,38 +2331,38 @@ msgstr ""
msgid "The selected mail method (class %s) is not available"
msgstr ""
-#: include/class_config.inc:986
+#: include/class_config.inc:916
#, php-format
msgid ""
"The snapshot functionality is enabled, but the required variable '%s' is not"
" set."
msgstr ""
-#: include/class_config.inc:999
+#: include/class_config.inc:929
#, php-format
msgid ""
"The snapshot functionality is enabled, but the required compression module "
"is missing. Please install '%s'."
msgstr ""
-#: include/class_config.inc:1104
+#: include/class_config.inc:1034
msgid "All categories"
msgstr ""
-#: include/class_config.inc:1231
+#: include/class_config.inc:1161
msgid "My account"
msgstr ""
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
msgid "Performance warning"
msgstr ""
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
#, php-format
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr ""
-#: include/class_ldap.inc:868 include/class_ldap.inc:904
+#: include/class_ldap.inc:869 include/class_ldap.inc:905
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
@@ -2328,39 +2372,39 @@ msgstr ""
msgid "Internal error"
msgstr ""
-#: include/class_ldap.inc:868
+#: include/class_ldap.inc:869
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:904
+#: include/class_ldap.inc:905
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1016
+#: include/class_ldap.inc:1017
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr ""
-#: include/class_ldap.inc:1018
+#: include/class_ldap.inc:1019
#, php-format
msgid "while operating on LDAP server %s"
msgstr ""
-#: include/class_ldap.inc:1108
+#: include/class_ldap.inc:1109
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1220
+#: include/class_ldap.inc:1221
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr ""
-#: include/class_ldap.inc:1231
+#: include/class_ldap.inc:1232
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2948,10 +2992,10 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr ""
-#: include/functions.inc:496 include/functions.inc:3294
-#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:263
-#: include/simpleplugin/class_simplePlugin.inc:268
-#: include/simpleplugin/class_simplePlugin.inc:280
+#: include/functions.inc:496 include/functions.inc:3295
+#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
+#: include/simpleplugin/class_simplePlugin.inc:269
+#: include/simpleplugin/class_simplePlugin.inc:281
#: html/class_passwordRecovery.inc:216
msgid "Fatal error"
msgstr ""
@@ -3104,98 +3148,98 @@ msgstr ""
msgid "Cannot read to revision file!"
msgstr ""
-#: include/functions.inc:2548
+#: include/functions.inc:2549
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "LDAP warning"
msgstr ""
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "Cannot get schema information from server. No schema check possible!"
msgstr ""
-#: include/functions.inc:2584
+#: include/functions.inc:2585
msgid ""
"Used to lock currently edited entries to avoid multiple changes at the same "
"time."
msgstr ""
-#: include/functions.inc:2596
+#: include/functions.inc:2597
#, php-format
msgid "Missing required object class '%s'!"
msgstr ""
-#: include/functions.inc:2599
+#: include/functions.inc:2600
#, php-format
msgid "Missing optional object class '%s'!"
msgstr ""
-#: include/functions.inc:2603
+#: include/functions.inc:2604
#, php-format
msgid "Class(es) available"
msgstr ""
-#: include/functions.inc:2623
+#: include/functions.inc:2624
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2625
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2628
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2629
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3106 include/functions.inc:3127
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3106
+#: include/functions.inc:3107
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3127
+#: include/functions.inc:3128
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3157
+#: include/functions.inc:3158
msgid "Cannot create sambaUnixIdPool entry!"
msgstr ""
-#: include/functions.inc:3165
+#: include/functions.inc:3166
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3177 include/functions.inc:3181
+#: include/functions.inc:3178 include/functions.inc:3182
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3197
+#: include/functions.inc:3198
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3259
+#: include/functions.inc:3260
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3295
+#: include/functions.inc:3296
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
@@ -3351,13 +3395,13 @@ msgstr ""
msgid "XML error"
msgstr ""
-#: include/class_plugin.inc:554
+#: include/class_plugin.inc:553
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/class_plugin.inc:1466
+#: include/class_plugin.inc:1467
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -3383,32 +3427,32 @@ msgstr ""
msgid "This is the name of the template"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:263
+#: include/simpleplugin/class_simplePlugin.inc:264
msgid "Only main tab can compute dn"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:270
+#: include/simpleplugin/class_simplePlugin.inc:271
#, php-format
msgid "Could not compute dn: no parent tab class for \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:282
+#: include/simpleplugin/class_simplePlugin.inc:283
#, php-format
msgid ""
"Could not compute dn: could not find objectType infos from tab class \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:638
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:644
+#: include/simpleplugin/class_simplePlugin.inc:652
msgid "Error when saving"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:638
+#: include/simpleplugin/class_simplePlugin.inc:644
#, php-format
msgid "There is already an entry with the same dn : %s"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:652
#, php-format
msgid "The entry %s is not existing"
msgstr ""
@@ -3428,27 +3472,27 @@ msgstr ""
msgid "Show %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:409
+#: include/simpleplugin/class_dialogAttributes.inc:415
#, php-format
msgid "Group %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:411
+#: include/simpleplugin/class_dialogAttributes.inc:417
#, php-format
msgid "Role %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:446
+#: include/simpleplugin/class_dialogAttributes.inc:452
msgid "Group of user"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:615
+#: include/simpleplugin/class_dialogAttributes.inc:621
#: include/simpleplugin/class_attribute.inc:1090
#: include/simpleplugin/class_attribute.inc:1124
msgid "None"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:617
+#: include/simpleplugin/class_dialogAttributes.inc:623
msgid "Unknown"
msgstr ""
@@ -3489,11 +3533,16 @@ msgid "days"
msgstr ""
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2161
+#: include/simpleplugin/class_attribute.inc:2171
#, php-format
msgid "%s (required)"
msgstr ""
+#: include/simpleplugin/class_attribute.inc:1150
+#, php-format
+msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
+msgstr ""
+
#: include/simpleplugin/class_attribute.inc:1277
#, php-format
msgid "An integer between %d and %d"
@@ -3509,75 +3558,75 @@ msgstr ""
msgid "An integer smaller than %d"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1379
+#: include/simpleplugin/class_attribute.inc:1383
#, php-format
msgid "A float between %f and %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1381
+#: include/simpleplugin/class_attribute.inc:1385
#, php-format
msgid "A float larger than %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1383
+#: include/simpleplugin/class_attribute.inc:1387
#, php-format
msgid "A float smaller than %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1490
+#: include/simpleplugin/class_attribute.inc:1500
msgid "Error, incorrect date: "
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
#, php-format
msgid "Cannot read uploaded file: %s"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1530
+#: include/simpleplugin/class_attribute.inc:1540
msgid "file is empty"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1533
+#: include/simpleplugin/class_attribute.inc:1543
msgid "file not found"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1546
msgid "file not readable"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1569
+#: include/simpleplugin/class_attribute.inc:1579
#, php-format
msgid "%s (%d bytes)"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1616
-#: include/simpleplugin/class_attribute.inc:1793
+#: include/simpleplugin/class_attribute.inc:1626
+#: include/simpleplugin/class_attribute.inc:1803
msgid "Upload"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1621
-#: include/simpleplugin/class_attribute.inc:1622
+#: include/simpleplugin/class_attribute.inc:1631
+#: include/simpleplugin/class_attribute.inc:1632
msgid "Download"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1775
+#: include/simpleplugin/class_attribute.inc:1785
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1826
+#: include/simpleplugin/class_attribute.inc:1836
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1829
+#: include/simpleplugin/class_attribute.inc:1839
msgid "Object base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:2755
+#: include/simpleplugin/class_attribute.inc:2769
#, php-format
msgid "Invalid value for %s"
msgstr ""
@@ -3711,17 +3760,17 @@ msgstr ""
msgid "Account locked. Please contact your system administrator!"
msgstr ""
-#: html/index.php:436
+#: html/index.php:475
#, php-format
msgid "CAS user \"%s\" could not be found in the LDAP"
msgstr ""
-#: html/index.php:446
+#: html/index.php:485
#, php-format
msgid "CAS user \"%s\" match several users in the LDAP"
msgstr ""
-#: html/index.php:481
+#: html/index.php:522
msgid ""
"Your browser has cookies disabled. Please enable cookies and reload this "
"page before logging in!"
@@ -4044,7 +4093,7 @@ msgid "Checking for duplicated UID numbers"
msgstr ""
#: setup/class_setupStep_Migrate.inc:267
-msgid "Checking for duplicate GID numbers"
+msgid "Checking for duplicated GID numbers"
msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:487
@@ -4054,7 +4103,7 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:1179
#: setup/class_setupStep_Migrate.inc:1272
#: setup/class_setupStep_Migrate.inc:1351
-#: setup/class_setupStep_Migrate.inc:1390
+#: setup/class_setupStep_Migrate.inc:1395
msgid "LDAP query failed"
msgstr ""
@@ -4065,7 +4114,7 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:1180
#: setup/class_setupStep_Migrate.inc:1273
#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1391
+#: setup/class_setupStep_Migrate.inc:1396
msgid "Possibly the \"root object\" is missing."
msgstr ""
@@ -4220,14 +4269,14 @@ msgstr ""
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1373
+#: setup/class_setupStep_Migrate.inc:1378
#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\"."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1412
+#: setup/class_setupStep_Migrate.inc:1422
#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\"."
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
diff --git a/locale/nl/fusiondirectory.po b/locale/nl/fusiondirectory.po
index 431e5c4a0a4e84e20b79204c45ae65a339cb7bcd..7de2d0e9a4adb3520e477c11fcc86a172ac8f767 100644
--- a/locale/nl/fusiondirectory.po
+++ b/locale/nl/fusiondirectory.po
@@ -5,12 +5,12 @@
# Translators:
msgid ""
msgstr ""
-"Project-Id-Version: FusionDirectory-109\n"
+"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-01-22 11:26+0100\n"
-"PO-Revision-Date: 2016-01-22 10:24+0000\n"
+"POT-Creation-Date: 2016-03-14 12:07+0100\n"
+"PO-Revision-Date: 2016-03-07 12:09+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-109/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -28,31 +28,31 @@ msgstr "Welkom %s!"
msgid "References"
msgstr "Referenties"
-#: plugins/admin/groups/class_roleGeneric.inc:30
-#: plugins/admin/groups/class_roleGeneric.inc:34
+#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:61
#: plugins/admin/groups/class_groupManagement.inc:71
#: plugins/admin/aclrole/class_aclRole.inc:78
#: plugins/admin/acl/class_aclAssignment.inc:49
msgid "Role"
msgstr "Funktie"
-#: plugins/admin/groups/class_roleGeneric.inc:31
+#: plugins/admin/groups/class_roleGeneric.inc:58
msgid "Role information"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:35
+#: plugins/admin/groups/class_roleGeneric.inc:62
msgid "Organizational role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:84
msgid "Informations"
msgstr "Informatie"
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:158
+#: plugins/admin/departments/class_department.inc:174
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -62,13 +62,13 @@ msgstr "Informatie"
msgid "Name"
msgstr "Naam"
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
msgid "Name of this group"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
#: plugins/admin/groups/class_group.inc:66
#: plugins/admin/groups/class_ogroup.inc:192
#: plugins/admin/groups/group-list.xml:41
@@ -81,26 +81,26 @@ msgstr ""
msgid "Description"
msgstr "Omschrijving"
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
msgid "Description of the role"
msgstr "Beschrijving van de rol"
-#: plugins/admin/groups/class_roleGeneric.inc:70
+#: plugins/admin/groups/class_roleGeneric.inc:97
msgid "Phone number"
msgstr "Telefoonnummer"
-#: plugins/admin/groups/class_roleGeneric.inc:74
+#: plugins/admin/groups/class_roleGeneric.inc:101
msgid "Fax number"
msgstr "Fax nummer"
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
#: plugins/admin/users/class_userManagement.inc:42
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: setup/class_setupStep_Migrate.inc:871
msgid "Users"
msgstr "Gebruikers"
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
msgid "Add users for the role"
msgstr "Voeg gebruikers toe voor de rol"
@@ -147,7 +147,7 @@ msgstr ""
#: plugins/admin/groups/class_group.inc:74
#: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:403
+#: plugins/personal/posix/class_posixAccount.inc:410
msgid "GID"
msgstr "GID"
@@ -204,23 +204,23 @@ msgid "Only allow this group to connect to this list of hosts"
msgstr ""
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458 include/functions.inc:794
-#: include/functions.inc:2548 include/class_xml.inc:55
+#: plugins/personal/posix/class_posixAccount.inc:465 include/functions.inc:794
+#: include/functions.inc:2549 include/class_xml.inc:55
#: include/simpleplugin/class_simpleTabs.inc:325 html/index.php:56
-#: html/index.php:62 html/index.php:481 html/class_passwordRecovery.inc:378
+#: html/index.php:62 html/index.php:522 html/class_passwordRecovery.inc:378
#: setup/class_setupStep_Migrate.inc:572
#: setup/class_setupStep_Migrate.inc:1083
#: setup/class_setupStep_Migrate.inc:1202
#: setup/class_setupStep_Migrate.inc:1313
-#: setup/class_setupStep_Migrate.inc:1372
-#: setup/class_setupStep_Migrate.inc:1411 plugins/admin/acl/remove.tpl.c:2
+#: setup/class_setupStep_Migrate.inc:1377
+#: setup/class_setupStep_Migrate.inc:1421 plugins/admin/acl/remove.tpl.c:2
#: ihtml/themes/default/islocked.tpl.c:5 ihtml/themes/default/remove.tpl.c:2
#: ihtml/themes/default/msg_dialog.tpl.c:5 setup/setup_checks.tpl.c:8
msgid "Warning"
msgstr "Waarschuwing"
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458
+#: plugins/personal/posix/class_posixAccount.inc:465
msgid "Timeout while waiting for lock. Ignoring lock!"
msgstr "Timeout tijdens het wachten voor een lock. lock is genegeerd!"
@@ -250,7 +250,7 @@ msgstr "Lidmaatschap objecten"
msgid "Objects member of this group"
msgstr ""
-#: plugins/admin/groups/class_ogroup.inc:318
+#: plugins/admin/groups/class_ogroup.inc:313
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
@@ -279,10 +279,10 @@ msgstr "Aanmaken"
#: plugins/admin/departments/dep-list.xml:79
#: plugins/admin/users/user-list.xml:105
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-#: include/simpleplugin/class_dialogAttributes.inc:626
-#: include/simpleplugin/class_dialogAttributes.inc:627
-#: include/simpleplugin/class_attribute.inc:2661
-#: include/simpleplugin/class_attribute.inc:2662
+#: include/simpleplugin/class_dialogAttributes.inc:632
+#: include/simpleplugin/class_dialogAttributes.inc:633
+#: include/simpleplugin/class_attribute.inc:2675
+#: include/simpleplugin/class_attribute.inc:2676
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -293,8 +293,8 @@ msgstr "Bewerken"
#: plugins/admin/departments/dep-list.xml:67
#: plugins/admin/departments/dep-list.xml:88
#: plugins/admin/users/user-list.xml:112
-#: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_dialogAttributes.inc:637
+#: include/simpleplugin/class_dialogAttributes.inc:642
+#: include/simpleplugin/class_dialogAttributes.inc:643
#: include/simpleplugin/simple-list.xml:75
#: include/simpleplugin/simple-list.xml:125
msgid "Remove"
@@ -343,7 +343,7 @@ msgid "Show application groups"
msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Show department groups"
+msgid "Show unidentified groups"
msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:137
@@ -432,51 +432,67 @@ msgid "Category of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:81
+msgid "Website"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:81
+#, php-format
+msgid "Website of this %s"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:85
#: plugins/personal/generic/class_user.inc:410
msgid "Manager"
msgstr "Beheerder"
-#: plugins/admin/departments/class_department.inc:81
+#: plugins/admin/departments/class_department.inc:85
#, php-format
msgid "Manager of this %s"
msgstr ""
-#: plugins/admin/departments/class_department.inc:87
-#: plugins/admin/departments/class_department.inc:93
+#: plugins/admin/departments/class_department.inc:91
+#: plugins/admin/departments/class_department.inc:97
#: plugins/personal/generic/class_user.inc:304
msgid "Location"
msgstr "Plaats"
-#: plugins/admin/departments/class_department.inc:90
+#: plugins/admin/departments/class_department.inc:94
#: plugins/personal/generic/class_user.inc:308
msgid "State"
msgstr "Provincie"
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_country.inc:29
+#: plugins/admin/departments/class_country.inc:30
+#: plugins/admin/departments/class_country.inc:33
+msgid "Country"
+msgstr "Land"
+
+#: plugins/admin/departments/class_department.inc:103
#: plugins/personal/generic/class_user.inc:312
msgid "Address"
msgstr "Adres"
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:103
#, php-format
msgid "A postal address for this %s"
msgstr ""
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
#: plugins/personal/generic/class_user.inc:320
msgid "Phone"
msgstr "Telefoon"
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
msgid "Telephone number"
msgstr "Telefoonnummer"
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
#: plugins/personal/generic/class_user.inc:332
msgid "Fax"
msgstr "Fax"
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
msgid "Facsimile telephone number"
msgstr ""
@@ -504,12 +520,6 @@ msgstr "Localiteit"
msgid "locality"
msgstr ""
-#: plugins/admin/departments/class_country.inc:29
-#: plugins/admin/departments/class_country.inc:30
-#: plugins/admin/departments/class_country.inc:33
-msgid "Country"
-msgstr "Land"
-
#: plugins/admin/departments/class_country.inc:50
msgid "country"
msgstr ""
@@ -552,7 +562,8 @@ msgid "Given name"
msgstr "Naam"
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
+#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
msgid "Login"
@@ -665,8 +676,8 @@ msgid "Edit category ACL"
msgstr "Wijzig ACL categorie"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2671
-#: include/simpleplugin/class_attribute.inc:2672
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
+#: include/simpleplugin/class_attribute.inc:2686
#, php-format
msgid "Delete"
msgstr "Verwijderen"
@@ -771,19 +782,37 @@ msgstr ""
msgid "ACLs which are part of this group"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:38
+#: plugins/admin/acl/class_aclManagement.inc:31
+#: plugins/admin/acl/class_aclManagement.inc:32
+#: plugins/admin/acl/class_aclManagement.inc:45
+msgid "ACL assignment creation"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:33
+msgid "Create an ACL assignment on an arbitrary dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "Dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "DN you wish to add assignments for"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:135
msgid "ACL assignments"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:39
+#: plugins/admin/acl/class_aclManagement.inc:136
msgid "ACL assignments management"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:40
+#: plugins/admin/acl/class_aclManagement.inc:137
msgid "Manage ACL roles assignments to users"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:78
+#: plugins/admin/acl/class_aclManagement.inc:199
#: plugins/admin/acl/class_aclAssignment.inc:263
msgid "ACL Assignment"
msgstr "ACL toekenning"
@@ -899,7 +928,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -994,59 +1023,59 @@ msgstr ""
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:336
+msgid "Homepage"
+msgstr "Homepage"
+
+#: plugins/personal/generic/class_user.inc:336
+msgid "Personal homepage"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:342
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:351
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr "Gewenste taal"
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:362
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
msgid "Display name"
msgstr "Getoonde naam"
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home postal address"
msgstr "Postadres thuis"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:374
msgid "Private phone"
msgstr "Telefoon privé"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:374
msgid "Home phone number"
msgstr "Prive nummer"
-#: plugins/personal/generic/class_user.inc:374
-msgid "Homepage"
-msgstr "Homepage"
-
-#: plugins/personal/generic/class_user.inc:374
-msgid "Personal homepage"
-msgstr ""
-
#: plugins/personal/generic/class_user.inc:380
msgid "Organizational information"
msgstr "Organisatie informatie"
@@ -1279,33 +1308,33 @@ msgstr "niet geconfigureerd"
msgid "automatic"
msgstr "automatisch"
-#: plugins/personal/posix/class_posixAccount.inc:309
+#: plugins/personal/posix/class_posixAccount.inc:310
msgid "expired"
msgstr "verlopen"
-#: plugins/personal/posix/class_posixAccount.inc:311
+#: plugins/personal/posix/class_posixAccount.inc:312
msgid "grace time active"
msgstr "gratie tijd actief"
-#: plugins/personal/posix/class_posixAccount.inc:314
-#: plugins/personal/posix/class_posixAccount.inc:316
-#: plugins/personal/posix/class_posixAccount.inc:318
+#: plugins/personal/posix/class_posixAccount.inc:315
+#: plugins/personal/posix/class_posixAccount.inc:317
+#: plugins/personal/posix/class_posixAccount.inc:319
msgid "active"
msgstr "actief"
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:315
msgid "password expired"
msgstr "paswoord is vervallen"
-#: plugins/personal/posix/class_posixAccount.inc:316
+#: plugins/personal/posix/class_posixAccount.inc:317
msgid "password not changeable"
msgstr "paswoord niet wijzigbaar"
-#: plugins/personal/posix/class_posixAccount.inc:400
+#: plugins/personal/posix/class_posixAccount.inc:407
msgid "UID"
msgstr "UID"
-#: plugins/personal/posix/class_posixAccount.inc:516
+#: plugins/personal/posix/class_posixAccount.inc:525
#, php-format
msgid "Group of user %s"
msgstr ""
@@ -1477,424 +1506,440 @@ msgid "Core settings"
msgstr ""
#: plugins/config/class_configInLdap.inc:161
-msgid "Enable primary group filter"
-msgstr "Activeer primaire groep filter"
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"It is time consuming to evaluate which groups are primary and which are not,"
-" so you may want to disable it if your group plugin is slow."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:167
msgid "Display summary in listings"
msgstr "Toon overzicht in lijsten"
-#: plugins/config/class_configInLdap.inc:168
+#: 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:173
+#: plugins/config/class_configInLdap.inc:167
msgid "Edit locking"
msgstr ""
-#: plugins/config/class_configInLdap.inc:174
+#: 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:179
+#: plugins/config/class_configInLdap.inc:173
msgid "Enable logging"
msgstr ""
-#: plugins/config/class_configInLdap.inc:180
+#: plugins/config/class_configInLdap.inc:174
msgid "Event logging on FusionDirectory side."
msgstr ""
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "LDAP size limit"
msgstr ""
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "Defines the number of entries to get from LDAP by default."
msgstr ""
-#: plugins/config/class_configInLdap.inc:192
+#: plugins/config/class_configInLdap.inc:186
msgid "Login and session"
msgstr "Login en sessie"
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:189
msgid "Login attribute"
msgstr "Login attribuut"
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:190
msgid "Which LDAP attribute should be used as the login name during login."
msgstr ""
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:196
msgid "Enforce encrypted connections"
msgstr "Forceer gëencrypteerde connecties"
-#: plugins/config/class_configInLdap.inc:203
+#: plugins/config/class_configInLdap.inc:197
msgid ""
"Enables PHP security checks to force encrypted access (https) to the web "
"interface."
msgstr ""
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:201
msgid "Warn if session is not encrypted"
msgstr "Verwittig mij als de sessie niet gëencrypteerd is"
-#: plugins/config/class_configInLdap.inc:208
+#: plugins/config/class_configInLdap.inc:202
msgid "will display a warning to the user when http is used instead of https."
msgstr ""
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Session lifetime"
msgstr "Sessie levensduur"
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Defines when a session will expire in seconds."
msgstr ""
-#: plugins/config/class_configInLdap.inc:220
+#: plugins/config/class_configInLdap.inc:212
+msgid "HTTP authentication"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:212
+msgid "Use HTTP authentication protocol instead of the login form."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:219
#: include/class_SnapshotDialogs.inc:186
msgid "Snapshots"
msgstr ""
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid "Enable snapshots"
msgstr "Activeer snapshots"
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid ""
"This enables you to save certain states of entries and restore them later "
"on."
msgstr ""
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
msgid "Snapshot base"
msgstr "Snaphosts basis"
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
msgid "The base where snapshots should be stored inside of the LDAP."
msgstr ""
-#: plugins/config/class_configInLdap.inc:235
+#: plugins/config/class_configInLdap.inc:234
msgid "SSL"
msgstr ""
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Key path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Path to FusionDirectory private key. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Certificate path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Path to FusionDirectory certificate. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:262
msgid "CA certificate path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:247
msgid "Path to the CA certificate. Used for validating Argonaut Server host."
msgstr ""
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:254
msgid "CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "Enable CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "CAS login will be used instead of LDAP bind"
msgstr ""
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:262
msgid "Path to the CA certificate of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host"
msgstr "Host"
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port"
msgstr "Poort"
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port the CAS server is listening on"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context to be used"
msgstr ""
-#: plugins/config/class_configInLdap.inc:285
+#: plugins/config/class_configInLdap.inc:284
msgid "People and group storage"
msgstr "People and group opslag"
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "People DN attribute"
msgstr "People DN attribuut"
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "Attribute to use at the beginning of users dn"
msgstr ""
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "CN pattern"
msgstr ""
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "The pattern to use to build the common name field"
msgstr ""
-#: plugins/config/class_configInLdap.inc:299
+#: plugins/config/class_configInLdap.inc:298
msgid "Strict naming policy"
msgstr ""
-#: plugins/config/class_configInLdap.inc:300
+#: plugins/config/class_configInLdap.inc:299
msgid "Enables strict checking of user and group names"
msgstr ""
-#: plugins/config/class_configInLdap.inc:305
+#: plugins/config/class_configInLdap.inc:304
msgid "Group/user min id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:306
+#: plugins/config/class_configInLdap.inc:305
msgid ""
"The minimum assignable user or group id to avoid security leaks with id 0 "
"accounts."
msgstr ""
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid "Next id hook"
msgstr ""
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid ""
"A script to be called for finding the next free id number for users or "
"groups."
msgstr ""
-#: plugins/config/class_configInLdap.inc:315
+#: plugins/config/class_configInLdap.inc:314
msgid "Base number for user id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:315
msgid "Where to start looking for a new free user id."
msgstr ""
-#: plugins/config/class_configInLdap.inc:321
+#: plugins/config/class_configInLdap.inc:320
msgid "Base number for group id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:321
msgid "Where to start looking for a new free group id."
msgstr ""
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "Users RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "The branch where users are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "Groups RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "The branch where groups are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "ACL role RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "The branch where ACL roles are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Id allocation method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Method to allocate user/group ids"
msgstr ""
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Traditional"
msgstr ""
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Samba unix id pool"
msgstr ""
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Pool user id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Minimum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Pool user id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Maximum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Pool group id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Minimum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Pool group id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Maximum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:370
+#: plugins/config/class_configInLdap.inc:367
+msgid "Restrict role members"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:367
+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:373
msgid "Debugging"
msgstr "Debugging"
-#: plugins/config/class_configInLdap.inc:373
+#: plugins/config/class_configInLdap.inc:376
msgid "Display errors"
msgstr ""
-#: plugins/config/class_configInLdap.inc:374
+#: plugins/config/class_configInLdap.inc:377
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:378
+#: plugins/config/class_configInLdap.inc:381
msgid "Maximum LDAP query time"
msgstr "Maximum LDAP query tijd"
-#: plugins/config/class_configInLdap.inc:378
+#: plugins/config/class_configInLdap.inc:381
msgid ""
"Stop LDAP actions if there is no answer within the specified number of "
"seconds."
msgstr ""
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:386
msgid "Log LDAP statistics"
msgstr "Log LDAP statistieken"
-#: plugins/config/class_configInLdap.inc:384
+#: plugins/config/class_configInLdap.inc:387
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:389
+#: plugins/config/class_configInLdap.inc:392
msgid "Debug level"
msgstr "Debug level"
-#: plugins/config/class_configInLdap.inc:390
+#: plugins/config/class_configInLdap.inc:393
msgid "Display certain information on each page load."
msgstr ""
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:405
msgid "Miscellaneous"
msgstr "Terminal Service diverse"
-#: plugins/config/class_configInLdap.inc:407
+#: plugins/config/class_configInLdap.inc:410
msgid "Hooks that are called when specific actions happens"
msgstr ""
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "tab"
msgstr ""
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "The tab that this hook concerns"
msgstr ""
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "mode"
msgstr "Modus"
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "When to call this command"
msgstr ""
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "cmd"
msgstr ""
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "The command that will be called"
msgstr ""
-#: plugins/config/class_configInLdap.inc:429
+#: plugins/config/class_configInLdap.inc:432
msgid "Hooks"
msgstr "Inhakers"
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:439
msgid "Display hook output"
msgstr ""
-#: plugins/config/class_configInLdap.inc:437
+#: plugins/config/class_configInLdap.inc:440
msgid ""
"When enabled successful hook execution output is displayed to the user using"
" a dialog."
msgstr ""
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available shells"
msgstr ""
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available POSIX shells for FD users."
msgstr ""
-#: plugins/config/class_configInLdap.inc:449
+#: plugins/config/class_configInLdap.inc:452
msgid "Show ACL tab on all objects"
msgstr ""
-#: plugins/config/class_configInLdap.inc:450
+#: plugins/config/class_configInLdap.inc:453
msgid ""
"For very specific ACL rights setting where you might need to give right on a"
" single object."
msgstr ""
-#: plugins/config/class_configInLdap.inc:464
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available department categories"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available categories in the departments dropdown"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:474
#: setup/class_setupStep_Language.inc:69
msgid "Automatic"
msgstr "Automatisch"
@@ -1911,80 +1956,80 @@ msgstr "Instellingen voor de wachtwoord herstel feature"
msgid "Password recovery settings"
msgstr "Paswoord herstel opties"
-#: plugins/config/class_recoveryConfig.inc:44
+#: plugins/config/class_recoveryConfig.inc:45
msgid "Activate password recovery"
msgstr "Activeer paswoord herstel"
-#: plugins/config/class_recoveryConfig.inc:45
+#: plugins/config/class_recoveryConfig.inc:46
msgid "Whether to activate or not password recovery feature"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:50
+#: plugins/config/class_recoveryConfig.inc:51
msgid "Sender email address"
msgstr "Zender email adres"
-#: plugins/config/class_recoveryConfig.inc:51
+#: plugins/config/class_recoveryConfig.inc:52
msgid "Email address from which mails will be sent"
msgstr "Email adres van waaruit de mails zullen verzonden worden"
-#: plugins/config/class_recoveryConfig.inc:57
+#: plugins/config/class_recoveryConfig.inc:58
msgid "Link validity (minutes)"
msgstr "Link geldigheid (minuten)"
-#: plugins/config/class_recoveryConfig.inc:58
+#: plugins/config/class_recoveryConfig.inc:59
msgid "Number of minutes before a recovery link expires"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:64
+#: plugins/config/class_recoveryConfig.inc:65
msgid "Salt for tokens"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:65
+#: plugins/config/class_recoveryConfig.inc:66
msgid ""
"Just a security measure, you can put anything in there, even random "
"characters"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:71
+#: plugins/config/class_recoveryConfig.inc:72
msgid "Allow the use of alternate addresses"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:72
+#: plugins/config/class_recoveryConfig.inc:73
msgid ""
"Users will also be able to enter one of theirs alternate addresses to "
"recover their password"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:79
+#: plugins/config/class_recoveryConfig.inc:80
msgid "First email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:82
-#: plugins/config/class_recoveryConfig.inc:101
+#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:102
msgid "Subject"
msgstr "Onderwerp"
-#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:84
msgid "Subject of the first email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:86
+#: plugins/config/class_recoveryConfig.inc:87
msgid "[FusionDirectory] Password recovery link"
msgstr "[FusionDirectory] Paswoord herstel link"
-#: plugins/config/class_recoveryConfig.inc:89
+#: plugins/config/class_recoveryConfig.inc:90
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:91
#, 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 ""
-#: plugins/config/class_recoveryConfig.inc:93
+#: plugins/config/class_recoveryConfig.inc:94
#, php-format
msgid ""
"Hello,\n"
@@ -1996,31 +2041,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr "Hallo,⎠⎠Hier is je informatie : ⎠- Login : %s⎠- Link : %s⎠⎠Deze link is enkel geldig voor 10 minuten."
-#: plugins/config/class_recoveryConfig.inc:98
+#: plugins/config/class_recoveryConfig.inc:99
msgid "Second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:103
msgid "Subject of the second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:105
+#: plugins/config/class_recoveryConfig.inc:106
msgid "[FusionDirectory] Password recovery successful"
msgstr "[FusionDirectory] Paswoord herstel succesvol"
-#: plugins/config/class_recoveryConfig.inc:108
+#: plugins/config/class_recoveryConfig.inc:109
#, php-format
msgid "Body (%s is login)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:110
#, php-format
msgid ""
"Body of the second email, sent to confirm the password has been changed. Use"
" %s for the user login."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:112
+#: plugins/config/class_recoveryConfig.inc:113
#, php-format
msgid ""
"Hello,\n"
@@ -2088,13 +2133,13 @@ msgstr "Omhoog"
msgid "Down"
msgstr "Omlaag"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2633
-#: include/simpleplugin/class_attribute.inc:2634
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
+#: include/simpleplugin/class_attribute.inc:2648
msgid "Sort up"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2646
-#: include/simpleplugin/class_attribute.inc:2647
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
+#: include/simpleplugin/class_attribute.inc:2661
msgid "Sort down"
msgstr ""
@@ -2106,27 +2151,26 @@ msgstr "Selecteer alles"
#: include/class_config.inc:479 include/class_msgPool.inc:215
#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3106
-#: include/functions.inc:3127 include/functions.inc:3157
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197 include/functions.inc:3259
+#: include/class_msgPool.inc:740 include/functions.inc:3107
+#: include/functions.inc:3128 include/functions.inc:3158
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3260
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1663 include/class_CopyPasteHandler.inc:278
-#: include/simpleplugin/class_dialogAttributes.inc:733
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
-#: include/simpleplugin/class_attribute.inc:1774
-#: include/simpleplugin/class_attribute.inc:1877
-#: include/simpleplugin/class_attribute.inc:1879
+#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
+#: include/simpleplugin/class_attribute.inc:1784
+#: include/simpleplugin/class_attribute.inc:1887
+#: include/simpleplugin/class_attribute.inc:1889
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: 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:437
#: include/password-methods/class_password-methods.inc:447
-#: include/class_SnapshotHandler.inc:415 html/index.php:434 html/index.php:444
+#: include/class_SnapshotHandler.inc:415 html/index.php:473 html/index.php:483
#: setup/class_setupStep_Migrate.inc:935
#: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
msgid "Error"
@@ -2165,44 +2209,44 @@ msgstr "Lijst herladen"
msgid "Submit"
msgstr "Verwerk"
-#: include/class_listing.inc:1586 include/class_listing.inc:1640
+#: include/class_listing.inc:1590 include/class_listing.inc:1644
msgid "Copy"
msgstr "Kopieer"
-#: include/class_listing.inc:1592 include/class_listing.inc:1628
+#: include/class_listing.inc:1596 include/class_listing.inc:1632
msgid "Cut"
msgstr "Knip"
-#: include/class_listing.inc:1600 include/class_listing.inc:1602
+#: include/class_listing.inc:1604 include/class_listing.inc:1606
#: include/class_CopyPasteHandler.inc:370
msgid "Paste"
msgstr "Plakken"
-#: include/class_listing.inc:1628
+#: include/class_listing.inc:1632
msgid "Cut this entry"
msgstr "Deze invoer knippen"
-#: include/class_listing.inc:1640
+#: include/class_listing.inc:1644
msgid "Copy this entry"
msgstr "Deze invoer kopieren"
-#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_listing.inc:1677 include/class_listing.inc:1679
msgid "Restore snapshots"
msgstr "Restaureer snapshots"
-#: include/class_listing.inc:1689
+#: include/class_listing.inc:1693
msgid "Export list"
msgstr "Export lijst"
-#: include/class_listing.inc:1724 include/class_listing.inc:1725
+#: include/class_listing.inc:1728 include/class_listing.inc:1729
msgid "Restore snapshot"
msgstr "Restaureer snapshot"
-#: include/class_listing.inc:1734
+#: include/class_listing.inc:1738
msgid "Create snapshot"
msgstr "Maak snapshot"
-#: include/class_listing.inc:1735
+#: include/class_listing.inc:1739
msgid "Create a new snapshot from this object"
msgstr "Maak een nieuw snapshot van dit object"
@@ -2245,7 +2289,7 @@ msgid "XML error in fusiondirectory.conf: %s at line %d"
msgstr "XML fout in fusiondirectory.conf: %s op regel %d"
#: include/class_config.inc:162 include/class_config.inc:300
-#: include/class_config.inc:985 include/class_config.inc:998
+#: include/class_config.inc:915 include/class_config.inc:928
#: include/functions.inc:663 include/class_timezone.inc:51
#: include/password-methods/class_password-methods-sha.inc:71
#: include/password-methods/class_password-methods-ssha.inc:75
@@ -2262,17 +2306,17 @@ msgid ""
"while your passwords are not encrypted."
msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:917
-#: include/class_ldap.inc:1371 include/functions.inc:526
+#: include/class_config.inc:337 include/class_ldap.inc:918
+#: include/class_ldap.inc:1372 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2985 include/simpleplugin/class_simplePlugin.inc:545
-#: include/simpleplugin/class_attribute.inc:2895
+#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2909
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
#: include/class_SnapshotHandler.inc:422 include/class_SnapshotHandler.inc:425
-#: html/index.php:360 html/class_passwordRecovery.inc:497
+#: html/index.php:369 html/class_passwordRecovery.inc:497
#: setup/class_setupStep_Migrate.inc:451
#: setup/class_setupStep_Migrate.inc:1130
msgid "LDAP error"
@@ -2287,38 +2331,38 @@ msgstr "Kan niet binden met de LDAP. Gelie je systeembeheerder te contacteren."
msgid "The selected mail method (class %s) is not available"
msgstr "De geselecteerde mail methode (class %s) is niet beschikbaar"
-#: include/class_config.inc:986
+#: include/class_config.inc:916
#, 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."
-#: include/class_config.inc:999
+#: include/class_config.inc:929
#, 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'."
-#: include/class_config.inc:1104
+#: include/class_config.inc:1034
msgid "All categories"
msgstr "Alle categoriën"
-#: include/class_config.inc:1231
+#: include/class_config.inc:1161
msgid "My account"
msgstr "Mijn account"
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
msgid "Performance warning"
msgstr "Performantie waarschuwing"
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
#, 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:868 include/class_ldap.inc:904
+#: include/class_ldap.inc:869 include/class_ldap.inc:905
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
@@ -2328,39 +2372,39 @@ msgstr "LDAP performantie is slecht: laatste query duurde ongeveer %.2fs!"
msgid "Internal error"
msgstr "Interne fout"
-#: include/class_ldap.inc:868
+#: include/class_ldap.inc:869
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:904
+#: include/class_ldap.inc:905
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1016
+#: include/class_ldap.inc:1017
#, 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:1018
+#: include/class_ldap.inc:1019
#, php-format
msgid "while operating on LDAP server %s"
msgstr "bij het bewerken van LDAP server %s"
-#: include/class_ldap.inc:1108
+#: include/class_ldap.inc:1109
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1220
+#: include/class_ldap.inc:1221
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr "Dit is geen geldige DN: '%s'. Een blok dat geïmporteerd wordt, dient te beginnen met 'dn: ...' op regel %s"
-#: include/class_ldap.inc:1231
+#: include/class_ldap.inc:1232
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2948,10 +2992,10 @@ 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"
-#: include/functions.inc:496 include/functions.inc:3294
-#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:263
-#: include/simpleplugin/class_simplePlugin.inc:268
-#: include/simpleplugin/class_simplePlugin.inc:280
+#: include/functions.inc:496 include/functions.inc:3295
+#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
+#: include/simpleplugin/class_simplePlugin.inc:269
+#: include/simpleplugin/class_simplePlugin.inc:281
#: html/class_passwordRecovery.inc:216
msgid "Fatal error"
msgstr "Fatale fout."
@@ -3104,98 +3148,98 @@ msgstr "Kan niet wegschrijven naar revisie bestand!"
msgid "Cannot read to revision file!"
msgstr "Kan revisie bestand niet lezen!"
-#: include/functions.inc:2548
+#: include/functions.inc:2549
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "LDAP warning"
msgstr "LDAP waarschuwing"
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "Cannot get schema information from server. No schema check possible!"
msgstr "Kan geen schema informatie krijgen van de server. Geen schema verificatie mogelijk!"
-#: include/functions.inc:2584
+#: include/functions.inc:2585
msgid ""
"Used to lock currently edited entries to avoid multiple changes at the same "
"time."
msgstr "Wordt gebruikt om huidige gewijzigde inzendingen te blokkeren en zo meerdere wijzingen terzelfde tijd tegen te gaan."
-#: include/functions.inc:2596
+#: include/functions.inc:2597
#, php-format
msgid "Missing required object class '%s'!"
msgstr "Vereiste object class '%s' ontbreekt!"
-#: include/functions.inc:2599
+#: include/functions.inc:2600
#, php-format
msgid "Missing optional object class '%s'!"
msgstr "Optionele object class '%s' ontbreekt!"
-#: include/functions.inc:2603
+#: include/functions.inc:2604
#, php-format
msgid "Class(es) available"
msgstr "Class(es) beschikbaar"
-#: include/functions.inc:2623
+#: include/functions.inc:2624
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2625
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2628
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2629
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3106 include/functions.inc:3127
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198
msgid "Cannot allocate a free ID:"
msgstr "Kan geen vrij ID toekennen:"
-#: include/functions.inc:3106
+#: include/functions.inc:3107
msgid "unknown idAllocation method!"
msgstr "onbekende idAllocation methode!"
-#: include/functions.inc:3127
+#: include/functions.inc:3128
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr "%sPoolMin >=%sPoolMax!"
-#: include/functions.inc:3157
+#: include/functions.inc:3158
msgid "Cannot create sambaUnixIdPool entry!"
msgstr "Kan inzending sambaUnixIdPool niet aanmaken!"
-#: include/functions.inc:3165
+#: include/functions.inc:3166
msgid "sambaUnixIdPool is not unique!"
msgstr "sambaUnixIdPool is niet uniek!"
-#: include/functions.inc:3177 include/functions.inc:3181
+#: include/functions.inc:3178 include/functions.inc:3182
msgid "no ID available!"
msgstr "Geen ID beschikbaar!"
-#: include/functions.inc:3197
+#: include/functions.inc:3198
msgid "maximum tries exceeded!"
msgstr "maximum pogingen overschreden!"
-#: include/functions.inc:3259
+#: include/functions.inc:3260
msgid "Cannot allocate a free ID!"
msgstr "Kan geen vrij ID toekennen!"
-#: include/functions.inc:3295
+#: include/functions.inc:3296
#, 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"
@@ -3351,13 +3395,13 @@ msgstr "op lijn"
msgid "XML error"
msgstr "XML error"
-#: include/class_plugin.inc:554
+#: include/class_plugin.inc:553
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/class_plugin.inc:1466
+#: include/class_plugin.inc:1467
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -3383,32 +3427,32 @@ msgstr "Sjabloon naam"
msgid "This is the name of the template"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:263
+#: include/simpleplugin/class_simplePlugin.inc:264
msgid "Only main tab can compute dn"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:270
+#: include/simpleplugin/class_simplePlugin.inc:271
#, php-format
msgid "Could not compute dn: no parent tab class for \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:282
+#: include/simpleplugin/class_simplePlugin.inc:283
#, php-format
msgid ""
"Could not compute dn: could not find objectType infos from tab class \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:638
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:644
+#: include/simpleplugin/class_simplePlugin.inc:652
msgid "Error when saving"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:638
+#: include/simpleplugin/class_simplePlugin.inc:644
#, php-format
msgid "There is already an entry with the same dn : %s"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:652
#, php-format
msgid "The entry %s is not existing"
msgstr ""
@@ -3428,27 +3472,27 @@ msgstr ""
msgid "Show %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:409
+#: include/simpleplugin/class_dialogAttributes.inc:415
#, php-format
msgid "Group %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:411
+#: include/simpleplugin/class_dialogAttributes.inc:417
#, php-format
msgid "Role %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:446
+#: include/simpleplugin/class_dialogAttributes.inc:452
msgid "Group of user"
msgstr "Gebruikersgroep"
-#: include/simpleplugin/class_dialogAttributes.inc:615
+#: include/simpleplugin/class_dialogAttributes.inc:621
#: include/simpleplugin/class_attribute.inc:1090
#: include/simpleplugin/class_attribute.inc:1124
msgid "None"
msgstr "Geen"
-#: include/simpleplugin/class_dialogAttributes.inc:617
+#: include/simpleplugin/class_dialogAttributes.inc:623
msgid "Unknown"
msgstr "Onbekend"
@@ -3489,11 +3533,16 @@ msgid "days"
msgstr "dagen"
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2161
+#: include/simpleplugin/class_attribute.inc:2171
#, php-format
msgid "%s (required)"
msgstr ""
+#: include/simpleplugin/class_attribute.inc:1150
+#, php-format
+msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
+msgstr ""
+
#: include/simpleplugin/class_attribute.inc:1277
#, php-format
msgid "An integer between %d and %d"
@@ -3509,75 +3558,75 @@ msgstr ""
msgid "An integer smaller than %d"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1379
+#: include/simpleplugin/class_attribute.inc:1383
#, php-format
msgid "A float between %f and %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1381
+#: include/simpleplugin/class_attribute.inc:1385
#, php-format
msgid "A float larger than %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1383
+#: include/simpleplugin/class_attribute.inc:1387
#, php-format
msgid "A float smaller than %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1490
+#: include/simpleplugin/class_attribute.inc:1500
msgid "Error, incorrect date: "
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
#, php-format
msgid "Cannot read uploaded file: %s"
msgstr "Kan geupload bestand niet lezen: %s"
-#: include/simpleplugin/class_attribute.inc:1530
+#: include/simpleplugin/class_attribute.inc:1540
msgid "file is empty"
msgstr "bestand is leeg"
-#: include/simpleplugin/class_attribute.inc:1533
+#: include/simpleplugin/class_attribute.inc:1543
msgid "file not found"
msgstr "bestand niet gevonden"
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1546
msgid "file not readable"
msgstr "bestand onleesbaar"
-#: include/simpleplugin/class_attribute.inc:1569
+#: include/simpleplugin/class_attribute.inc:1579
#, php-format
msgid "%s (%d bytes)"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1616
-#: include/simpleplugin/class_attribute.inc:1793
+#: include/simpleplugin/class_attribute.inc:1626
+#: include/simpleplugin/class_attribute.inc:1803
msgid "Upload"
msgstr "Uploaden"
-#: include/simpleplugin/class_attribute.inc:1621
-#: include/simpleplugin/class_attribute.inc:1622
+#: include/simpleplugin/class_attribute.inc:1631
+#: include/simpleplugin/class_attribute.inc:1632
msgid "Download"
msgstr "Downloaden"
-#: include/simpleplugin/class_attribute.inc:1775
+#: include/simpleplugin/class_attribute.inc:1785
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr "Kan gebruikersfoto niet opslaan, FusionDirectory heeft het pakket 'php5-imagick' nodig"
-#: include/simpleplugin/class_attribute.inc:1826
+#: include/simpleplugin/class_attribute.inc:1836
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr "Basis"
-#: include/simpleplugin/class_attribute.inc:1829
+#: include/simpleplugin/class_attribute.inc:1839
msgid "Object base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:2755
+#: include/simpleplugin/class_attribute.inc:2769
#, php-format
msgid "Invalid value for %s"
msgstr ""
@@ -3711,17 +3760,17 @@ msgstr "Controleer a.u.b. de gebruikersnaam/wachtwoord combinatie."
msgid "Account locked. Please contact your system administrator!"
msgstr "Accound geblokkeerd. Contacteer aub je systeembeheerder!"
-#: html/index.php:436
+#: html/index.php:475
#, php-format
msgid "CAS user \"%s\" could not be found in the LDAP"
msgstr ""
-#: html/index.php:446
+#: html/index.php:485
#, php-format
msgid "CAS user \"%s\" match several users in the LDAP"
msgstr ""
-#: html/index.php:481
+#: html/index.php:522
msgid ""
"Your browser has cookies disabled. Please enable cookies and reload this "
"page before logging in!"
@@ -4044,8 +4093,8 @@ msgid "Checking for duplicated UID numbers"
msgstr "Verificatie voor duplicate UID nummers"
#: setup/class_setupStep_Migrate.inc:267
-msgid "Checking for duplicate GID numbers"
-msgstr "Verificatie voor duplicate GID nummers"
+msgid "Checking for duplicated GID numbers"
+msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:487
#: setup/class_setupStep_Migrate.inc:564 setup/class_setupStep_Migrate.inc:702
@@ -4054,7 +4103,7 @@ msgstr "Verificatie voor duplicate GID nummers"
#: setup/class_setupStep_Migrate.inc:1179
#: setup/class_setupStep_Migrate.inc:1272
#: setup/class_setupStep_Migrate.inc:1351
-#: setup/class_setupStep_Migrate.inc:1390
+#: setup/class_setupStep_Migrate.inc:1395
msgid "LDAP query failed"
msgstr "LDAP query faalde"
@@ -4065,7 +4114,7 @@ msgstr "LDAP query faalde"
#: setup/class_setupStep_Migrate.inc:1180
#: setup/class_setupStep_Migrate.inc:1273
#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1391
+#: setup/class_setupStep_Migrate.inc:1396
msgid "Possibly the \"root object\" is missing."
msgstr ""
@@ -4220,14 +4269,14 @@ msgstr "Vond %s departement(en) die niet zichtbaar zullen zijn in FusionDirector
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1373
+#: setup/class_setupStep_Migrate.inc:1378
#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\"."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1412
+#: setup/class_setupStep_Migrate.inc:1422
#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\"."
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
diff --git a/locale/pl/fusiondirectory.po b/locale/pl/fusiondirectory.po
index ca3bea355b9c376bc90c5df1be11c2f6af06406e..d538f4f2a0357ebeb9ce81fadb62472e6b59606b 100644
--- a/locale/pl/fusiondirectory.po
+++ b/locale/pl/fusiondirectory.po
@@ -5,12 +5,12 @@
# Translators:
msgid ""
msgstr ""
-"Project-Id-Version: FusionDirectory-109\n"
+"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-01-22 11:26+0100\n"
-"PO-Revision-Date: 2016-01-22 10:24+0000\n"
+"POT-Creation-Date: 2016-03-14 12:07+0100\n"
+"PO-Revision-Date: 2016-03-07 12:09+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-109/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -28,31 +28,31 @@ msgstr "Witaj %s!"
msgid "References"
msgstr "Zależności"
-#: plugins/admin/groups/class_roleGeneric.inc:30
-#: plugins/admin/groups/class_roleGeneric.inc:34
+#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:61
#: plugins/admin/groups/class_groupManagement.inc:71
#: plugins/admin/aclrole/class_aclRole.inc:78
#: plugins/admin/acl/class_aclAssignment.inc:49
msgid "Role"
msgstr "Pełniona funkcja"
-#: plugins/admin/groups/class_roleGeneric.inc:31
+#: plugins/admin/groups/class_roleGeneric.inc:58
msgid "Role information"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:35
+#: plugins/admin/groups/class_roleGeneric.inc:62
msgid "Organizational role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:84
msgid "Informations"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:158
+#: plugins/admin/departments/class_department.inc:174
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -62,13 +62,13 @@ msgstr ""
msgid "Name"
msgstr "ImiÄ™"
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
msgid "Name of this group"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
#: plugins/admin/groups/class_group.inc:66
#: plugins/admin/groups/class_ogroup.inc:192
#: plugins/admin/groups/group-list.xml:41
@@ -81,26 +81,26 @@ msgstr ""
msgid "Description"
msgstr "Opis"
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
msgid "Description of the role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:70
+#: plugins/admin/groups/class_roleGeneric.inc:97
msgid "Phone number"
msgstr "Numer telefonu"
-#: plugins/admin/groups/class_roleGeneric.inc:74
+#: plugins/admin/groups/class_roleGeneric.inc:101
msgid "Fax number"
msgstr "Numer fax"
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
#: plugins/admin/users/class_userManagement.inc:42
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: setup/class_setupStep_Migrate.inc:871
msgid "Users"
msgstr "Użytkownicy"
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
msgid "Add users for the role"
msgstr ""
@@ -147,7 +147,7 @@ msgstr ""
#: plugins/admin/groups/class_group.inc:74
#: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:403
+#: plugins/personal/posix/class_posixAccount.inc:410
msgid "GID"
msgstr "GID"
@@ -204,23 +204,23 @@ msgid "Only allow this group to connect to this list of hosts"
msgstr ""
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458 include/functions.inc:794
-#: include/functions.inc:2548 include/class_xml.inc:55
+#: plugins/personal/posix/class_posixAccount.inc:465 include/functions.inc:794
+#: include/functions.inc:2549 include/class_xml.inc:55
#: include/simpleplugin/class_simpleTabs.inc:325 html/index.php:56
-#: html/index.php:62 html/index.php:481 html/class_passwordRecovery.inc:378
+#: html/index.php:62 html/index.php:522 html/class_passwordRecovery.inc:378
#: setup/class_setupStep_Migrate.inc:572
#: setup/class_setupStep_Migrate.inc:1083
#: setup/class_setupStep_Migrate.inc:1202
#: setup/class_setupStep_Migrate.inc:1313
-#: setup/class_setupStep_Migrate.inc:1372
-#: setup/class_setupStep_Migrate.inc:1411 plugins/admin/acl/remove.tpl.c:2
+#: setup/class_setupStep_Migrate.inc:1377
+#: setup/class_setupStep_Migrate.inc:1421 plugins/admin/acl/remove.tpl.c:2
#: ihtml/themes/default/islocked.tpl.c:5 ihtml/themes/default/remove.tpl.c:2
#: ihtml/themes/default/msg_dialog.tpl.c:5 setup/setup_checks.tpl.c:8
msgid "Warning"
msgstr "Ostrzeżenie"
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458
+#: plugins/personal/posix/class_posixAccount.inc:465
msgid "Timeout while waiting for lock. Ignoring lock!"
msgstr ""
@@ -250,7 +250,7 @@ msgstr "Dodaj członka"
msgid "Objects member of this group"
msgstr ""
-#: plugins/admin/groups/class_ogroup.inc:318
+#: plugins/admin/groups/class_ogroup.inc:313
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
@@ -279,10 +279,10 @@ msgstr "Utwórz"
#: plugins/admin/departments/dep-list.xml:79
#: plugins/admin/users/user-list.xml:105
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-#: include/simpleplugin/class_dialogAttributes.inc:626
-#: include/simpleplugin/class_dialogAttributes.inc:627
-#: include/simpleplugin/class_attribute.inc:2661
-#: include/simpleplugin/class_attribute.inc:2662
+#: include/simpleplugin/class_dialogAttributes.inc:632
+#: include/simpleplugin/class_dialogAttributes.inc:633
+#: include/simpleplugin/class_attribute.inc:2675
+#: include/simpleplugin/class_attribute.inc:2676
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -293,8 +293,8 @@ msgstr "Edytuj"
#: plugins/admin/departments/dep-list.xml:67
#: plugins/admin/departments/dep-list.xml:88
#: plugins/admin/users/user-list.xml:112
-#: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_dialogAttributes.inc:637
+#: include/simpleplugin/class_dialogAttributes.inc:642
+#: include/simpleplugin/class_dialogAttributes.inc:643
#: include/simpleplugin/simple-list.xml:75
#: include/simpleplugin/simple-list.xml:125
msgid "Remove"
@@ -343,7 +343,7 @@ msgid "Show application groups"
msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Show department groups"
+msgid "Show unidentified groups"
msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:137
@@ -432,51 +432,67 @@ msgid "Category of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:81
+msgid "Website"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:81
+#, php-format
+msgid "Website of this %s"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:85
#: plugins/personal/generic/class_user.inc:410
msgid "Manager"
msgstr ""
-#: plugins/admin/departments/class_department.inc:81
+#: plugins/admin/departments/class_department.inc:85
#, php-format
msgid "Manager of this %s"
msgstr ""
-#: plugins/admin/departments/class_department.inc:87
-#: plugins/admin/departments/class_department.inc:93
+#: plugins/admin/departments/class_department.inc:91
+#: plugins/admin/departments/class_department.inc:97
#: plugins/personal/generic/class_user.inc:304
msgid "Location"
msgstr "Lokalizacja"
-#: plugins/admin/departments/class_department.inc:90
+#: plugins/admin/departments/class_department.inc:94
#: plugins/personal/generic/class_user.inc:308
msgid "State"
msgstr "Stan"
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_country.inc:29
+#: plugins/admin/departments/class_country.inc:30
+#: plugins/admin/departments/class_country.inc:33
+msgid "Country"
+msgstr "Kraj"
+
+#: plugins/admin/departments/class_department.inc:103
#: plugins/personal/generic/class_user.inc:312
msgid "Address"
msgstr "Adres"
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:103
#, php-format
msgid "A postal address for this %s"
msgstr ""
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
#: plugins/personal/generic/class_user.inc:320
msgid "Phone"
msgstr "Telefon"
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
msgid "Telephone number"
msgstr "Numer telefonu"
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
#: plugins/personal/generic/class_user.inc:332
msgid "Fax"
msgstr "Fax"
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
msgid "Facsimile telephone number"
msgstr ""
@@ -504,12 +520,6 @@ msgstr ""
msgid "locality"
msgstr ""
-#: plugins/admin/departments/class_country.inc:29
-#: plugins/admin/departments/class_country.inc:30
-#: plugins/admin/departments/class_country.inc:33
-msgid "Country"
-msgstr "Kraj"
-
#: plugins/admin/departments/class_country.inc:50
msgid "country"
msgstr ""
@@ -552,7 +562,8 @@ msgid "Given name"
msgstr "ImiÄ™"
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
+#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
msgid "Login"
@@ -665,8 +676,8 @@ msgid "Edit category ACL"
msgstr ""
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2671
-#: include/simpleplugin/class_attribute.inc:2672
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
+#: include/simpleplugin/class_attribute.inc:2686
#, php-format
msgid "Delete"
msgstr "Usuń"
@@ -771,19 +782,37 @@ msgstr ""
msgid "ACLs which are part of this group"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:38
+#: plugins/admin/acl/class_aclManagement.inc:31
+#: plugins/admin/acl/class_aclManagement.inc:32
+#: plugins/admin/acl/class_aclManagement.inc:45
+msgid "ACL assignment creation"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:33
+msgid "Create an ACL assignment on an arbitrary dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "Dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "DN you wish to add assignments for"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:135
msgid "ACL assignments"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:39
+#: plugins/admin/acl/class_aclManagement.inc:136
msgid "ACL assignments management"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:40
+#: plugins/admin/acl/class_aclManagement.inc:137
msgid "Manage ACL roles assignments to users"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:78
+#: plugins/admin/acl/class_aclManagement.inc:199
#: plugins/admin/acl/class_aclAssignment.inc:263
msgid "ACL Assignment"
msgstr ""
@@ -899,7 +928,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -994,59 +1023,59 @@ msgstr ""
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:336
+msgid "Homepage"
+msgstr "Strona domowa"
+
+#: plugins/personal/generic/class_user.inc:336
+msgid "Personal homepage"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:342
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:351
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr "Preferowany język"
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:362
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
msgid "Display name"
msgstr "Wyświetl nazwę"
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home postal address"
msgstr "Adres domowy"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:374
msgid "Private phone"
msgstr "Telefon prywatny"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:374
msgid "Home phone number"
msgstr "Numer telefonu domowego"
-#: plugins/personal/generic/class_user.inc:374
-msgid "Homepage"
-msgstr "Strona domowa"
-
-#: plugins/personal/generic/class_user.inc:374
-msgid "Personal homepage"
-msgstr ""
-
#: plugins/personal/generic/class_user.inc:380
msgid "Organizational information"
msgstr "Informacje organizacyjne"
@@ -1279,33 +1308,33 @@ msgstr "nieskonfigurowane"
msgid "automatic"
msgstr "automatyczne"
-#: plugins/personal/posix/class_posixAccount.inc:309
+#: plugins/personal/posix/class_posixAccount.inc:310
msgid "expired"
msgstr "wygasło"
-#: plugins/personal/posix/class_posixAccount.inc:311
+#: plugins/personal/posix/class_posixAccount.inc:312
msgid "grace time active"
msgstr "Czas prolongaty aktywny"
-#: plugins/personal/posix/class_posixAccount.inc:314
-#: plugins/personal/posix/class_posixAccount.inc:316
-#: plugins/personal/posix/class_posixAccount.inc:318
+#: plugins/personal/posix/class_posixAccount.inc:315
+#: plugins/personal/posix/class_posixAccount.inc:317
+#: plugins/personal/posix/class_posixAccount.inc:319
msgid "active"
msgstr "Aktywne"
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:315
msgid "password expired"
msgstr "hasło wygasło"
-#: plugins/personal/posix/class_posixAccount.inc:316
+#: plugins/personal/posix/class_posixAccount.inc:317
msgid "password not changeable"
msgstr "hasło niezmienialne"
-#: plugins/personal/posix/class_posixAccount.inc:400
+#: plugins/personal/posix/class_posixAccount.inc:407
msgid "UID"
msgstr "UID"
-#: plugins/personal/posix/class_posixAccount.inc:516
+#: plugins/personal/posix/class_posixAccount.inc:525
#, php-format
msgid "Group of user %s"
msgstr ""
@@ -1477,424 +1506,440 @@ msgid "Core settings"
msgstr ""
#: plugins/config/class_configInLdap.inc:161
-msgid "Enable primary group filter"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"It is time consuming to evaluate which groups are primary and which are not,"
-" so you may want to disable it if your group plugin is slow."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:167
msgid "Display summary in listings"
msgstr ""
-#: plugins/config/class_configInLdap.inc:168
+#: 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:173
+#: plugins/config/class_configInLdap.inc:167
msgid "Edit locking"
msgstr ""
-#: plugins/config/class_configInLdap.inc:174
+#: 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:179
+#: plugins/config/class_configInLdap.inc:173
msgid "Enable logging"
msgstr ""
-#: plugins/config/class_configInLdap.inc:180
+#: plugins/config/class_configInLdap.inc:174
msgid "Event logging on FusionDirectory side."
msgstr ""
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "LDAP size limit"
msgstr ""
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "Defines the number of entries to get from LDAP by default."
msgstr ""
-#: plugins/config/class_configInLdap.inc:192
+#: plugins/config/class_configInLdap.inc:186
msgid "Login and session"
msgstr ""
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:189
msgid "Login attribute"
msgstr ""
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:190
msgid "Which LDAP attribute should be used as the login name during login."
msgstr ""
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:196
msgid "Enforce encrypted connections"
msgstr ""
-#: plugins/config/class_configInLdap.inc:203
+#: plugins/config/class_configInLdap.inc:197
msgid ""
"Enables PHP security checks to force encrypted access (https) to the web "
"interface."
msgstr ""
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:201
msgid "Warn if session is not encrypted"
msgstr ""
-#: plugins/config/class_configInLdap.inc:208
+#: plugins/config/class_configInLdap.inc:202
msgid "will display a warning to the user when http is used instead of https."
msgstr ""
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Session lifetime"
msgstr ""
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Defines when a session will expire in seconds."
msgstr ""
-#: plugins/config/class_configInLdap.inc:220
+#: plugins/config/class_configInLdap.inc:212
+msgid "HTTP authentication"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:212
+msgid "Use HTTP authentication protocol instead of the login form."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:219
#: include/class_SnapshotDialogs.inc:186
msgid "Snapshots"
msgstr ""
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid "Enable snapshots"
msgstr ""
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid ""
"This enables you to save certain states of entries and restore them later "
"on."
msgstr ""
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
msgid "Snapshot base"
msgstr ""
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
msgid "The base where snapshots should be stored inside of the LDAP."
msgstr ""
-#: plugins/config/class_configInLdap.inc:235
+#: plugins/config/class_configInLdap.inc:234
msgid "SSL"
msgstr ""
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Key path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Path to FusionDirectory private key. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Certificate path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Path to FusionDirectory certificate. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:262
msgid "CA certificate path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:247
msgid "Path to the CA certificate. Used for validating Argonaut Server host."
msgstr ""
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:254
msgid "CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "Enable CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "CAS login will be used instead of LDAP bind"
msgstr ""
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:262
msgid "Path to the CA certificate of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host"
msgstr ""
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port"
msgstr "Port"
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port the CAS server is listening on"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context to be used"
msgstr ""
-#: plugins/config/class_configInLdap.inc:285
+#: plugins/config/class_configInLdap.inc:284
msgid "People and group storage"
msgstr ""
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "People DN attribute"
msgstr ""
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "Attribute to use at the beginning of users dn"
msgstr ""
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "CN pattern"
msgstr ""
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "The pattern to use to build the common name field"
msgstr ""
-#: plugins/config/class_configInLdap.inc:299
+#: plugins/config/class_configInLdap.inc:298
msgid "Strict naming policy"
msgstr ""
-#: plugins/config/class_configInLdap.inc:300
+#: plugins/config/class_configInLdap.inc:299
msgid "Enables strict checking of user and group names"
msgstr ""
-#: plugins/config/class_configInLdap.inc:305
+#: plugins/config/class_configInLdap.inc:304
msgid "Group/user min id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:306
+#: plugins/config/class_configInLdap.inc:305
msgid ""
"The minimum assignable user or group id to avoid security leaks with id 0 "
"accounts."
msgstr ""
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid "Next id hook"
msgstr ""
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid ""
"A script to be called for finding the next free id number for users or "
"groups."
msgstr ""
-#: plugins/config/class_configInLdap.inc:315
+#: plugins/config/class_configInLdap.inc:314
msgid "Base number for user id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:315
msgid "Where to start looking for a new free user id."
msgstr ""
-#: plugins/config/class_configInLdap.inc:321
+#: plugins/config/class_configInLdap.inc:320
msgid "Base number for group id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:321
msgid "Where to start looking for a new free group id."
msgstr ""
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "Users RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "The branch where users are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "Groups RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "The branch where groups are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "ACL role RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "The branch where ACL roles are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Id allocation method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Method to allocate user/group ids"
msgstr ""
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Traditional"
msgstr ""
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Samba unix id pool"
msgstr ""
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Pool user id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Minimum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Pool user id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Maximum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Pool group id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Minimum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Pool group id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Maximum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:370
-msgid "Debugging"
+#: plugins/config/class_configInLdap.inc:367
+msgid "Restrict role members"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:367
+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:373
+msgid "Debugging"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:376
msgid "Display errors"
msgstr ""
-#: plugins/config/class_configInLdap.inc:374
+#: plugins/config/class_configInLdap.inc:377
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:378
+#: plugins/config/class_configInLdap.inc:381
msgid "Maximum LDAP query time"
msgstr ""
-#: plugins/config/class_configInLdap.inc:378
+#: plugins/config/class_configInLdap.inc:381
msgid ""
"Stop LDAP actions if there is no answer within the specified number of "
"seconds."
msgstr ""
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:386
msgid "Log LDAP statistics"
msgstr ""
-#: plugins/config/class_configInLdap.inc:384
+#: plugins/config/class_configInLdap.inc:387
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:389
+#: plugins/config/class_configInLdap.inc:392
msgid "Debug level"
msgstr ""
-#: plugins/config/class_configInLdap.inc:390
+#: plugins/config/class_configInLdap.inc:393
msgid "Display certain information on each page load."
msgstr ""
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:405
msgid "Miscellaneous"
msgstr "Różne"
-#: plugins/config/class_configInLdap.inc:407
+#: plugins/config/class_configInLdap.inc:410
msgid "Hooks that are called when specific actions happens"
msgstr ""
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "tab"
msgstr ""
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "The tab that this hook concerns"
msgstr ""
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "mode"
msgstr "Tryb"
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "When to call this command"
msgstr ""
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "cmd"
msgstr ""
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "The command that will be called"
msgstr ""
-#: plugins/config/class_configInLdap.inc:429
+#: plugins/config/class_configInLdap.inc:432
msgid "Hooks"
msgstr "Zaczepy"
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:439
msgid "Display hook output"
msgstr ""
-#: plugins/config/class_configInLdap.inc:437
+#: plugins/config/class_configInLdap.inc:440
msgid ""
"When enabled successful hook execution output is displayed to the user using"
" a dialog."
msgstr ""
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available shells"
msgstr ""
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available POSIX shells for FD users."
msgstr ""
-#: plugins/config/class_configInLdap.inc:449
+#: plugins/config/class_configInLdap.inc:452
msgid "Show ACL tab on all objects"
msgstr ""
-#: plugins/config/class_configInLdap.inc:450
+#: plugins/config/class_configInLdap.inc:453
msgid ""
"For very specific ACL rights setting where you might need to give right on a"
" single object."
msgstr ""
-#: plugins/config/class_configInLdap.inc:464
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available department categories"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available categories in the departments dropdown"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:474
#: setup/class_setupStep_Language.inc:69
msgid "Automatic"
msgstr "Automatycznie"
@@ -1911,80 +1956,80 @@ msgstr ""
msgid "Password recovery settings"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:44
+#: plugins/config/class_recoveryConfig.inc:45
msgid "Activate password recovery"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:45
+#: plugins/config/class_recoveryConfig.inc:46
msgid "Whether to activate or not password recovery feature"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:50
+#: plugins/config/class_recoveryConfig.inc:51
msgid "Sender email address"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:51
+#: plugins/config/class_recoveryConfig.inc:52
msgid "Email address from which mails will be sent"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:57
+#: plugins/config/class_recoveryConfig.inc:58
msgid "Link validity (minutes)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:58
+#: plugins/config/class_recoveryConfig.inc:59
msgid "Number of minutes before a recovery link expires"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:64
+#: plugins/config/class_recoveryConfig.inc:65
msgid "Salt for tokens"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:65
+#: plugins/config/class_recoveryConfig.inc:66
msgid ""
"Just a security measure, you can put anything in there, even random "
"characters"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:71
+#: plugins/config/class_recoveryConfig.inc:72
msgid "Allow the use of alternate addresses"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:72
+#: plugins/config/class_recoveryConfig.inc:73
msgid ""
"Users will also be able to enter one of theirs alternate addresses to "
"recover their password"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:79
+#: plugins/config/class_recoveryConfig.inc:80
msgid "First email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:82
-#: plugins/config/class_recoveryConfig.inc:101
+#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:102
msgid "Subject"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:84
msgid "Subject of the first email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:86
+#: plugins/config/class_recoveryConfig.inc:87
msgid "[FusionDirectory] Password recovery link"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:89
+#: plugins/config/class_recoveryConfig.inc:90
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:91
#, 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 ""
-#: plugins/config/class_recoveryConfig.inc:93
+#: plugins/config/class_recoveryConfig.inc:94
#, php-format
msgid ""
"Hello,\n"
@@ -1996,31 +2041,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:98
+#: plugins/config/class_recoveryConfig.inc:99
msgid "Second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:103
msgid "Subject of the second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:105
+#: plugins/config/class_recoveryConfig.inc:106
msgid "[FusionDirectory] Password recovery successful"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:108
+#: plugins/config/class_recoveryConfig.inc:109
#, php-format
msgid "Body (%s is login)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:110
#, php-format
msgid ""
"Body of the second email, sent to confirm the password has been changed. Use"
" %s for the user login."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:112
+#: plugins/config/class_recoveryConfig.inc:113
#, php-format
msgid ""
"Hello,\n"
@@ -2088,13 +2133,13 @@ msgstr "Góra"
msgid "Down"
msgstr "W dół"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2633
-#: include/simpleplugin/class_attribute.inc:2634
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
+#: include/simpleplugin/class_attribute.inc:2648
msgid "Sort up"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2646
-#: include/simpleplugin/class_attribute.inc:2647
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
+#: include/simpleplugin/class_attribute.inc:2661
msgid "Sort down"
msgstr ""
@@ -2106,27 +2151,26 @@ msgstr "Wybierz wszystko"
#: include/class_config.inc:479 include/class_msgPool.inc:215
#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3106
-#: include/functions.inc:3127 include/functions.inc:3157
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197 include/functions.inc:3259
+#: include/class_msgPool.inc:740 include/functions.inc:3107
+#: include/functions.inc:3128 include/functions.inc:3158
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3260
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1663 include/class_CopyPasteHandler.inc:278
-#: include/simpleplugin/class_dialogAttributes.inc:733
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
-#: include/simpleplugin/class_attribute.inc:1774
-#: include/simpleplugin/class_attribute.inc:1877
-#: include/simpleplugin/class_attribute.inc:1879
+#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
+#: include/simpleplugin/class_attribute.inc:1784
+#: include/simpleplugin/class_attribute.inc:1887
+#: include/simpleplugin/class_attribute.inc:1889
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: 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:437
#: include/password-methods/class_password-methods.inc:447
-#: include/class_SnapshotHandler.inc:415 html/index.php:434 html/index.php:444
+#: include/class_SnapshotHandler.inc:415 html/index.php:473 html/index.php:483
#: setup/class_setupStep_Migrate.inc:935
#: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
msgid "Error"
@@ -2165,44 +2209,44 @@ msgstr "Przeładuj listę"
msgid "Submit"
msgstr "Wyślij"
-#: include/class_listing.inc:1586 include/class_listing.inc:1640
+#: include/class_listing.inc:1590 include/class_listing.inc:1644
msgid "Copy"
msgstr "Kopiuj"
-#: include/class_listing.inc:1592 include/class_listing.inc:1628
+#: include/class_listing.inc:1596 include/class_listing.inc:1632
msgid "Cut"
msgstr "Wytnij"
-#: include/class_listing.inc:1600 include/class_listing.inc:1602
+#: include/class_listing.inc:1604 include/class_listing.inc:1606
#: include/class_CopyPasteHandler.inc:370
msgid "Paste"
msgstr "Wklej"
-#: include/class_listing.inc:1628
+#: include/class_listing.inc:1632
msgid "Cut this entry"
msgstr "Wytnij ten obiekt"
-#: include/class_listing.inc:1640
+#: include/class_listing.inc:1644
msgid "Copy this entry"
msgstr "Kopiuj ten obiekt"
-#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_listing.inc:1677 include/class_listing.inc:1679
msgid "Restore snapshots"
msgstr ""
-#: include/class_listing.inc:1689
+#: include/class_listing.inc:1693
msgid "Export list"
msgstr ""
-#: include/class_listing.inc:1724 include/class_listing.inc:1725
+#: include/class_listing.inc:1728 include/class_listing.inc:1729
msgid "Restore snapshot"
msgstr "Odtwórz snapshot"
-#: include/class_listing.inc:1734
+#: include/class_listing.inc:1738
msgid "Create snapshot"
msgstr "Utwórz spanshot"
-#: include/class_listing.inc:1735
+#: include/class_listing.inc:1739
msgid "Create a new snapshot from this object"
msgstr "Utwórz nowy snapshot z tego obiektu"
@@ -2245,7 +2289,7 @@ 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:162 include/class_config.inc:300
-#: include/class_config.inc:985 include/class_config.inc:998
+#: include/class_config.inc:915 include/class_config.inc:928
#: include/functions.inc:663 include/class_timezone.inc:51
#: include/password-methods/class_password-methods-sha.inc:71
#: include/password-methods/class_password-methods-ssha.inc:75
@@ -2262,17 +2306,17 @@ msgid ""
"while your passwords are not encrypted."
msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:917
-#: include/class_ldap.inc:1371 include/functions.inc:526
+#: include/class_config.inc:337 include/class_ldap.inc:918
+#: include/class_ldap.inc:1372 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2985 include/simpleplugin/class_simplePlugin.inc:545
-#: include/simpleplugin/class_attribute.inc:2895
+#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2909
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
#: include/class_SnapshotHandler.inc:422 include/class_SnapshotHandler.inc:425
-#: html/index.php:360 html/class_passwordRecovery.inc:497
+#: html/index.php:369 html/class_passwordRecovery.inc:497
#: setup/class_setupStep_Migrate.inc:451
#: setup/class_setupStep_Migrate.inc:1130
msgid "LDAP error"
@@ -2287,38 +2331,38 @@ msgstr ""
msgid "The selected mail method (class %s) is not available"
msgstr ""
-#: include/class_config.inc:986
+#: include/class_config.inc:916
#, php-format
msgid ""
"The snapshot functionality is enabled, but the required variable '%s' is not"
" set."
msgstr ""
-#: include/class_config.inc:999
+#: include/class_config.inc:929
#, php-format
msgid ""
"The snapshot functionality is enabled, but the required compression module "
"is missing. Please install '%s'."
msgstr ""
-#: include/class_config.inc:1104
+#: include/class_config.inc:1034
msgid "All categories"
msgstr "Wszystkie kategorie"
-#: include/class_config.inc:1231
+#: include/class_config.inc:1161
msgid "My account"
msgstr "Moje konto "
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
msgid "Performance warning"
msgstr "Ostrzeżenie wydajności"
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
#, php-format
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr ""
-#: include/class_ldap.inc:868 include/class_ldap.inc:904
+#: include/class_ldap.inc:869 include/class_ldap.inc:905
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
@@ -2328,39 +2372,39 @@ msgstr ""
msgid "Internal error"
msgstr "Błąd wewnętrzny"
-#: include/class_ldap.inc:868
+#: include/class_ldap.inc:869
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:904
+#: include/class_ldap.inc:905
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1016
+#: include/class_ldap.inc:1017
#, 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:1018
+#: include/class_ldap.inc:1019
#, php-format
msgid "while operating on LDAP server %s"
msgstr "podczas połączenia z serwerem LDAP '%s'"
-#: include/class_ldap.inc:1108
+#: include/class_ldap.inc:1109
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1220
+#: include/class_ldap.inc:1221
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr "To nie jest poprawne DN: '%s'. Blok dla importu powinien zaczynać się 'dn: ...' w linii %s"
-#: include/class_ldap.inc:1231
+#: include/class_ldap.inc:1232
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2948,10 +2992,10 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr ""
-#: include/functions.inc:496 include/functions.inc:3294
-#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:263
-#: include/simpleplugin/class_simplePlugin.inc:268
-#: include/simpleplugin/class_simplePlugin.inc:280
+#: include/functions.inc:496 include/functions.inc:3295
+#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
+#: include/simpleplugin/class_simplePlugin.inc:269
+#: include/simpleplugin/class_simplePlugin.inc:281
#: html/class_passwordRecovery.inc:216
msgid "Fatal error"
msgstr "BÅ‚Ä…d krytyczny"
@@ -3104,98 +3148,98 @@ msgstr ""
msgid "Cannot read to revision file!"
msgstr ""
-#: include/functions.inc:2548
+#: include/functions.inc:2549
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "LDAP warning"
msgstr "Ostrzeżenie LDAP"
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "Cannot get schema information from server. No schema check possible!"
msgstr ""
-#: include/functions.inc:2584
+#: include/functions.inc:2585
msgid ""
"Used to lock currently edited entries to avoid multiple changes at the same "
"time."
msgstr ""
-#: include/functions.inc:2596
+#: include/functions.inc:2597
#, php-format
msgid "Missing required object class '%s'!"
msgstr ""
-#: include/functions.inc:2599
+#: include/functions.inc:2600
#, php-format
msgid "Missing optional object class '%s'!"
msgstr "Brak opcjonalnego obiektu klasy '%s'!"
-#: include/functions.inc:2603
+#: include/functions.inc:2604
#, php-format
msgid "Class(es) available"
msgstr ""
-#: include/functions.inc:2623
+#: include/functions.inc:2624
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2625
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2628
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2629
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3106 include/functions.inc:3127
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3106
+#: include/functions.inc:3107
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3127
+#: include/functions.inc:3128
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3157
+#: include/functions.inc:3158
msgid "Cannot create sambaUnixIdPool entry!"
msgstr ""
-#: include/functions.inc:3165
+#: include/functions.inc:3166
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3177 include/functions.inc:3181
+#: include/functions.inc:3178 include/functions.inc:3182
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3197
+#: include/functions.inc:3198
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3259
+#: include/functions.inc:3260
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3295
+#: include/functions.inc:3296
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
@@ -3351,13 +3395,13 @@ msgstr ""
msgid "XML error"
msgstr ""
-#: include/class_plugin.inc:554
+#: include/class_plugin.inc:553
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/class_plugin.inc:1466
+#: include/class_plugin.inc:1467
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -3383,32 +3427,32 @@ msgstr "Nazwa Szablonu"
msgid "This is the name of the template"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:263
+#: include/simpleplugin/class_simplePlugin.inc:264
msgid "Only main tab can compute dn"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:270
+#: include/simpleplugin/class_simplePlugin.inc:271
#, php-format
msgid "Could not compute dn: no parent tab class for \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:282
+#: include/simpleplugin/class_simplePlugin.inc:283
#, php-format
msgid ""
"Could not compute dn: could not find objectType infos from tab class \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:638
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:644
+#: include/simpleplugin/class_simplePlugin.inc:652
msgid "Error when saving"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:638
+#: include/simpleplugin/class_simplePlugin.inc:644
#, php-format
msgid "There is already an entry with the same dn : %s"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:652
#, php-format
msgid "The entry %s is not existing"
msgstr ""
@@ -3428,27 +3472,27 @@ msgstr ""
msgid "Show %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:409
+#: include/simpleplugin/class_dialogAttributes.inc:415
#, php-format
msgid "Group %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:411
+#: include/simpleplugin/class_dialogAttributes.inc:417
#, php-format
msgid "Role %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:446
+#: include/simpleplugin/class_dialogAttributes.inc:452
msgid "Group of user"
msgstr "Grupa użytkownika"
-#: include/simpleplugin/class_dialogAttributes.inc:615
+#: include/simpleplugin/class_dialogAttributes.inc:621
#: include/simpleplugin/class_attribute.inc:1090
#: include/simpleplugin/class_attribute.inc:1124
msgid "None"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:617
+#: include/simpleplugin/class_dialogAttributes.inc:623
msgid "Unknown"
msgstr "Nieznane"
@@ -3489,11 +3533,16 @@ msgid "days"
msgstr "dni"
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2161
+#: include/simpleplugin/class_attribute.inc:2171
#, php-format
msgid "%s (required)"
msgstr ""
+#: include/simpleplugin/class_attribute.inc:1150
+#, php-format
+msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
+msgstr ""
+
#: include/simpleplugin/class_attribute.inc:1277
#, php-format
msgid "An integer between %d and %d"
@@ -3509,75 +3558,75 @@ msgstr ""
msgid "An integer smaller than %d"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1379
+#: include/simpleplugin/class_attribute.inc:1383
#, php-format
msgid "A float between %f and %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1381
+#: include/simpleplugin/class_attribute.inc:1385
#, php-format
msgid "A float larger than %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1383
+#: include/simpleplugin/class_attribute.inc:1387
#, php-format
msgid "A float smaller than %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1490
+#: include/simpleplugin/class_attribute.inc:1500
msgid "Error, incorrect date: "
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
#, php-format
msgid "Cannot read uploaded file: %s"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1530
+#: include/simpleplugin/class_attribute.inc:1540
msgid "file is empty"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1533
+#: include/simpleplugin/class_attribute.inc:1543
msgid "file not found"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1546
msgid "file not readable"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1569
+#: include/simpleplugin/class_attribute.inc:1579
#, php-format
msgid "%s (%d bytes)"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1616
-#: include/simpleplugin/class_attribute.inc:1793
+#: include/simpleplugin/class_attribute.inc:1626
+#: include/simpleplugin/class_attribute.inc:1803
msgid "Upload"
msgstr "Wgraj"
-#: include/simpleplugin/class_attribute.inc:1621
-#: include/simpleplugin/class_attribute.inc:1622
+#: include/simpleplugin/class_attribute.inc:1631
+#: include/simpleplugin/class_attribute.inc:1632
msgid "Download"
msgstr "ÅšciÄ…gnij"
-#: include/simpleplugin/class_attribute.inc:1775
+#: include/simpleplugin/class_attribute.inc:1785
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1826
+#: include/simpleplugin/class_attribute.inc:1836
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr "Kontener"
-#: include/simpleplugin/class_attribute.inc:1829
+#: include/simpleplugin/class_attribute.inc:1839
msgid "Object base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:2755
+#: include/simpleplugin/class_attribute.inc:2769
#, php-format
msgid "Invalid value for %s"
msgstr ""
@@ -3711,17 +3760,17 @@ msgstr "Proszę sprawdzić kombinację login/hasło."
msgid "Account locked. Please contact your system administrator!"
msgstr ""
-#: html/index.php:436
+#: html/index.php:475
#, php-format
msgid "CAS user \"%s\" could not be found in the LDAP"
msgstr ""
-#: html/index.php:446
+#: html/index.php:485
#, php-format
msgid "CAS user \"%s\" match several users in the LDAP"
msgstr ""
-#: html/index.php:481
+#: html/index.php:522
msgid ""
"Your browser has cookies disabled. Please enable cookies and reload this "
"page before logging in!"
@@ -4044,7 +4093,7 @@ msgid "Checking for duplicated UID numbers"
msgstr ""
#: setup/class_setupStep_Migrate.inc:267
-msgid "Checking for duplicate GID numbers"
+msgid "Checking for duplicated GID numbers"
msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:487
@@ -4054,7 +4103,7 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:1179
#: setup/class_setupStep_Migrate.inc:1272
#: setup/class_setupStep_Migrate.inc:1351
-#: setup/class_setupStep_Migrate.inc:1390
+#: setup/class_setupStep_Migrate.inc:1395
msgid "LDAP query failed"
msgstr ""
@@ -4065,7 +4114,7 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:1180
#: setup/class_setupStep_Migrate.inc:1273
#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1391
+#: setup/class_setupStep_Migrate.inc:1396
msgid "Possibly the \"root object\" is missing."
msgstr ""
@@ -4220,14 +4269,14 @@ msgstr ""
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1373
+#: setup/class_setupStep_Migrate.inc:1378
#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\"."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1412
+#: setup/class_setupStep_Migrate.inc:1422
#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\"."
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
diff --git a/locale/pt/fusiondirectory.po b/locale/pt/fusiondirectory.po
index 37d428f70aa3ba4ee8daf4b32dacd296f59fbc8c..26024a476d6960bbbbab163d653c975296ca5604 100644
--- a/locale/pt/fusiondirectory.po
+++ b/locale/pt/fusiondirectory.po
@@ -5,12 +5,12 @@
# Translators:
msgid ""
msgstr ""
-"Project-Id-Version: FusionDirectory-109\n"
+"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-01-22 11:26+0100\n"
-"PO-Revision-Date: 2016-01-22 10:24+0000\n"
+"POT-Creation-Date: 2016-03-14 12:07+0100\n"
+"PO-Revision-Date: 2016-03-07 12:09+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-109/language/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -28,31 +28,31 @@ msgstr "Bem vindo %s!"
msgid "References"
msgstr "Referências"
-#: plugins/admin/groups/class_roleGeneric.inc:30
-#: plugins/admin/groups/class_roleGeneric.inc:34
+#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:61
#: plugins/admin/groups/class_groupManagement.inc:71
#: plugins/admin/aclrole/class_aclRole.inc:78
#: plugins/admin/acl/class_aclAssignment.inc:49
msgid "Role"
msgstr "Papel"
-#: plugins/admin/groups/class_roleGeneric.inc:31
+#: plugins/admin/groups/class_roleGeneric.inc:58
msgid "Role information"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:35
+#: plugins/admin/groups/class_roleGeneric.inc:62
msgid "Organizational role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:84
msgid "Informations"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:158
+#: plugins/admin/departments/class_department.inc:174
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -62,13 +62,13 @@ msgstr ""
msgid "Name"
msgstr "Nome"
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
msgid "Name of this group"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
#: plugins/admin/groups/class_group.inc:66
#: plugins/admin/groups/class_ogroup.inc:192
#: plugins/admin/groups/group-list.xml:41
@@ -81,26 +81,26 @@ msgstr ""
msgid "Description"
msgstr "Descrição"
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
msgid "Description of the role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:70
+#: plugins/admin/groups/class_roleGeneric.inc:97
msgid "Phone number"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:74
+#: plugins/admin/groups/class_roleGeneric.inc:101
msgid "Fax number"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
#: plugins/admin/users/class_userManagement.inc:42
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: setup/class_setupStep_Migrate.inc:871
msgid "Users"
msgstr "Usuários"
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
msgid "Add users for the role"
msgstr ""
@@ -147,7 +147,7 @@ msgstr ""
#: plugins/admin/groups/class_group.inc:74
#: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:403
+#: plugins/personal/posix/class_posixAccount.inc:410
msgid "GID"
msgstr "GID"
@@ -204,23 +204,23 @@ msgid "Only allow this group to connect to this list of hosts"
msgstr ""
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458 include/functions.inc:794
-#: include/functions.inc:2548 include/class_xml.inc:55
+#: plugins/personal/posix/class_posixAccount.inc:465 include/functions.inc:794
+#: include/functions.inc:2549 include/class_xml.inc:55
#: include/simpleplugin/class_simpleTabs.inc:325 html/index.php:56
-#: html/index.php:62 html/index.php:481 html/class_passwordRecovery.inc:378
+#: html/index.php:62 html/index.php:522 html/class_passwordRecovery.inc:378
#: setup/class_setupStep_Migrate.inc:572
#: setup/class_setupStep_Migrate.inc:1083
#: setup/class_setupStep_Migrate.inc:1202
#: setup/class_setupStep_Migrate.inc:1313
-#: setup/class_setupStep_Migrate.inc:1372
-#: setup/class_setupStep_Migrate.inc:1411 plugins/admin/acl/remove.tpl.c:2
+#: setup/class_setupStep_Migrate.inc:1377
+#: setup/class_setupStep_Migrate.inc:1421 plugins/admin/acl/remove.tpl.c:2
#: ihtml/themes/default/islocked.tpl.c:5 ihtml/themes/default/remove.tpl.c:2
#: ihtml/themes/default/msg_dialog.tpl.c:5 setup/setup_checks.tpl.c:8
msgid "Warning"
msgstr "Atenção"
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458
+#: plugins/personal/posix/class_posixAccount.inc:465
msgid "Timeout while waiting for lock. Ignoring lock!"
msgstr ""
@@ -250,7 +250,7 @@ msgstr ""
msgid "Objects member of this group"
msgstr ""
-#: plugins/admin/groups/class_ogroup.inc:318
+#: plugins/admin/groups/class_ogroup.inc:313
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
@@ -279,10 +279,10 @@ msgstr "Criar"
#: plugins/admin/departments/dep-list.xml:79
#: plugins/admin/users/user-list.xml:105
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-#: include/simpleplugin/class_dialogAttributes.inc:626
-#: include/simpleplugin/class_dialogAttributes.inc:627
-#: include/simpleplugin/class_attribute.inc:2661
-#: include/simpleplugin/class_attribute.inc:2662
+#: include/simpleplugin/class_dialogAttributes.inc:632
+#: include/simpleplugin/class_dialogAttributes.inc:633
+#: include/simpleplugin/class_attribute.inc:2675
+#: include/simpleplugin/class_attribute.inc:2676
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -293,8 +293,8 @@ msgstr "Editar"
#: plugins/admin/departments/dep-list.xml:67
#: plugins/admin/departments/dep-list.xml:88
#: plugins/admin/users/user-list.xml:112
-#: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_dialogAttributes.inc:637
+#: include/simpleplugin/class_dialogAttributes.inc:642
+#: include/simpleplugin/class_dialogAttributes.inc:643
#: include/simpleplugin/simple-list.xml:75
#: include/simpleplugin/simple-list.xml:125
msgid "Remove"
@@ -343,7 +343,7 @@ msgid "Show application groups"
msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Show department groups"
+msgid "Show unidentified groups"
msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:137
@@ -432,51 +432,67 @@ msgid "Category of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:81
+msgid "Website"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:81
+#, php-format
+msgid "Website of this %s"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:85
#: plugins/personal/generic/class_user.inc:410
msgid "Manager"
msgstr ""
-#: plugins/admin/departments/class_department.inc:81
+#: plugins/admin/departments/class_department.inc:85
#, php-format
msgid "Manager of this %s"
msgstr ""
-#: plugins/admin/departments/class_department.inc:87
-#: plugins/admin/departments/class_department.inc:93
+#: plugins/admin/departments/class_department.inc:91
+#: plugins/admin/departments/class_department.inc:97
#: plugins/personal/generic/class_user.inc:304
msgid "Location"
msgstr "Localização"
-#: plugins/admin/departments/class_department.inc:90
+#: plugins/admin/departments/class_department.inc:94
#: plugins/personal/generic/class_user.inc:308
msgid "State"
msgstr "Estado"
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_country.inc:29
+#: plugins/admin/departments/class_country.inc:30
+#: plugins/admin/departments/class_country.inc:33
+msgid "Country"
+msgstr "PaÃs"
+
+#: plugins/admin/departments/class_department.inc:103
#: plugins/personal/generic/class_user.inc:312
msgid "Address"
msgstr "Endereço"
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:103
#, php-format
msgid "A postal address for this %s"
msgstr ""
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
#: plugins/personal/generic/class_user.inc:320
msgid "Phone"
msgstr "Fone"
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
msgid "Telephone number"
msgstr ""
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
#: plugins/personal/generic/class_user.inc:332
msgid "Fax"
msgstr "Fax"
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
msgid "Facsimile telephone number"
msgstr ""
@@ -504,12 +520,6 @@ msgstr ""
msgid "locality"
msgstr ""
-#: plugins/admin/departments/class_country.inc:29
-#: plugins/admin/departments/class_country.inc:30
-#: plugins/admin/departments/class_country.inc:33
-msgid "Country"
-msgstr "PaÃs"
-
#: plugins/admin/departments/class_country.inc:50
msgid "country"
msgstr ""
@@ -552,7 +562,8 @@ msgid "Given name"
msgstr "Nome fornecido"
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
+#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
msgid "Login"
@@ -665,8 +676,8 @@ msgid "Edit category ACL"
msgstr ""
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2671
-#: include/simpleplugin/class_attribute.inc:2672
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
+#: include/simpleplugin/class_attribute.inc:2686
#, php-format
msgid "Delete"
msgstr "Deletar"
@@ -771,19 +782,37 @@ msgstr ""
msgid "ACLs which are part of this group"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:38
+#: plugins/admin/acl/class_aclManagement.inc:31
+#: plugins/admin/acl/class_aclManagement.inc:32
+#: plugins/admin/acl/class_aclManagement.inc:45
+msgid "ACL assignment creation"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:33
+msgid "Create an ACL assignment on an arbitrary dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "Dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "DN you wish to add assignments for"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:135
msgid "ACL assignments"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:39
+#: plugins/admin/acl/class_aclManagement.inc:136
msgid "ACL assignments management"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:40
+#: plugins/admin/acl/class_aclManagement.inc:137
msgid "Manage ACL roles assignments to users"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:78
+#: plugins/admin/acl/class_aclManagement.inc:199
#: plugins/admin/acl/class_aclAssignment.inc:263
msgid "ACL Assignment"
msgstr ""
@@ -899,7 +928,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -994,57 +1023,57 @@ msgstr ""
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:336
+msgid "Homepage"
+msgstr "Página pessoal"
+
+#: plugins/personal/generic/class_user.inc:336
+msgid "Personal homepage"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:342
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:351
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr ""
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:362
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
msgid "Display name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home postal address"
msgstr "Caixa postal residencial"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:374
msgid "Private phone"
msgstr "Telefone privativo"
-#: plugins/personal/generic/class_user.inc:370
-msgid "Home phone number"
-msgstr ""
-
#: plugins/personal/generic/class_user.inc:374
-msgid "Homepage"
-msgstr "Página pessoal"
-
-#: plugins/personal/generic/class_user.inc:374
-msgid "Personal homepage"
+msgid "Home phone number"
msgstr ""
#: plugins/personal/generic/class_user.inc:380
@@ -1279,33 +1308,33 @@ msgstr "desconfigurado"
msgid "automatic"
msgstr "automático"
-#: plugins/personal/posix/class_posixAccount.inc:309
+#: plugins/personal/posix/class_posixAccount.inc:310
msgid "expired"
msgstr "expirado"
-#: plugins/personal/posix/class_posixAccount.inc:311
+#: plugins/personal/posix/class_posixAccount.inc:312
msgid "grace time active"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:314
-#: plugins/personal/posix/class_posixAccount.inc:316
-#: plugins/personal/posix/class_posixAccount.inc:318
+#: plugins/personal/posix/class_posixAccount.inc:315
+#: plugins/personal/posix/class_posixAccount.inc:317
+#: plugins/personal/posix/class_posixAccount.inc:319
msgid "active"
msgstr "ativo"
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:315
msgid "password expired"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:316
+#: plugins/personal/posix/class_posixAccount.inc:317
msgid "password not changeable"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:400
+#: plugins/personal/posix/class_posixAccount.inc:407
msgid "UID"
msgstr "UID"
-#: plugins/personal/posix/class_posixAccount.inc:516
+#: plugins/personal/posix/class_posixAccount.inc:525
#, php-format
msgid "Group of user %s"
msgstr ""
@@ -1477,424 +1506,440 @@ msgid "Core settings"
msgstr ""
#: plugins/config/class_configInLdap.inc:161
-msgid "Enable primary group filter"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"It is time consuming to evaluate which groups are primary and which are not,"
-" so you may want to disable it if your group plugin is slow."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:167
msgid "Display summary in listings"
msgstr ""
-#: plugins/config/class_configInLdap.inc:168
+#: 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:173
+#: plugins/config/class_configInLdap.inc:167
msgid "Edit locking"
msgstr ""
-#: plugins/config/class_configInLdap.inc:174
+#: 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:179
+#: plugins/config/class_configInLdap.inc:173
msgid "Enable logging"
msgstr ""
-#: plugins/config/class_configInLdap.inc:180
+#: plugins/config/class_configInLdap.inc:174
msgid "Event logging on FusionDirectory side."
msgstr ""
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "LDAP size limit"
msgstr ""
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "Defines the number of entries to get from LDAP by default."
msgstr ""
-#: plugins/config/class_configInLdap.inc:192
+#: plugins/config/class_configInLdap.inc:186
msgid "Login and session"
msgstr ""
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:189
msgid "Login attribute"
msgstr ""
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:190
msgid "Which LDAP attribute should be used as the login name during login."
msgstr ""
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:196
msgid "Enforce encrypted connections"
msgstr ""
-#: plugins/config/class_configInLdap.inc:203
+#: plugins/config/class_configInLdap.inc:197
msgid ""
"Enables PHP security checks to force encrypted access (https) to the web "
"interface."
msgstr ""
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:201
msgid "Warn if session is not encrypted"
msgstr ""
-#: plugins/config/class_configInLdap.inc:208
+#: plugins/config/class_configInLdap.inc:202
msgid "will display a warning to the user when http is used instead of https."
msgstr ""
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Session lifetime"
msgstr ""
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Defines when a session will expire in seconds."
msgstr ""
-#: plugins/config/class_configInLdap.inc:220
+#: plugins/config/class_configInLdap.inc:212
+msgid "HTTP authentication"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:212
+msgid "Use HTTP authentication protocol instead of the login form."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:219
#: include/class_SnapshotDialogs.inc:186
msgid "Snapshots"
msgstr ""
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid "Enable snapshots"
msgstr ""
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid ""
"This enables you to save certain states of entries and restore them later "
"on."
msgstr ""
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
msgid "Snapshot base"
msgstr ""
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
msgid "The base where snapshots should be stored inside of the LDAP."
msgstr ""
-#: plugins/config/class_configInLdap.inc:235
+#: plugins/config/class_configInLdap.inc:234
msgid "SSL"
msgstr ""
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Key path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Path to FusionDirectory private key. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Certificate path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Path to FusionDirectory certificate. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:262
msgid "CA certificate path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:247
msgid "Path to the CA certificate. Used for validating Argonaut Server host."
msgstr ""
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:254
msgid "CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "Enable CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "CAS login will be used instead of LDAP bind"
msgstr ""
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:262
msgid "Path to the CA certificate of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host"
msgstr ""
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port"
msgstr ""
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port the CAS server is listening on"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context to be used"
msgstr ""
-#: plugins/config/class_configInLdap.inc:285
+#: plugins/config/class_configInLdap.inc:284
msgid "People and group storage"
msgstr ""
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "People DN attribute"
msgstr ""
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "Attribute to use at the beginning of users dn"
msgstr ""
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "CN pattern"
msgstr ""
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "The pattern to use to build the common name field"
msgstr ""
-#: plugins/config/class_configInLdap.inc:299
+#: plugins/config/class_configInLdap.inc:298
msgid "Strict naming policy"
msgstr ""
-#: plugins/config/class_configInLdap.inc:300
+#: plugins/config/class_configInLdap.inc:299
msgid "Enables strict checking of user and group names"
msgstr ""
-#: plugins/config/class_configInLdap.inc:305
+#: plugins/config/class_configInLdap.inc:304
msgid "Group/user min id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:306
+#: plugins/config/class_configInLdap.inc:305
msgid ""
"The minimum assignable user or group id to avoid security leaks with id 0 "
"accounts."
msgstr ""
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid "Next id hook"
msgstr ""
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid ""
"A script to be called for finding the next free id number for users or "
"groups."
msgstr ""
-#: plugins/config/class_configInLdap.inc:315
+#: plugins/config/class_configInLdap.inc:314
msgid "Base number for user id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:315
msgid "Where to start looking for a new free user id."
msgstr ""
-#: plugins/config/class_configInLdap.inc:321
+#: plugins/config/class_configInLdap.inc:320
msgid "Base number for group id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:321
msgid "Where to start looking for a new free group id."
msgstr ""
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "Users RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "The branch where users are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "Groups RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "The branch where groups are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "ACL role RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "The branch where ACL roles are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Id allocation method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Method to allocate user/group ids"
msgstr ""
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Traditional"
msgstr ""
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Samba unix id pool"
msgstr ""
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Pool user id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Minimum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Pool user id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Maximum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Pool group id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Minimum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Pool group id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Maximum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:370
-msgid "Debugging"
+#: plugins/config/class_configInLdap.inc:367
+msgid "Restrict role members"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:367
+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:373
+msgid "Debugging"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:376
msgid "Display errors"
msgstr ""
-#: plugins/config/class_configInLdap.inc:374
+#: plugins/config/class_configInLdap.inc:377
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:378
+#: plugins/config/class_configInLdap.inc:381
msgid "Maximum LDAP query time"
msgstr ""
-#: plugins/config/class_configInLdap.inc:378
+#: plugins/config/class_configInLdap.inc:381
msgid ""
"Stop LDAP actions if there is no answer within the specified number of "
"seconds."
msgstr ""
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:386
msgid "Log LDAP statistics"
msgstr ""
-#: plugins/config/class_configInLdap.inc:384
+#: plugins/config/class_configInLdap.inc:387
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:389
+#: plugins/config/class_configInLdap.inc:392
msgid "Debug level"
msgstr ""
-#: plugins/config/class_configInLdap.inc:390
+#: plugins/config/class_configInLdap.inc:393
msgid "Display certain information on each page load."
msgstr ""
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:405
msgid "Miscellaneous"
msgstr ""
-#: plugins/config/class_configInLdap.inc:407
+#: plugins/config/class_configInLdap.inc:410
msgid "Hooks that are called when specific actions happens"
msgstr ""
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "tab"
msgstr ""
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "The tab that this hook concerns"
msgstr ""
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "mode"
msgstr ""
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "When to call this command"
msgstr ""
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "cmd"
msgstr ""
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "The command that will be called"
msgstr ""
-#: plugins/config/class_configInLdap.inc:429
+#: plugins/config/class_configInLdap.inc:432
msgid "Hooks"
msgstr ""
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:439
msgid "Display hook output"
msgstr ""
-#: plugins/config/class_configInLdap.inc:437
+#: plugins/config/class_configInLdap.inc:440
msgid ""
"When enabled successful hook execution output is displayed to the user using"
" a dialog."
msgstr ""
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available shells"
msgstr ""
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available POSIX shells for FD users."
msgstr ""
-#: plugins/config/class_configInLdap.inc:449
+#: plugins/config/class_configInLdap.inc:452
msgid "Show ACL tab on all objects"
msgstr ""
-#: plugins/config/class_configInLdap.inc:450
+#: plugins/config/class_configInLdap.inc:453
msgid ""
"For very specific ACL rights setting where you might need to give right on a"
" single object."
msgstr ""
-#: plugins/config/class_configInLdap.inc:464
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available department categories"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available categories in the departments dropdown"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:474
#: setup/class_setupStep_Language.inc:69
msgid "Automatic"
msgstr ""
@@ -1911,80 +1956,80 @@ msgstr ""
msgid "Password recovery settings"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:44
+#: plugins/config/class_recoveryConfig.inc:45
msgid "Activate password recovery"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:45
+#: plugins/config/class_recoveryConfig.inc:46
msgid "Whether to activate or not password recovery feature"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:50
+#: plugins/config/class_recoveryConfig.inc:51
msgid "Sender email address"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:51
+#: plugins/config/class_recoveryConfig.inc:52
msgid "Email address from which mails will be sent"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:57
+#: plugins/config/class_recoveryConfig.inc:58
msgid "Link validity (minutes)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:58
+#: plugins/config/class_recoveryConfig.inc:59
msgid "Number of minutes before a recovery link expires"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:64
+#: plugins/config/class_recoveryConfig.inc:65
msgid "Salt for tokens"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:65
+#: plugins/config/class_recoveryConfig.inc:66
msgid ""
"Just a security measure, you can put anything in there, even random "
"characters"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:71
+#: plugins/config/class_recoveryConfig.inc:72
msgid "Allow the use of alternate addresses"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:72
+#: plugins/config/class_recoveryConfig.inc:73
msgid ""
"Users will also be able to enter one of theirs alternate addresses to "
"recover their password"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:79
+#: plugins/config/class_recoveryConfig.inc:80
msgid "First email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:82
-#: plugins/config/class_recoveryConfig.inc:101
+#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:102
msgid "Subject"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:84
msgid "Subject of the first email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:86
+#: plugins/config/class_recoveryConfig.inc:87
msgid "[FusionDirectory] Password recovery link"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:89
+#: plugins/config/class_recoveryConfig.inc:90
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:91
#, 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 ""
-#: plugins/config/class_recoveryConfig.inc:93
+#: plugins/config/class_recoveryConfig.inc:94
#, php-format
msgid ""
"Hello,\n"
@@ -1996,31 +2041,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:98
+#: plugins/config/class_recoveryConfig.inc:99
msgid "Second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:103
msgid "Subject of the second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:105
+#: plugins/config/class_recoveryConfig.inc:106
msgid "[FusionDirectory] Password recovery successful"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:108
+#: plugins/config/class_recoveryConfig.inc:109
#, php-format
msgid "Body (%s is login)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:110
#, php-format
msgid ""
"Body of the second email, sent to confirm the password has been changed. Use"
" %s for the user login."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:112
+#: plugins/config/class_recoveryConfig.inc:113
#, php-format
msgid ""
"Hello,\n"
@@ -2088,13 +2133,13 @@ msgstr "Para cima"
msgid "Down"
msgstr "Para baixo"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2633
-#: include/simpleplugin/class_attribute.inc:2634
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
+#: include/simpleplugin/class_attribute.inc:2648
msgid "Sort up"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2646
-#: include/simpleplugin/class_attribute.inc:2647
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
+#: include/simpleplugin/class_attribute.inc:2661
msgid "Sort down"
msgstr ""
@@ -2106,27 +2151,26 @@ msgstr ""
#: include/class_config.inc:479 include/class_msgPool.inc:215
#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3106
-#: include/functions.inc:3127 include/functions.inc:3157
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197 include/functions.inc:3259
+#: include/class_msgPool.inc:740 include/functions.inc:3107
+#: include/functions.inc:3128 include/functions.inc:3158
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3260
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1663 include/class_CopyPasteHandler.inc:278
-#: include/simpleplugin/class_dialogAttributes.inc:733
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
-#: include/simpleplugin/class_attribute.inc:1774
-#: include/simpleplugin/class_attribute.inc:1877
-#: include/simpleplugin/class_attribute.inc:1879
+#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
+#: include/simpleplugin/class_attribute.inc:1784
+#: include/simpleplugin/class_attribute.inc:1887
+#: include/simpleplugin/class_attribute.inc:1889
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: 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:437
#: include/password-methods/class_password-methods.inc:447
-#: include/class_SnapshotHandler.inc:415 html/index.php:434 html/index.php:444
+#: include/class_SnapshotHandler.inc:415 html/index.php:473 html/index.php:483
#: setup/class_setupStep_Migrate.inc:935
#: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
msgid "Error"
@@ -2165,44 +2209,44 @@ msgstr "Recarregar lista"
msgid "Submit"
msgstr "Submeter"
-#: include/class_listing.inc:1586 include/class_listing.inc:1640
+#: include/class_listing.inc:1590 include/class_listing.inc:1644
msgid "Copy"
msgstr ""
-#: include/class_listing.inc:1592 include/class_listing.inc:1628
+#: include/class_listing.inc:1596 include/class_listing.inc:1632
msgid "Cut"
msgstr ""
-#: include/class_listing.inc:1600 include/class_listing.inc:1602
+#: include/class_listing.inc:1604 include/class_listing.inc:1606
#: include/class_CopyPasteHandler.inc:370
msgid "Paste"
msgstr "Colar"
-#: include/class_listing.inc:1628
+#: include/class_listing.inc:1632
msgid "Cut this entry"
msgstr ""
-#: include/class_listing.inc:1640
+#: include/class_listing.inc:1644
msgid "Copy this entry"
msgstr ""
-#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_listing.inc:1677 include/class_listing.inc:1679
msgid "Restore snapshots"
msgstr ""
-#: include/class_listing.inc:1689
+#: include/class_listing.inc:1693
msgid "Export list"
msgstr ""
-#: include/class_listing.inc:1724 include/class_listing.inc:1725
+#: include/class_listing.inc:1728 include/class_listing.inc:1729
msgid "Restore snapshot"
msgstr ""
-#: include/class_listing.inc:1734
+#: include/class_listing.inc:1738
msgid "Create snapshot"
msgstr ""
-#: include/class_listing.inc:1735
+#: include/class_listing.inc:1739
msgid "Create a new snapshot from this object"
msgstr ""
@@ -2245,7 +2289,7 @@ 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:162 include/class_config.inc:300
-#: include/class_config.inc:985 include/class_config.inc:998
+#: include/class_config.inc:915 include/class_config.inc:928
#: include/functions.inc:663 include/class_timezone.inc:51
#: include/password-methods/class_password-methods-sha.inc:71
#: include/password-methods/class_password-methods-ssha.inc:75
@@ -2262,17 +2306,17 @@ msgid ""
"while your passwords are not encrypted."
msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:917
-#: include/class_ldap.inc:1371 include/functions.inc:526
+#: include/class_config.inc:337 include/class_ldap.inc:918
+#: include/class_ldap.inc:1372 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2985 include/simpleplugin/class_simplePlugin.inc:545
-#: include/simpleplugin/class_attribute.inc:2895
+#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2909
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
#: include/class_SnapshotHandler.inc:422 include/class_SnapshotHandler.inc:425
-#: html/index.php:360 html/class_passwordRecovery.inc:497
+#: html/index.php:369 html/class_passwordRecovery.inc:497
#: setup/class_setupStep_Migrate.inc:451
#: setup/class_setupStep_Migrate.inc:1130
msgid "LDAP error"
@@ -2287,38 +2331,38 @@ msgstr "Não foi possÃvel realizar bind para o LDAP. Por favor, contacte o admi
msgid "The selected mail method (class %s) is not available"
msgstr ""
-#: include/class_config.inc:986
+#: include/class_config.inc:916
#, php-format
msgid ""
"The snapshot functionality is enabled, but the required variable '%s' is not"
" set."
msgstr ""
-#: include/class_config.inc:999
+#: include/class_config.inc:929
#, php-format
msgid ""
"The snapshot functionality is enabled, but the required compression module "
"is missing. Please install '%s'."
msgstr ""
-#: include/class_config.inc:1104
+#: include/class_config.inc:1034
msgid "All categories"
msgstr "Todas as categorias"
-#: include/class_config.inc:1231
+#: include/class_config.inc:1161
msgid "My account"
msgstr "Minha conta"
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
msgid "Performance warning"
msgstr "Alerta de performance"
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
#, php-format
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr "A performance do LDAP está ruim: a última pesquisa levou cerca de %.2fs!"
-#: include/class_ldap.inc:868 include/class_ldap.inc:904
+#: include/class_ldap.inc:869 include/class_ldap.inc:905
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
@@ -2328,39 +2372,39 @@ msgstr "A performance do LDAP está ruim: a última pesquisa levou cerca de %.2f
msgid "Internal error"
msgstr "Erro interno"
-#: include/class_ldap.inc:868
+#: include/class_ldap.inc:869
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:904
+#: include/class_ldap.inc:905
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1016
+#: include/class_ldap.inc:1017
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr "enquanto executava em '%s' usando LDAP server '%s'"
-#: include/class_ldap.inc:1018
+#: include/class_ldap.inc:1019
#, php-format
msgid "while operating on LDAP server %s"
msgstr "enquanto executava no LDAP server %s"
-#: include/class_ldap.inc:1108
+#: include/class_ldap.inc:1109
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1220
+#: include/class_ldap.inc:1221
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr "Esse não é um DN válido: '%s'. O bloco para importação deve iniciar com 'dn: ...' na linha %s"
-#: include/class_ldap.inc:1231
+#: include/class_ldap.inc:1232
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2948,10 +2992,10 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr ""
-#: include/functions.inc:496 include/functions.inc:3294
-#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:263
-#: include/simpleplugin/class_simplePlugin.inc:268
-#: include/simpleplugin/class_simplePlugin.inc:280
+#: include/functions.inc:496 include/functions.inc:3295
+#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
+#: include/simpleplugin/class_simplePlugin.inc:269
+#: include/simpleplugin/class_simplePlugin.inc:281
#: html/class_passwordRecovery.inc:216
msgid "Fatal error"
msgstr ""
@@ -3104,98 +3148,98 @@ msgstr ""
msgid "Cannot read to revision file!"
msgstr ""
-#: include/functions.inc:2548
+#: include/functions.inc:2549
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "LDAP warning"
msgstr ""
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "Cannot get schema information from server. No schema check possible!"
msgstr ""
-#: include/functions.inc:2584
+#: include/functions.inc:2585
msgid ""
"Used to lock currently edited entries to avoid multiple changes at the same "
"time."
msgstr ""
-#: include/functions.inc:2596
+#: include/functions.inc:2597
#, php-format
msgid "Missing required object class '%s'!"
msgstr ""
-#: include/functions.inc:2599
+#: include/functions.inc:2600
#, php-format
msgid "Missing optional object class '%s'!"
msgstr ""
-#: include/functions.inc:2603
+#: include/functions.inc:2604
#, php-format
msgid "Class(es) available"
msgstr ""
-#: include/functions.inc:2623
+#: include/functions.inc:2624
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2625
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2628
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2629
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3106 include/functions.inc:3127
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3106
+#: include/functions.inc:3107
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3127
+#: include/functions.inc:3128
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3157
+#: include/functions.inc:3158
msgid "Cannot create sambaUnixIdPool entry!"
msgstr ""
-#: include/functions.inc:3165
+#: include/functions.inc:3166
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3177 include/functions.inc:3181
+#: include/functions.inc:3178 include/functions.inc:3182
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3197
+#: include/functions.inc:3198
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3259
+#: include/functions.inc:3260
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3295
+#: include/functions.inc:3296
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
@@ -3351,13 +3395,13 @@ msgstr ""
msgid "XML error"
msgstr ""
-#: include/class_plugin.inc:554
+#: include/class_plugin.inc:553
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/class_plugin.inc:1466
+#: include/class_plugin.inc:1467
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -3383,32 +3427,32 @@ msgstr "Nome modelo"
msgid "This is the name of the template"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:263
+#: include/simpleplugin/class_simplePlugin.inc:264
msgid "Only main tab can compute dn"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:270
+#: include/simpleplugin/class_simplePlugin.inc:271
#, php-format
msgid "Could not compute dn: no parent tab class for \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:282
+#: include/simpleplugin/class_simplePlugin.inc:283
#, php-format
msgid ""
"Could not compute dn: could not find objectType infos from tab class \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:638
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:644
+#: include/simpleplugin/class_simplePlugin.inc:652
msgid "Error when saving"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:638
+#: include/simpleplugin/class_simplePlugin.inc:644
#, php-format
msgid "There is already an entry with the same dn : %s"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:652
#, php-format
msgid "The entry %s is not existing"
msgstr ""
@@ -3428,27 +3472,27 @@ msgstr ""
msgid "Show %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:409
+#: include/simpleplugin/class_dialogAttributes.inc:415
#, php-format
msgid "Group %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:411
+#: include/simpleplugin/class_dialogAttributes.inc:417
#, php-format
msgid "Role %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:446
+#: include/simpleplugin/class_dialogAttributes.inc:452
msgid "Group of user"
msgstr "Grupo do usuário"
-#: include/simpleplugin/class_dialogAttributes.inc:615
+#: include/simpleplugin/class_dialogAttributes.inc:621
#: include/simpleplugin/class_attribute.inc:1090
#: include/simpleplugin/class_attribute.inc:1124
msgid "None"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:617
+#: include/simpleplugin/class_dialogAttributes.inc:623
msgid "Unknown"
msgstr "Desconhecido"
@@ -3489,11 +3533,16 @@ msgid "days"
msgstr ""
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2161
+#: include/simpleplugin/class_attribute.inc:2171
#, php-format
msgid "%s (required)"
msgstr ""
+#: include/simpleplugin/class_attribute.inc:1150
+#, php-format
+msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
+msgstr ""
+
#: include/simpleplugin/class_attribute.inc:1277
#, php-format
msgid "An integer between %d and %d"
@@ -3509,75 +3558,75 @@ msgstr ""
msgid "An integer smaller than %d"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1379
+#: include/simpleplugin/class_attribute.inc:1383
#, php-format
msgid "A float between %f and %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1381
+#: include/simpleplugin/class_attribute.inc:1385
#, php-format
msgid "A float larger than %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1383
+#: include/simpleplugin/class_attribute.inc:1387
#, php-format
msgid "A float smaller than %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1490
+#: include/simpleplugin/class_attribute.inc:1500
msgid "Error, incorrect date: "
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
#, php-format
msgid "Cannot read uploaded file: %s"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1530
+#: include/simpleplugin/class_attribute.inc:1540
msgid "file is empty"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1533
+#: include/simpleplugin/class_attribute.inc:1543
msgid "file not found"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1546
msgid "file not readable"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1569
+#: include/simpleplugin/class_attribute.inc:1579
#, php-format
msgid "%s (%d bytes)"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1616
-#: include/simpleplugin/class_attribute.inc:1793
+#: include/simpleplugin/class_attribute.inc:1626
+#: include/simpleplugin/class_attribute.inc:1803
msgid "Upload"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1621
-#: include/simpleplugin/class_attribute.inc:1622
+#: include/simpleplugin/class_attribute.inc:1631
+#: include/simpleplugin/class_attribute.inc:1632
msgid "Download"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1775
+#: include/simpleplugin/class_attribute.inc:1785
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1826
+#: include/simpleplugin/class_attribute.inc:1836
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr "Base"
-#: include/simpleplugin/class_attribute.inc:1829
+#: include/simpleplugin/class_attribute.inc:1839
msgid "Object base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:2755
+#: include/simpleplugin/class_attribute.inc:2769
#, php-format
msgid "Invalid value for %s"
msgstr ""
@@ -3711,17 +3760,17 @@ msgstr "Por favor, verifique a combinação usuário / senha"
msgid "Account locked. Please contact your system administrator!"
msgstr ""
-#: html/index.php:436
+#: html/index.php:475
#, php-format
msgid "CAS user \"%s\" could not be found in the LDAP"
msgstr ""
-#: html/index.php:446
+#: html/index.php:485
#, php-format
msgid "CAS user \"%s\" match several users in the LDAP"
msgstr ""
-#: html/index.php:481
+#: html/index.php:522
msgid ""
"Your browser has cookies disabled. Please enable cookies and reload this "
"page before logging in!"
@@ -4044,7 +4093,7 @@ msgid "Checking for duplicated UID numbers"
msgstr ""
#: setup/class_setupStep_Migrate.inc:267
-msgid "Checking for duplicate GID numbers"
+msgid "Checking for duplicated GID numbers"
msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:487
@@ -4054,7 +4103,7 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:1179
#: setup/class_setupStep_Migrate.inc:1272
#: setup/class_setupStep_Migrate.inc:1351
-#: setup/class_setupStep_Migrate.inc:1390
+#: setup/class_setupStep_Migrate.inc:1395
msgid "LDAP query failed"
msgstr ""
@@ -4065,7 +4114,7 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:1180
#: setup/class_setupStep_Migrate.inc:1273
#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1391
+#: setup/class_setupStep_Migrate.inc:1396
msgid "Possibly the \"root object\" is missing."
msgstr ""
@@ -4220,14 +4269,14 @@ msgstr ""
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1373
+#: setup/class_setupStep_Migrate.inc:1378
#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\"."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1412
+#: setup/class_setupStep_Migrate.inc:1422
#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\"."
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
diff --git a/locale/pt_BR/fusiondirectory.po b/locale/pt_BR/fusiondirectory.po
index 49a37fdd502d8f00a79b3100305950e4e8be744b..964bb671ed9a907515a73bbd4200fca41c018bef 100644
--- a/locale/pt_BR/fusiondirectory.po
+++ b/locale/pt_BR/fusiondirectory.po
@@ -5,12 +5,12 @@
# Translators:
msgid ""
msgstr ""
-"Project-Id-Version: FusionDirectory-109\n"
+"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-01-22 11:26+0100\n"
-"PO-Revision-Date: 2016-01-22 10:24+0000\n"
+"POT-Creation-Date: 2016-03-14 12:07+0100\n"
+"PO-Revision-Date: 2016-03-07 12:09+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-109/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -28,31 +28,31 @@ msgstr "Bem-vindo %s!"
msgid "References"
msgstr "Referências"
-#: plugins/admin/groups/class_roleGeneric.inc:30
-#: plugins/admin/groups/class_roleGeneric.inc:34
+#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:61
#: plugins/admin/groups/class_groupManagement.inc:71
#: plugins/admin/aclrole/class_aclRole.inc:78
#: plugins/admin/acl/class_aclAssignment.inc:49
msgid "Role"
msgstr "Atribuição"
-#: plugins/admin/groups/class_roleGeneric.inc:31
+#: plugins/admin/groups/class_roleGeneric.inc:58
msgid "Role information"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:35
+#: plugins/admin/groups/class_roleGeneric.inc:62
msgid "Organizational role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:84
msgid "Informations"
msgstr "Informações"
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:158
+#: plugins/admin/departments/class_department.inc:174
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -62,13 +62,13 @@ msgstr "Informações"
msgid "Name"
msgstr "Nome"
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
msgid "Name of this group"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
#: plugins/admin/groups/class_group.inc:66
#: plugins/admin/groups/class_ogroup.inc:192
#: plugins/admin/groups/group-list.xml:41
@@ -81,26 +81,26 @@ msgstr ""
msgid "Description"
msgstr "Descrição"
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
msgid "Description of the role"
msgstr "Descrição da atribuição"
-#: plugins/admin/groups/class_roleGeneric.inc:70
+#: plugins/admin/groups/class_roleGeneric.inc:97
msgid "Phone number"
msgstr "Número de telefone"
-#: plugins/admin/groups/class_roleGeneric.inc:74
+#: plugins/admin/groups/class_roleGeneric.inc:101
msgid "Fax number"
msgstr "Número de Fax"
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
#: plugins/admin/users/class_userManagement.inc:42
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: setup/class_setupStep_Migrate.inc:871
msgid "Users"
msgstr "Usuários"
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
msgid "Add users for the role"
msgstr "Adicionar usuários para a atribuição"
@@ -147,7 +147,7 @@ msgstr ""
#: plugins/admin/groups/class_group.inc:74
#: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:403
+#: plugins/personal/posix/class_posixAccount.inc:410
msgid "GID"
msgstr "GID"
@@ -204,23 +204,23 @@ msgid "Only allow this group to connect to this list of hosts"
msgstr ""
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458 include/functions.inc:794
-#: include/functions.inc:2548 include/class_xml.inc:55
+#: plugins/personal/posix/class_posixAccount.inc:465 include/functions.inc:794
+#: include/functions.inc:2549 include/class_xml.inc:55
#: include/simpleplugin/class_simpleTabs.inc:325 html/index.php:56
-#: html/index.php:62 html/index.php:481 html/class_passwordRecovery.inc:378
+#: html/index.php:62 html/index.php:522 html/class_passwordRecovery.inc:378
#: setup/class_setupStep_Migrate.inc:572
#: setup/class_setupStep_Migrate.inc:1083
#: setup/class_setupStep_Migrate.inc:1202
#: setup/class_setupStep_Migrate.inc:1313
-#: setup/class_setupStep_Migrate.inc:1372
-#: setup/class_setupStep_Migrate.inc:1411 plugins/admin/acl/remove.tpl.c:2
+#: setup/class_setupStep_Migrate.inc:1377
+#: setup/class_setupStep_Migrate.inc:1421 plugins/admin/acl/remove.tpl.c:2
#: ihtml/themes/default/islocked.tpl.c:5 ihtml/themes/default/remove.tpl.c:2
#: ihtml/themes/default/msg_dialog.tpl.c:5 setup/setup_checks.tpl.c:8
msgid "Warning"
msgstr "Aviso"
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458
+#: plugins/personal/posix/class_posixAccount.inc:465
msgid "Timeout while waiting for lock. Ignoring lock!"
msgstr ""
@@ -250,7 +250,7 @@ msgstr ""
msgid "Objects member of this group"
msgstr ""
-#: plugins/admin/groups/class_ogroup.inc:318
+#: plugins/admin/groups/class_ogroup.inc:313
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
@@ -279,10 +279,10 @@ msgstr "Criar"
#: plugins/admin/departments/dep-list.xml:79
#: plugins/admin/users/user-list.xml:105
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-#: include/simpleplugin/class_dialogAttributes.inc:626
-#: include/simpleplugin/class_dialogAttributes.inc:627
-#: include/simpleplugin/class_attribute.inc:2661
-#: include/simpleplugin/class_attribute.inc:2662
+#: include/simpleplugin/class_dialogAttributes.inc:632
+#: include/simpleplugin/class_dialogAttributes.inc:633
+#: include/simpleplugin/class_attribute.inc:2675
+#: include/simpleplugin/class_attribute.inc:2676
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -293,8 +293,8 @@ msgstr "Editar"
#: plugins/admin/departments/dep-list.xml:67
#: plugins/admin/departments/dep-list.xml:88
#: plugins/admin/users/user-list.xml:112
-#: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_dialogAttributes.inc:637
+#: include/simpleplugin/class_dialogAttributes.inc:642
+#: include/simpleplugin/class_dialogAttributes.inc:643
#: include/simpleplugin/simple-list.xml:75
#: include/simpleplugin/simple-list.xml:125
msgid "Remove"
@@ -343,7 +343,7 @@ msgid "Show application groups"
msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Show department groups"
+msgid "Show unidentified groups"
msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:137
@@ -432,51 +432,67 @@ msgid "Category of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:81
+msgid "Website"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:81
+#, php-format
+msgid "Website of this %s"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:85
#: plugins/personal/generic/class_user.inc:410
msgid "Manager"
msgstr "Gerente"
-#: plugins/admin/departments/class_department.inc:81
+#: plugins/admin/departments/class_department.inc:85
#, php-format
msgid "Manager of this %s"
msgstr ""
-#: plugins/admin/departments/class_department.inc:87
-#: plugins/admin/departments/class_department.inc:93
+#: plugins/admin/departments/class_department.inc:91
+#: plugins/admin/departments/class_department.inc:97
#: plugins/personal/generic/class_user.inc:304
msgid "Location"
msgstr "Localização"
-#: plugins/admin/departments/class_department.inc:90
+#: plugins/admin/departments/class_department.inc:94
#: plugins/personal/generic/class_user.inc:308
msgid "State"
msgstr "Estado"
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_country.inc:29
+#: plugins/admin/departments/class_country.inc:30
+#: plugins/admin/departments/class_country.inc:33
+msgid "Country"
+msgstr "PaÃs"
+
+#: plugins/admin/departments/class_department.inc:103
#: plugins/personal/generic/class_user.inc:312
msgid "Address"
msgstr "Endereço"
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:103
#, php-format
msgid "A postal address for this %s"
msgstr ""
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
#: plugins/personal/generic/class_user.inc:320
msgid "Phone"
msgstr "Telefone"
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
msgid "Telephone number"
msgstr "Número de telefone"
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
#: plugins/personal/generic/class_user.inc:332
msgid "Fax"
msgstr "Fax"
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
msgid "Facsimile telephone number"
msgstr ""
@@ -504,12 +520,6 @@ msgstr "Localização"
msgid "locality"
msgstr ""
-#: plugins/admin/departments/class_country.inc:29
-#: plugins/admin/departments/class_country.inc:30
-#: plugins/admin/departments/class_country.inc:33
-msgid "Country"
-msgstr "PaÃs"
-
#: plugins/admin/departments/class_country.inc:50
msgid "country"
msgstr ""
@@ -552,7 +562,8 @@ msgid "Given name"
msgstr "Primeiro nome"
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
+#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
msgid "Login"
@@ -665,8 +676,8 @@ msgid "Edit category ACL"
msgstr "Editar categoria de ACL"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2671
-#: include/simpleplugin/class_attribute.inc:2672
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
+#: include/simpleplugin/class_attribute.inc:2686
#, php-format
msgid "Delete"
msgstr "Deletar"
@@ -771,19 +782,37 @@ msgstr ""
msgid "ACLs which are part of this group"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:38
+#: plugins/admin/acl/class_aclManagement.inc:31
+#: plugins/admin/acl/class_aclManagement.inc:32
+#: plugins/admin/acl/class_aclManagement.inc:45
+msgid "ACL assignment creation"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:33
+msgid "Create an ACL assignment on an arbitrary dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "Dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "DN you wish to add assignments for"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:135
msgid "ACL assignments"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:39
+#: plugins/admin/acl/class_aclManagement.inc:136
msgid "ACL assignments management"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:40
+#: plugins/admin/acl/class_aclManagement.inc:137
msgid "Manage ACL roles assignments to users"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:78
+#: plugins/admin/acl/class_aclManagement.inc:199
#: plugins/admin/acl/class_aclAssignment.inc:263
msgid "ACL Assignment"
msgstr "Atribuições de ACL"
@@ -899,7 +928,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:352
+#: plugins/personal/generic/class_user.inc:356
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -994,59 +1023,59 @@ msgstr ""
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:336
+msgid "Homepage"
+msgstr "Página inicial"
+
+#: plugins/personal/generic/class_user.inc:336
+msgid "Personal homepage"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:342
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:351
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr "Idioma desejado"
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:362
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
msgid "Display name"
msgstr "Nome de exibição"
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home postal address"
msgstr "Endereço residencial"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:374
msgid "Private phone"
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:374
msgid "Home phone number"
msgstr "Telefone residencial"
-#: plugins/personal/generic/class_user.inc:374
-msgid "Homepage"
-msgstr "Página inicial"
-
-#: plugins/personal/generic/class_user.inc:374
-msgid "Personal homepage"
-msgstr ""
-
#: plugins/personal/generic/class_user.inc:380
msgid "Organizational information"
msgstr ""
@@ -1279,33 +1308,33 @@ msgstr ""
msgid "automatic"
msgstr "automático"
-#: plugins/personal/posix/class_posixAccount.inc:309
+#: plugins/personal/posix/class_posixAccount.inc:310
msgid "expired"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:311
+#: plugins/personal/posix/class_posixAccount.inc:312
msgid "grace time active"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:314
-#: plugins/personal/posix/class_posixAccount.inc:316
-#: plugins/personal/posix/class_posixAccount.inc:318
+#: plugins/personal/posix/class_posixAccount.inc:315
+#: plugins/personal/posix/class_posixAccount.inc:317
+#: plugins/personal/posix/class_posixAccount.inc:319
msgid "active"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:315
msgid "password expired"
msgstr "senha expirada"
-#: plugins/personal/posix/class_posixAccount.inc:316
+#: plugins/personal/posix/class_posixAccount.inc:317
msgid "password not changeable"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:400
+#: plugins/personal/posix/class_posixAccount.inc:407
msgid "UID"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:516
+#: plugins/personal/posix/class_posixAccount.inc:525
#, php-format
msgid "Group of user %s"
msgstr ""
@@ -1477,424 +1506,440 @@ msgid "Core settings"
msgstr ""
#: plugins/config/class_configInLdap.inc:161
-msgid "Enable primary group filter"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"It is time consuming to evaluate which groups are primary and which are not,"
-" so you may want to disable it if your group plugin is slow."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:167
msgid "Display summary in listings"
msgstr ""
-#: plugins/config/class_configInLdap.inc:168
+#: 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:173
+#: plugins/config/class_configInLdap.inc:167
msgid "Edit locking"
msgstr ""
-#: plugins/config/class_configInLdap.inc:174
+#: 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:179
+#: plugins/config/class_configInLdap.inc:173
msgid "Enable logging"
msgstr ""
-#: plugins/config/class_configInLdap.inc:180
+#: plugins/config/class_configInLdap.inc:174
msgid "Event logging on FusionDirectory side."
msgstr ""
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "LDAP size limit"
msgstr ""
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "Defines the number of entries to get from LDAP by default."
msgstr ""
-#: plugins/config/class_configInLdap.inc:192
+#: plugins/config/class_configInLdap.inc:186
msgid "Login and session"
msgstr ""
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:189
msgid "Login attribute"
msgstr ""
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:190
msgid "Which LDAP attribute should be used as the login name during login."
msgstr ""
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:196
msgid "Enforce encrypted connections"
msgstr ""
-#: plugins/config/class_configInLdap.inc:203
+#: plugins/config/class_configInLdap.inc:197
msgid ""
"Enables PHP security checks to force encrypted access (https) to the web "
"interface."
msgstr ""
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:201
msgid "Warn if session is not encrypted"
msgstr ""
-#: plugins/config/class_configInLdap.inc:208
+#: plugins/config/class_configInLdap.inc:202
msgid "will display a warning to the user when http is used instead of https."
msgstr ""
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Session lifetime"
msgstr ""
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Defines when a session will expire in seconds."
msgstr "Defina em quantos segundos a sessão irá expirar."
-#: plugins/config/class_configInLdap.inc:220
+#: plugins/config/class_configInLdap.inc:212
+msgid "HTTP authentication"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:212
+msgid "Use HTTP authentication protocol instead of the login form."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:219
#: include/class_SnapshotDialogs.inc:186
msgid "Snapshots"
msgstr ""
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid "Enable snapshots"
msgstr "Habilitar snapshots"
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid ""
"This enables you to save certain states of entries and restore them later "
"on."
msgstr ""
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
msgid "Snapshot base"
msgstr "Base de snapshots"
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
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:235
+#: plugins/config/class_configInLdap.inc:234
msgid "SSL"
msgstr ""
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Key path"
msgstr "Chave de pacote"
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Path to FusionDirectory private key. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Certificate path"
msgstr "Caminho de certificado"
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Path to FusionDirectory certificate. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:262
msgid "CA certificate path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:247
msgid "Path to the CA certificate. Used for validating Argonaut Server host."
msgstr ""
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:254
msgid "CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "Enable CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "CAS login will be used instead of LDAP bind"
msgstr ""
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:262
msgid "Path to the CA certificate of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host"
msgstr "Host"
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port"
msgstr "Porta"
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port the CAS server is listening on"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context to be used"
msgstr ""
-#: plugins/config/class_configInLdap.inc:285
+#: plugins/config/class_configInLdap.inc:284
msgid "People and group storage"
msgstr ""
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "People DN attribute"
msgstr ""
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "Attribute to use at the beginning of users dn"
msgstr ""
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "CN pattern"
msgstr ""
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "The pattern to use to build the common name field"
msgstr ""
-#: plugins/config/class_configInLdap.inc:299
+#: plugins/config/class_configInLdap.inc:298
msgid "Strict naming policy"
msgstr ""
-#: plugins/config/class_configInLdap.inc:300
+#: plugins/config/class_configInLdap.inc:299
msgid "Enables strict checking of user and group names"
msgstr ""
-#: plugins/config/class_configInLdap.inc:305
+#: plugins/config/class_configInLdap.inc:304
msgid "Group/user min id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:306
+#: plugins/config/class_configInLdap.inc:305
msgid ""
"The minimum assignable user or group id to avoid security leaks with id 0 "
"accounts."
msgstr ""
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid "Next id hook"
msgstr ""
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid ""
"A script to be called for finding the next free id number for users or "
"groups."
msgstr ""
-#: plugins/config/class_configInLdap.inc:315
+#: plugins/config/class_configInLdap.inc:314
msgid "Base number for user id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:315
msgid "Where to start looking for a new free user id."
msgstr ""
-#: plugins/config/class_configInLdap.inc:321
+#: plugins/config/class_configInLdap.inc:320
msgid "Base number for group id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:321
msgid "Where to start looking for a new free group id."
msgstr ""
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "Users RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "The branch where users are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "Groups RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "The branch where groups are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "ACL role RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "The branch where ACL roles are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Id allocation method"
msgstr "Método de alocação de id"
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Method to allocate user/group ids"
msgstr ""
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Traditional"
msgstr "Tradicional"
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Samba unix id pool"
msgstr "Pool de id samba unix"
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Pool user id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Minimum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Pool user id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Maximum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Pool group id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Minimum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Pool group id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Maximum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:370
-msgid "Debugging"
+#: plugins/config/class_configInLdap.inc:367
+msgid "Restrict role members"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:367
+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:373
+msgid "Debugging"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:376
msgid "Display errors"
msgstr ""
-#: plugins/config/class_configInLdap.inc:374
+#: plugins/config/class_configInLdap.inc:377
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:378
+#: plugins/config/class_configInLdap.inc:381
msgid "Maximum LDAP query time"
msgstr ""
-#: plugins/config/class_configInLdap.inc:378
+#: plugins/config/class_configInLdap.inc:381
msgid ""
"Stop LDAP actions if there is no answer within the specified number of "
"seconds."
msgstr ""
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:386
msgid "Log LDAP statistics"
msgstr ""
-#: plugins/config/class_configInLdap.inc:384
+#: plugins/config/class_configInLdap.inc:387
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:389
+#: plugins/config/class_configInLdap.inc:392
msgid "Debug level"
msgstr ""
-#: plugins/config/class_configInLdap.inc:390
+#: plugins/config/class_configInLdap.inc:393
msgid "Display certain information on each page load."
msgstr ""
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:405
msgid "Miscellaneous"
msgstr "Diversos"
-#: plugins/config/class_configInLdap.inc:407
+#: plugins/config/class_configInLdap.inc:410
msgid "Hooks that are called when specific actions happens"
msgstr ""
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "tab"
msgstr ""
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "The tab that this hook concerns"
msgstr ""
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "mode"
msgstr "Modo"
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "When to call this command"
msgstr ""
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "cmd"
msgstr ""
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "The command that will be called"
msgstr ""
-#: plugins/config/class_configInLdap.inc:429
+#: plugins/config/class_configInLdap.inc:432
msgid "Hooks"
msgstr "Ganchos"
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:439
msgid "Display hook output"
msgstr ""
-#: plugins/config/class_configInLdap.inc:437
+#: plugins/config/class_configInLdap.inc:440
msgid ""
"When enabled successful hook execution output is displayed to the user using"
" a dialog."
msgstr ""
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available shells"
msgstr ""
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available POSIX shells for FD users."
msgstr ""
-#: plugins/config/class_configInLdap.inc:449
+#: plugins/config/class_configInLdap.inc:452
msgid "Show ACL tab on all objects"
msgstr ""
-#: plugins/config/class_configInLdap.inc:450
+#: plugins/config/class_configInLdap.inc:453
msgid ""
"For very specific ACL rights setting where you might need to give right on a"
" single object."
msgstr ""
-#: plugins/config/class_configInLdap.inc:464
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available department categories"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available categories in the departments dropdown"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:474
#: setup/class_setupStep_Language.inc:69
msgid "Automatic"
msgstr "Automático"
@@ -1911,80 +1956,80 @@ msgstr "Configurações para recuperar senha"
msgid "Password recovery settings"
msgstr "Configurações de recuperação de senha"
-#: plugins/config/class_recoveryConfig.inc:44
+#: plugins/config/class_recoveryConfig.inc:45
msgid "Activate password recovery"
msgstr "Ativar recuperador de senha"
-#: plugins/config/class_recoveryConfig.inc:45
+#: plugins/config/class_recoveryConfig.inc:46
msgid "Whether to activate or not password recovery feature"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:50
+#: plugins/config/class_recoveryConfig.inc:51
msgid "Sender email address"
msgstr "Endereço de e-mail do remetente"
-#: plugins/config/class_recoveryConfig.inc:51
+#: plugins/config/class_recoveryConfig.inc:52
msgid "Email address from which mails will be sent"
msgstr "E-mail a partir dos e-mail que serão enviados"
-#: plugins/config/class_recoveryConfig.inc:57
+#: plugins/config/class_recoveryConfig.inc:58
msgid "Link validity (minutes)"
msgstr "Validade do link (minutos)"
-#: plugins/config/class_recoveryConfig.inc:58
+#: plugins/config/class_recoveryConfig.inc:59
msgid "Number of minutes before a recovery link expires"
msgstr "Número de minutos antes do link de recuperação expirar"
-#: plugins/config/class_recoveryConfig.inc:64
+#: plugins/config/class_recoveryConfig.inc:65
msgid "Salt for tokens"
msgstr "graça para simbolos "
-#: plugins/config/class_recoveryConfig.inc:65
+#: plugins/config/class_recoveryConfig.inc:66
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"
-#: plugins/config/class_recoveryConfig.inc:71
+#: plugins/config/class_recoveryConfig.inc:72
msgid "Allow the use of alternate addresses"
msgstr "Permitir o uso de endereços alternativos"
-#: plugins/config/class_recoveryConfig.inc:72
+#: plugins/config/class_recoveryConfig.inc:73
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"
-#: plugins/config/class_recoveryConfig.inc:79
+#: plugins/config/class_recoveryConfig.inc:80
msgid "First email"
msgstr "Primeiro e-mail"
-#: plugins/config/class_recoveryConfig.inc:82
-#: plugins/config/class_recoveryConfig.inc:101
+#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:102
msgid "Subject"
msgstr "Assunto"
-#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:84
msgid "Subject of the first email"
msgstr "Assunto do primeiro e-mail"
-#: plugins/config/class_recoveryConfig.inc:86
+#: plugins/config/class_recoveryConfig.inc:87
msgid "[FusionDirectory] Password recovery link"
msgstr "[FusionDirectory] Link de recuperação de senha"
-#: plugins/config/class_recoveryConfig.inc:89
+#: plugins/config/class_recoveryConfig.inc:90
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr "Corpo(primeiro %s é o login, segundo é o link)"
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:91
#, 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 "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:93
+#: plugins/config/class_recoveryConfig.inc:94
#, php-format
msgid ""
"Hello,\n"
@@ -1996,31 +2041,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr "Olá,\n\nAqui estão suas informações:\n-Login : %s\n-Link : %s\n\nEste link é válido por apenas 10 minutos."
-#: plugins/config/class_recoveryConfig.inc:98
+#: plugins/config/class_recoveryConfig.inc:99
msgid "Second email"
msgstr "Segundo e-mail"
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:103
msgid "Subject of the second email"
msgstr "Assunto do segundo e-mail"
-#: plugins/config/class_recoveryConfig.inc:105
+#: plugins/config/class_recoveryConfig.inc:106
msgid "[FusionDirectory] Password recovery successful"
msgstr "[FusionDirectory] Senha recuperada com sucesso"
-#: plugins/config/class_recoveryConfig.inc:108
+#: plugins/config/class_recoveryConfig.inc:109
#, php-format
msgid "Body (%s is login)"
msgstr "Corpo (%s é o login)"
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:110
#, php-format
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. "
-#: plugins/config/class_recoveryConfig.inc:112
+#: plugins/config/class_recoveryConfig.inc:113
#, php-format
msgid ""
"Hello,\n"
@@ -2088,13 +2133,13 @@ msgstr "Subir"
msgid "Down"
msgstr "Descer"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2633
-#: include/simpleplugin/class_attribute.inc:2634
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
+#: include/simpleplugin/class_attribute.inc:2648
msgid "Sort up"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2646
-#: include/simpleplugin/class_attribute.inc:2647
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
+#: include/simpleplugin/class_attribute.inc:2661
msgid "Sort down"
msgstr ""
@@ -2106,27 +2151,26 @@ msgstr "Selecionar tudo"
#: include/class_config.inc:479 include/class_msgPool.inc:215
#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3106
-#: include/functions.inc:3127 include/functions.inc:3157
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197 include/functions.inc:3259
+#: include/class_msgPool.inc:740 include/functions.inc:3107
+#: include/functions.inc:3128 include/functions.inc:3158
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3260
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1663 include/class_CopyPasteHandler.inc:278
-#: include/simpleplugin/class_dialogAttributes.inc:733
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
-#: include/simpleplugin/class_attribute.inc:1774
-#: include/simpleplugin/class_attribute.inc:1877
-#: include/simpleplugin/class_attribute.inc:1879
+#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
+#: include/simpleplugin/class_attribute.inc:1784
+#: include/simpleplugin/class_attribute.inc:1887
+#: include/simpleplugin/class_attribute.inc:1889
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: 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:437
#: include/password-methods/class_password-methods.inc:447
-#: include/class_SnapshotHandler.inc:415 html/index.php:434 html/index.php:444
+#: include/class_SnapshotHandler.inc:415 html/index.php:473 html/index.php:483
#: setup/class_setupStep_Migrate.inc:935
#: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
msgid "Error"
@@ -2165,44 +2209,44 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: include/class_listing.inc:1586 include/class_listing.inc:1640
+#: include/class_listing.inc:1590 include/class_listing.inc:1644
msgid "Copy"
msgstr "Copiar"
-#: include/class_listing.inc:1592 include/class_listing.inc:1628
+#: include/class_listing.inc:1596 include/class_listing.inc:1632
msgid "Cut"
msgstr "Recortar"
-#: include/class_listing.inc:1600 include/class_listing.inc:1602
+#: include/class_listing.inc:1604 include/class_listing.inc:1606
#: include/class_CopyPasteHandler.inc:370
msgid "Paste"
msgstr "Colar"
-#: include/class_listing.inc:1628
+#: include/class_listing.inc:1632
msgid "Cut this entry"
msgstr ""
-#: include/class_listing.inc:1640
+#: include/class_listing.inc:1644
msgid "Copy this entry"
msgstr ""
-#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_listing.inc:1677 include/class_listing.inc:1679
msgid "Restore snapshots"
msgstr "Restaurar snapshots"
-#: include/class_listing.inc:1689
+#: include/class_listing.inc:1693
msgid "Export list"
msgstr ""
-#: include/class_listing.inc:1724 include/class_listing.inc:1725
+#: include/class_listing.inc:1728 include/class_listing.inc:1729
msgid "Restore snapshot"
msgstr "Restaurar snapshot"
-#: include/class_listing.inc:1734
+#: include/class_listing.inc:1738
msgid "Create snapshot"
msgstr "Criar snapshot"
-#: include/class_listing.inc:1735
+#: include/class_listing.inc:1739
msgid "Create a new snapshot from this object"
msgstr "Criar um novo snapshots deste objeto"
@@ -2245,7 +2289,7 @@ msgid "XML error in fusiondirectory.conf: %s at line %d"
msgstr ""
#: include/class_config.inc:162 include/class_config.inc:300
-#: include/class_config.inc:985 include/class_config.inc:998
+#: include/class_config.inc:915 include/class_config.inc:928
#: include/functions.inc:663 include/class_timezone.inc:51
#: include/password-methods/class_password-methods-sha.inc:71
#: include/password-methods/class_password-methods-ssha.inc:75
@@ -2262,17 +2306,17 @@ msgid ""
"while your passwords are not encrypted."
msgstr "Você está tentando decodificar algo que não está codificado: %s<br/>\\nPor favor, verifique se você não está utilizando um arquivo fusiondirectory.secrets enquanto suas senhas não estão encriptadas."
-#: include/class_config.inc:337 include/class_ldap.inc:917
-#: include/class_ldap.inc:1371 include/functions.inc:526
+#: include/class_config.inc:337 include/class_ldap.inc:918
+#: include/class_ldap.inc:1372 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2985 include/simpleplugin/class_simplePlugin.inc:545
-#: include/simpleplugin/class_attribute.inc:2895
+#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2909
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
#: include/class_SnapshotHandler.inc:422 include/class_SnapshotHandler.inc:425
-#: html/index.php:360 html/class_passwordRecovery.inc:497
+#: html/index.php:369 html/class_passwordRecovery.inc:497
#: setup/class_setupStep_Migrate.inc:451
#: setup/class_setupStep_Migrate.inc:1130
msgid "LDAP error"
@@ -2287,38 +2331,38 @@ msgstr ""
msgid "The selected mail method (class %s) is not available"
msgstr ""
-#: include/class_config.inc:986
+#: include/class_config.inc:916
#, 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."
-#: include/class_config.inc:999
+#: include/class_config.inc:929
#, 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'."
-#: include/class_config.inc:1104
+#: include/class_config.inc:1034
msgid "All categories"
msgstr "Todas as categorias"
-#: include/class_config.inc:1231
+#: include/class_config.inc:1161
msgid "My account"
msgstr "Minha conta"
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
msgid "Performance warning"
msgstr ""
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
#, php-format
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr ""
-#: include/class_ldap.inc:868 include/class_ldap.inc:904
+#: include/class_ldap.inc:869 include/class_ldap.inc:905
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
@@ -2328,39 +2372,39 @@ msgstr ""
msgid "Internal error"
msgstr "Erro interno"
-#: include/class_ldap.inc:868
+#: include/class_ldap.inc:869
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:904
+#: include/class_ldap.inc:905
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1016
+#: include/class_ldap.inc:1017
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr ""
-#: include/class_ldap.inc:1018
+#: include/class_ldap.inc:1019
#, php-format
msgid "while operating on LDAP server %s"
msgstr ""
-#: include/class_ldap.inc:1108
+#: include/class_ldap.inc:1109
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1220
+#: include/class_ldap.inc:1221
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr ""
-#: include/class_ldap.inc:1231
+#: include/class_ldap.inc:1232
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2948,10 +2992,10 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr ""
-#: include/functions.inc:496 include/functions.inc:3294
-#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:263
-#: include/simpleplugin/class_simplePlugin.inc:268
-#: include/simpleplugin/class_simplePlugin.inc:280
+#: include/functions.inc:496 include/functions.inc:3295
+#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
+#: include/simpleplugin/class_simplePlugin.inc:269
+#: include/simpleplugin/class_simplePlugin.inc:281
#: html/class_passwordRecovery.inc:216
msgid "Fatal error"
msgstr "Erro fatal"
@@ -3104,98 +3148,98 @@ msgstr ""
msgid "Cannot read to revision file!"
msgstr ""
-#: include/functions.inc:2548
+#: include/functions.inc:2549
msgid "'nextIdHook' is not available. Using default base!"
msgstr "'nextIdHook' não está disponÃvel. Utilizando base padrão."
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "LDAP warning"
msgstr ""
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "Cannot get schema information from server. No schema check possible!"
msgstr ""
-#: include/functions.inc:2584
+#: include/functions.inc:2585
msgid ""
"Used to lock currently edited entries to avoid multiple changes at the same "
"time."
msgstr ""
-#: include/functions.inc:2596
+#: include/functions.inc:2597
#, php-format
msgid "Missing required object class '%s'!"
msgstr ""
-#: include/functions.inc:2599
+#: include/functions.inc:2600
#, php-format
msgid "Missing optional object class '%s'!"
msgstr ""
-#: include/functions.inc:2603
+#: include/functions.inc:2604
#, php-format
msgid "Class(es) available"
msgstr ""
-#: include/functions.inc:2623
+#: include/functions.inc:2624
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2625
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2628
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2629
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3106 include/functions.inc:3127
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3106
+#: include/functions.inc:3107
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3127
+#: include/functions.inc:3128
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3157
+#: include/functions.inc:3158
msgid "Cannot create sambaUnixIdPool entry!"
msgstr ""
-#: include/functions.inc:3165
+#: include/functions.inc:3166
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3177 include/functions.inc:3181
+#: include/functions.inc:3178 include/functions.inc:3182
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3197
+#: include/functions.inc:3198
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3259
+#: include/functions.inc:3260
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3295
+#: include/functions.inc:3296
#, 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"
@@ -3351,13 +3395,13 @@ msgstr "online"
msgid "XML error"
msgstr "Erro de XML"
-#: include/class_plugin.inc:554
+#: include/class_plugin.inc:553
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/class_plugin.inc:1466
+#: include/class_plugin.inc:1467
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -3383,32 +3427,32 @@ msgstr ""
msgid "This is the name of the template"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:263
+#: include/simpleplugin/class_simplePlugin.inc:264
msgid "Only main tab can compute dn"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:270
+#: include/simpleplugin/class_simplePlugin.inc:271
#, php-format
msgid "Could not compute dn: no parent tab class for \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:282
+#: include/simpleplugin/class_simplePlugin.inc:283
#, php-format
msgid ""
"Could not compute dn: could not find objectType infos from tab class \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:638
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:644
+#: include/simpleplugin/class_simplePlugin.inc:652
msgid "Error when saving"
msgstr "Erro ao salvar"
-#: include/simpleplugin/class_simplePlugin.inc:638
+#: include/simpleplugin/class_simplePlugin.inc:644
#, 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:646
+#: include/simpleplugin/class_simplePlugin.inc:652
#, php-format
msgid "The entry %s is not existing"
msgstr "A entrada %s não é existente"
@@ -3428,27 +3472,27 @@ msgstr ""
msgid "Show %s"
msgstr "Mostrar %s"
-#: include/simpleplugin/class_dialogAttributes.inc:409
+#: include/simpleplugin/class_dialogAttributes.inc:415
#, php-format
msgid "Group %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:411
+#: include/simpleplugin/class_dialogAttributes.inc:417
#, php-format
msgid "Role %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:446
+#: include/simpleplugin/class_dialogAttributes.inc:452
msgid "Group of user"
msgstr "Grupo de usuário"
-#: include/simpleplugin/class_dialogAttributes.inc:615
+#: include/simpleplugin/class_dialogAttributes.inc:621
#: include/simpleplugin/class_attribute.inc:1090
#: include/simpleplugin/class_attribute.inc:1124
msgid "None"
msgstr "Nenhum"
-#: include/simpleplugin/class_dialogAttributes.inc:617
+#: include/simpleplugin/class_dialogAttributes.inc:623
msgid "Unknown"
msgstr "Desconhecido"
@@ -3489,11 +3533,16 @@ msgid "days"
msgstr "dias"
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2161
+#: include/simpleplugin/class_attribute.inc:2171
#, php-format
msgid "%s (required)"
msgstr "%s (required)"
+#: include/simpleplugin/class_attribute.inc:1150
+#, php-format
+msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
+msgstr ""
+
#: include/simpleplugin/class_attribute.inc:1277
#, php-format
msgid "An integer between %d and %d"
@@ -3509,75 +3558,75 @@ msgstr "Um inteiro maior que %d"
msgid "An integer smaller than %d"
msgstr "Um inteiro menor que %d"
-#: include/simpleplugin/class_attribute.inc:1379
+#: include/simpleplugin/class_attribute.inc:1383
#, php-format
msgid "A float between %f and %f"
msgstr "Um float entre %f e %f"
-#: include/simpleplugin/class_attribute.inc:1381
+#: include/simpleplugin/class_attribute.inc:1385
#, php-format
msgid "A float larger than %f"
msgstr "Um float maior que %f"
-#: include/simpleplugin/class_attribute.inc:1383
+#: include/simpleplugin/class_attribute.inc:1387
#, php-format
msgid "A float smaller than %f"
msgstr "Um float menor que %f"
-#: include/simpleplugin/class_attribute.inc:1490
+#: include/simpleplugin/class_attribute.inc:1500
msgid "Error, incorrect date: "
msgstr "Erro, data incorreta:"
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
#, php-format
msgid "Cannot read uploaded file: %s"
msgstr "Não é possÃvel ler arquivo enviado: %s"
-#: include/simpleplugin/class_attribute.inc:1530
+#: include/simpleplugin/class_attribute.inc:1540
msgid "file is empty"
msgstr "arquivo está vazio"
-#: include/simpleplugin/class_attribute.inc:1533
+#: include/simpleplugin/class_attribute.inc:1543
msgid "file not found"
msgstr "arquivo não encontrado"
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1546
msgid "file not readable"
msgstr "arquivo não é legivel"
-#: include/simpleplugin/class_attribute.inc:1569
+#: include/simpleplugin/class_attribute.inc:1579
#, php-format
msgid "%s (%d bytes)"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1616
-#: include/simpleplugin/class_attribute.inc:1793
+#: include/simpleplugin/class_attribute.inc:1626
+#: include/simpleplugin/class_attribute.inc:1803
msgid "Upload"
msgstr "Upload"
-#: include/simpleplugin/class_attribute.inc:1621
-#: include/simpleplugin/class_attribute.inc:1622
+#: include/simpleplugin/class_attribute.inc:1631
+#: include/simpleplugin/class_attribute.inc:1632
msgid "Download"
msgstr "Download"
-#: include/simpleplugin/class_attribute.inc:1775
+#: include/simpleplugin/class_attribute.inc:1785
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr "Não foi possÃvel salvar esta imagem, FusionDirectory requer o pacote 'php5-omagick' instalado"
-#: include/simpleplugin/class_attribute.inc:1826
+#: include/simpleplugin/class_attribute.inc:1836
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr "Base"
-#: include/simpleplugin/class_attribute.inc:1829
+#: include/simpleplugin/class_attribute.inc:1839
msgid "Object base"
msgstr "Base de objeto"
-#: include/simpleplugin/class_attribute.inc:2755
+#: include/simpleplugin/class_attribute.inc:2769
#, php-format
msgid "Invalid value for %s"
msgstr "Valor inválido para %s"
@@ -3711,17 +3760,17 @@ msgstr "Por favor, verifique o usuário ou senha."
msgid "Account locked. Please contact your system administrator!"
msgstr "Conta bloqueada. Entre em contato com o administrador do sistema!"
-#: html/index.php:436
+#: html/index.php:475
#, php-format
msgid "CAS user \"%s\" could not be found in the LDAP"
msgstr ""
-#: html/index.php:446
+#: html/index.php:485
#, php-format
msgid "CAS user \"%s\" match several users in the LDAP"
msgstr ""
-#: html/index.php:481
+#: html/index.php:522
msgid ""
"Your browser has cookies disabled. Please enable cookies and reload this "
"page before logging in!"
@@ -4044,8 +4093,8 @@ msgid "Checking for duplicated UID numbers"
msgstr "Checando por números de UID duplicados"
#: setup/class_setupStep_Migrate.inc:267
-msgid "Checking for duplicate GID numbers"
-msgstr "Checando por números de GID duplicados"
+msgid "Checking for duplicated GID numbers"
+msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:487
#: setup/class_setupStep_Migrate.inc:564 setup/class_setupStep_Migrate.inc:702
@@ -4054,7 +4103,7 @@ msgstr "Checando por números de GID duplicados"
#: setup/class_setupStep_Migrate.inc:1179
#: setup/class_setupStep_Migrate.inc:1272
#: setup/class_setupStep_Migrate.inc:1351
-#: setup/class_setupStep_Migrate.inc:1390
+#: setup/class_setupStep_Migrate.inc:1395
msgid "LDAP query failed"
msgstr "Consulta em LDAP falhou"
@@ -4065,7 +4114,7 @@ msgstr "Consulta em LDAP falhou"
#: setup/class_setupStep_Migrate.inc:1180
#: setup/class_setupStep_Migrate.inc:1273
#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1391
+#: setup/class_setupStep_Migrate.inc:1396
msgid "Possibly the \"root object\" is missing."
msgstr ""
@@ -4220,14 +4269,14 @@ msgstr ""
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1373
+#: setup/class_setupStep_Migrate.inc:1378
#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\"."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1412
+#: setup/class_setupStep_Migrate.inc:1422
#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\"."
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
diff --git a/locale/ru/fusiondirectory.po b/locale/ru/fusiondirectory.po
index 06f23a266843dd8e21d16f0b42fd3fadce729ff4..9f5b496c64c300e72b234a21bbaa8a7be371cae9 100644
--- a/locale/ru/fusiondirectory.po
+++ b/locale/ru/fusiondirectory.po
@@ -4,15 +4,14 @@
#
# Translators:
# Alexey Matveev, 2015
-# Alexey Matveev, 2015
msgid ""
msgstr ""
-"Project-Id-Version: FusionDirectory-109\n"
+"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-01-22 11:26+0100\n"
-"PO-Revision-Date: 2016-01-22 10:24+0000\n"
+"POT-Creation-Date: 2016-03-14 12:07+0100\n"
+"PO-Revision-Date: 2016-03-07 12:09+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-109/language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -30,31 +29,31 @@ msgstr "Добро пожаловать %s!"
msgid "References"
msgstr "СÑылки"
-#: plugins/admin/groups/class_roleGeneric.inc:30
-#: plugins/admin/groups/class_roleGeneric.inc:34
+#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:61
#: plugins/admin/groups/class_groupManagement.inc:71
#: plugins/admin/aclrole/class_aclRole.inc:78
#: plugins/admin/acl/class_aclAssignment.inc:49
msgid "Role"
msgstr "Роль"
-#: plugins/admin/groups/class_roleGeneric.inc:31
+#: plugins/admin/groups/class_roleGeneric.inc:58
msgid "Role information"
msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ роли"
-#: plugins/admin/groups/class_roleGeneric.inc:35
+#: plugins/admin/groups/class_roleGeneric.inc:62
msgid "Organizational role"
msgstr "ÐžÑ€Ð³Ð°Ð½Ð¸Ð·Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð°Ñ Ñ€Ð¾Ð»ÑŒ"
-#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:84
msgid "Informations"
msgstr "ИнформациÑ"
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:158
+#: plugins/admin/departments/class_department.inc:174
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -64,13 +63,13 @@ msgstr "ИнформациÑ"
msgid "Name"
msgstr "Ðазвание"
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
msgid "Name of this group"
msgstr "Ðазвание Ñтой группы"
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
#: plugins/admin/groups/class_group.inc:66
#: plugins/admin/groups/class_ogroup.inc:192
#: plugins/admin/groups/group-list.xml:41
@@ -83,26 +82,26 @@ msgstr "Ðазвание Ñтой группы"
msgid "Description"
msgstr "ОпиÑание"
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
msgid "Description of the role"
msgstr "ОпиÑание роли"
-#: plugins/admin/groups/class_roleGeneric.inc:70
+#: plugins/admin/groups/class_roleGeneric.inc:97
msgid "Phone number"
msgstr "Телефон"
-#: plugins/admin/groups/class_roleGeneric.inc:74
+#: plugins/admin/groups/class_roleGeneric.inc:101
msgid "Fax number"
msgstr "ФакÑ"
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
#: plugins/admin/users/class_userManagement.inc:42
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: setup/class_setupStep_Migrate.inc:871
msgid "Users"
msgstr "Пользователи"
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
msgid "Add users for the role"
msgstr "Добавить пользователей Ð´Ð»Ñ Ñ€Ð¾Ð»Ð¸"
@@ -149,7 +148,7 @@ msgstr ""
#: plugins/admin/groups/class_group.inc:74
#: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:403
+#: plugins/personal/posix/class_posixAccount.inc:410
msgid "GID"
msgstr "GID"
@@ -206,23 +205,23 @@ msgid "Only allow this group to connect to this list of hosts"
msgstr ""
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458 include/functions.inc:794
-#: include/functions.inc:2548 include/class_xml.inc:55
+#: plugins/personal/posix/class_posixAccount.inc:465 include/functions.inc:794
+#: include/functions.inc:2549 include/class_xml.inc:55
#: include/simpleplugin/class_simpleTabs.inc:325 html/index.php:56
-#: html/index.php:62 html/index.php:481 html/class_passwordRecovery.inc:378
+#: html/index.php:62 html/index.php:522 html/class_passwordRecovery.inc:378
#: setup/class_setupStep_Migrate.inc:572
#: setup/class_setupStep_Migrate.inc:1083
#: setup/class_setupStep_Migrate.inc:1202
#: setup/class_setupStep_Migrate.inc:1313
-#: setup/class_setupStep_Migrate.inc:1372
-#: setup/class_setupStep_Migrate.inc:1411 plugins/admin/acl/remove.tpl.c:2
+#: setup/class_setupStep_Migrate.inc:1377
+#: setup/class_setupStep_Migrate.inc:1421 plugins/admin/acl/remove.tpl.c:2
#: ihtml/themes/default/islocked.tpl.c:5 ihtml/themes/default/remove.tpl.c:2
#: ihtml/themes/default/msg_dialog.tpl.c:5 setup/setup_checks.tpl.c:8
msgid "Warning"
msgstr "Предупреждение"
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458
+#: plugins/personal/posix/class_posixAccount.inc:465
msgid "Timeout while waiting for lock. Ignoring lock!"
msgstr ""
@@ -252,7 +251,7 @@ msgstr "Включаемые объекты"
msgid "Objects member of this group"
msgstr ""
-#: plugins/admin/groups/class_ogroup.inc:318
+#: plugins/admin/groups/class_ogroup.inc:313
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
@@ -281,10 +280,10 @@ msgstr "Создать"
#: plugins/admin/departments/dep-list.xml:79
#: plugins/admin/users/user-list.xml:105
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-#: include/simpleplugin/class_dialogAttributes.inc:626
-#: include/simpleplugin/class_dialogAttributes.inc:627
-#: include/simpleplugin/class_attribute.inc:2661
-#: include/simpleplugin/class_attribute.inc:2662
+#: include/simpleplugin/class_dialogAttributes.inc:632
+#: include/simpleplugin/class_dialogAttributes.inc:633
+#: include/simpleplugin/class_attribute.inc:2675
+#: include/simpleplugin/class_attribute.inc:2676
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -295,8 +294,8 @@ msgstr "Изменить"
#: plugins/admin/departments/dep-list.xml:67
#: plugins/admin/departments/dep-list.xml:88
#: plugins/admin/users/user-list.xml:112
-#: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_dialogAttributes.inc:637
+#: include/simpleplugin/class_dialogAttributes.inc:642
+#: include/simpleplugin/class_dialogAttributes.inc:643
#: include/simpleplugin/simple-list.xml:75
#: include/simpleplugin/simple-list.xml:125
msgid "Remove"
@@ -345,7 +344,7 @@ msgid "Show application groups"
msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Show department groups"
+msgid "Show unidentified groups"
msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:137
@@ -434,51 +433,67 @@ msgid "Category of this %s"
msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð´Ð»Ñ %s"
#: plugins/admin/departments/class_department.inc:81
+msgid "Website"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:81
+#, php-format
+msgid "Website of this %s"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:85
#: plugins/personal/generic/class_user.inc:410
msgid "Manager"
msgstr "Руководитель"
-#: plugins/admin/departments/class_department.inc:81
+#: plugins/admin/departments/class_department.inc:85
#, php-format
msgid "Manager of this %s"
msgstr "Руководитель Ñтого %s"
-#: plugins/admin/departments/class_department.inc:87
-#: plugins/admin/departments/class_department.inc:93
+#: plugins/admin/departments/class_department.inc:91
+#: plugins/admin/departments/class_department.inc:97
#: plugins/personal/generic/class_user.inc:304
msgid "Location"
msgstr "МеÑтоположение"
-#: plugins/admin/departments/class_department.inc:90
+#: plugins/admin/departments/class_department.inc:94
#: plugins/personal/generic/class_user.inc:308
msgid "State"
msgstr "Ðдм. единица"
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_country.inc:29
+#: plugins/admin/departments/class_country.inc:30
+#: plugins/admin/departments/class_country.inc:33
+msgid "Country"
+msgstr "Страна"
+
+#: plugins/admin/departments/class_department.inc:103
#: plugins/personal/generic/class_user.inc:312
msgid "Address"
msgstr "ÐдреÑ"
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:103
#, php-format
msgid "A postal address for this %s"
msgstr "Почтовый Ð°Ð´Ñ€ÐµÑ Ð´Ð»Ñ %s"
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
#: plugins/personal/generic/class_user.inc:320
msgid "Phone"
msgstr "Телефон"
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
msgid "Telephone number"
msgstr "Ðомер телефона"
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
#: plugins/personal/generic/class_user.inc:332
msgid "Fax"
msgstr "ФакÑ"
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
msgid "Facsimile telephone number"
msgstr "Ðомер факÑа"
@@ -506,12 +521,6 @@ msgstr "МеÑтоположение"
msgid "locality"
msgstr "МеÑтоположениÑ"
-#: plugins/admin/departments/class_country.inc:29
-#: plugins/admin/departments/class_country.inc:30
-#: plugins/admin/departments/class_country.inc:33
-msgid "Country"
-msgstr "Страна"
-
#: plugins/admin/departments/class_country.inc:50
msgid "country"
msgstr "Ñтрана"
@@ -554,7 +563,8 @@ msgid "Given name"
msgstr "ИмÑ"
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
+#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
msgid "Login"
@@ -667,8 +677,8 @@ msgid "Edit category ACL"
msgstr "Редактировать категорию ACL"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2671
-#: include/simpleplugin/class_attribute.inc:2672
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
+#: include/simpleplugin/class_attribute.inc:2686
#, php-format
msgid "Delete"
msgstr "Удалить"
@@ -773,19 +783,37 @@ msgstr "ACLs"
msgid "ACLs which are part of this group"
msgstr "ACLs, которые ÑвлÑÑŽÑ‚ÑÑ Ñ‡Ð°Ñтью Ñтой группы"
-#: plugins/admin/acl/class_aclManagement.inc:38
+#: plugins/admin/acl/class_aclManagement.inc:31
+#: plugins/admin/acl/class_aclManagement.inc:32
+#: plugins/admin/acl/class_aclManagement.inc:45
+msgid "ACL assignment creation"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:33
+msgid "Create an ACL assignment on an arbitrary dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "Dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "DN you wish to add assignments for"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:135
msgid "ACL assignments"
msgstr "ÐÐ°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ ACL"
-#: plugins/admin/acl/class_aclManagement.inc:39
+#: plugins/admin/acl/class_aclManagement.inc:136
msgid "ACL assignments management"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:40
+#: plugins/admin/acl/class_aclManagement.inc:137
msgid "Manage ACL roles assignments to users"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:78
+#: plugins/admin/acl/class_aclManagement.inc:199
#: plugins/admin/acl/class_aclAssignment.inc:263
msgid "ACL Assignment"
msgstr "Ðазначение ACL"
@@ -901,7 +929,7 @@ msgid "Password hash method to use"
msgstr "ПрименÑемый метод Ð´Ð»Ñ Ñ…Ñша паролÑ"
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -996,59 +1024,59 @@ msgstr "Рабочий номер пейджера"
msgid "Business fax number"
msgstr "Рабочий номер факÑа"
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:336
+msgid "Homepage"
+msgstr "ДомашнÑÑ Ñтраница"
+
+#: plugins/personal/generic/class_user.inc:336
+msgid "Personal homepage"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:342
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:351
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr "Предпочитаемый Ñзык"
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
msgid "Password of the user"
msgstr "Пароль пользователÑ"
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:362
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
msgid "Display name"
msgstr "Отображаемое имÑ"
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home address"
msgstr "Домашний адреÑ"
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home postal address"
msgstr "Домашний почтовый адреÑ"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:374
msgid "Private phone"
msgstr "Личный телефон"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:374
msgid "Home phone number"
msgstr "Домашний телефон"
-#: plugins/personal/generic/class_user.inc:374
-msgid "Homepage"
-msgstr "ДомашнÑÑ Ñтраница"
-
-#: plugins/personal/generic/class_user.inc:374
-msgid "Personal homepage"
-msgstr ""
-
#: plugins/personal/generic/class_user.inc:380
msgid "Organizational information"
msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ð± организации"
@@ -1281,33 +1309,33 @@ msgstr "Ðе наÑтроено"
msgid "automatic"
msgstr "автоматичеÑки"
-#: plugins/personal/posix/class_posixAccount.inc:309
+#: plugins/personal/posix/class_posixAccount.inc:310
msgid "expired"
msgstr "ИÑтек"
-#: plugins/personal/posix/class_posixAccount.inc:311
+#: plugins/personal/posix/class_posixAccount.inc:312
msgid "grace time active"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:314
-#: plugins/personal/posix/class_posixAccount.inc:316
-#: plugins/personal/posix/class_posixAccount.inc:318
+#: plugins/personal/posix/class_posixAccount.inc:315
+#: plugins/personal/posix/class_posixAccount.inc:317
+#: plugins/personal/posix/class_posixAccount.inc:319
msgid "active"
msgstr "активный"
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:315
msgid "password expired"
msgstr "Ñрок дейÑÑ‚Ð²Ð¸Ñ Ð¿Ð°Ñ€Ð°Ð»Ñ Ð¸Ñтек"
-#: plugins/personal/posix/class_posixAccount.inc:316
+#: plugins/personal/posix/class_posixAccount.inc:317
msgid "password not changeable"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:400
+#: plugins/personal/posix/class_posixAccount.inc:407
msgid "UID"
msgstr "UID"
-#: plugins/personal/posix/class_posixAccount.inc:516
+#: plugins/personal/posix/class_posixAccount.inc:525
#, php-format
msgid "Group of user %s"
msgstr "Группа Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %s"
@@ -1479,424 +1507,440 @@ msgid "Core settings"
msgstr "ОÑновные наÑтройки"
#: plugins/config/class_configInLdap.inc:161
-msgid "Enable primary group filter"
-msgstr "Включить фильтр оÑновной группы"
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"It is time consuming to evaluate which groups are primary and which are not,"
-" so you may want to disable it if your group plugin is slow."
-msgstr "Ðа оценку ÑвлÑетÑÑ Ð»Ð¸ группа оÑновной или нет раÑходуетÑÑ Ð²Ñ€ÐµÐ¼Ñ, так что возможно вы захотите отключить Ñтот плагин групп еÑли он будет медленный."
-
-#: plugins/config/class_configInLdap.inc:167
msgid "Display summary in listings"
msgstr "Показать краткую информацию о ÑпиÑках"
-#: plugins/config/class_configInLdap.inc:168
+#: 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:173
+#: plugins/config/class_configInLdap.inc:167
msgid "Edit locking"
msgstr "Блокировка редактированиÑ"
-#: plugins/config/class_configInLdap.inc:174
+#: 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:179
+#: plugins/config/class_configInLdap.inc:173
msgid "Enable logging"
msgstr "Включить логирование"
-#: plugins/config/class_configInLdap.inc:180
+#: plugins/config/class_configInLdap.inc:174
msgid "Event logging on FusionDirectory side."
msgstr "РегиÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ñобытий на Ñтороне FusionDirectory"
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "LDAP size limit"
msgstr "Ограничение размера LDAP"
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "Defines the number of entries to get from LDAP by default."
msgstr "ОпределÑет количеÑтво запиÑей, которые можно получить из LDAP по умолчанию."
-#: plugins/config/class_configInLdap.inc:192
+#: plugins/config/class_configInLdap.inc:186
msgid "Login and session"
msgstr "Вход в ÑиÑтему и ÑеÑÑии"
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:189
msgid "Login attribute"
msgstr "Ðтрибут Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ð°"
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:190
msgid "Which LDAP attribute should be used as the login name during login."
msgstr "Какой LDAP атрибут необходимо иÑпользовать в качеÑтве логина при входе в ÑиÑтему."
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:196
msgid "Enforce encrypted connections"
msgstr "Принудительно шифровать ÑоединениÑ"
-#: plugins/config/class_configInLdap.inc:203
+#: plugins/config/class_configInLdap.inc:197
msgid ""
"Enables PHP security checks to force encrypted access (https) to the web "
"interface."
msgstr "Принудительно иÑпользовать шифрованный доÑтуп (https) к веб интерфейÑу, включив проверку безопаÑноÑти PHP."
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:201
msgid "Warn if session is not encrypted"
msgstr "Предупреждать еÑли ÑÐµÐ°Ð½Ñ Ð½Ðµ зашифрован"
-#: plugins/config/class_configInLdap.inc:208
+#: plugins/config/class_configInLdap.inc:202
msgid "will display a warning to the user when http is used instead of https."
msgstr "будут отображатьÑÑ Ð¿Ñ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ, когда http будет иÑпользоватьÑÑ Ð²Ð¼ÐµÑто https."
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Session lifetime"
msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð¶Ð¸Ð·Ð½Ð¸ ÑеÑÑии"
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Defines when a session will expire in seconds."
msgstr "ОпределÑет, через Ñколько Ñекунд ÑеÑÑÐ¸Ñ Ð±ÑƒÐ´ÐµÑ‚ закончена."
-#: plugins/config/class_configInLdap.inc:220
+#: plugins/config/class_configInLdap.inc:212
+msgid "HTTP authentication"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:212
+msgid "Use HTTP authentication protocol instead of the login form."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:219
#: include/class_SnapshotDialogs.inc:186
msgid "Snapshots"
msgstr "Снапшоты"
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid "Enable snapshots"
msgstr "Включить Ñнапшоты"
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid ""
"This enables you to save certain states of entries and restore them later "
"on."
msgstr "Ðто позволÑет ÑохранÑÑ‚ÑŒ определенное ÑоÑтоÑние запиÑей и позже его воÑÑтанавливать."
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
msgid "Snapshot base"
msgstr "Ð‘Ð°Ð·Ð¾Ð²Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ Ñнапшотов"
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
msgid "The base where snapshots should be stored inside of the LDAP."
msgstr "Ð‘Ð°Ð·Ð¾Ð²Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ, где Ñнапшоты должны будут хранитьÑÑ Ð²Ð½ÑƒÑ‚Ñ€Ð¸ LDAP."
-#: plugins/config/class_configInLdap.inc:235
+#: plugins/config/class_configInLdap.inc:234
msgid "SSL"
msgstr "SSL"
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Key path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Path to FusionDirectory private key. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Certificate path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Path to FusionDirectory certificate. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:262
msgid "CA certificate path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:247
msgid "Path to the CA certificate. Used for validating Argonaut Server host."
msgstr ""
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:254
msgid "CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "Enable CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "CAS login will be used instead of LDAP bind"
msgstr ""
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:262
msgid "Path to the CA certificate of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host"
msgstr "ХоÑÑ‚"
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port"
msgstr "Порт"
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port the CAS server is listening on"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context to be used"
msgstr ""
-#: plugins/config/class_configInLdap.inc:285
+#: plugins/config/class_configInLdap.inc:284
msgid "People and group storage"
msgstr "МеÑтоположение пользователей и групп"
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "People DN attribute"
msgstr "DN атрибут пользователÑ"
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "Attribute to use at the beginning of users dn"
msgstr "Ðтрибут иÑпользуемый у пользователей в начале dn"
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "CN pattern"
msgstr ""
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "The pattern to use to build the common name field"
msgstr ""
-#: plugins/config/class_configInLdap.inc:299
+#: plugins/config/class_configInLdap.inc:298
msgid "Strict naming policy"
msgstr "Политика Ñтрого приÑÐ²Ð°Ð¸Ð²Ð°Ð½Ð¸Ñ Ð¸Ð¼ÐµÐ½"
-#: plugins/config/class_configInLdap.inc:300
+#: plugins/config/class_configInLdap.inc:299
msgid "Enables strict checking of user and group names"
msgstr "Включить Ñтрогую проверку имен Ð´Ð»Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ и групп"
-#: plugins/config/class_configInLdap.inc:305
+#: plugins/config/class_configInLdap.inc:304
msgid "Group/user min id"
msgstr "Минимальный id групп/пользователей"
-#: plugins/config/class_configInLdap.inc:306
+#: plugins/config/class_configInLdap.inc:305
msgid ""
"The minimum assignable user or group id to avoid security leaks with id 0 "
"accounts."
msgstr "Ðаименьший идентификатор Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸Ð»Ð¸ группы, который может быть назначен, чтобы избежать дыры в безопаÑноÑти Ñ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð¾Ñ€Ð¾Ð¼ учетной запиÑи равным 0."
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid "Next id hook"
msgstr ""
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid ""
"A script to be called for finding the next free id number for users or "
"groups."
msgstr "Скрипт, который будет вызватьÑÑ Ð¿Ñ€Ð¸ нахождении Ñледующего Ñвободного номера id Ð´Ð»Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ иил групп."
-#: plugins/config/class_configInLdap.inc:315
+#: plugins/config/class_configInLdap.inc:314
msgid "Base number for user id"
msgstr "Ðачальное значение Ð´Ð»Ñ id пользователÑ"
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:315
msgid "Where to start looking for a new free user id."
msgstr "Откуда начинать Ñмотреть значение Ð´Ð»Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ Ñвободного id пользователÑ."
-#: plugins/config/class_configInLdap.inc:321
+#: plugins/config/class_configInLdap.inc:320
msgid "Base number for group id"
msgstr "Ðачальное значение Ð´Ð»Ñ id группы"
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:321
msgid "Where to start looking for a new free group id."
msgstr "Откуда начинать Ñмотреть значение Ð´Ð»Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ Ñвободного id группы."
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "Users RDN"
msgstr " RDN пользователей"
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "The branch where users are stored."
msgstr "Ветка где пользователели хранÑÑ‚ÑÑ."
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "Groups RDN"
msgstr "RDN групп"
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "The branch where groups are stored."
msgstr "Ветка в которой хранÑÑ‚ÑÑ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹."
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "ACL role RDN"
msgstr "RDN Ð´Ð»Ñ ACL ролей"
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "The branch where ACL roles are stored."
msgstr "Ветка в которой хранÑÑ‚ÑÑ ACL ролей."
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Id allocation method"
msgstr "Метод Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð¸Ñ id"
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Method to allocate user/group ids"
msgstr "Метод Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð¸Ñ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð¾Ñ€Ð¾Ð² Ð´Ð»Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ и групп"
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Traditional"
msgstr "Традиционный"
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Samba unix id pool"
msgstr "Пул id Ð´Ð»Ñ samba и unix"
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Pool user id min"
msgstr "Минимальное значение id пользователей в пуле"
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Minimum value for user id when using pool method"
msgstr "Минимальное значение Ð´Ð»Ñ id пользователÑ, при иÑпользовании пул метода"
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Pool user id max"
msgstr "МакÑимальное значение id Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð² пуле"
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Maximum value for user id when using pool method"
msgstr "МакÑимальное значение Ð´Ð»Ñ id пользователÑ, при иÑпользовании пул метода"
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Pool group id min"
msgstr "Минимальное значение id группы в пуле"
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Minimum value for group id when using pool method"
msgstr "Минимальное значение Ð´Ð»Ñ id группы, при иÑпользовании пул метода"
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Pool group id max"
msgstr "МакÑимальное значение id группы в пуле"
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Maximum value for group id when using pool method"
msgstr "МакÑимальное значение Ð´Ð»Ñ id группы, при иÑпользовании пул метода"
-#: plugins/config/class_configInLdap.inc:370
+#: plugins/config/class_configInLdap.inc:367
+msgid "Restrict role members"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:367
+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:373
msgid "Debugging"
msgstr "Отладка"
-#: plugins/config/class_configInLdap.inc:373
+#: plugins/config/class_configInLdap.inc:376
msgid "Display errors"
msgstr "Отображение ошибок"
-#: plugins/config/class_configInLdap.inc:374
+#: plugins/config/class_configInLdap.inc:377
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 ошибки в верхней чаÑти Ñкрана. Следует отключить при рабочем иÑпользовании, потому что там могут быть отображены пароли."
-#: plugins/config/class_configInLdap.inc:378
+#: plugins/config/class_configInLdap.inc:381
msgid "Maximum LDAP query time"
msgstr "МакÑимальное Ð²Ñ€ÐµÐ¼Ñ LDAP запроÑа"
-#: plugins/config/class_configInLdap.inc:378
+#: plugins/config/class_configInLdap.inc:381
msgid ""
"Stop LDAP actions if there is no answer within the specified number of "
"seconds."
msgstr "ОÑтановить работу Ñ LDAP еÑли нет ответа за определенное количеÑтво Ñекунд."
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:386
msgid "Log LDAP statistics"
msgstr "Лог ÑтатиÑтики обращений к LDAP"
-#: plugins/config/class_configInLdap.inc:384
+#: plugins/config/class_configInLdap.inc:387
msgid ""
"Track LDAP timing statistics to the syslog. This may help to find indexing "
"problems or bad search filters."
msgstr "ОтÑлеживать продолжительноÑÑ‚ÑŒ обращений к LDAP в syslog. Ðто может помочь найти проблемы в индекÑировании и плохих фильтров поиÑка."
-#: plugins/config/class_configInLdap.inc:389
+#: plugins/config/class_configInLdap.inc:392
msgid "Debug level"
msgstr "Уровень отладки"
-#: plugins/config/class_configInLdap.inc:390
+#: plugins/config/class_configInLdap.inc:393
msgid "Display certain information on each page load."
msgstr "Отображать Ñледующую информацию при каждой загрузке Ñтранице."
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:405
msgid "Miscellaneous"
msgstr "Разное"
-#: plugins/config/class_configInLdap.inc:407
+#: plugins/config/class_configInLdap.inc:410
msgid "Hooks that are called when specific actions happens"
msgstr ""
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "tab"
msgstr "вкладка"
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "The tab that this hook concerns"
msgstr ""
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "mode"
msgstr "Режим"
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "When to call this command"
msgstr "Когда вызывать Ñту команду"
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "cmd"
msgstr "cmd"
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "The command that will be called"
msgstr "Команда, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð±ÑƒÐ´ÐµÑ‚ вызвана"
-#: plugins/config/class_configInLdap.inc:429
+#: plugins/config/class_configInLdap.inc:432
msgid "Hooks"
msgstr "Хуки"
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:439
msgid "Display hook output"
msgstr ""
-#: plugins/config/class_configInLdap.inc:437
+#: plugins/config/class_configInLdap.inc:440
msgid ""
"When enabled successful hook execution output is displayed to the user using"
" a dialog."
msgstr ""
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available shells"
msgstr "ДоÑтупные оболочки"
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available POSIX shells for FD users."
msgstr "ДоÑтупные POSIX шеллы Ð´Ð»Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ FD"
-#: plugins/config/class_configInLdap.inc:449
+#: plugins/config/class_configInLdap.inc:452
msgid "Show ACL tab on all objects"
msgstr "Показать вкладку ACL Ð´Ð»Ñ Ð²Ñех объектов."
-#: plugins/config/class_configInLdap.inc:450
+#: plugins/config/class_configInLdap.inc:453
msgid ""
"For very specific ACL rights setting where you might need to give right on a"
" single object."
msgstr ""
-#: plugins/config/class_configInLdap.inc:464
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available department categories"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available categories in the departments dropdown"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:474
#: setup/class_setupStep_Language.inc:69
msgid "Automatic"
msgstr "ÐвтоматичеÑки"
@@ -1913,80 +1957,80 @@ msgstr "ÐаÑтройки Ð´Ð»Ñ Ñ„ÑƒÐ½ÐºÑ†Ð¸Ð¸ воÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿
msgid "Password recovery settings"
msgstr "ÐаÑтройки воÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ"
-#: plugins/config/class_recoveryConfig.inc:44
+#: plugins/config/class_recoveryConfig.inc:45
msgid "Activate password recovery"
msgstr "Включить воÑÑтановление паролÑ"
-#: plugins/config/class_recoveryConfig.inc:45
+#: plugins/config/class_recoveryConfig.inc:46
msgid "Whether to activate or not password recovery feature"
msgstr "Включить или нет функцию воÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ"
-#: plugins/config/class_recoveryConfig.inc:50
+#: plugins/config/class_recoveryConfig.inc:51
msgid "Sender email address"
msgstr "ÐÐ´Ñ€ÐµÑ Ñлектронной почты отправителÑ"
-#: plugins/config/class_recoveryConfig.inc:51
+#: plugins/config/class_recoveryConfig.inc:52
msgid "Email address from which mails will be sent"
msgstr "ÐÐ´Ñ€ÐµÑ Ñлектронной почты Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð³Ð¾ будут отправлÑÑ‚ÑŒÑÑ Ð¿Ð¸Ñьма"
-#: plugins/config/class_recoveryConfig.inc:57
+#: plugins/config/class_recoveryConfig.inc:58
msgid "Link validity (minutes)"
msgstr "СÑылка дейÑтвительна (минуты)"
-#: plugins/config/class_recoveryConfig.inc:58
+#: plugins/config/class_recoveryConfig.inc:59
msgid "Number of minutes before a recovery link expires"
msgstr "КоличеÑтво минут до иÑÑ‚ÐµÑ‡ÐµÐ½Ð¸Ñ Ñрока годноÑти ÑÑылки Ð´Ð»Ñ Ð²Ð¾ÑÑтановление "
-#: plugins/config/class_recoveryConfig.inc:64
+#: plugins/config/class_recoveryConfig.inc:65
msgid "Salt for tokens"
msgstr "Соль Ð´Ð»Ñ Ñ‚Ð¾ÐºÐµÐ½Ð¾Ð²"
-#: plugins/config/class_recoveryConfig.inc:65
+#: plugins/config/class_recoveryConfig.inc:66
msgid ""
"Just a security measure, you can put anything in there, even random "
"characters"
msgstr "ПроÑто мера безопаÑноÑти, вы можете вÑтавить Ñюда вÑе что угодно, даже Ñлучайные Ñимволы"
-#: plugins/config/class_recoveryConfig.inc:71
+#: plugins/config/class_recoveryConfig.inc:72
msgid "Allow the use of alternate addresses"
msgstr "Разрешить иÑользование альтернативных адреÑов"
-#: plugins/config/class_recoveryConfig.inc:72
+#: plugins/config/class_recoveryConfig.inc:73
msgid ""
"Users will also be able to enter one of theirs alternate addresses to "
"recover their password"
msgstr "ПользователÑм также нужно ввеÑти один из их дополнительных адреÑов Ð´Ð»Ñ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ"
-#: plugins/config/class_recoveryConfig.inc:79
+#: plugins/config/class_recoveryConfig.inc:80
msgid "First email"
msgstr "Первое пиÑьмо"
-#: plugins/config/class_recoveryConfig.inc:82
-#: plugins/config/class_recoveryConfig.inc:101
+#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:102
msgid "Subject"
msgstr "Тема"
-#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:84
msgid "Subject of the first email"
msgstr "Тема первого пиÑьма"
-#: plugins/config/class_recoveryConfig.inc:86
+#: plugins/config/class_recoveryConfig.inc:87
msgid "[FusionDirectory] Password recovery link"
msgstr "[FusionDirectory] СÑылка Ð´Ð»Ñ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ"
-#: plugins/config/class_recoveryConfig.inc:89
+#: plugins/config/class_recoveryConfig.inc:90
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr "Тело (вначале логин %s, Ð²Ñ‚Ð¾Ñ€Ð°Ñ ÑÑылка)"
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:91
#, 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 "Тело первого пиÑьма, отправлÑетÑÑ ÐºÐ¾Ð³Ð´Ð° пользователь запрашивает новый пароль. ИÑпользует %s логин и ÑÑылку Ð´Ð»Ñ Ð²Ð¾ÑÑтановлениÑ."
-#: plugins/config/class_recoveryConfig.inc:93
+#: plugins/config/class_recoveryConfig.inc:94
#, php-format
msgid ""
"Hello,\n"
@@ -1998,31 +2042,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr "Привет,\n\nЗдеÑÑŒ ваша информациÑ:\n - Логин: %s\n - СÑылка: %s\n\nÐта ÑÑылка будет работать только 10 минут."
-#: plugins/config/class_recoveryConfig.inc:98
+#: plugins/config/class_recoveryConfig.inc:99
msgid "Second email"
msgstr "Второе пиÑьмо"
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:103
msgid "Subject of the second email"
msgstr "Тема второго пиÑьма"
-#: plugins/config/class_recoveryConfig.inc:105
+#: plugins/config/class_recoveryConfig.inc:106
msgid "[FusionDirectory] Password recovery successful"
msgstr "[FusionDirectory] Пароль воÑÑтановлен уÑпешно"
-#: plugins/config/class_recoveryConfig.inc:108
+#: plugins/config/class_recoveryConfig.inc:109
#, php-format
msgid "Body (%s is login)"
msgstr "Тело (%s логин)"
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:110
#, php-format
msgid ""
"Body of the second email, sent to confirm the password has been changed. Use"
" %s for the user login."
msgstr "Тело второго пиÑьма, отправлÑетÑÑ, чтобы подтвердить, что пароль был изменен. ИÑпользует %s логин пользователÑ."
-#: plugins/config/class_recoveryConfig.inc:112
+#: plugins/config/class_recoveryConfig.inc:113
#, php-format
msgid ""
"Hello,\n"
@@ -2090,13 +2134,13 @@ msgstr "По убыванию"
msgid "Down"
msgstr "Вниз"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2633
-#: include/simpleplugin/class_attribute.inc:2634
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
+#: include/simpleplugin/class_attribute.inc:2648
msgid "Sort up"
msgstr "Сортировать по возвраÑтанию"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2646
-#: include/simpleplugin/class_attribute.inc:2647
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
+#: include/simpleplugin/class_attribute.inc:2661
msgid "Sort down"
msgstr "Сортировать по убыванию"
@@ -2108,27 +2152,26 @@ msgstr "Выбрать вÑе"
#: include/class_config.inc:479 include/class_msgPool.inc:215
#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3106
-#: include/functions.inc:3127 include/functions.inc:3157
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197 include/functions.inc:3259
+#: include/class_msgPool.inc:740 include/functions.inc:3107
+#: include/functions.inc:3128 include/functions.inc:3158
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3260
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1663 include/class_CopyPasteHandler.inc:278
-#: include/simpleplugin/class_dialogAttributes.inc:733
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
-#: include/simpleplugin/class_attribute.inc:1774
-#: include/simpleplugin/class_attribute.inc:1877
-#: include/simpleplugin/class_attribute.inc:1879
+#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
+#: include/simpleplugin/class_attribute.inc:1784
+#: include/simpleplugin/class_attribute.inc:1887
+#: include/simpleplugin/class_attribute.inc:1889
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: 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:437
#: include/password-methods/class_password-methods.inc:447
-#: include/class_SnapshotHandler.inc:415 html/index.php:434 html/index.php:444
+#: include/class_SnapshotHandler.inc:415 html/index.php:473 html/index.php:483
#: setup/class_setupStep_Migrate.inc:935
#: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
msgid "Error"
@@ -2167,44 +2210,44 @@ msgstr "Обновить ÑпиÑок"
msgid "Submit"
msgstr "Отправить"
-#: include/class_listing.inc:1586 include/class_listing.inc:1640
+#: include/class_listing.inc:1590 include/class_listing.inc:1644
msgid "Copy"
msgstr "Копировать"
-#: include/class_listing.inc:1592 include/class_listing.inc:1628
+#: include/class_listing.inc:1596 include/class_listing.inc:1632
msgid "Cut"
msgstr "Вырезать"
-#: include/class_listing.inc:1600 include/class_listing.inc:1602
+#: include/class_listing.inc:1604 include/class_listing.inc:1606
#: include/class_CopyPasteHandler.inc:370
msgid "Paste"
msgstr "Ð’Ñтавить"
-#: include/class_listing.inc:1628
+#: include/class_listing.inc:1632
msgid "Cut this entry"
msgstr "Вырезать Ñту запиÑÑŒ"
-#: include/class_listing.inc:1640
+#: include/class_listing.inc:1644
msgid "Copy this entry"
msgstr "Копировать Ñту запиÑÑŒ"
-#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_listing.inc:1677 include/class_listing.inc:1679
msgid "Restore snapshots"
msgstr "ВоÑÑтановить Ñнапшоты"
-#: include/class_listing.inc:1689
+#: include/class_listing.inc:1693
msgid "Export list"
msgstr "ÐкÑпортировать ÑпиÑок"
-#: include/class_listing.inc:1724 include/class_listing.inc:1725
+#: include/class_listing.inc:1728 include/class_listing.inc:1729
msgid "Restore snapshot"
msgstr "ВоÑÑтановить Ñнапшот"
-#: include/class_listing.inc:1734
+#: include/class_listing.inc:1738
msgid "Create snapshot"
msgstr "Создать Ñнапшот"
-#: include/class_listing.inc:1735
+#: include/class_listing.inc:1739
msgid "Create a new snapshot from this object"
msgstr "Создать новый Ñнапшот из объекта"
@@ -2247,7 +2290,7 @@ msgid "XML error in fusiondirectory.conf: %s at line %d"
msgstr "Ошибка XML в fusiondirectory.conf: %s в Ñтроке %d"
#: include/class_config.inc:162 include/class_config.inc:300
-#: include/class_config.inc:985 include/class_config.inc:998
+#: include/class_config.inc:915 include/class_config.inc:928
#: include/functions.inc:663 include/class_timezone.inc:51
#: include/password-methods/class_password-methods-sha.inc:71
#: include/password-methods/class_password-methods-ssha.inc:75
@@ -2264,17 +2307,17 @@ msgid ""
"while your passwords are not encrypted."
msgstr "КажетÑÑ Ð²Ñ‹ пытаетеÑÑŒ раÑшифровать что то, что не было зашифровано: %s<br/>\\n ПожалуйÑта проверьте, что вы не иÑпользуете файле fusiondirectory.secrets пароль в котором не зашифрован."
-#: include/class_config.inc:337 include/class_ldap.inc:917
-#: include/class_ldap.inc:1371 include/functions.inc:526
+#: include/class_config.inc:337 include/class_ldap.inc:918
+#: include/class_ldap.inc:1372 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2985 include/simpleplugin/class_simplePlugin.inc:545
-#: include/simpleplugin/class_attribute.inc:2895
+#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2909
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
#: include/class_SnapshotHandler.inc:422 include/class_SnapshotHandler.inc:425
-#: html/index.php:360 html/class_passwordRecovery.inc:497
+#: html/index.php:369 html/class_passwordRecovery.inc:497
#: setup/class_setupStep_Migrate.inc:451
#: setup/class_setupStep_Migrate.inc:1130
msgid "LDAP error"
@@ -2289,38 +2332,38 @@ msgstr "Ðе могу привÑзатьÑÑ Ðº LDAP. ПожалуйÑта Ñв
msgid "The selected mail method (class %s) is not available"
msgstr "Выбранные почтовый метод (клаÑÑ %s) не доÑтупен"
-#: include/class_config.inc:986
+#: include/class_config.inc:916
#, php-format
msgid ""
"The snapshot functionality is enabled, but the required variable '%s' is not"
" set."
msgstr "Функционал Ñнапшотов включен, но Ñ‚Ñ€ÐµÐ±ÑƒÐµÐ¼Ð°Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ '%s' не уÑтановлена."
-#: include/class_config.inc:999
+#: include/class_config.inc:929
#, php-format
msgid ""
"The snapshot functionality is enabled, but the required compression module "
"is missing. Please install '%s'."
msgstr "Функционал Ñнапшотов включен, но требуемый модуль ÑÐ¶Ð°Ñ‚Ð¸Ñ Ð¾Ñ‚ÑутÑтвует. ПожалуйÑта уÑтановите '%s'."
-#: include/class_config.inc:1104
+#: include/class_config.inc:1034
msgid "All categories"
msgstr "Ð’Ñе категории"
-#: include/class_config.inc:1231
+#: include/class_config.inc:1161
msgid "My account"
msgstr "ÐœÐ¾Ñ ÑƒÑ‡ÐµÑ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ"
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
msgid "Performance warning"
msgstr "Предупреждение о производительноÑти"
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
#, php-format
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr "ÐÐ¸Ð·ÐºÐ°Ñ Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ÑÑ‚ÑŒ LDAP: поÑледний Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð·Ð°Ð½Ñл около %.2fs!"
-#: include/class_ldap.inc:868 include/class_ldap.inc:904
+#: include/class_ldap.inc:869 include/class_ldap.inc:905
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
@@ -2330,39 +2373,39 @@ msgstr "ÐÐ¸Ð·ÐºÐ°Ñ Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ÑÑ‚ÑŒ LDAP: поÑледни
msgid "Internal error"
msgstr "ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°"
-#: include/class_ldap.inc:868
+#: include/class_ldap.inc:869
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:904
+#: include/class_ldap.inc:905
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1016
+#: include/class_ldap.inc:1017
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr "во Ð²Ñ€ÐµÐ¼Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ð¸ на '%s' иÑпользовалÑÑ LDAP Ñервер '%s'"
-#: include/class_ldap.inc:1018
+#: include/class_ldap.inc:1019
#, php-format
msgid "while operating on LDAP server %s"
msgstr "во Ð²Ñ€ÐµÐ¼Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ð¸ на LDAP Ñервер %s"
-#: include/class_ldap.inc:1108
+#: include/class_ldap.inc:1109
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1220
+#: include/class_ldap.inc:1221
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr "Ðеправильный DN: '%s'. Блок Ð´Ð»Ñ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð° должен начинатьÑÑ Ñ dn: ...' в Ñтроке %s."
-#: include/class_ldap.inc:1231
+#: include/class_ldap.inc:1232
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2950,10 +2993,10 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr "КритичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°: не могу Ñоздать ÑкземплÑÑ€ клаÑÑа '%s' - попробуйте запуÑтить '%s' чтобы иÑправить Ñто"
-#: include/functions.inc:496 include/functions.inc:3294
-#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:263
-#: include/simpleplugin/class_simplePlugin.inc:268
-#: include/simpleplugin/class_simplePlugin.inc:280
+#: include/functions.inc:496 include/functions.inc:3295
+#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
+#: include/simpleplugin/class_simplePlugin.inc:269
+#: include/simpleplugin/class_simplePlugin.inc:281
#: html/class_passwordRecovery.inc:216
msgid "Fatal error"
msgstr "Ð¤Ð°Ñ‚Ð°Ð»ÑŒÐ½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°"
@@ -3106,98 +3149,98 @@ msgstr "Ðе могу запиÑать файл проверки!"
msgid "Cannot read to revision file!"
msgstr "Ðе могу прочитать файл проверки!"
-#: include/functions.inc:2548
+#: include/functions.inc:2549
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "LDAP warning"
msgstr "Предупреждение LDAP"
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "Cannot get schema information from server. No schema check possible!"
msgstr "Ðе могу получить информацию о Ñхемах Ñ Ñервера. Проверить Ñхемы невозможно!"
-#: include/functions.inc:2584
+#: include/functions.inc:2585
msgid ""
"Used to lock currently edited entries to avoid multiple changes at the same "
"time."
msgstr ""
-#: include/functions.inc:2596
+#: include/functions.inc:2597
#, php-format
msgid "Missing required object class '%s'!"
msgstr "Пропущен обÑзательный объектный клаÑÑ '%s'!"
-#: include/functions.inc:2599
+#: include/functions.inc:2600
#, php-format
msgid "Missing optional object class '%s'!"
msgstr "Пропущен дополнительный объектный клаÑÑ '%s'!"
-#: include/functions.inc:2603
+#: include/functions.inc:2604
#, php-format
msgid "Class(es) available"
msgstr "ДоÑтупные клаÑÑ(Ñ‹)"
-#: include/functions.inc:2623
+#: include/functions.inc:2624
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2625
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2628
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2629
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3106 include/functions.inc:3127
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198
msgid "Cannot allocate a free ID:"
msgstr "Ðе могу выделить Ñвободный ID:"
-#: include/functions.inc:3106
+#: include/functions.inc:3107
msgid "unknown idAllocation method!"
msgstr " неизвеÑтный idAllocation метод!"
-#: include/functions.inc:3127
+#: include/functions.inc:3128
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr "%sPoolMin >= %sPoolMax!"
-#: include/functions.inc:3157
+#: include/functions.inc:3158
msgid "Cannot create sambaUnixIdPool entry!"
msgstr "Ðе могу Ñоздать запиÑÑŒ sambaUnixIdPool!"
-#: include/functions.inc:3165
+#: include/functions.inc:3166
msgid "sambaUnixIdPool is not unique!"
msgstr "sambaUnixIdPool не уникальна!"
-#: include/functions.inc:3177 include/functions.inc:3181
+#: include/functions.inc:3178 include/functions.inc:3182
msgid "no ID available!"
msgstr "нет доÑтупных ID!"
-#: include/functions.inc:3197
+#: include/functions.inc:3198
msgid "maximum tries exceeded!"
msgstr "Превышено макÑимальное чиÑло попыток!"
-#: include/functions.inc:3259
+#: include/functions.inc:3260
msgid "Cannot allocate a free ID!"
msgstr "Ðе могу выделить Ñвободный ID!"
-#: include/functions.inc:3295
+#: include/functions.inc:3296
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr "Ðе могу обнаружить файл '%s' - пожалуйÑта запуÑтите '%s', чтобы иÑправить Ñто."
@@ -3353,13 +3396,13 @@ msgstr "на Ñтроке"
msgid "XML error"
msgstr "Ошибка XML"
-#: include/class_plugin.inc:554
+#: include/class_plugin.inc:553
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/class_plugin.inc:1466
+#: include/class_plugin.inc:1467
#, php-format
msgid "Tab \"%s\""
msgstr "Вкладка \"%s\""
@@ -3385,32 +3428,32 @@ msgstr "Ðазвание шаблона"
msgid "This is the name of the template"
msgstr "Ðто название шаблона"
-#: include/simpleplugin/class_simplePlugin.inc:263
+#: include/simpleplugin/class_simplePlugin.inc:264
msgid "Only main tab can compute dn"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:270
+#: include/simpleplugin/class_simplePlugin.inc:271
#, php-format
msgid "Could not compute dn: no parent tab class for \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:282
+#: include/simpleplugin/class_simplePlugin.inc:283
#, php-format
msgid ""
"Could not compute dn: could not find objectType infos from tab class \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:638
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:644
+#: include/simpleplugin/class_simplePlugin.inc:652
msgid "Error when saving"
msgstr "Ошибка при Ñохранении"
-#: include/simpleplugin/class_simplePlugin.inc:638
+#: include/simpleplugin/class_simplePlugin.inc:644
#, php-format
msgid "There is already an entry with the same dn : %s"
msgstr "Уже еÑÑ‚ÑŒ запиÑÑŒ Ñ Ñ‚Ð°ÐºÐ¸Ð¼ dn: %s"
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:652
#, php-format
msgid "The entry %s is not existing"
msgstr "ЗапиÑÑŒ %s не ÑущеÑтвует"
@@ -3430,27 +3473,27 @@ msgstr ""
msgid "Show %s"
msgstr "Показать %s"
-#: include/simpleplugin/class_dialogAttributes.inc:409
+#: include/simpleplugin/class_dialogAttributes.inc:415
#, php-format
msgid "Group %s"
msgstr "Группа %s"
-#: include/simpleplugin/class_dialogAttributes.inc:411
+#: include/simpleplugin/class_dialogAttributes.inc:417
#, php-format
msgid "Role %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:446
+#: include/simpleplugin/class_dialogAttributes.inc:452
msgid "Group of user"
msgstr "Группа пользователÑ"
-#: include/simpleplugin/class_dialogAttributes.inc:615
+#: include/simpleplugin/class_dialogAttributes.inc:621
#: include/simpleplugin/class_attribute.inc:1090
#: include/simpleplugin/class_attribute.inc:1124
msgid "None"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:617
+#: include/simpleplugin/class_dialogAttributes.inc:623
msgid "Unknown"
msgstr "ÐеизвеÑтно"
@@ -3491,11 +3534,16 @@ msgid "days"
msgstr "дни"
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2161
+#: include/simpleplugin/class_attribute.inc:2171
#, php-format
msgid "%s (required)"
msgstr "%s (обÑзательный)"
+#: include/simpleplugin/class_attribute.inc:1150
+#, php-format
+msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
+msgstr ""
+
#: include/simpleplugin/class_attribute.inc:1277
#, php-format
msgid "An integer between %d and %d"
@@ -3511,75 +3559,75 @@ msgstr "Целое чиÑло больше %d"
msgid "An integer smaller than %d"
msgstr "Целое чиÑло меньше %d"
-#: include/simpleplugin/class_attribute.inc:1379
+#: include/simpleplugin/class_attribute.inc:1383
#, php-format
msgid "A float between %f and %f"
msgstr "ВещеÑтвенное чиÑло от %f до %f"
-#: include/simpleplugin/class_attribute.inc:1381
+#: include/simpleplugin/class_attribute.inc:1385
#, php-format
msgid "A float larger than %f"
msgstr "ВещеÑтвенно чиÑло больше %f"
-#: include/simpleplugin/class_attribute.inc:1383
+#: include/simpleplugin/class_attribute.inc:1387
#, php-format
msgid "A float smaller than %f"
msgstr "ВещеÑтвенное чиÑло меньше %f"
-#: include/simpleplugin/class_attribute.inc:1490
+#: include/simpleplugin/class_attribute.inc:1500
msgid "Error, incorrect date: "
msgstr "Ошибка: Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ð´Ð°Ñ‚Ð°:"
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
#, php-format
msgid "Cannot read uploaded file: %s"
msgstr "Ðе могу прочеÑÑ‚ÑŒ загруженный файл: %s"
-#: include/simpleplugin/class_attribute.inc:1530
+#: include/simpleplugin/class_attribute.inc:1540
msgid "file is empty"
msgstr "файл пуÑтой"
-#: include/simpleplugin/class_attribute.inc:1533
+#: include/simpleplugin/class_attribute.inc:1543
msgid "file not found"
msgstr "файл не найден"
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1546
msgid "file not readable"
msgstr "файл не читаем"
-#: include/simpleplugin/class_attribute.inc:1569
+#: include/simpleplugin/class_attribute.inc:1579
#, php-format
msgid "%s (%d bytes)"
msgstr "%s (%d байт)"
-#: include/simpleplugin/class_attribute.inc:1616
-#: include/simpleplugin/class_attribute.inc:1793
+#: include/simpleplugin/class_attribute.inc:1626
+#: include/simpleplugin/class_attribute.inc:1803
msgid "Upload"
msgstr "Загрузить"
-#: include/simpleplugin/class_attribute.inc:1621
-#: include/simpleplugin/class_attribute.inc:1622
+#: include/simpleplugin/class_attribute.inc:1631
+#: include/simpleplugin/class_attribute.inc:1632
msgid "Download"
msgstr "Скачать"
-#: include/simpleplugin/class_attribute.inc:1775
+#: include/simpleplugin/class_attribute.inc:1785
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr "Ðе могу Ñохранить фотографию пользователÑ, FusionDirectory нужен уÑтановленный пакета 'php5-imagick'!"
-#: include/simpleplugin/class_attribute.inc:1826
+#: include/simpleplugin/class_attribute.inc:1836
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr "Ветка"
-#: include/simpleplugin/class_attribute.inc:1829
+#: include/simpleplugin/class_attribute.inc:1839
msgid "Object base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:2755
+#: include/simpleplugin/class_attribute.inc:2769
#, php-format
msgid "Invalid value for %s"
msgstr "Ðеверное значение Ð´Ð»Ñ %s"
@@ -3713,17 +3761,17 @@ msgstr "Проверьте, правильно ли вы ввели Ð¸Ð¼Ñ Ð¿Ð¾
msgid "Account locked. Please contact your system administrator!"
msgstr "Ð£Ñ‡ÐµÑ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ заблокирована. ПожалуйÑта ÑвÑжитеÑÑŒ Ñ Ð²Ð°ÑˆÐ¸Ð¼ ÑиÑтемным админиÑтратором."
-#: html/index.php:436
+#: html/index.php:475
#, php-format
msgid "CAS user \"%s\" could not be found in the LDAP"
msgstr ""
-#: html/index.php:446
+#: html/index.php:485
#, php-format
msgid "CAS user \"%s\" match several users in the LDAP"
msgstr ""
-#: html/index.php:481
+#: html/index.php:522
msgid ""
"Your browser has cookies disabled. Please enable cookies and reload this "
"page before logging in!"
@@ -4046,7 +4094,7 @@ msgid "Checking for duplicated UID numbers"
msgstr ""
#: setup/class_setupStep_Migrate.inc:267
-msgid "Checking for duplicate GID numbers"
+msgid "Checking for duplicated GID numbers"
msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:487
@@ -4056,7 +4104,7 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:1179
#: setup/class_setupStep_Migrate.inc:1272
#: setup/class_setupStep_Migrate.inc:1351
-#: setup/class_setupStep_Migrate.inc:1390
+#: setup/class_setupStep_Migrate.inc:1395
msgid "LDAP query failed"
msgstr "LDAP Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ðµ удалÑÑ"
@@ -4067,7 +4115,7 @@ msgstr "LDAP Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ðµ удалÑÑ"
#: setup/class_setupStep_Migrate.inc:1180
#: setup/class_setupStep_Migrate.inc:1273
#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1391
+#: setup/class_setupStep_Migrate.inc:1396
msgid "Possibly the \"root object\" is missing."
msgstr ""
@@ -4222,14 +4270,14 @@ msgstr "Ðайдены подразделение(Ñ) %s, которые буд
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1373
+#: setup/class_setupStep_Migrate.inc:1378
#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\"."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1412
+#: setup/class_setupStep_Migrate.inc:1422
#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\"."
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
diff --git a/locale/ru@petr1708/fusiondirectory.po b/locale/ru@petr1708/fusiondirectory.po
index b8db0819f30e3ccf702a206a6dc197efd5ca32e1..e3e7377ac55ae7880cd9efeb137ee8142e8fc26c 100644
--- a/locale/ru@petr1708/fusiondirectory.po
+++ b/locale/ru@petr1708/fusiondirectory.po
@@ -5,12 +5,12 @@
# Translators:
msgid ""
msgstr ""
-"Project-Id-Version: FusionDirectory-109\n"
+"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-01-22 11:26+0100\n"
-"PO-Revision-Date: 2016-01-22 10:24+0000\n"
+"POT-Creation-Date: 2016-03-14 12:07+0100\n"
+"PO-Revision-Date: 2016-03-07 12:09+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-109/language/ru@petr1708/)\n"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -28,31 +28,31 @@ msgstr ""
msgid "References"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:30
-#: plugins/admin/groups/class_roleGeneric.inc:34
+#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:61
#: plugins/admin/groups/class_groupManagement.inc:71
#: plugins/admin/aclrole/class_aclRole.inc:78
#: plugins/admin/acl/class_aclAssignment.inc:49
msgid "Role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:31
+#: plugins/admin/groups/class_roleGeneric.inc:58
msgid "Role information"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:35
+#: plugins/admin/groups/class_roleGeneric.inc:62
msgid "Organizational role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:84
msgid "Informations"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:158
+#: plugins/admin/departments/class_department.inc:174
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -62,13 +62,13 @@ msgstr ""
msgid "Name"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
msgid "Name of this group"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
#: plugins/admin/groups/class_group.inc:66
#: plugins/admin/groups/class_ogroup.inc:192
#: plugins/admin/groups/group-list.xml:41
@@ -81,26 +81,26 @@ msgstr ""
msgid "Description"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
msgid "Description of the role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:70
+#: plugins/admin/groups/class_roleGeneric.inc:97
msgid "Phone number"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:74
+#: plugins/admin/groups/class_roleGeneric.inc:101
msgid "Fax number"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
#: plugins/admin/users/class_userManagement.inc:42
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: setup/class_setupStep_Migrate.inc:871
msgid "Users"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
msgid "Add users for the role"
msgstr ""
@@ -147,7 +147,7 @@ msgstr ""
#: plugins/admin/groups/class_group.inc:74
#: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:403
+#: plugins/personal/posix/class_posixAccount.inc:410
msgid "GID"
msgstr ""
@@ -204,23 +204,23 @@ msgid "Only allow this group to connect to this list of hosts"
msgstr ""
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458 include/functions.inc:794
-#: include/functions.inc:2548 include/class_xml.inc:55
+#: plugins/personal/posix/class_posixAccount.inc:465 include/functions.inc:794
+#: include/functions.inc:2549 include/class_xml.inc:55
#: include/simpleplugin/class_simpleTabs.inc:325 html/index.php:56
-#: html/index.php:62 html/index.php:481 html/class_passwordRecovery.inc:378
+#: html/index.php:62 html/index.php:522 html/class_passwordRecovery.inc:378
#: setup/class_setupStep_Migrate.inc:572
#: setup/class_setupStep_Migrate.inc:1083
#: setup/class_setupStep_Migrate.inc:1202
#: setup/class_setupStep_Migrate.inc:1313
-#: setup/class_setupStep_Migrate.inc:1372
-#: setup/class_setupStep_Migrate.inc:1411 plugins/admin/acl/remove.tpl.c:2
+#: setup/class_setupStep_Migrate.inc:1377
+#: setup/class_setupStep_Migrate.inc:1421 plugins/admin/acl/remove.tpl.c:2
#: ihtml/themes/default/islocked.tpl.c:5 ihtml/themes/default/remove.tpl.c:2
#: ihtml/themes/default/msg_dialog.tpl.c:5 setup/setup_checks.tpl.c:8
msgid "Warning"
msgstr ""
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458
+#: plugins/personal/posix/class_posixAccount.inc:465
msgid "Timeout while waiting for lock. Ignoring lock!"
msgstr ""
@@ -250,7 +250,7 @@ msgstr ""
msgid "Objects member of this group"
msgstr ""
-#: plugins/admin/groups/class_ogroup.inc:318
+#: plugins/admin/groups/class_ogroup.inc:313
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
@@ -279,10 +279,10 @@ msgstr ""
#: plugins/admin/departments/dep-list.xml:79
#: plugins/admin/users/user-list.xml:105
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-#: include/simpleplugin/class_dialogAttributes.inc:626
-#: include/simpleplugin/class_dialogAttributes.inc:627
-#: include/simpleplugin/class_attribute.inc:2661
-#: include/simpleplugin/class_attribute.inc:2662
+#: include/simpleplugin/class_dialogAttributes.inc:632
+#: include/simpleplugin/class_dialogAttributes.inc:633
+#: include/simpleplugin/class_attribute.inc:2675
+#: include/simpleplugin/class_attribute.inc:2676
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -293,8 +293,8 @@ msgstr ""
#: plugins/admin/departments/dep-list.xml:67
#: plugins/admin/departments/dep-list.xml:88
#: plugins/admin/users/user-list.xml:112
-#: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_dialogAttributes.inc:637
+#: include/simpleplugin/class_dialogAttributes.inc:642
+#: include/simpleplugin/class_dialogAttributes.inc:643
#: include/simpleplugin/simple-list.xml:75
#: include/simpleplugin/simple-list.xml:125
msgid "Remove"
@@ -343,7 +343,7 @@ msgid "Show application groups"
msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Show department groups"
+msgid "Show unidentified groups"
msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:137
@@ -432,51 +432,67 @@ msgid "Category of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:81
+msgid "Website"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:81
+#, php-format
+msgid "Website of this %s"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:85
#: plugins/personal/generic/class_user.inc:410
msgid "Manager"
msgstr ""
-#: plugins/admin/departments/class_department.inc:81
+#: plugins/admin/departments/class_department.inc:85
#, php-format
msgid "Manager of this %s"
msgstr ""
-#: plugins/admin/departments/class_department.inc:87
-#: plugins/admin/departments/class_department.inc:93
+#: plugins/admin/departments/class_department.inc:91
+#: plugins/admin/departments/class_department.inc:97
#: plugins/personal/generic/class_user.inc:304
msgid "Location"
msgstr ""
-#: plugins/admin/departments/class_department.inc:90
+#: plugins/admin/departments/class_department.inc:94
#: plugins/personal/generic/class_user.inc:308
msgid "State"
msgstr ""
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_country.inc:29
+#: plugins/admin/departments/class_country.inc:30
+#: plugins/admin/departments/class_country.inc:33
+msgid "Country"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:103
#: plugins/personal/generic/class_user.inc:312
msgid "Address"
msgstr ""
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:103
#, php-format
msgid "A postal address for this %s"
msgstr ""
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
#: plugins/personal/generic/class_user.inc:320
msgid "Phone"
msgstr ""
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
msgid "Telephone number"
msgstr ""
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
#: plugins/personal/generic/class_user.inc:332
msgid "Fax"
msgstr ""
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
msgid "Facsimile telephone number"
msgstr ""
@@ -504,12 +520,6 @@ msgstr ""
msgid "locality"
msgstr ""
-#: plugins/admin/departments/class_country.inc:29
-#: plugins/admin/departments/class_country.inc:30
-#: plugins/admin/departments/class_country.inc:33
-msgid "Country"
-msgstr ""
-
#: plugins/admin/departments/class_country.inc:50
msgid "country"
msgstr ""
@@ -552,7 +562,8 @@ msgid "Given name"
msgstr ""
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
+#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
msgid "Login"
@@ -665,8 +676,8 @@ msgid "Edit category ACL"
msgstr ""
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2671
-#: include/simpleplugin/class_attribute.inc:2672
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
+#: include/simpleplugin/class_attribute.inc:2686
#, php-format
msgid "Delete"
msgstr ""
@@ -771,19 +782,37 @@ msgstr ""
msgid "ACLs which are part of this group"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:38
+#: plugins/admin/acl/class_aclManagement.inc:31
+#: plugins/admin/acl/class_aclManagement.inc:32
+#: plugins/admin/acl/class_aclManagement.inc:45
+msgid "ACL assignment creation"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:33
+msgid "Create an ACL assignment on an arbitrary dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "Dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "DN you wish to add assignments for"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:135
msgid "ACL assignments"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:39
+#: plugins/admin/acl/class_aclManagement.inc:136
msgid "ACL assignments management"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:40
+#: plugins/admin/acl/class_aclManagement.inc:137
msgid "Manage ACL roles assignments to users"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:78
+#: plugins/admin/acl/class_aclManagement.inc:199
#: plugins/admin/acl/class_aclAssignment.inc:263
msgid "ACL Assignment"
msgstr ""
@@ -899,7 +928,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -994,57 +1023,57 @@ msgstr ""
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:336
+msgid "Homepage"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:336
+msgid "Personal homepage"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:342
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:351
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr ""
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:358
-msgid "Personal contact information"
-msgstr ""
-
#: plugins/personal/generic/class_user.inc:362
-msgid "Display name"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:362
-msgid "Name this user should appear as. Used by Exchange."
+msgid "Personal contact information"
msgstr ""
#: plugins/personal/generic/class_user.inc:366
-msgid "Home address"
+msgid "Display name"
msgstr ""
#: plugins/personal/generic/class_user.inc:366
-msgid "Home postal address"
+msgid "Name this user should appear as. Used by Exchange."
msgstr ""
#: plugins/personal/generic/class_user.inc:370
-msgid "Private phone"
+msgid "Home address"
msgstr ""
#: plugins/personal/generic/class_user.inc:370
-msgid "Home phone number"
+msgid "Home postal address"
msgstr ""
#: plugins/personal/generic/class_user.inc:374
-msgid "Homepage"
+msgid "Private phone"
msgstr ""
#: plugins/personal/generic/class_user.inc:374
-msgid "Personal homepage"
+msgid "Home phone number"
msgstr ""
#: plugins/personal/generic/class_user.inc:380
@@ -1279,33 +1308,33 @@ msgstr ""
msgid "automatic"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:309
+#: plugins/personal/posix/class_posixAccount.inc:310
msgid "expired"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:311
+#: plugins/personal/posix/class_posixAccount.inc:312
msgid "grace time active"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:314
-#: plugins/personal/posix/class_posixAccount.inc:316
-#: plugins/personal/posix/class_posixAccount.inc:318
+#: plugins/personal/posix/class_posixAccount.inc:315
+#: plugins/personal/posix/class_posixAccount.inc:317
+#: plugins/personal/posix/class_posixAccount.inc:319
msgid "active"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:315
msgid "password expired"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:316
+#: plugins/personal/posix/class_posixAccount.inc:317
msgid "password not changeable"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:400
+#: plugins/personal/posix/class_posixAccount.inc:407
msgid "UID"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:516
+#: plugins/personal/posix/class_posixAccount.inc:525
#, php-format
msgid "Group of user %s"
msgstr ""
@@ -1477,424 +1506,440 @@ msgid "Core settings"
msgstr ""
#: plugins/config/class_configInLdap.inc:161
-msgid "Enable primary group filter"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"It is time consuming to evaluate which groups are primary and which are not,"
-" so you may want to disable it if your group plugin is slow."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:167
msgid "Display summary in listings"
msgstr ""
-#: plugins/config/class_configInLdap.inc:168
+#: 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:173
+#: plugins/config/class_configInLdap.inc:167
msgid "Edit locking"
msgstr ""
-#: plugins/config/class_configInLdap.inc:174
+#: 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:179
+#: plugins/config/class_configInLdap.inc:173
msgid "Enable logging"
msgstr ""
-#: plugins/config/class_configInLdap.inc:180
+#: plugins/config/class_configInLdap.inc:174
msgid "Event logging on FusionDirectory side."
msgstr ""
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "LDAP size limit"
msgstr ""
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "Defines the number of entries to get from LDAP by default."
msgstr ""
-#: plugins/config/class_configInLdap.inc:192
+#: plugins/config/class_configInLdap.inc:186
msgid "Login and session"
msgstr ""
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:189
msgid "Login attribute"
msgstr ""
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:190
msgid "Which LDAP attribute should be used as the login name during login."
msgstr ""
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:196
msgid "Enforce encrypted connections"
msgstr ""
-#: plugins/config/class_configInLdap.inc:203
+#: plugins/config/class_configInLdap.inc:197
msgid ""
"Enables PHP security checks to force encrypted access (https) to the web "
"interface."
msgstr ""
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:201
msgid "Warn if session is not encrypted"
msgstr ""
-#: plugins/config/class_configInLdap.inc:208
+#: plugins/config/class_configInLdap.inc:202
msgid "will display a warning to the user when http is used instead of https."
msgstr ""
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Session lifetime"
msgstr ""
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Defines when a session will expire in seconds."
msgstr ""
-#: plugins/config/class_configInLdap.inc:220
+#: plugins/config/class_configInLdap.inc:212
+msgid "HTTP authentication"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:212
+msgid "Use HTTP authentication protocol instead of the login form."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:219
#: include/class_SnapshotDialogs.inc:186
msgid "Snapshots"
msgstr ""
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid "Enable snapshots"
msgstr ""
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid ""
"This enables you to save certain states of entries and restore them later "
"on."
msgstr ""
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
msgid "Snapshot base"
msgstr ""
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
msgid "The base where snapshots should be stored inside of the LDAP."
msgstr ""
-#: plugins/config/class_configInLdap.inc:235
+#: plugins/config/class_configInLdap.inc:234
msgid "SSL"
msgstr ""
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Key path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Path to FusionDirectory private key. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Certificate path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Path to FusionDirectory certificate. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:262
msgid "CA certificate path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:247
msgid "Path to the CA certificate. Used for validating Argonaut Server host."
msgstr ""
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:254
msgid "CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "Enable CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "CAS login will be used instead of LDAP bind"
msgstr ""
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:262
msgid "Path to the CA certificate of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host"
msgstr ""
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port"
msgstr ""
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port the CAS server is listening on"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context to be used"
msgstr ""
-#: plugins/config/class_configInLdap.inc:285
+#: plugins/config/class_configInLdap.inc:284
msgid "People and group storage"
msgstr ""
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "People DN attribute"
msgstr ""
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "Attribute to use at the beginning of users dn"
msgstr ""
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "CN pattern"
msgstr ""
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "The pattern to use to build the common name field"
msgstr ""
-#: plugins/config/class_configInLdap.inc:299
+#: plugins/config/class_configInLdap.inc:298
msgid "Strict naming policy"
msgstr ""
-#: plugins/config/class_configInLdap.inc:300
+#: plugins/config/class_configInLdap.inc:299
msgid "Enables strict checking of user and group names"
msgstr ""
-#: plugins/config/class_configInLdap.inc:305
+#: plugins/config/class_configInLdap.inc:304
msgid "Group/user min id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:306
+#: plugins/config/class_configInLdap.inc:305
msgid ""
"The minimum assignable user or group id to avoid security leaks with id 0 "
"accounts."
msgstr ""
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid "Next id hook"
msgstr ""
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid ""
"A script to be called for finding the next free id number for users or "
"groups."
msgstr ""
-#: plugins/config/class_configInLdap.inc:315
+#: plugins/config/class_configInLdap.inc:314
msgid "Base number for user id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:315
msgid "Where to start looking for a new free user id."
msgstr ""
-#: plugins/config/class_configInLdap.inc:321
+#: plugins/config/class_configInLdap.inc:320
msgid "Base number for group id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:321
msgid "Where to start looking for a new free group id."
msgstr ""
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "Users RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "The branch where users are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "Groups RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "The branch where groups are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "ACL role RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "The branch where ACL roles are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Id allocation method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Method to allocate user/group ids"
msgstr ""
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Traditional"
msgstr ""
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Samba unix id pool"
msgstr ""
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Pool user id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Minimum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Pool user id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Maximum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Pool group id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Minimum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Pool group id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Maximum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:370
-msgid "Debugging"
+#: plugins/config/class_configInLdap.inc:367
+msgid "Restrict role members"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:367
+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:373
+msgid "Debugging"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:376
msgid "Display errors"
msgstr ""
-#: plugins/config/class_configInLdap.inc:374
+#: plugins/config/class_configInLdap.inc:377
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:378
+#: plugins/config/class_configInLdap.inc:381
msgid "Maximum LDAP query time"
msgstr ""
-#: plugins/config/class_configInLdap.inc:378
+#: plugins/config/class_configInLdap.inc:381
msgid ""
"Stop LDAP actions if there is no answer within the specified number of "
"seconds."
msgstr ""
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:386
msgid "Log LDAP statistics"
msgstr ""
-#: plugins/config/class_configInLdap.inc:384
+#: plugins/config/class_configInLdap.inc:387
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:389
+#: plugins/config/class_configInLdap.inc:392
msgid "Debug level"
msgstr ""
-#: plugins/config/class_configInLdap.inc:390
+#: plugins/config/class_configInLdap.inc:393
msgid "Display certain information on each page load."
msgstr ""
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:405
msgid "Miscellaneous"
msgstr ""
-#: plugins/config/class_configInLdap.inc:407
+#: plugins/config/class_configInLdap.inc:410
msgid "Hooks that are called when specific actions happens"
msgstr ""
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "tab"
msgstr ""
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "The tab that this hook concerns"
msgstr ""
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "mode"
msgstr ""
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "When to call this command"
msgstr ""
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "cmd"
msgstr ""
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "The command that will be called"
msgstr ""
-#: plugins/config/class_configInLdap.inc:429
+#: plugins/config/class_configInLdap.inc:432
msgid "Hooks"
msgstr ""
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:439
msgid "Display hook output"
msgstr ""
-#: plugins/config/class_configInLdap.inc:437
+#: plugins/config/class_configInLdap.inc:440
msgid ""
"When enabled successful hook execution output is displayed to the user using"
" a dialog."
msgstr ""
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available shells"
msgstr ""
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available POSIX shells for FD users."
msgstr ""
-#: plugins/config/class_configInLdap.inc:449
+#: plugins/config/class_configInLdap.inc:452
msgid "Show ACL tab on all objects"
msgstr ""
-#: plugins/config/class_configInLdap.inc:450
+#: plugins/config/class_configInLdap.inc:453
msgid ""
"For very specific ACL rights setting where you might need to give right on a"
" single object."
msgstr ""
-#: plugins/config/class_configInLdap.inc:464
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available department categories"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available categories in the departments dropdown"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:474
#: setup/class_setupStep_Language.inc:69
msgid "Automatic"
msgstr ""
@@ -1911,80 +1956,80 @@ msgstr ""
msgid "Password recovery settings"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:44
+#: plugins/config/class_recoveryConfig.inc:45
msgid "Activate password recovery"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:45
+#: plugins/config/class_recoveryConfig.inc:46
msgid "Whether to activate or not password recovery feature"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:50
+#: plugins/config/class_recoveryConfig.inc:51
msgid "Sender email address"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:51
+#: plugins/config/class_recoveryConfig.inc:52
msgid "Email address from which mails will be sent"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:57
+#: plugins/config/class_recoveryConfig.inc:58
msgid "Link validity (minutes)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:58
+#: plugins/config/class_recoveryConfig.inc:59
msgid "Number of minutes before a recovery link expires"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:64
+#: plugins/config/class_recoveryConfig.inc:65
msgid "Salt for tokens"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:65
+#: plugins/config/class_recoveryConfig.inc:66
msgid ""
"Just a security measure, you can put anything in there, even random "
"characters"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:71
+#: plugins/config/class_recoveryConfig.inc:72
msgid "Allow the use of alternate addresses"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:72
+#: plugins/config/class_recoveryConfig.inc:73
msgid ""
"Users will also be able to enter one of theirs alternate addresses to "
"recover their password"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:79
+#: plugins/config/class_recoveryConfig.inc:80
msgid "First email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:82
-#: plugins/config/class_recoveryConfig.inc:101
+#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:102
msgid "Subject"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:84
msgid "Subject of the first email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:86
+#: plugins/config/class_recoveryConfig.inc:87
msgid "[FusionDirectory] Password recovery link"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:89
+#: plugins/config/class_recoveryConfig.inc:90
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:91
#, 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 ""
-#: plugins/config/class_recoveryConfig.inc:93
+#: plugins/config/class_recoveryConfig.inc:94
#, php-format
msgid ""
"Hello,\n"
@@ -1996,31 +2041,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:98
+#: plugins/config/class_recoveryConfig.inc:99
msgid "Second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:103
msgid "Subject of the second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:105
+#: plugins/config/class_recoveryConfig.inc:106
msgid "[FusionDirectory] Password recovery successful"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:108
+#: plugins/config/class_recoveryConfig.inc:109
#, php-format
msgid "Body (%s is login)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:110
#, php-format
msgid ""
"Body of the second email, sent to confirm the password has been changed. Use"
" %s for the user login."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:112
+#: plugins/config/class_recoveryConfig.inc:113
#, php-format
msgid ""
"Hello,\n"
@@ -2088,13 +2133,13 @@ msgstr ""
msgid "Down"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2633
-#: include/simpleplugin/class_attribute.inc:2634
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
+#: include/simpleplugin/class_attribute.inc:2648
msgid "Sort up"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2646
-#: include/simpleplugin/class_attribute.inc:2647
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
+#: include/simpleplugin/class_attribute.inc:2661
msgid "Sort down"
msgstr ""
@@ -2106,27 +2151,26 @@ msgstr ""
#: include/class_config.inc:479 include/class_msgPool.inc:215
#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3106
-#: include/functions.inc:3127 include/functions.inc:3157
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197 include/functions.inc:3259
+#: include/class_msgPool.inc:740 include/functions.inc:3107
+#: include/functions.inc:3128 include/functions.inc:3158
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3260
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1663 include/class_CopyPasteHandler.inc:278
-#: include/simpleplugin/class_dialogAttributes.inc:733
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
-#: include/simpleplugin/class_attribute.inc:1774
-#: include/simpleplugin/class_attribute.inc:1877
-#: include/simpleplugin/class_attribute.inc:1879
+#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
+#: include/simpleplugin/class_attribute.inc:1784
+#: include/simpleplugin/class_attribute.inc:1887
+#: include/simpleplugin/class_attribute.inc:1889
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: 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:437
#: include/password-methods/class_password-methods.inc:447
-#: include/class_SnapshotHandler.inc:415 html/index.php:434 html/index.php:444
+#: include/class_SnapshotHandler.inc:415 html/index.php:473 html/index.php:483
#: setup/class_setupStep_Migrate.inc:935
#: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
msgid "Error"
@@ -2165,44 +2209,44 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: include/class_listing.inc:1586 include/class_listing.inc:1640
+#: include/class_listing.inc:1590 include/class_listing.inc:1644
msgid "Copy"
msgstr ""
-#: include/class_listing.inc:1592 include/class_listing.inc:1628
+#: include/class_listing.inc:1596 include/class_listing.inc:1632
msgid "Cut"
msgstr ""
-#: include/class_listing.inc:1600 include/class_listing.inc:1602
+#: include/class_listing.inc:1604 include/class_listing.inc:1606
#: include/class_CopyPasteHandler.inc:370
msgid "Paste"
msgstr ""
-#: include/class_listing.inc:1628
+#: include/class_listing.inc:1632
msgid "Cut this entry"
msgstr ""
-#: include/class_listing.inc:1640
+#: include/class_listing.inc:1644
msgid "Copy this entry"
msgstr ""
-#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_listing.inc:1677 include/class_listing.inc:1679
msgid "Restore snapshots"
msgstr ""
-#: include/class_listing.inc:1689
+#: include/class_listing.inc:1693
msgid "Export list"
msgstr ""
-#: include/class_listing.inc:1724 include/class_listing.inc:1725
+#: include/class_listing.inc:1728 include/class_listing.inc:1729
msgid "Restore snapshot"
msgstr ""
-#: include/class_listing.inc:1734
+#: include/class_listing.inc:1738
msgid "Create snapshot"
msgstr ""
-#: include/class_listing.inc:1735
+#: include/class_listing.inc:1739
msgid "Create a new snapshot from this object"
msgstr ""
@@ -2245,7 +2289,7 @@ msgid "XML error in fusiondirectory.conf: %s at line %d"
msgstr ""
#: include/class_config.inc:162 include/class_config.inc:300
-#: include/class_config.inc:985 include/class_config.inc:998
+#: include/class_config.inc:915 include/class_config.inc:928
#: include/functions.inc:663 include/class_timezone.inc:51
#: include/password-methods/class_password-methods-sha.inc:71
#: include/password-methods/class_password-methods-ssha.inc:75
@@ -2262,17 +2306,17 @@ msgid ""
"while your passwords are not encrypted."
msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:917
-#: include/class_ldap.inc:1371 include/functions.inc:526
+#: include/class_config.inc:337 include/class_ldap.inc:918
+#: include/class_ldap.inc:1372 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2985 include/simpleplugin/class_simplePlugin.inc:545
-#: include/simpleplugin/class_attribute.inc:2895
+#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2909
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
#: include/class_SnapshotHandler.inc:422 include/class_SnapshotHandler.inc:425
-#: html/index.php:360 html/class_passwordRecovery.inc:497
+#: html/index.php:369 html/class_passwordRecovery.inc:497
#: setup/class_setupStep_Migrate.inc:451
#: setup/class_setupStep_Migrate.inc:1130
msgid "LDAP error"
@@ -2287,38 +2331,38 @@ msgstr ""
msgid "The selected mail method (class %s) is not available"
msgstr ""
-#: include/class_config.inc:986
+#: include/class_config.inc:916
#, php-format
msgid ""
"The snapshot functionality is enabled, but the required variable '%s' is not"
" set."
msgstr ""
-#: include/class_config.inc:999
+#: include/class_config.inc:929
#, php-format
msgid ""
"The snapshot functionality is enabled, but the required compression module "
"is missing. Please install '%s'."
msgstr ""
-#: include/class_config.inc:1104
+#: include/class_config.inc:1034
msgid "All categories"
msgstr ""
-#: include/class_config.inc:1231
+#: include/class_config.inc:1161
msgid "My account"
msgstr ""
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
msgid "Performance warning"
msgstr ""
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
#, php-format
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr ""
-#: include/class_ldap.inc:868 include/class_ldap.inc:904
+#: include/class_ldap.inc:869 include/class_ldap.inc:905
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
@@ -2328,39 +2372,39 @@ msgstr ""
msgid "Internal error"
msgstr ""
-#: include/class_ldap.inc:868
+#: include/class_ldap.inc:869
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:904
+#: include/class_ldap.inc:905
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1016
+#: include/class_ldap.inc:1017
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr ""
-#: include/class_ldap.inc:1018
+#: include/class_ldap.inc:1019
#, php-format
msgid "while operating on LDAP server %s"
msgstr ""
-#: include/class_ldap.inc:1108
+#: include/class_ldap.inc:1109
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1220
+#: include/class_ldap.inc:1221
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr ""
-#: include/class_ldap.inc:1231
+#: include/class_ldap.inc:1232
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2948,10 +2992,10 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr ""
-#: include/functions.inc:496 include/functions.inc:3294
-#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:263
-#: include/simpleplugin/class_simplePlugin.inc:268
-#: include/simpleplugin/class_simplePlugin.inc:280
+#: include/functions.inc:496 include/functions.inc:3295
+#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
+#: include/simpleplugin/class_simplePlugin.inc:269
+#: include/simpleplugin/class_simplePlugin.inc:281
#: html/class_passwordRecovery.inc:216
msgid "Fatal error"
msgstr ""
@@ -3104,98 +3148,98 @@ msgstr ""
msgid "Cannot read to revision file!"
msgstr ""
-#: include/functions.inc:2548
+#: include/functions.inc:2549
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "LDAP warning"
msgstr ""
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "Cannot get schema information from server. No schema check possible!"
msgstr ""
-#: include/functions.inc:2584
+#: include/functions.inc:2585
msgid ""
"Used to lock currently edited entries to avoid multiple changes at the same "
"time."
msgstr ""
-#: include/functions.inc:2596
+#: include/functions.inc:2597
#, php-format
msgid "Missing required object class '%s'!"
msgstr ""
-#: include/functions.inc:2599
+#: include/functions.inc:2600
#, php-format
msgid "Missing optional object class '%s'!"
msgstr ""
-#: include/functions.inc:2603
+#: include/functions.inc:2604
#, php-format
msgid "Class(es) available"
msgstr ""
-#: include/functions.inc:2623
+#: include/functions.inc:2624
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2625
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2628
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2629
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3106 include/functions.inc:3127
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3106
+#: include/functions.inc:3107
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3127
+#: include/functions.inc:3128
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3157
+#: include/functions.inc:3158
msgid "Cannot create sambaUnixIdPool entry!"
msgstr ""
-#: include/functions.inc:3165
+#: include/functions.inc:3166
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3177 include/functions.inc:3181
+#: include/functions.inc:3178 include/functions.inc:3182
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3197
+#: include/functions.inc:3198
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3259
+#: include/functions.inc:3260
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3295
+#: include/functions.inc:3296
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
@@ -3351,13 +3395,13 @@ msgstr ""
msgid "XML error"
msgstr ""
-#: include/class_plugin.inc:554
+#: include/class_plugin.inc:553
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/class_plugin.inc:1466
+#: include/class_plugin.inc:1467
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -3383,32 +3427,32 @@ msgstr ""
msgid "This is the name of the template"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:263
+#: include/simpleplugin/class_simplePlugin.inc:264
msgid "Only main tab can compute dn"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:270
+#: include/simpleplugin/class_simplePlugin.inc:271
#, php-format
msgid "Could not compute dn: no parent tab class for \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:282
+#: include/simpleplugin/class_simplePlugin.inc:283
#, php-format
msgid ""
"Could not compute dn: could not find objectType infos from tab class \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:638
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:644
+#: include/simpleplugin/class_simplePlugin.inc:652
msgid "Error when saving"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:638
+#: include/simpleplugin/class_simplePlugin.inc:644
#, php-format
msgid "There is already an entry with the same dn : %s"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:652
#, php-format
msgid "The entry %s is not existing"
msgstr ""
@@ -3428,27 +3472,27 @@ msgstr ""
msgid "Show %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:409
+#: include/simpleplugin/class_dialogAttributes.inc:415
#, php-format
msgid "Group %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:411
+#: include/simpleplugin/class_dialogAttributes.inc:417
#, php-format
msgid "Role %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:446
+#: include/simpleplugin/class_dialogAttributes.inc:452
msgid "Group of user"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:615
+#: include/simpleplugin/class_dialogAttributes.inc:621
#: include/simpleplugin/class_attribute.inc:1090
#: include/simpleplugin/class_attribute.inc:1124
msgid "None"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:617
+#: include/simpleplugin/class_dialogAttributes.inc:623
msgid "Unknown"
msgstr ""
@@ -3489,11 +3533,16 @@ msgid "days"
msgstr ""
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2161
+#: include/simpleplugin/class_attribute.inc:2171
#, php-format
msgid "%s (required)"
msgstr ""
+#: include/simpleplugin/class_attribute.inc:1150
+#, php-format
+msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
+msgstr ""
+
#: include/simpleplugin/class_attribute.inc:1277
#, php-format
msgid "An integer between %d and %d"
@@ -3509,75 +3558,75 @@ msgstr ""
msgid "An integer smaller than %d"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1379
+#: include/simpleplugin/class_attribute.inc:1383
#, php-format
msgid "A float between %f and %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1381
+#: include/simpleplugin/class_attribute.inc:1385
#, php-format
msgid "A float larger than %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1383
+#: include/simpleplugin/class_attribute.inc:1387
#, php-format
msgid "A float smaller than %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1490
+#: include/simpleplugin/class_attribute.inc:1500
msgid "Error, incorrect date: "
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
#, php-format
msgid "Cannot read uploaded file: %s"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1530
+#: include/simpleplugin/class_attribute.inc:1540
msgid "file is empty"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1533
+#: include/simpleplugin/class_attribute.inc:1543
msgid "file not found"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1546
msgid "file not readable"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1569
+#: include/simpleplugin/class_attribute.inc:1579
#, php-format
msgid "%s (%d bytes)"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1616
-#: include/simpleplugin/class_attribute.inc:1793
+#: include/simpleplugin/class_attribute.inc:1626
+#: include/simpleplugin/class_attribute.inc:1803
msgid "Upload"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1621
-#: include/simpleplugin/class_attribute.inc:1622
+#: include/simpleplugin/class_attribute.inc:1631
+#: include/simpleplugin/class_attribute.inc:1632
msgid "Download"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1775
+#: include/simpleplugin/class_attribute.inc:1785
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1826
+#: include/simpleplugin/class_attribute.inc:1836
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1829
+#: include/simpleplugin/class_attribute.inc:1839
msgid "Object base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:2755
+#: include/simpleplugin/class_attribute.inc:2769
#, php-format
msgid "Invalid value for %s"
msgstr ""
@@ -3711,17 +3760,17 @@ msgstr ""
msgid "Account locked. Please contact your system administrator!"
msgstr ""
-#: html/index.php:436
+#: html/index.php:475
#, php-format
msgid "CAS user \"%s\" could not be found in the LDAP"
msgstr ""
-#: html/index.php:446
+#: html/index.php:485
#, php-format
msgid "CAS user \"%s\" match several users in the LDAP"
msgstr ""
-#: html/index.php:481
+#: html/index.php:522
msgid ""
"Your browser has cookies disabled. Please enable cookies and reload this "
"page before logging in!"
@@ -4044,7 +4093,7 @@ msgid "Checking for duplicated UID numbers"
msgstr ""
#: setup/class_setupStep_Migrate.inc:267
-msgid "Checking for duplicate GID numbers"
+msgid "Checking for duplicated GID numbers"
msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:487
@@ -4054,7 +4103,7 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:1179
#: setup/class_setupStep_Migrate.inc:1272
#: setup/class_setupStep_Migrate.inc:1351
-#: setup/class_setupStep_Migrate.inc:1390
+#: setup/class_setupStep_Migrate.inc:1395
msgid "LDAP query failed"
msgstr ""
@@ -4065,7 +4114,7 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:1180
#: setup/class_setupStep_Migrate.inc:1273
#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1391
+#: setup/class_setupStep_Migrate.inc:1396
msgid "Possibly the \"root object\" is missing."
msgstr ""
@@ -4220,14 +4269,14 @@ msgstr ""
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1373
+#: setup/class_setupStep_Migrate.inc:1378
#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\"."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1412
+#: setup/class_setupStep_Migrate.inc:1422
#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\"."
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
diff --git a/locale/sv/fusiondirectory.po b/locale/sv/fusiondirectory.po
index 29c28d23cd97ecf41ad97e212e12c4a549e74ca4..92874f5a604fefb85046e274bb23f4278fe1e4a8 100644
--- a/locale/sv/fusiondirectory.po
+++ b/locale/sv/fusiondirectory.po
@@ -5,12 +5,12 @@
# Translators:
msgid ""
msgstr ""
-"Project-Id-Version: FusionDirectory-109\n"
+"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-01-22 11:26+0100\n"
-"PO-Revision-Date: 2016-01-22 10:24+0000\n"
+"POT-Creation-Date: 2016-03-14 12:07+0100\n"
+"PO-Revision-Date: 2016-03-07 12:09+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-109/language/sv/)\n"
+"Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -28,31 +28,31 @@ msgstr "Välkommen %s!"
msgid "References"
msgstr "Referenser"
-#: plugins/admin/groups/class_roleGeneric.inc:30
-#: plugins/admin/groups/class_roleGeneric.inc:34
+#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:61
#: plugins/admin/groups/class_groupManagement.inc:71
#: plugins/admin/aclrole/class_aclRole.inc:78
#: plugins/admin/acl/class_aclAssignment.inc:49
msgid "Role"
msgstr "Roll"
-#: plugins/admin/groups/class_roleGeneric.inc:31
+#: plugins/admin/groups/class_roleGeneric.inc:58
msgid "Role information"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:35
+#: plugins/admin/groups/class_roleGeneric.inc:62
msgid "Organizational role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:84
msgid "Informations"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:158
+#: plugins/admin/departments/class_department.inc:174
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -62,13 +62,13 @@ msgstr ""
msgid "Name"
msgstr "Namn"
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
msgid "Name of this group"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
#: plugins/admin/groups/class_group.inc:66
#: plugins/admin/groups/class_ogroup.inc:192
#: plugins/admin/groups/group-list.xml:41
@@ -81,26 +81,26 @@ msgstr ""
msgid "Description"
msgstr "Beskrivning"
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
msgid "Description of the role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:70
+#: plugins/admin/groups/class_roleGeneric.inc:97
msgid "Phone number"
msgstr "Telefonnummer"
-#: plugins/admin/groups/class_roleGeneric.inc:74
+#: plugins/admin/groups/class_roleGeneric.inc:101
msgid "Fax number"
msgstr "Fax-nummer"
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
#: plugins/admin/users/class_userManagement.inc:42
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: setup/class_setupStep_Migrate.inc:871
msgid "Users"
msgstr "Användare"
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
msgid "Add users for the role"
msgstr ""
@@ -147,7 +147,7 @@ msgstr ""
#: plugins/admin/groups/class_group.inc:74
#: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:403
+#: plugins/personal/posix/class_posixAccount.inc:410
msgid "GID"
msgstr "GID"
@@ -204,23 +204,23 @@ msgid "Only allow this group to connect to this list of hosts"
msgstr ""
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458 include/functions.inc:794
-#: include/functions.inc:2548 include/class_xml.inc:55
+#: plugins/personal/posix/class_posixAccount.inc:465 include/functions.inc:794
+#: include/functions.inc:2549 include/class_xml.inc:55
#: include/simpleplugin/class_simpleTabs.inc:325 html/index.php:56
-#: html/index.php:62 html/index.php:481 html/class_passwordRecovery.inc:378
+#: html/index.php:62 html/index.php:522 html/class_passwordRecovery.inc:378
#: setup/class_setupStep_Migrate.inc:572
#: setup/class_setupStep_Migrate.inc:1083
#: setup/class_setupStep_Migrate.inc:1202
#: setup/class_setupStep_Migrate.inc:1313
-#: setup/class_setupStep_Migrate.inc:1372
-#: setup/class_setupStep_Migrate.inc:1411 plugins/admin/acl/remove.tpl.c:2
+#: setup/class_setupStep_Migrate.inc:1377
+#: setup/class_setupStep_Migrate.inc:1421 plugins/admin/acl/remove.tpl.c:2
#: ihtml/themes/default/islocked.tpl.c:5 ihtml/themes/default/remove.tpl.c:2
#: ihtml/themes/default/msg_dialog.tpl.c:5 setup/setup_checks.tpl.c:8
msgid "Warning"
msgstr "Varning"
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458
+#: plugins/personal/posix/class_posixAccount.inc:465
msgid "Timeout while waiting for lock. Ignoring lock!"
msgstr "Timeout under väntan på låsning. Ignorerar lås!"
@@ -250,7 +250,7 @@ msgstr "Medlemsobjekt"
msgid "Objects member of this group"
msgstr ""
-#: plugins/admin/groups/class_ogroup.inc:318
+#: plugins/admin/groups/class_ogroup.inc:313
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
@@ -279,10 +279,10 @@ msgstr "Skapa"
#: plugins/admin/departments/dep-list.xml:79
#: plugins/admin/users/user-list.xml:105
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-#: include/simpleplugin/class_dialogAttributes.inc:626
-#: include/simpleplugin/class_dialogAttributes.inc:627
-#: include/simpleplugin/class_attribute.inc:2661
-#: include/simpleplugin/class_attribute.inc:2662
+#: include/simpleplugin/class_dialogAttributes.inc:632
+#: include/simpleplugin/class_dialogAttributes.inc:633
+#: include/simpleplugin/class_attribute.inc:2675
+#: include/simpleplugin/class_attribute.inc:2676
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -293,8 +293,8 @@ msgstr "Redigera"
#: plugins/admin/departments/dep-list.xml:67
#: plugins/admin/departments/dep-list.xml:88
#: plugins/admin/users/user-list.xml:112
-#: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_dialogAttributes.inc:637
+#: include/simpleplugin/class_dialogAttributes.inc:642
+#: include/simpleplugin/class_dialogAttributes.inc:643
#: include/simpleplugin/simple-list.xml:75
#: include/simpleplugin/simple-list.xml:125
msgid "Remove"
@@ -343,7 +343,7 @@ msgid "Show application groups"
msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Show department groups"
+msgid "Show unidentified groups"
msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:137
@@ -432,51 +432,67 @@ msgid "Category of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:81
+msgid "Website"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:81
+#, php-format
+msgid "Website of this %s"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:85
#: plugins/personal/generic/class_user.inc:410
msgid "Manager"
msgstr "Manager"
-#: plugins/admin/departments/class_department.inc:81
+#: plugins/admin/departments/class_department.inc:85
#, php-format
msgid "Manager of this %s"
msgstr ""
-#: plugins/admin/departments/class_department.inc:87
-#: plugins/admin/departments/class_department.inc:93
+#: plugins/admin/departments/class_department.inc:91
+#: plugins/admin/departments/class_department.inc:97
#: plugins/personal/generic/class_user.inc:304
msgid "Location"
msgstr "Plats"
-#: plugins/admin/departments/class_department.inc:90
+#: plugins/admin/departments/class_department.inc:94
#: plugins/personal/generic/class_user.inc:308
msgid "State"
msgstr "Län"
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_country.inc:29
+#: plugins/admin/departments/class_country.inc:30
+#: plugins/admin/departments/class_country.inc:33
+msgid "Country"
+msgstr "Land"
+
+#: plugins/admin/departments/class_department.inc:103
#: plugins/personal/generic/class_user.inc:312
msgid "Address"
msgstr "Adress"
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:103
#, php-format
msgid "A postal address for this %s"
msgstr ""
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
#: plugins/personal/generic/class_user.inc:320
msgid "Phone"
msgstr "Telefon"
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
msgid "Telephone number"
msgstr ""
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
#: plugins/personal/generic/class_user.inc:332
msgid "Fax"
msgstr "Fax"
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
msgid "Facsimile telephone number"
msgstr ""
@@ -504,12 +520,6 @@ msgstr "Lokalitet"
msgid "locality"
msgstr ""
-#: plugins/admin/departments/class_country.inc:29
-#: plugins/admin/departments/class_country.inc:30
-#: plugins/admin/departments/class_country.inc:33
-msgid "Country"
-msgstr "Land"
-
#: plugins/admin/departments/class_country.inc:50
msgid "country"
msgstr ""
@@ -552,7 +562,8 @@ msgid "Given name"
msgstr "Förnamn"
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
+#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
msgid "Login"
@@ -665,8 +676,8 @@ msgid "Edit category ACL"
msgstr "Redigera kategori-ACL"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2671
-#: include/simpleplugin/class_attribute.inc:2672
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
+#: include/simpleplugin/class_attribute.inc:2686
#, php-format
msgid "Delete"
msgstr "Ta bort"
@@ -771,19 +782,37 @@ msgstr ""
msgid "ACLs which are part of this group"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:38
+#: plugins/admin/acl/class_aclManagement.inc:31
+#: plugins/admin/acl/class_aclManagement.inc:32
+#: plugins/admin/acl/class_aclManagement.inc:45
+msgid "ACL assignment creation"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:33
+msgid "Create an ACL assignment on an arbitrary dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "Dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "DN you wish to add assignments for"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:135
msgid "ACL assignments"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:39
+#: plugins/admin/acl/class_aclManagement.inc:136
msgid "ACL assignments management"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:40
+#: plugins/admin/acl/class_aclManagement.inc:137
msgid "Manage ACL roles assignments to users"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:78
+#: plugins/admin/acl/class_aclManagement.inc:199
#: plugins/admin/acl/class_aclAssignment.inc:263
msgid "ACL Assignment"
msgstr "ACL-tilldelning"
@@ -899,7 +928,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:352
+#: plugins/personal/generic/class_user.inc:356
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -994,59 +1023,59 @@ msgstr ""
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:336
+msgid "Homepage"
+msgstr "Hemsida"
+
+#: plugins/personal/generic/class_user.inc:336
+msgid "Personal homepage"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:342
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:351
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr "Föredraget språk"
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:362
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
msgid "Display name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home postal address"
msgstr "Hempostadress"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:374
msgid "Private phone"
msgstr "Privat telefon"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:374
msgid "Home phone number"
msgstr "Hemtelefonnummer"
-#: plugins/personal/generic/class_user.inc:374
-msgid "Homepage"
-msgstr "Hemsida"
-
-#: plugins/personal/generic/class_user.inc:374
-msgid "Personal homepage"
-msgstr ""
-
#: plugins/personal/generic/class_user.inc:380
msgid "Organizational information"
msgstr "Organisationsinformation"
@@ -1279,33 +1308,33 @@ msgstr "okonfigurerad"
msgid "automatic"
msgstr "automatisk"
-#: plugins/personal/posix/class_posixAccount.inc:309
+#: plugins/personal/posix/class_posixAccount.inc:310
msgid "expired"
msgstr "har utgått"
-#: plugins/personal/posix/class_posixAccount.inc:311
+#: plugins/personal/posix/class_posixAccount.inc:312
msgid "grace time active"
msgstr "grace-tid aktiv"
-#: plugins/personal/posix/class_posixAccount.inc:314
-#: plugins/personal/posix/class_posixAccount.inc:316
-#: plugins/personal/posix/class_posixAccount.inc:318
+#: plugins/personal/posix/class_posixAccount.inc:315
+#: plugins/personal/posix/class_posixAccount.inc:317
+#: plugins/personal/posix/class_posixAccount.inc:319
msgid "active"
msgstr "aktiv"
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:315
msgid "password expired"
msgstr "lösenord har slutat gälla"
-#: plugins/personal/posix/class_posixAccount.inc:316
+#: plugins/personal/posix/class_posixAccount.inc:317
msgid "password not changeable"
msgstr "lösenord kan inte ändras"
-#: plugins/personal/posix/class_posixAccount.inc:400
+#: plugins/personal/posix/class_posixAccount.inc:407
msgid "UID"
msgstr "UID"
-#: plugins/personal/posix/class_posixAccount.inc:516
+#: plugins/personal/posix/class_posixAccount.inc:525
#, php-format
msgid "Group of user %s"
msgstr ""
@@ -1477,424 +1506,440 @@ msgid "Core settings"
msgstr "Bas-inställningar"
#: plugins/config/class_configInLdap.inc:161
-msgid "Enable primary group filter"
-msgstr "Aktivera primärgruppsfilter"
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"It is time consuming to evaluate which groups are primary and which are not,"
-" so you may want to disable it if your group plugin is slow."
-msgstr "Det är tidskrävande att utvärdera vilka grupper som är primära och vilka som inte är det, så du kan vilja avaktivera det om din grupp-plugin är långsam."
-
-#: plugins/config/class_configInLdap.inc:167
msgid "Display summary in listings"
msgstr "Visa sammanfattning i listningar"
-#: plugins/config/class_configInLdap.inc:168
+#: 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:173
+#: plugins/config/class_configInLdap.inc:167
msgid "Edit locking"
msgstr "Redigera låsning"
-#: plugins/config/class_configInLdap.inc:174
+#: 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:179
+#: plugins/config/class_configInLdap.inc:173
msgid "Enable logging"
msgstr "Aktivera loggning"
-#: plugins/config/class_configInLdap.inc:180
+#: plugins/config/class_configInLdap.inc:174
msgid "Event logging on FusionDirectory side."
msgstr "Event-loggning på FusionDirectorys sida."
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "LDAP size limit"
msgstr "LDAP storleksgräns"
-#: plugins/config/class_configInLdap.inc:185
+#: 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."
-#: plugins/config/class_configInLdap.inc:192
+#: plugins/config/class_configInLdap.inc:186
msgid "Login and session"
msgstr "Inloggning och session"
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:189
msgid "Login attribute"
msgstr "Inloggningsattribut"
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:190
msgid "Which LDAP attribute should be used as the login name during login."
msgstr "Vilket LDAP-attribut ska användas som inloggningnamn under inloggning."
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:196
msgid "Enforce encrypted connections"
msgstr "Tvinga krypterade anslutningar"
-#: plugins/config/class_configInLdap.inc:203
+#: plugins/config/class_configInLdap.inc:197
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."
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:201
msgid "Warn if session is not encrypted"
msgstr "Varna om session inte är krypterad"
-#: plugins/config/class_configInLdap.inc:208
+#: plugins/config/class_configInLdap.inc:202
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:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Session lifetime"
msgstr "Sessioners livslängd"
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Defines when a session will expire in seconds."
msgstr "Definierar när en session löper ut, i sekunder."
-#: plugins/config/class_configInLdap.inc:220
+#: plugins/config/class_configInLdap.inc:212
+msgid "HTTP authentication"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:212
+msgid "Use HTTP authentication protocol instead of the login form."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:219
#: include/class_SnapshotDialogs.inc:186
msgid "Snapshots"
msgstr ""
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid "Enable snapshots"
msgstr "Aktivera ögonblicksbilder"
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
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:228
+#: plugins/config/class_configInLdap.inc:227
msgid "Snapshot base"
msgstr "Bas för ögonblicksbilder"
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
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:235
+#: plugins/config/class_configInLdap.inc:234
msgid "SSL"
msgstr ""
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Key path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Path to FusionDirectory private key. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Certificate path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Path to FusionDirectory certificate. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:262
msgid "CA certificate path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:247
msgid "Path to the CA certificate. Used for validating Argonaut Server host."
msgstr ""
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:254
msgid "CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "Enable CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "CAS login will be used instead of LDAP bind"
msgstr ""
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:262
msgid "Path to the CA certificate of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host"
msgstr "Host"
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port"
msgstr "Port"
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port the CAS server is listening on"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context to be used"
msgstr ""
-#: plugins/config/class_configInLdap.inc:285
+#: plugins/config/class_configInLdap.inc:284
msgid "People and group storage"
msgstr "Lagring för personer och grupper"
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "People DN attribute"
msgstr "Personer DN-attribut"
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
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:294
+#: plugins/config/class_configInLdap.inc:293
msgid "CN pattern"
msgstr ""
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "The pattern to use to build the common name field"
msgstr ""
-#: plugins/config/class_configInLdap.inc:299
+#: plugins/config/class_configInLdap.inc:298
msgid "Strict naming policy"
msgstr "Strikt namnpolicy"
-#: plugins/config/class_configInLdap.inc:300
+#: plugins/config/class_configInLdap.inc:299
msgid "Enables strict checking of user and group names"
msgstr ""
-#: plugins/config/class_configInLdap.inc:305
+#: plugins/config/class_configInLdap.inc:304
msgid "Group/user min id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:306
+#: plugins/config/class_configInLdap.inc:305
msgid ""
"The minimum assignable user or group id to avoid security leaks with id 0 "
"accounts."
msgstr ""
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid "Next id hook"
msgstr "Nästa id-hook"
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid ""
"A script to be called for finding the next free id number for users or "
"groups."
msgstr ""
-#: plugins/config/class_configInLdap.inc:315
+#: plugins/config/class_configInLdap.inc:314
msgid "Base number for user id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:315
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:321
+#: plugins/config/class_configInLdap.inc:320
msgid "Base number for group id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:321
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:327
+#: plugins/config/class_configInLdap.inc:326
msgid "Users RDN"
msgstr "Användares RDN"
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "The branch where users are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "Groups RDN"
msgstr "Gruppers RDN"
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "The branch where groups are stored."
msgstr "Grenen där grupper lagras."
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "ACL role RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "The branch where ACL roles are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Id allocation method"
msgstr "Id-allokeringsmetod"
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Method to allocate user/group ids"
msgstr ""
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Traditional"
msgstr "Traditionell"
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Samba unix id pool"
msgstr "Samba unix id pool"
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Pool user id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Minimum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Pool user id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Maximum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Pool group id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Minimum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Pool group id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Maximum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:370
+#: plugins/config/class_configInLdap.inc:367
+msgid "Restrict role members"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:367
+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:373
msgid "Debugging"
msgstr "Debugging"
-#: plugins/config/class_configInLdap.inc:373
+#: plugins/config/class_configInLdap.inc:376
msgid "Display errors"
msgstr "Visa fel"
-#: plugins/config/class_configInLdap.inc:374
+#: plugins/config/class_configInLdap.inc:377
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."
-#: plugins/config/class_configInLdap.inc:378
+#: plugins/config/class_configInLdap.inc:381
msgid "Maximum LDAP query time"
msgstr "Maximal tid för LDAP-frågor"
-#: plugins/config/class_configInLdap.inc:378
+#: plugins/config/class_configInLdap.inc:381
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."
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:386
msgid "Log LDAP statistics"
msgstr "Logga LDAP-statistik"
-#: plugins/config/class_configInLdap.inc:384
+#: plugins/config/class_configInLdap.inc:387
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."
-#: plugins/config/class_configInLdap.inc:389
+#: plugins/config/class_configInLdap.inc:392
msgid "Debug level"
msgstr "Debug-nivå"
-#: plugins/config/class_configInLdap.inc:390
+#: plugins/config/class_configInLdap.inc:393
msgid "Display certain information on each page load."
msgstr "Visa viss information på varje sidladdning."
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:405
msgid "Miscellaneous"
msgstr "Diverse"
-#: plugins/config/class_configInLdap.inc:407
+#: 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:411
+#: plugins/config/class_configInLdap.inc:414
msgid "tab"
msgstr "flik"
-#: plugins/config/class_configInLdap.inc:411
+#: 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:416
+#: plugins/config/class_configInLdap.inc:419
msgid "mode"
msgstr "läge"
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "When to call this command"
msgstr "När detta kommando ska anropas"
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "cmd"
msgstr "cmd"
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "The command that will be called"
msgstr "Kommando som ska anropas"
-#: plugins/config/class_configInLdap.inc:429
+#: plugins/config/class_configInLdap.inc:432
msgid "Hooks"
msgstr "Hooks"
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:439
msgid "Display hook output"
msgstr ""
-#: plugins/config/class_configInLdap.inc:437
+#: plugins/config/class_configInLdap.inc:440
msgid ""
"When enabled successful hook execution output is displayed to the user using"
" a dialog."
msgstr ""
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available shells"
msgstr "Tillgängliga skal"
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available POSIX shells for FD users."
msgstr "Tillgängliga POSIX-skal för FD-användare"
-#: plugins/config/class_configInLdap.inc:449
+#: plugins/config/class_configInLdap.inc:452
msgid "Show ACL tab on all objects"
msgstr ""
-#: plugins/config/class_configInLdap.inc:450
+#: plugins/config/class_configInLdap.inc:453
msgid ""
"For very specific ACL rights setting where you might need to give right on a"
" single object."
msgstr ""
-#: plugins/config/class_configInLdap.inc:464
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available department categories"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available categories in the departments dropdown"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:474
#: setup/class_setupStep_Language.inc:69
msgid "Automatic"
msgstr "Automatiskt"
@@ -1911,80 +1956,80 @@ msgstr "Inställningar för funktionen för återställning av lösenord"
msgid "Password recovery settings"
msgstr "Inställningar för återskapande av lösenord"
-#: plugins/config/class_recoveryConfig.inc:44
+#: plugins/config/class_recoveryConfig.inc:45
msgid "Activate password recovery"
msgstr "Aktivera återställning av lösenord"
-#: plugins/config/class_recoveryConfig.inc:45
+#: plugins/config/class_recoveryConfig.inc:46
msgid "Whether to activate or not password recovery feature"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:50
+#: plugins/config/class_recoveryConfig.inc:51
msgid "Sender email address"
msgstr "Avsändaradress för epost"
-#: plugins/config/class_recoveryConfig.inc:51
+#: plugins/config/class_recoveryConfig.inc:52
msgid "Email address from which mails will be sent"
msgstr "Epostadress från vilken epostmeddelanden sänds"
-#: plugins/config/class_recoveryConfig.inc:57
+#: plugins/config/class_recoveryConfig.inc:58
msgid "Link validity (minutes)"
msgstr "Länkens giltighetstid (minuter)"
-#: plugins/config/class_recoveryConfig.inc:58
+#: plugins/config/class_recoveryConfig.inc:59
msgid "Number of minutes before a recovery link expires"
msgstr "Antalet minuter innan en återställningslänk slutar gälla"
-#: plugins/config/class_recoveryConfig.inc:64
+#: plugins/config/class_recoveryConfig.inc:65
msgid "Salt for tokens"
msgstr "Salt för tokens"
-#: plugins/config/class_recoveryConfig.inc:65
+#: plugins/config/class_recoveryConfig.inc:66
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"
-#: plugins/config/class_recoveryConfig.inc:71
+#: plugins/config/class_recoveryConfig.inc:72
msgid "Allow the use of alternate addresses"
msgstr "Tillåt användande av alternativa adresser"
-#: plugins/config/class_recoveryConfig.inc:72
+#: plugins/config/class_recoveryConfig.inc:73
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"
-#: plugins/config/class_recoveryConfig.inc:79
+#: plugins/config/class_recoveryConfig.inc:80
msgid "First email"
msgstr "Första epost"
-#: plugins/config/class_recoveryConfig.inc:82
-#: plugins/config/class_recoveryConfig.inc:101
+#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:102
msgid "Subject"
msgstr "Ämne"
-#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:84
msgid "Subject of the first email"
msgstr "Ämne på första epostmeddelandet"
-#: plugins/config/class_recoveryConfig.inc:86
+#: plugins/config/class_recoveryConfig.inc:87
msgid "[FusionDirectory] Password recovery link"
msgstr "[FusionDirectory] Länk för återskapande av lösenord"
-#: plugins/config/class_recoveryConfig.inc:89
+#: plugins/config/class_recoveryConfig.inc:90
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr "Meddelandekropp (första %s är inläggnings-ID, andra är länken)"
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:91
#, 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 "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:93
+#: plugins/config/class_recoveryConfig.inc:94
#, php-format
msgid ""
"Hello,\n"
@@ -1996,31 +2041,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr "Hej,\n\nHär är informationen för återställning:\n - Inloggning : %s\n - Länk : %s\n\nDen här länken är bara giltig i 10 minuter."
-#: plugins/config/class_recoveryConfig.inc:98
+#: plugins/config/class_recoveryConfig.inc:99
msgid "Second email"
msgstr "Andre epostmeddelandet"
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:103
msgid "Subject of the second email"
msgstr "Ämne på det andra epostmeddelandet"
-#: plugins/config/class_recoveryConfig.inc:105
+#: plugins/config/class_recoveryConfig.inc:106
msgid "[FusionDirectory] Password recovery successful"
msgstr "[FusionDirectory] Återställning av lösenord lyckades"
-#: plugins/config/class_recoveryConfig.inc:108
+#: plugins/config/class_recoveryConfig.inc:109
#, php-format
msgid "Body (%s is login)"
msgstr "Meddelandekropp (%s är login)"
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:110
#, php-format
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."
-#: plugins/config/class_recoveryConfig.inc:112
+#: plugins/config/class_recoveryConfig.inc:113
#, php-format
msgid ""
"Hello,\n"
@@ -2088,13 +2133,13 @@ msgstr "Upp"
msgid "Down"
msgstr "Ner"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2633
-#: include/simpleplugin/class_attribute.inc:2634
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
+#: include/simpleplugin/class_attribute.inc:2648
msgid "Sort up"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2646
-#: include/simpleplugin/class_attribute.inc:2647
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
+#: include/simpleplugin/class_attribute.inc:2661
msgid "Sort down"
msgstr ""
@@ -2106,27 +2151,26 @@ msgstr "Välj alla"
#: include/class_config.inc:479 include/class_msgPool.inc:215
#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3106
-#: include/functions.inc:3127 include/functions.inc:3157
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197 include/functions.inc:3259
+#: include/class_msgPool.inc:740 include/functions.inc:3107
+#: include/functions.inc:3128 include/functions.inc:3158
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3260
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1663 include/class_CopyPasteHandler.inc:278
-#: include/simpleplugin/class_dialogAttributes.inc:733
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
-#: include/simpleplugin/class_attribute.inc:1774
-#: include/simpleplugin/class_attribute.inc:1877
-#: include/simpleplugin/class_attribute.inc:1879
+#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
+#: include/simpleplugin/class_attribute.inc:1784
+#: include/simpleplugin/class_attribute.inc:1887
+#: include/simpleplugin/class_attribute.inc:1889
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: 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:437
#: include/password-methods/class_password-methods.inc:447
-#: include/class_SnapshotHandler.inc:415 html/index.php:434 html/index.php:444
+#: include/class_SnapshotHandler.inc:415 html/index.php:473 html/index.php:483
#: setup/class_setupStep_Migrate.inc:935
#: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
msgid "Error"
@@ -2165,44 +2209,44 @@ msgstr "Ladda om lista"
msgid "Submit"
msgstr "Skicka"
-#: include/class_listing.inc:1586 include/class_listing.inc:1640
+#: include/class_listing.inc:1590 include/class_listing.inc:1644
msgid "Copy"
msgstr "Kopiera"
-#: include/class_listing.inc:1592 include/class_listing.inc:1628
+#: include/class_listing.inc:1596 include/class_listing.inc:1632
msgid "Cut"
msgstr "Klipp ut"
-#: include/class_listing.inc:1600 include/class_listing.inc:1602
+#: include/class_listing.inc:1604 include/class_listing.inc:1606
#: include/class_CopyPasteHandler.inc:370
msgid "Paste"
msgstr "Klistra in"
-#: include/class_listing.inc:1628
+#: include/class_listing.inc:1632
msgid "Cut this entry"
msgstr "Klipp ut post"
-#: include/class_listing.inc:1640
+#: include/class_listing.inc:1644
msgid "Copy this entry"
msgstr "Kopiera post"
-#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_listing.inc:1677 include/class_listing.inc:1679
msgid "Restore snapshots"
msgstr "Återskapa ögonblicksbilder"
-#: include/class_listing.inc:1689
+#: include/class_listing.inc:1693
msgid "Export list"
msgstr "Exportera lista"
-#: include/class_listing.inc:1724 include/class_listing.inc:1725
+#: include/class_listing.inc:1728 include/class_listing.inc:1729
msgid "Restore snapshot"
msgstr "Återskapa ögonblicksbild"
-#: include/class_listing.inc:1734
+#: include/class_listing.inc:1738
msgid "Create snapshot"
msgstr "Skapa ögonblicksbild"
-#: include/class_listing.inc:1735
+#: include/class_listing.inc:1739
msgid "Create a new snapshot from this object"
msgstr "Skapa ny ögonblicksbild från det här objektet"
@@ -2245,7 +2289,7 @@ msgid "XML error in fusiondirectory.conf: %s at line %d"
msgstr "XML-fel i fusiondirectory.conf: %s på rad %d"
#: include/class_config.inc:162 include/class_config.inc:300
-#: include/class_config.inc:985 include/class_config.inc:998
+#: include/class_config.inc:915 include/class_config.inc:928
#: include/functions.inc:663 include/class_timezone.inc:51
#: include/password-methods/class_password-methods-sha.inc:71
#: include/password-methods/class_password-methods-ssha.inc:75
@@ -2262,17 +2306,17 @@ msgid ""
"while your passwords are not encrypted."
msgstr "Det verkar som att du försöker avkoda något som inte är kodat : %s<br/>\\nVänligen kontroller att du inte använder en fusiondirectory.secrets-fil medan dina lösenord inte är krypterade."
-#: include/class_config.inc:337 include/class_ldap.inc:917
-#: include/class_ldap.inc:1371 include/functions.inc:526
+#: include/class_config.inc:337 include/class_ldap.inc:918
+#: include/class_ldap.inc:1372 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2985 include/simpleplugin/class_simplePlugin.inc:545
-#: include/simpleplugin/class_attribute.inc:2895
+#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2909
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
#: include/class_SnapshotHandler.inc:422 include/class_SnapshotHandler.inc:425
-#: html/index.php:360 html/class_passwordRecovery.inc:497
+#: html/index.php:369 html/class_passwordRecovery.inc:497
#: setup/class_setupStep_Migrate.inc:451
#: setup/class_setupStep_Migrate.inc:1130
msgid "LDAP error"
@@ -2287,38 +2331,38 @@ msgstr "Kan inte koppla mot LDAP. Vänligen kontakta systemadministratören"
msgid "The selected mail method (class %s) is not available"
msgstr "Den valda epostmetoden (klassen %s) är inte tillgänglig"
-#: include/class_config.inc:986
+#: include/class_config.inc:916
#, 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."
-#: include/class_config.inc:999
+#: include/class_config.inc:929
#, 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'."
-#: include/class_config.inc:1104
+#: include/class_config.inc:1034
msgid "All categories"
msgstr "Alla kategorier"
-#: include/class_config.inc:1231
+#: include/class_config.inc:1161
msgid "My account"
msgstr "Mitt konto"
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
msgid "Performance warning"
msgstr "Prestandavarning"
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
#, 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:868 include/class_ldap.inc:904
+#: include/class_ldap.inc:869 include/class_ldap.inc:905
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
@@ -2328,39 +2372,39 @@ msgstr "LDAP-prestanda är låg: senaste frågan tog runt %.2fs!"
msgid "Internal error"
msgstr "Internt fel"
-#: include/class_ldap.inc:868
+#: include/class_ldap.inc:869
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:904
+#: include/class_ldap.inc:905
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1016
+#: include/class_ldap.inc:1017
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr "under operation på '%s' med LDAP-server '%s'"
-#: include/class_ldap.inc:1018
+#: include/class_ldap.inc:1019
#, php-format
msgid "while operating on LDAP server %s"
msgstr "under operation på LDAP-server %s"
-#: include/class_ldap.inc:1108
+#: include/class_ldap.inc:1109
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1220
+#: include/class_ldap.inc:1221
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr "Det här är inte ett giltigt DN: '%s'. Ett importblock bör börja med 'dn: ...' på rad %s"
-#: include/class_ldap.inc:1231
+#: include/class_ldap.inc:1232
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2948,10 +2992,10 @@ 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"
-#: include/functions.inc:496 include/functions.inc:3294
-#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:263
-#: include/simpleplugin/class_simplePlugin.inc:268
-#: include/simpleplugin/class_simplePlugin.inc:280
+#: include/functions.inc:496 include/functions.inc:3295
+#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
+#: include/simpleplugin/class_simplePlugin.inc:269
+#: include/simpleplugin/class_simplePlugin.inc:281
#: html/class_passwordRecovery.inc:216
msgid "Fatal error"
msgstr "Allvarligt fel"
@@ -3104,98 +3148,98 @@ msgstr "Kan inte skriva till revisionsfil!"
msgid "Cannot read to revision file!"
msgstr "Kan inte läsa revisionsfil!"
-#: include/functions.inc:2548
+#: include/functions.inc:2549
msgid "'nextIdHook' is not available. Using default base!"
msgstr "'nextIdHook' är inte tillgänglig. Använder standard-bas!"
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "LDAP warning"
msgstr "LDAP-varning"
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "Cannot get schema information from server. No schema check possible!"
msgstr "Kan inte hämta schemainformation från servern. Ingen schemakontroll är möjlig!"
-#: include/functions.inc:2584
+#: include/functions.inc:2585
msgid ""
"Used to lock currently edited entries to avoid multiple changes at the same "
"time."
msgstr "Används för att låsa aktuella poster under redigering för att undvika multipla ändringar på samma gång. "
-#: include/functions.inc:2596
+#: include/functions.inc:2597
#, php-format
msgid "Missing required object class '%s'!"
msgstr "Saknar objektklass '%s' som krävs!"
-#: include/functions.inc:2599
+#: include/functions.inc:2600
#, php-format
msgid "Missing optional object class '%s'!"
msgstr "Saknar valfri objektklass '%s' !"
-#: include/functions.inc:2603
+#: include/functions.inc:2604
#, php-format
msgid "Class(es) available"
msgstr "Klass(er) tillgänglig(a)"
-#: include/functions.inc:2623
+#: include/functions.inc:2624
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2625
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2628
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2629
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3106 include/functions.inc:3127
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198
msgid "Cannot allocate a free ID:"
msgstr "Kan inte allokera ett fritt ID:"
-#: include/functions.inc:3106
+#: include/functions.inc:3107
msgid "unknown idAllocation method!"
msgstr "okänd idAllocation-metod!"
-#: include/functions.inc:3127
+#: include/functions.inc:3128
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr "%sPoolMin >= %sPoolMax!"
-#: include/functions.inc:3157
+#: include/functions.inc:3158
msgid "Cannot create sambaUnixIdPool entry!"
msgstr "Kan inte skapa sambaUnixIdPool-post!"
-#: include/functions.inc:3165
+#: include/functions.inc:3166
msgid "sambaUnixIdPool is not unique!"
msgstr "sambaUnixIdPool är inte unik!"
-#: include/functions.inc:3177 include/functions.inc:3181
+#: include/functions.inc:3178 include/functions.inc:3182
msgid "no ID available!"
msgstr "inget ID tillgängligt!"
-#: include/functions.inc:3197
+#: include/functions.inc:3198
msgid "maximum tries exceeded!"
msgstr "maximalt antal försök överskridet!"
-#: include/functions.inc:3259
+#: include/functions.inc:3260
msgid "Cannot allocate a free ID!"
msgstr "Kan inte allokera ett fritt ID!"
-#: include/functions.inc:3295
+#: include/functions.inc:3296
#, 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"
@@ -3351,13 +3395,13 @@ msgstr "online"
msgid "XML error"
msgstr "XML-fel"
-#: include/class_plugin.inc:554
+#: include/class_plugin.inc:553
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/class_plugin.inc:1466
+#: include/class_plugin.inc:1467
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -3383,32 +3427,32 @@ msgstr "Mall-namn"
msgid "This is the name of the template"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:263
+#: include/simpleplugin/class_simplePlugin.inc:264
msgid "Only main tab can compute dn"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:270
+#: include/simpleplugin/class_simplePlugin.inc:271
#, php-format
msgid "Could not compute dn: no parent tab class for \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:282
+#: include/simpleplugin/class_simplePlugin.inc:283
#, php-format
msgid ""
"Could not compute dn: could not find objectType infos from tab class \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:638
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:644
+#: include/simpleplugin/class_simplePlugin.inc:652
msgid "Error when saving"
msgstr "Fel under skrivning"
-#: include/simpleplugin/class_simplePlugin.inc:638
+#: include/simpleplugin/class_simplePlugin.inc:644
#, 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:646
+#: include/simpleplugin/class_simplePlugin.inc:652
#, php-format
msgid "The entry %s is not existing"
msgstr "Posten %s finns inte"
@@ -3428,27 +3472,27 @@ msgstr ""
msgid "Show %s"
msgstr "Visa %s"
-#: include/simpleplugin/class_dialogAttributes.inc:409
+#: include/simpleplugin/class_dialogAttributes.inc:415
#, php-format
msgid "Group %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:411
+#: include/simpleplugin/class_dialogAttributes.inc:417
#, php-format
msgid "Role %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:446
+#: include/simpleplugin/class_dialogAttributes.inc:452
msgid "Group of user"
msgstr "Användarens grupp"
-#: include/simpleplugin/class_dialogAttributes.inc:615
+#: include/simpleplugin/class_dialogAttributes.inc:621
#: include/simpleplugin/class_attribute.inc:1090
#: include/simpleplugin/class_attribute.inc:1124
msgid "None"
msgstr "Ingen"
-#: include/simpleplugin/class_dialogAttributes.inc:617
+#: include/simpleplugin/class_dialogAttributes.inc:623
msgid "Unknown"
msgstr "Okänd"
@@ -3489,11 +3533,16 @@ msgid "days"
msgstr ""
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2161
+#: include/simpleplugin/class_attribute.inc:2171
#, php-format
msgid "%s (required)"
msgstr "%s (krävs)"
+#: include/simpleplugin/class_attribute.inc:1150
+#, php-format
+msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
+msgstr ""
+
#: include/simpleplugin/class_attribute.inc:1277
#, php-format
msgid "An integer between %d and %d"
@@ -3509,75 +3558,75 @@ msgstr "En siffra större än %d"
msgid "An integer smaller than %d"
msgstr "En siffra mindre än %d"
-#: include/simpleplugin/class_attribute.inc:1379
+#: include/simpleplugin/class_attribute.inc:1383
#, php-format
msgid "A float between %f and %f"
msgstr "Ett flyttal mellan %f och %f"
-#: include/simpleplugin/class_attribute.inc:1381
+#: include/simpleplugin/class_attribute.inc:1385
#, php-format
msgid "A float larger than %f"
msgstr "Ett flyttal större än %f"
-#: include/simpleplugin/class_attribute.inc:1383
+#: include/simpleplugin/class_attribute.inc:1387
#, php-format
msgid "A float smaller than %f"
msgstr "Ett flyttal mindre än %f"
-#: include/simpleplugin/class_attribute.inc:1490
+#: include/simpleplugin/class_attribute.inc:1500
msgid "Error, incorrect date: "
msgstr "Fel, inkorrekt datum:"
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
#, php-format
msgid "Cannot read uploaded file: %s"
msgstr "Kan inte läsa uppladdad fil: %s"
-#: include/simpleplugin/class_attribute.inc:1530
+#: include/simpleplugin/class_attribute.inc:1540
msgid "file is empty"
msgstr "filen är tom"
-#: include/simpleplugin/class_attribute.inc:1533
+#: include/simpleplugin/class_attribute.inc:1543
msgid "file not found"
msgstr "filen kunde inte hittas"
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1546
msgid "file not readable"
msgstr "filen är inte läsbar"
-#: include/simpleplugin/class_attribute.inc:1569
+#: include/simpleplugin/class_attribute.inc:1579
#, php-format
msgid "%s (%d bytes)"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1616
-#: include/simpleplugin/class_attribute.inc:1793
+#: include/simpleplugin/class_attribute.inc:1626
+#: include/simpleplugin/class_attribute.inc:1803
msgid "Upload"
msgstr "Ladda upp"
-#: include/simpleplugin/class_attribute.inc:1621
-#: include/simpleplugin/class_attribute.inc:1622
+#: include/simpleplugin/class_attribute.inc:1631
+#: include/simpleplugin/class_attribute.inc:1632
msgid "Download"
msgstr "Ladda ner"
-#: include/simpleplugin/class_attribute.inc:1775
+#: include/simpleplugin/class_attribute.inc:1785
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr "Kan inte spara användarbild, FusionDirectory kräver att paketet 'php-imagick' är installerat!"
-#: include/simpleplugin/class_attribute.inc:1826
+#: include/simpleplugin/class_attribute.inc:1836
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr "Bas"
-#: include/simpleplugin/class_attribute.inc:1829
+#: include/simpleplugin/class_attribute.inc:1839
msgid "Object base"
msgstr "Objekt-bas"
-#: include/simpleplugin/class_attribute.inc:2755
+#: include/simpleplugin/class_attribute.inc:2769
#, php-format
msgid "Invalid value for %s"
msgstr "Ogiltigt värde för %s"
@@ -3711,17 +3760,17 @@ msgstr "Kontrollera användarnamn/lösenord-kombinationen."
msgid "Account locked. Please contact your system administrator!"
msgstr "Kontot låst. Kontakta systemadministratören!"
-#: html/index.php:436
+#: html/index.php:475
#, php-format
msgid "CAS user \"%s\" could not be found in the LDAP"
msgstr ""
-#: html/index.php:446
+#: html/index.php:485
#, php-format
msgid "CAS user \"%s\" match several users in the LDAP"
msgstr ""
-#: html/index.php:481
+#: html/index.php:522
msgid ""
"Your browser has cookies disabled. Please enable cookies and reload this "
"page before logging in!"
@@ -4044,8 +4093,8 @@ msgid "Checking for duplicated UID numbers"
msgstr "Söker efter dubbletter av UID-nummer"
#: setup/class_setupStep_Migrate.inc:267
-msgid "Checking for duplicate GID numbers"
-msgstr "Söker efter dubbletter av GID-nummer"
+msgid "Checking for duplicated GID numbers"
+msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:487
#: setup/class_setupStep_Migrate.inc:564 setup/class_setupStep_Migrate.inc:702
@@ -4054,7 +4103,7 @@ msgstr "Söker efter dubbletter av GID-nummer"
#: setup/class_setupStep_Migrate.inc:1179
#: setup/class_setupStep_Migrate.inc:1272
#: setup/class_setupStep_Migrate.inc:1351
-#: setup/class_setupStep_Migrate.inc:1390
+#: setup/class_setupStep_Migrate.inc:1395
msgid "LDAP query failed"
msgstr "LDAP-fråga misslyckades"
@@ -4065,7 +4114,7 @@ msgstr "LDAP-fråga misslyckades"
#: setup/class_setupStep_Migrate.inc:1180
#: setup/class_setupStep_Migrate.inc:1273
#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1391
+#: setup/class_setupStep_Migrate.inc:1396
msgid "Possibly the \"root object\" is missing."
msgstr ""
@@ -4220,14 +4269,14 @@ msgstr "Hittade %s avdelning(ar) som inte kommer att vara synliga i FusionDirect
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1373
+#: setup/class_setupStep_Migrate.inc:1378
#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\"."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1412
+#: setup/class_setupStep_Migrate.inc:1422
#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\"."
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
diff --git a/locale/ug/fusiondirectory.po b/locale/ug/fusiondirectory.po
index af7e5fa45845b93b3513ea3e36ff367375754b07..08c2f7d477d4bc826b57e1c346e0640930e50fb3 100644
--- a/locale/ug/fusiondirectory.po
+++ b/locale/ug/fusiondirectory.po
@@ -5,12 +5,12 @@
# Translators:
msgid ""
msgstr ""
-"Project-Id-Version: FusionDirectory-109\n"
+"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-01-22 11:26+0100\n"
-"PO-Revision-Date: 2016-01-22 10:24+0000\n"
+"POT-Creation-Date: 2016-03-14 12:07+0100\n"
+"PO-Revision-Date: 2016-03-07 12:09+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-109/language/ug/)\n"
+"Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -28,31 +28,31 @@ msgstr ""
msgid "References"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:30
-#: plugins/admin/groups/class_roleGeneric.inc:34
+#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:61
#: plugins/admin/groups/class_groupManagement.inc:71
#: plugins/admin/aclrole/class_aclRole.inc:78
#: plugins/admin/acl/class_aclAssignment.inc:49
msgid "Role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:31
+#: plugins/admin/groups/class_roleGeneric.inc:58
msgid "Role information"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:35
+#: plugins/admin/groups/class_roleGeneric.inc:62
msgid "Organizational role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:84
msgid "Informations"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:158
+#: plugins/admin/departments/class_department.inc:174
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -62,13 +62,13 @@ msgstr ""
msgid "Name"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
msgid "Name of this group"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
#: plugins/admin/groups/class_group.inc:66
#: plugins/admin/groups/class_ogroup.inc:192
#: plugins/admin/groups/group-list.xml:41
@@ -81,26 +81,26 @@ msgstr ""
msgid "Description"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
msgid "Description of the role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:70
+#: plugins/admin/groups/class_roleGeneric.inc:97
msgid "Phone number"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:74
+#: plugins/admin/groups/class_roleGeneric.inc:101
msgid "Fax number"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
#: plugins/admin/users/class_userManagement.inc:42
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: setup/class_setupStep_Migrate.inc:871
msgid "Users"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
msgid "Add users for the role"
msgstr ""
@@ -147,7 +147,7 @@ msgstr ""
#: plugins/admin/groups/class_group.inc:74
#: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:403
+#: plugins/personal/posix/class_posixAccount.inc:410
msgid "GID"
msgstr ""
@@ -204,23 +204,23 @@ msgid "Only allow this group to connect to this list of hosts"
msgstr ""
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458 include/functions.inc:794
-#: include/functions.inc:2548 include/class_xml.inc:55
+#: plugins/personal/posix/class_posixAccount.inc:465 include/functions.inc:794
+#: include/functions.inc:2549 include/class_xml.inc:55
#: include/simpleplugin/class_simpleTabs.inc:325 html/index.php:56
-#: html/index.php:62 html/index.php:481 html/class_passwordRecovery.inc:378
+#: html/index.php:62 html/index.php:522 html/class_passwordRecovery.inc:378
#: setup/class_setupStep_Migrate.inc:572
#: setup/class_setupStep_Migrate.inc:1083
#: setup/class_setupStep_Migrate.inc:1202
#: setup/class_setupStep_Migrate.inc:1313
-#: setup/class_setupStep_Migrate.inc:1372
-#: setup/class_setupStep_Migrate.inc:1411 plugins/admin/acl/remove.tpl.c:2
+#: setup/class_setupStep_Migrate.inc:1377
+#: setup/class_setupStep_Migrate.inc:1421 plugins/admin/acl/remove.tpl.c:2
#: ihtml/themes/default/islocked.tpl.c:5 ihtml/themes/default/remove.tpl.c:2
#: ihtml/themes/default/msg_dialog.tpl.c:5 setup/setup_checks.tpl.c:8
msgid "Warning"
msgstr ""
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458
+#: plugins/personal/posix/class_posixAccount.inc:465
msgid "Timeout while waiting for lock. Ignoring lock!"
msgstr ""
@@ -250,7 +250,7 @@ msgstr ""
msgid "Objects member of this group"
msgstr ""
-#: plugins/admin/groups/class_ogroup.inc:318
+#: plugins/admin/groups/class_ogroup.inc:313
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
@@ -279,10 +279,10 @@ msgstr ""
#: plugins/admin/departments/dep-list.xml:79
#: plugins/admin/users/user-list.xml:105
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-#: include/simpleplugin/class_dialogAttributes.inc:626
-#: include/simpleplugin/class_dialogAttributes.inc:627
-#: include/simpleplugin/class_attribute.inc:2661
-#: include/simpleplugin/class_attribute.inc:2662
+#: include/simpleplugin/class_dialogAttributes.inc:632
+#: include/simpleplugin/class_dialogAttributes.inc:633
+#: include/simpleplugin/class_attribute.inc:2675
+#: include/simpleplugin/class_attribute.inc:2676
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -293,8 +293,8 @@ msgstr ""
#: plugins/admin/departments/dep-list.xml:67
#: plugins/admin/departments/dep-list.xml:88
#: plugins/admin/users/user-list.xml:112
-#: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_dialogAttributes.inc:637
+#: include/simpleplugin/class_dialogAttributes.inc:642
+#: include/simpleplugin/class_dialogAttributes.inc:643
#: include/simpleplugin/simple-list.xml:75
#: include/simpleplugin/simple-list.xml:125
msgid "Remove"
@@ -343,7 +343,7 @@ msgid "Show application groups"
msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Show department groups"
+msgid "Show unidentified groups"
msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:137
@@ -432,51 +432,67 @@ msgid "Category of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:81
+msgid "Website"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:81
+#, php-format
+msgid "Website of this %s"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:85
#: plugins/personal/generic/class_user.inc:410
msgid "Manager"
msgstr ""
-#: plugins/admin/departments/class_department.inc:81
+#: plugins/admin/departments/class_department.inc:85
#, php-format
msgid "Manager of this %s"
msgstr ""
-#: plugins/admin/departments/class_department.inc:87
-#: plugins/admin/departments/class_department.inc:93
+#: plugins/admin/departments/class_department.inc:91
+#: plugins/admin/departments/class_department.inc:97
#: plugins/personal/generic/class_user.inc:304
msgid "Location"
msgstr ""
-#: plugins/admin/departments/class_department.inc:90
+#: plugins/admin/departments/class_department.inc:94
#: plugins/personal/generic/class_user.inc:308
msgid "State"
msgstr ""
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_country.inc:29
+#: plugins/admin/departments/class_country.inc:30
+#: plugins/admin/departments/class_country.inc:33
+msgid "Country"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:103
#: plugins/personal/generic/class_user.inc:312
msgid "Address"
msgstr ""
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:103
#, php-format
msgid "A postal address for this %s"
msgstr ""
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
#: plugins/personal/generic/class_user.inc:320
msgid "Phone"
msgstr ""
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
msgid "Telephone number"
msgstr ""
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
#: plugins/personal/generic/class_user.inc:332
msgid "Fax"
msgstr ""
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
msgid "Facsimile telephone number"
msgstr ""
@@ -504,12 +520,6 @@ msgstr ""
msgid "locality"
msgstr ""
-#: plugins/admin/departments/class_country.inc:29
-#: plugins/admin/departments/class_country.inc:30
-#: plugins/admin/departments/class_country.inc:33
-msgid "Country"
-msgstr ""
-
#: plugins/admin/departments/class_country.inc:50
msgid "country"
msgstr ""
@@ -552,7 +562,8 @@ msgid "Given name"
msgstr ""
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
+#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
msgid "Login"
@@ -665,8 +676,8 @@ msgid "Edit category ACL"
msgstr ""
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2671
-#: include/simpleplugin/class_attribute.inc:2672
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
+#: include/simpleplugin/class_attribute.inc:2686
#, php-format
msgid "Delete"
msgstr ""
@@ -771,19 +782,37 @@ msgstr ""
msgid "ACLs which are part of this group"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:38
+#: plugins/admin/acl/class_aclManagement.inc:31
+#: plugins/admin/acl/class_aclManagement.inc:32
+#: plugins/admin/acl/class_aclManagement.inc:45
+msgid "ACL assignment creation"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:33
+msgid "Create an ACL assignment on an arbitrary dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "Dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "DN you wish to add assignments for"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:135
msgid "ACL assignments"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:39
+#: plugins/admin/acl/class_aclManagement.inc:136
msgid "ACL assignments management"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:40
+#: plugins/admin/acl/class_aclManagement.inc:137
msgid "Manage ACL roles assignments to users"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:78
+#: plugins/admin/acl/class_aclManagement.inc:199
#: plugins/admin/acl/class_aclAssignment.inc:263
msgid "ACL Assignment"
msgstr ""
@@ -899,7 +928,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -994,57 +1023,57 @@ msgstr ""
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:336
+msgid "Homepage"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:336
+msgid "Personal homepage"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:342
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:351
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr ""
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:358
-msgid "Personal contact information"
-msgstr ""
-
#: plugins/personal/generic/class_user.inc:362
-msgid "Display name"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:362
-msgid "Name this user should appear as. Used by Exchange."
+msgid "Personal contact information"
msgstr ""
#: plugins/personal/generic/class_user.inc:366
-msgid "Home address"
+msgid "Display name"
msgstr ""
#: plugins/personal/generic/class_user.inc:366
-msgid "Home postal address"
+msgid "Name this user should appear as. Used by Exchange."
msgstr ""
#: plugins/personal/generic/class_user.inc:370
-msgid "Private phone"
+msgid "Home address"
msgstr ""
#: plugins/personal/generic/class_user.inc:370
-msgid "Home phone number"
+msgid "Home postal address"
msgstr ""
#: plugins/personal/generic/class_user.inc:374
-msgid "Homepage"
+msgid "Private phone"
msgstr ""
#: plugins/personal/generic/class_user.inc:374
-msgid "Personal homepage"
+msgid "Home phone number"
msgstr ""
#: plugins/personal/generic/class_user.inc:380
@@ -1279,33 +1308,33 @@ msgstr ""
msgid "automatic"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:309
+#: plugins/personal/posix/class_posixAccount.inc:310
msgid "expired"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:311
+#: plugins/personal/posix/class_posixAccount.inc:312
msgid "grace time active"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:314
-#: plugins/personal/posix/class_posixAccount.inc:316
-#: plugins/personal/posix/class_posixAccount.inc:318
+#: plugins/personal/posix/class_posixAccount.inc:315
+#: plugins/personal/posix/class_posixAccount.inc:317
+#: plugins/personal/posix/class_posixAccount.inc:319
msgid "active"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:315
msgid "password expired"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:316
+#: plugins/personal/posix/class_posixAccount.inc:317
msgid "password not changeable"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:400
+#: plugins/personal/posix/class_posixAccount.inc:407
msgid "UID"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:516
+#: plugins/personal/posix/class_posixAccount.inc:525
#, php-format
msgid "Group of user %s"
msgstr ""
@@ -1477,424 +1506,440 @@ msgid "Core settings"
msgstr ""
#: plugins/config/class_configInLdap.inc:161
-msgid "Enable primary group filter"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"It is time consuming to evaluate which groups are primary and which are not,"
-" so you may want to disable it if your group plugin is slow."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:167
msgid "Display summary in listings"
msgstr ""
-#: plugins/config/class_configInLdap.inc:168
+#: 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:173
+#: plugins/config/class_configInLdap.inc:167
msgid "Edit locking"
msgstr ""
-#: plugins/config/class_configInLdap.inc:174
+#: 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:179
+#: plugins/config/class_configInLdap.inc:173
msgid "Enable logging"
msgstr ""
-#: plugins/config/class_configInLdap.inc:180
+#: plugins/config/class_configInLdap.inc:174
msgid "Event logging on FusionDirectory side."
msgstr ""
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "LDAP size limit"
msgstr ""
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "Defines the number of entries to get from LDAP by default."
msgstr ""
-#: plugins/config/class_configInLdap.inc:192
+#: plugins/config/class_configInLdap.inc:186
msgid "Login and session"
msgstr ""
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:189
msgid "Login attribute"
msgstr ""
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:190
msgid "Which LDAP attribute should be used as the login name during login."
msgstr ""
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:196
msgid "Enforce encrypted connections"
msgstr ""
-#: plugins/config/class_configInLdap.inc:203
+#: plugins/config/class_configInLdap.inc:197
msgid ""
"Enables PHP security checks to force encrypted access (https) to the web "
"interface."
msgstr ""
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:201
msgid "Warn if session is not encrypted"
msgstr ""
-#: plugins/config/class_configInLdap.inc:208
+#: plugins/config/class_configInLdap.inc:202
msgid "will display a warning to the user when http is used instead of https."
msgstr ""
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Session lifetime"
msgstr ""
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Defines when a session will expire in seconds."
msgstr ""
-#: plugins/config/class_configInLdap.inc:220
+#: plugins/config/class_configInLdap.inc:212
+msgid "HTTP authentication"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:212
+msgid "Use HTTP authentication protocol instead of the login form."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:219
#: include/class_SnapshotDialogs.inc:186
msgid "Snapshots"
msgstr ""
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid "Enable snapshots"
msgstr ""
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid ""
"This enables you to save certain states of entries and restore them later "
"on."
msgstr ""
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
msgid "Snapshot base"
msgstr ""
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
msgid "The base where snapshots should be stored inside of the LDAP."
msgstr ""
-#: plugins/config/class_configInLdap.inc:235
+#: plugins/config/class_configInLdap.inc:234
msgid "SSL"
msgstr ""
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Key path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Path to FusionDirectory private key. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Certificate path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Path to FusionDirectory certificate. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:262
msgid "CA certificate path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:247
msgid "Path to the CA certificate. Used for validating Argonaut Server host."
msgstr ""
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:254
msgid "CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "Enable CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "CAS login will be used instead of LDAP bind"
msgstr ""
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:262
msgid "Path to the CA certificate of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host"
msgstr ""
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port"
msgstr ""
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port the CAS server is listening on"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context to be used"
msgstr ""
-#: plugins/config/class_configInLdap.inc:285
+#: plugins/config/class_configInLdap.inc:284
msgid "People and group storage"
msgstr ""
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "People DN attribute"
msgstr ""
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "Attribute to use at the beginning of users dn"
msgstr ""
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "CN pattern"
msgstr ""
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "The pattern to use to build the common name field"
msgstr ""
-#: plugins/config/class_configInLdap.inc:299
+#: plugins/config/class_configInLdap.inc:298
msgid "Strict naming policy"
msgstr ""
-#: plugins/config/class_configInLdap.inc:300
+#: plugins/config/class_configInLdap.inc:299
msgid "Enables strict checking of user and group names"
msgstr ""
-#: plugins/config/class_configInLdap.inc:305
+#: plugins/config/class_configInLdap.inc:304
msgid "Group/user min id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:306
+#: plugins/config/class_configInLdap.inc:305
msgid ""
"The minimum assignable user or group id to avoid security leaks with id 0 "
"accounts."
msgstr ""
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid "Next id hook"
msgstr ""
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid ""
"A script to be called for finding the next free id number for users or "
"groups."
msgstr ""
-#: plugins/config/class_configInLdap.inc:315
+#: plugins/config/class_configInLdap.inc:314
msgid "Base number for user id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:315
msgid "Where to start looking for a new free user id."
msgstr ""
-#: plugins/config/class_configInLdap.inc:321
+#: plugins/config/class_configInLdap.inc:320
msgid "Base number for group id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:321
msgid "Where to start looking for a new free group id."
msgstr ""
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "Users RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "The branch where users are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "Groups RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "The branch where groups are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "ACL role RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "The branch where ACL roles are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Id allocation method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Method to allocate user/group ids"
msgstr ""
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Traditional"
msgstr ""
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Samba unix id pool"
msgstr ""
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Pool user id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Minimum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Pool user id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Maximum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Pool group id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Minimum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Pool group id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Maximum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:370
-msgid "Debugging"
+#: plugins/config/class_configInLdap.inc:367
+msgid "Restrict role members"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:367
+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:373
+msgid "Debugging"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:376
msgid "Display errors"
msgstr ""
-#: plugins/config/class_configInLdap.inc:374
+#: plugins/config/class_configInLdap.inc:377
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:378
+#: plugins/config/class_configInLdap.inc:381
msgid "Maximum LDAP query time"
msgstr ""
-#: plugins/config/class_configInLdap.inc:378
+#: plugins/config/class_configInLdap.inc:381
msgid ""
"Stop LDAP actions if there is no answer within the specified number of "
"seconds."
msgstr ""
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:386
msgid "Log LDAP statistics"
msgstr ""
-#: plugins/config/class_configInLdap.inc:384
+#: plugins/config/class_configInLdap.inc:387
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:389
+#: plugins/config/class_configInLdap.inc:392
msgid "Debug level"
msgstr ""
-#: plugins/config/class_configInLdap.inc:390
+#: plugins/config/class_configInLdap.inc:393
msgid "Display certain information on each page load."
msgstr ""
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:405
msgid "Miscellaneous"
msgstr ""
-#: plugins/config/class_configInLdap.inc:407
+#: plugins/config/class_configInLdap.inc:410
msgid "Hooks that are called when specific actions happens"
msgstr ""
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "tab"
msgstr ""
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "The tab that this hook concerns"
msgstr ""
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "mode"
msgstr ""
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "When to call this command"
msgstr ""
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "cmd"
msgstr ""
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "The command that will be called"
msgstr ""
-#: plugins/config/class_configInLdap.inc:429
+#: plugins/config/class_configInLdap.inc:432
msgid "Hooks"
msgstr ""
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:439
msgid "Display hook output"
msgstr ""
-#: plugins/config/class_configInLdap.inc:437
+#: plugins/config/class_configInLdap.inc:440
msgid ""
"When enabled successful hook execution output is displayed to the user using"
" a dialog."
msgstr ""
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available shells"
msgstr ""
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available POSIX shells for FD users."
msgstr ""
-#: plugins/config/class_configInLdap.inc:449
+#: plugins/config/class_configInLdap.inc:452
msgid "Show ACL tab on all objects"
msgstr ""
-#: plugins/config/class_configInLdap.inc:450
+#: plugins/config/class_configInLdap.inc:453
msgid ""
"For very specific ACL rights setting where you might need to give right on a"
" single object."
msgstr ""
-#: plugins/config/class_configInLdap.inc:464
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available department categories"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available categories in the departments dropdown"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:474
#: setup/class_setupStep_Language.inc:69
msgid "Automatic"
msgstr ""
@@ -1911,80 +1956,80 @@ msgstr ""
msgid "Password recovery settings"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:44
+#: plugins/config/class_recoveryConfig.inc:45
msgid "Activate password recovery"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:45
+#: plugins/config/class_recoveryConfig.inc:46
msgid "Whether to activate or not password recovery feature"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:50
+#: plugins/config/class_recoveryConfig.inc:51
msgid "Sender email address"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:51
+#: plugins/config/class_recoveryConfig.inc:52
msgid "Email address from which mails will be sent"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:57
+#: plugins/config/class_recoveryConfig.inc:58
msgid "Link validity (minutes)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:58
+#: plugins/config/class_recoveryConfig.inc:59
msgid "Number of minutes before a recovery link expires"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:64
+#: plugins/config/class_recoveryConfig.inc:65
msgid "Salt for tokens"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:65
+#: plugins/config/class_recoveryConfig.inc:66
msgid ""
"Just a security measure, you can put anything in there, even random "
"characters"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:71
+#: plugins/config/class_recoveryConfig.inc:72
msgid "Allow the use of alternate addresses"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:72
+#: plugins/config/class_recoveryConfig.inc:73
msgid ""
"Users will also be able to enter one of theirs alternate addresses to "
"recover their password"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:79
+#: plugins/config/class_recoveryConfig.inc:80
msgid "First email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:82
-#: plugins/config/class_recoveryConfig.inc:101
+#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:102
msgid "Subject"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:84
msgid "Subject of the first email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:86
+#: plugins/config/class_recoveryConfig.inc:87
msgid "[FusionDirectory] Password recovery link"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:89
+#: plugins/config/class_recoveryConfig.inc:90
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:91
#, 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 ""
-#: plugins/config/class_recoveryConfig.inc:93
+#: plugins/config/class_recoveryConfig.inc:94
#, php-format
msgid ""
"Hello,\n"
@@ -1996,31 +2041,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:98
+#: plugins/config/class_recoveryConfig.inc:99
msgid "Second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:103
msgid "Subject of the second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:105
+#: plugins/config/class_recoveryConfig.inc:106
msgid "[FusionDirectory] Password recovery successful"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:108
+#: plugins/config/class_recoveryConfig.inc:109
#, php-format
msgid "Body (%s is login)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:110
#, php-format
msgid ""
"Body of the second email, sent to confirm the password has been changed. Use"
" %s for the user login."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:112
+#: plugins/config/class_recoveryConfig.inc:113
#, php-format
msgid ""
"Hello,\n"
@@ -2088,13 +2133,13 @@ msgstr ""
msgid "Down"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2633
-#: include/simpleplugin/class_attribute.inc:2634
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
+#: include/simpleplugin/class_attribute.inc:2648
msgid "Sort up"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2646
-#: include/simpleplugin/class_attribute.inc:2647
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
+#: include/simpleplugin/class_attribute.inc:2661
msgid "Sort down"
msgstr ""
@@ -2106,27 +2151,26 @@ msgstr ""
#: include/class_config.inc:479 include/class_msgPool.inc:215
#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3106
-#: include/functions.inc:3127 include/functions.inc:3157
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197 include/functions.inc:3259
+#: include/class_msgPool.inc:740 include/functions.inc:3107
+#: include/functions.inc:3128 include/functions.inc:3158
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3260
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1663 include/class_CopyPasteHandler.inc:278
-#: include/simpleplugin/class_dialogAttributes.inc:733
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
-#: include/simpleplugin/class_attribute.inc:1774
-#: include/simpleplugin/class_attribute.inc:1877
-#: include/simpleplugin/class_attribute.inc:1879
+#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
+#: include/simpleplugin/class_attribute.inc:1784
+#: include/simpleplugin/class_attribute.inc:1887
+#: include/simpleplugin/class_attribute.inc:1889
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: 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:437
#: include/password-methods/class_password-methods.inc:447
-#: include/class_SnapshotHandler.inc:415 html/index.php:434 html/index.php:444
+#: include/class_SnapshotHandler.inc:415 html/index.php:473 html/index.php:483
#: setup/class_setupStep_Migrate.inc:935
#: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
msgid "Error"
@@ -2165,44 +2209,44 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: include/class_listing.inc:1586 include/class_listing.inc:1640
+#: include/class_listing.inc:1590 include/class_listing.inc:1644
msgid "Copy"
msgstr ""
-#: include/class_listing.inc:1592 include/class_listing.inc:1628
+#: include/class_listing.inc:1596 include/class_listing.inc:1632
msgid "Cut"
msgstr ""
-#: include/class_listing.inc:1600 include/class_listing.inc:1602
+#: include/class_listing.inc:1604 include/class_listing.inc:1606
#: include/class_CopyPasteHandler.inc:370
msgid "Paste"
msgstr ""
-#: include/class_listing.inc:1628
+#: include/class_listing.inc:1632
msgid "Cut this entry"
msgstr ""
-#: include/class_listing.inc:1640
+#: include/class_listing.inc:1644
msgid "Copy this entry"
msgstr ""
-#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_listing.inc:1677 include/class_listing.inc:1679
msgid "Restore snapshots"
msgstr ""
-#: include/class_listing.inc:1689
+#: include/class_listing.inc:1693
msgid "Export list"
msgstr ""
-#: include/class_listing.inc:1724 include/class_listing.inc:1725
+#: include/class_listing.inc:1728 include/class_listing.inc:1729
msgid "Restore snapshot"
msgstr ""
-#: include/class_listing.inc:1734
+#: include/class_listing.inc:1738
msgid "Create snapshot"
msgstr ""
-#: include/class_listing.inc:1735
+#: include/class_listing.inc:1739
msgid "Create a new snapshot from this object"
msgstr ""
@@ -2245,7 +2289,7 @@ msgid "XML error in fusiondirectory.conf: %s at line %d"
msgstr ""
#: include/class_config.inc:162 include/class_config.inc:300
-#: include/class_config.inc:985 include/class_config.inc:998
+#: include/class_config.inc:915 include/class_config.inc:928
#: include/functions.inc:663 include/class_timezone.inc:51
#: include/password-methods/class_password-methods-sha.inc:71
#: include/password-methods/class_password-methods-ssha.inc:75
@@ -2262,17 +2306,17 @@ msgid ""
"while your passwords are not encrypted."
msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:917
-#: include/class_ldap.inc:1371 include/functions.inc:526
+#: include/class_config.inc:337 include/class_ldap.inc:918
+#: include/class_ldap.inc:1372 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2985 include/simpleplugin/class_simplePlugin.inc:545
-#: include/simpleplugin/class_attribute.inc:2895
+#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2909
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
#: include/class_SnapshotHandler.inc:422 include/class_SnapshotHandler.inc:425
-#: html/index.php:360 html/class_passwordRecovery.inc:497
+#: html/index.php:369 html/class_passwordRecovery.inc:497
#: setup/class_setupStep_Migrate.inc:451
#: setup/class_setupStep_Migrate.inc:1130
msgid "LDAP error"
@@ -2287,38 +2331,38 @@ msgstr ""
msgid "The selected mail method (class %s) is not available"
msgstr ""
-#: include/class_config.inc:986
+#: include/class_config.inc:916
#, php-format
msgid ""
"The snapshot functionality is enabled, but the required variable '%s' is not"
" set."
msgstr ""
-#: include/class_config.inc:999
+#: include/class_config.inc:929
#, php-format
msgid ""
"The snapshot functionality is enabled, but the required compression module "
"is missing. Please install '%s'."
msgstr ""
-#: include/class_config.inc:1104
+#: include/class_config.inc:1034
msgid "All categories"
msgstr ""
-#: include/class_config.inc:1231
+#: include/class_config.inc:1161
msgid "My account"
msgstr ""
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
msgid "Performance warning"
msgstr ""
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
#, php-format
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr ""
-#: include/class_ldap.inc:868 include/class_ldap.inc:904
+#: include/class_ldap.inc:869 include/class_ldap.inc:905
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
@@ -2328,39 +2372,39 @@ msgstr ""
msgid "Internal error"
msgstr ""
-#: include/class_ldap.inc:868
+#: include/class_ldap.inc:869
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:904
+#: include/class_ldap.inc:905
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1016
+#: include/class_ldap.inc:1017
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr ""
-#: include/class_ldap.inc:1018
+#: include/class_ldap.inc:1019
#, php-format
msgid "while operating on LDAP server %s"
msgstr ""
-#: include/class_ldap.inc:1108
+#: include/class_ldap.inc:1109
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1220
+#: include/class_ldap.inc:1221
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr ""
-#: include/class_ldap.inc:1231
+#: include/class_ldap.inc:1232
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2948,10 +2992,10 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr ""
-#: include/functions.inc:496 include/functions.inc:3294
-#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:263
-#: include/simpleplugin/class_simplePlugin.inc:268
-#: include/simpleplugin/class_simplePlugin.inc:280
+#: include/functions.inc:496 include/functions.inc:3295
+#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
+#: include/simpleplugin/class_simplePlugin.inc:269
+#: include/simpleplugin/class_simplePlugin.inc:281
#: html/class_passwordRecovery.inc:216
msgid "Fatal error"
msgstr ""
@@ -3104,98 +3148,98 @@ msgstr ""
msgid "Cannot read to revision file!"
msgstr ""
-#: include/functions.inc:2548
+#: include/functions.inc:2549
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "LDAP warning"
msgstr ""
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "Cannot get schema information from server. No schema check possible!"
msgstr ""
-#: include/functions.inc:2584
+#: include/functions.inc:2585
msgid ""
"Used to lock currently edited entries to avoid multiple changes at the same "
"time."
msgstr ""
-#: include/functions.inc:2596
+#: include/functions.inc:2597
#, php-format
msgid "Missing required object class '%s'!"
msgstr ""
-#: include/functions.inc:2599
+#: include/functions.inc:2600
#, php-format
msgid "Missing optional object class '%s'!"
msgstr ""
-#: include/functions.inc:2603
+#: include/functions.inc:2604
#, php-format
msgid "Class(es) available"
msgstr ""
-#: include/functions.inc:2623
+#: include/functions.inc:2624
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2625
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2628
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2629
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3106 include/functions.inc:3127
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3106
+#: include/functions.inc:3107
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3127
+#: include/functions.inc:3128
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3157
+#: include/functions.inc:3158
msgid "Cannot create sambaUnixIdPool entry!"
msgstr ""
-#: include/functions.inc:3165
+#: include/functions.inc:3166
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3177 include/functions.inc:3181
+#: include/functions.inc:3178 include/functions.inc:3182
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3197
+#: include/functions.inc:3198
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3259
+#: include/functions.inc:3260
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3295
+#: include/functions.inc:3296
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
@@ -3351,13 +3395,13 @@ msgstr ""
msgid "XML error"
msgstr ""
-#: include/class_plugin.inc:554
+#: include/class_plugin.inc:553
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/class_plugin.inc:1466
+#: include/class_plugin.inc:1467
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -3383,32 +3427,32 @@ msgstr ""
msgid "This is the name of the template"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:263
+#: include/simpleplugin/class_simplePlugin.inc:264
msgid "Only main tab can compute dn"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:270
+#: include/simpleplugin/class_simplePlugin.inc:271
#, php-format
msgid "Could not compute dn: no parent tab class for \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:282
+#: include/simpleplugin/class_simplePlugin.inc:283
#, php-format
msgid ""
"Could not compute dn: could not find objectType infos from tab class \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:638
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:644
+#: include/simpleplugin/class_simplePlugin.inc:652
msgid "Error when saving"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:638
+#: include/simpleplugin/class_simplePlugin.inc:644
#, php-format
msgid "There is already an entry with the same dn : %s"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:652
#, php-format
msgid "The entry %s is not existing"
msgstr ""
@@ -3428,27 +3472,27 @@ msgstr ""
msgid "Show %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:409
+#: include/simpleplugin/class_dialogAttributes.inc:415
#, php-format
msgid "Group %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:411
+#: include/simpleplugin/class_dialogAttributes.inc:417
#, php-format
msgid "Role %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:446
+#: include/simpleplugin/class_dialogAttributes.inc:452
msgid "Group of user"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:615
+#: include/simpleplugin/class_dialogAttributes.inc:621
#: include/simpleplugin/class_attribute.inc:1090
#: include/simpleplugin/class_attribute.inc:1124
msgid "None"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:617
+#: include/simpleplugin/class_dialogAttributes.inc:623
msgid "Unknown"
msgstr ""
@@ -3489,11 +3533,16 @@ msgid "days"
msgstr ""
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2161
+#: include/simpleplugin/class_attribute.inc:2171
#, php-format
msgid "%s (required)"
msgstr ""
+#: include/simpleplugin/class_attribute.inc:1150
+#, php-format
+msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
+msgstr ""
+
#: include/simpleplugin/class_attribute.inc:1277
#, php-format
msgid "An integer between %d and %d"
@@ -3509,75 +3558,75 @@ msgstr ""
msgid "An integer smaller than %d"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1379
+#: include/simpleplugin/class_attribute.inc:1383
#, php-format
msgid "A float between %f and %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1381
+#: include/simpleplugin/class_attribute.inc:1385
#, php-format
msgid "A float larger than %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1383
+#: include/simpleplugin/class_attribute.inc:1387
#, php-format
msgid "A float smaller than %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1490
+#: include/simpleplugin/class_attribute.inc:1500
msgid "Error, incorrect date: "
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
#, php-format
msgid "Cannot read uploaded file: %s"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1530
+#: include/simpleplugin/class_attribute.inc:1540
msgid "file is empty"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1533
+#: include/simpleplugin/class_attribute.inc:1543
msgid "file not found"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1546
msgid "file not readable"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1569
+#: include/simpleplugin/class_attribute.inc:1579
#, php-format
msgid "%s (%d bytes)"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1616
-#: include/simpleplugin/class_attribute.inc:1793
+#: include/simpleplugin/class_attribute.inc:1626
+#: include/simpleplugin/class_attribute.inc:1803
msgid "Upload"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1621
-#: include/simpleplugin/class_attribute.inc:1622
+#: include/simpleplugin/class_attribute.inc:1631
+#: include/simpleplugin/class_attribute.inc:1632
msgid "Download"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1775
+#: include/simpleplugin/class_attribute.inc:1785
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1826
+#: include/simpleplugin/class_attribute.inc:1836
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1829
+#: include/simpleplugin/class_attribute.inc:1839
msgid "Object base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:2755
+#: include/simpleplugin/class_attribute.inc:2769
#, php-format
msgid "Invalid value for %s"
msgstr ""
@@ -3711,17 +3760,17 @@ msgstr ""
msgid "Account locked. Please contact your system administrator!"
msgstr ""
-#: html/index.php:436
+#: html/index.php:475
#, php-format
msgid "CAS user \"%s\" could not be found in the LDAP"
msgstr ""
-#: html/index.php:446
+#: html/index.php:485
#, php-format
msgid "CAS user \"%s\" match several users in the LDAP"
msgstr ""
-#: html/index.php:481
+#: html/index.php:522
msgid ""
"Your browser has cookies disabled. Please enable cookies and reload this "
"page before logging in!"
@@ -4044,7 +4093,7 @@ msgid "Checking for duplicated UID numbers"
msgstr ""
#: setup/class_setupStep_Migrate.inc:267
-msgid "Checking for duplicate GID numbers"
+msgid "Checking for duplicated GID numbers"
msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:487
@@ -4054,7 +4103,7 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:1179
#: setup/class_setupStep_Migrate.inc:1272
#: setup/class_setupStep_Migrate.inc:1351
-#: setup/class_setupStep_Migrate.inc:1390
+#: setup/class_setupStep_Migrate.inc:1395
msgid "LDAP query failed"
msgstr ""
@@ -4065,7 +4114,7 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:1180
#: setup/class_setupStep_Migrate.inc:1273
#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1391
+#: setup/class_setupStep_Migrate.inc:1396
msgid "Possibly the \"root object\" is missing."
msgstr ""
@@ -4220,14 +4269,14 @@ msgstr ""
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1373
+#: setup/class_setupStep_Migrate.inc:1378
#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\"."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1412
+#: setup/class_setupStep_Migrate.inc:1422
#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\"."
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
diff --git a/locale/vi_VN/fusiondirectory.po b/locale/vi_VN/fusiondirectory.po
index 23007965b1d6d41ebb24d7dd0eb69333a86f334a..91bc24a1c4b0a043bf13f62323217968653d80b9 100644
--- a/locale/vi_VN/fusiondirectory.po
+++ b/locale/vi_VN/fusiondirectory.po
@@ -5,12 +5,12 @@
# Translators:
msgid ""
msgstr ""
-"Project-Id-Version: FusionDirectory-109\n"
+"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-01-22 11:26+0100\n"
-"PO-Revision-Date: 2016-01-22 10:24+0000\n"
+"POT-Creation-Date: 2016-03-14 12:07+0100\n"
+"PO-Revision-Date: 2016-03-07 12:09+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-109/language/vi_VN/)\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -28,31 +28,31 @@ msgstr "Chà o mừng %s!"
msgid "References"
msgstr "Các tham chiếu"
-#: plugins/admin/groups/class_roleGeneric.inc:30
-#: plugins/admin/groups/class_roleGeneric.inc:34
+#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:61
#: plugins/admin/groups/class_groupManagement.inc:71
#: plugins/admin/aclrole/class_aclRole.inc:78
#: plugins/admin/acl/class_aclAssignment.inc:49
msgid "Role"
msgstr "Vai trò"
-#: plugins/admin/groups/class_roleGeneric.inc:31
+#: plugins/admin/groups/class_roleGeneric.inc:58
msgid "Role information"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:35
+#: plugins/admin/groups/class_roleGeneric.inc:62
msgid "Organizational role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:84
msgid "Informations"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:158
+#: plugins/admin/departments/class_department.inc:174
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -62,13 +62,13 @@ msgstr ""
msgid "Name"
msgstr "Tên"
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
msgid "Name of this group"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
#: plugins/admin/groups/class_group.inc:66
#: plugins/admin/groups/class_ogroup.inc:192
#: plugins/admin/groups/group-list.xml:41
@@ -81,26 +81,26 @@ msgstr ""
msgid "Description"
msgstr "Mô tả"
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
msgid "Description of the role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:70
+#: plugins/admin/groups/class_roleGeneric.inc:97
msgid "Phone number"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:74
+#: plugins/admin/groups/class_roleGeneric.inc:101
msgid "Fax number"
msgstr "Số fax"
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
#: plugins/admin/users/class_userManagement.inc:42
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: setup/class_setupStep_Migrate.inc:871
msgid "Users"
msgstr "NgÆ°á»i dùng"
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
msgid "Add users for the role"
msgstr ""
@@ -147,7 +147,7 @@ msgstr ""
#: plugins/admin/groups/class_group.inc:74
#: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:403
+#: plugins/personal/posix/class_posixAccount.inc:410
msgid "GID"
msgstr "Số ID của nhóm"
@@ -204,23 +204,23 @@ msgid "Only allow this group to connect to this list of hosts"
msgstr ""
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458 include/functions.inc:794
-#: include/functions.inc:2548 include/class_xml.inc:55
+#: plugins/personal/posix/class_posixAccount.inc:465 include/functions.inc:794
+#: include/functions.inc:2549 include/class_xml.inc:55
#: include/simpleplugin/class_simpleTabs.inc:325 html/index.php:56
-#: html/index.php:62 html/index.php:481 html/class_passwordRecovery.inc:378
+#: html/index.php:62 html/index.php:522 html/class_passwordRecovery.inc:378
#: setup/class_setupStep_Migrate.inc:572
#: setup/class_setupStep_Migrate.inc:1083
#: setup/class_setupStep_Migrate.inc:1202
#: setup/class_setupStep_Migrate.inc:1313
-#: setup/class_setupStep_Migrate.inc:1372
-#: setup/class_setupStep_Migrate.inc:1411 plugins/admin/acl/remove.tpl.c:2
+#: setup/class_setupStep_Migrate.inc:1377
+#: setup/class_setupStep_Migrate.inc:1421 plugins/admin/acl/remove.tpl.c:2
#: ihtml/themes/default/islocked.tpl.c:5 ihtml/themes/default/remove.tpl.c:2
#: ihtml/themes/default/msg_dialog.tpl.c:5 setup/setup_checks.tpl.c:8
msgid "Warning"
msgstr "Cảnh báo"
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458
+#: plugins/personal/posix/class_posixAccount.inc:465
msgid "Timeout while waiting for lock. Ignoring lock!"
msgstr "Thá»i gian chá» khóa. Bá» qua khóa!"
@@ -250,7 +250,7 @@ msgstr "Các đối tượng thà nh viên"
msgid "Objects member of this group"
msgstr ""
-#: plugins/admin/groups/class_ogroup.inc:318
+#: plugins/admin/groups/class_ogroup.inc:313
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
@@ -279,10 +279,10 @@ msgstr "Tạo "
#: plugins/admin/departments/dep-list.xml:79
#: plugins/admin/users/user-list.xml:105
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-#: include/simpleplugin/class_dialogAttributes.inc:626
-#: include/simpleplugin/class_dialogAttributes.inc:627
-#: include/simpleplugin/class_attribute.inc:2661
-#: include/simpleplugin/class_attribute.inc:2662
+#: include/simpleplugin/class_dialogAttributes.inc:632
+#: include/simpleplugin/class_dialogAttributes.inc:633
+#: include/simpleplugin/class_attribute.inc:2675
+#: include/simpleplugin/class_attribute.inc:2676
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -293,8 +293,8 @@ msgstr "Hiệu chỉnh"
#: plugins/admin/departments/dep-list.xml:67
#: plugins/admin/departments/dep-list.xml:88
#: plugins/admin/users/user-list.xml:112
-#: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_dialogAttributes.inc:637
+#: include/simpleplugin/class_dialogAttributes.inc:642
+#: include/simpleplugin/class_dialogAttributes.inc:643
#: include/simpleplugin/simple-list.xml:75
#: include/simpleplugin/simple-list.xml:125
msgid "Remove"
@@ -343,7 +343,7 @@ msgid "Show application groups"
msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Show department groups"
+msgid "Show unidentified groups"
msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:137
@@ -432,51 +432,67 @@ msgid "Category of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:81
+msgid "Website"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:81
+#, php-format
+msgid "Website of this %s"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:85
#: plugins/personal/generic/class_user.inc:410
msgid "Manager"
msgstr ""
-#: plugins/admin/departments/class_department.inc:81
+#: plugins/admin/departments/class_department.inc:85
#, php-format
msgid "Manager of this %s"
msgstr ""
-#: plugins/admin/departments/class_department.inc:87
-#: plugins/admin/departments/class_department.inc:93
+#: plugins/admin/departments/class_department.inc:91
+#: plugins/admin/departments/class_department.inc:97
#: plugins/personal/generic/class_user.inc:304
msgid "Location"
msgstr "Vị trÃ"
-#: plugins/admin/departments/class_department.inc:90
+#: plugins/admin/departments/class_department.inc:94
#: plugins/personal/generic/class_user.inc:308
msgid "State"
msgstr "Bang"
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_country.inc:29
+#: plugins/admin/departments/class_country.inc:30
+#: plugins/admin/departments/class_country.inc:33
+msgid "Country"
+msgstr "Quốc Gia"
+
+#: plugins/admin/departments/class_department.inc:103
#: plugins/personal/generic/class_user.inc:312
msgid "Address"
msgstr "Äịa chỉ"
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:103
#, php-format
msgid "A postal address for this %s"
msgstr ""
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
#: plugins/personal/generic/class_user.inc:320
msgid "Phone"
msgstr "Số điện thoại"
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
msgid "Telephone number"
msgstr ""
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
#: plugins/personal/generic/class_user.inc:332
msgid "Fax"
msgstr "Số fax"
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
msgid "Facsimile telephone number"
msgstr ""
@@ -504,12 +520,6 @@ msgstr ""
msgid "locality"
msgstr ""
-#: plugins/admin/departments/class_country.inc:29
-#: plugins/admin/departments/class_country.inc:30
-#: plugins/admin/departments/class_country.inc:33
-msgid "Country"
-msgstr "Quốc Gia"
-
#: plugins/admin/departments/class_country.inc:50
msgid "country"
msgstr ""
@@ -552,7 +562,8 @@ msgid "Given name"
msgstr "Tên tháºt"
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
+#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
msgid "Login"
@@ -665,8 +676,8 @@ msgid "Edit category ACL"
msgstr "Hiệu chÃnh mục ACL"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2671
-#: include/simpleplugin/class_attribute.inc:2672
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
+#: include/simpleplugin/class_attribute.inc:2686
#, php-format
msgid "Delete"
msgstr "Xóa"
@@ -771,19 +782,37 @@ msgstr ""
msgid "ACLs which are part of this group"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:38
+#: plugins/admin/acl/class_aclManagement.inc:31
+#: plugins/admin/acl/class_aclManagement.inc:32
+#: plugins/admin/acl/class_aclManagement.inc:45
+msgid "ACL assignment creation"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:33
+msgid "Create an ACL assignment on an arbitrary dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "Dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "DN you wish to add assignments for"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:135
msgid "ACL assignments"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:39
+#: plugins/admin/acl/class_aclManagement.inc:136
msgid "ACL assignments management"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:40
+#: plugins/admin/acl/class_aclManagement.inc:137
msgid "Manage ACL roles assignments to users"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:78
+#: plugins/admin/acl/class_aclManagement.inc:199
#: plugins/admin/acl/class_aclAssignment.inc:263
msgid "ACL Assignment"
msgstr ""
@@ -899,7 +928,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -994,59 +1023,59 @@ msgstr ""
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:336
+msgid "Homepage"
+msgstr "Trang chủ"
+
+#: plugins/personal/generic/class_user.inc:336
+msgid "Personal homepage"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:342
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:351
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr "Ngôn ngữ muốn sỠdụng"
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:362
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
msgid "Display name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home postal address"
msgstr "Äại chỉ nhà theo bÆ°u Ä‘iện"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:374
msgid "Private phone"
msgstr "Số điện thoại riêng"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:374
msgid "Home phone number"
msgstr "Số điện thoại nhà "
-#: plugins/personal/generic/class_user.inc:374
-msgid "Homepage"
-msgstr "Trang chủ"
-
-#: plugins/personal/generic/class_user.inc:374
-msgid "Personal homepage"
-msgstr ""
-
#: plugins/personal/generic/class_user.inc:380
msgid "Organizational information"
msgstr "Thông tin vỠtổ chức"
@@ -1279,33 +1308,33 @@ msgstr "không được cấu hình"
msgid "automatic"
msgstr "tá»± Ä‘á»™ng"
-#: plugins/personal/posix/class_posixAccount.inc:309
+#: plugins/personal/posix/class_posixAccount.inc:310
msgid "expired"
msgstr "hết hạn"
-#: plugins/personal/posix/class_posixAccount.inc:311
+#: plugins/personal/posix/class_posixAccount.inc:312
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:314
-#: plugins/personal/posix/class_posixAccount.inc:316
-#: plugins/personal/posix/class_posixAccount.inc:318
+#: plugins/personal/posix/class_posixAccount.inc:315
+#: plugins/personal/posix/class_posixAccount.inc:317
+#: plugins/personal/posix/class_posixAccount.inc:319
msgid "active"
msgstr "hoạt động"
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:315
msgid "password expired"
msgstr "máºt khẩu hết hạn"
-#: plugins/personal/posix/class_posixAccount.inc:316
+#: plugins/personal/posix/class_posixAccount.inc:317
msgid "password not changeable"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:400
+#: plugins/personal/posix/class_posixAccount.inc:407
msgid "UID"
msgstr "Số ID của ngÆ°á»i sá» dụng"
-#: plugins/personal/posix/class_posixAccount.inc:516
+#: plugins/personal/posix/class_posixAccount.inc:525
#, php-format
msgid "Group of user %s"
msgstr ""
@@ -1477,424 +1506,440 @@ msgid "Core settings"
msgstr ""
#: plugins/config/class_configInLdap.inc:161
-msgid "Enable primary group filter"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"It is time consuming to evaluate which groups are primary and which are not,"
-" so you may want to disable it if your group plugin is slow."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:167
msgid "Display summary in listings"
msgstr "Hiển thị tóm tắt trên danh sách"
-#: plugins/config/class_configInLdap.inc:168
+#: 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:173
+#: plugins/config/class_configInLdap.inc:167
msgid "Edit locking"
msgstr ""
-#: plugins/config/class_configInLdap.inc:174
+#: 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:179
+#: plugins/config/class_configInLdap.inc:173
msgid "Enable logging"
msgstr ""
-#: plugins/config/class_configInLdap.inc:180
+#: plugins/config/class_configInLdap.inc:174
msgid "Event logging on FusionDirectory side."
msgstr ""
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "LDAP size limit"
msgstr ""
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "Defines the number of entries to get from LDAP by default."
msgstr ""
-#: plugins/config/class_configInLdap.inc:192
+#: plugins/config/class_configInLdap.inc:186
msgid "Login and session"
msgstr "Äăng nháºp và phiên"
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:189
msgid "Login attribute"
msgstr "Thuá»™c tÃnh đăng nháºp"
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:190
msgid "Which LDAP attribute should be used as the login name during login."
msgstr ""
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:196
msgid "Enforce encrypted connections"
msgstr "Thực thi việc mã hóa các kết nối"
-#: plugins/config/class_configInLdap.inc:203
+#: plugins/config/class_configInLdap.inc:197
msgid ""
"Enables PHP security checks to force encrypted access (https) to the web "
"interface."
msgstr ""
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:201
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:208
+#: plugins/config/class_configInLdap.inc:202
msgid "will display a warning to the user when http is used instead of https."
msgstr ""
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Session lifetime"
msgstr "Thá»i gian cho má»™t phiên (má»™t Session)"
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Defines when a session will expire in seconds."
msgstr ""
-#: plugins/config/class_configInLdap.inc:220
+#: plugins/config/class_configInLdap.inc:212
+msgid "HTTP authentication"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:212
+msgid "Use HTTP authentication protocol instead of the login form."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:219
#: include/class_SnapshotDialogs.inc:186
msgid "Snapshots"
msgstr ""
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid "Enable snapshots"
msgstr "Báºt chức năng snapshots"
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid ""
"This enables you to save certain states of entries and restore them later "
"on."
msgstr ""
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
msgid "Snapshot base"
msgstr "Gốc snapshot"
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
msgid "The base where snapshots should be stored inside of the LDAP."
msgstr ""
-#: plugins/config/class_configInLdap.inc:235
+#: plugins/config/class_configInLdap.inc:234
msgid "SSL"
msgstr ""
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Key path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Path to FusionDirectory private key. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Certificate path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Path to FusionDirectory certificate. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:262
msgid "CA certificate path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:247
msgid "Path to the CA certificate. Used for validating Argonaut Server host."
msgstr ""
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:254
msgid "CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "Enable CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "CAS login will be used instead of LDAP bind"
msgstr ""
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:262
msgid "Path to the CA certificate of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host"
msgstr ""
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port"
msgstr ""
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port the CAS server is listening on"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context to be used"
msgstr ""
-#: plugins/config/class_configInLdap.inc:285
+#: plugins/config/class_configInLdap.inc:284
msgid "People and group storage"
msgstr "Kho lÆ°u trữ ngÆ°á»i và nhóm"
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "People DN attribute"
msgstr "Thuá»™c tÃnh DN ngÆ°á»i"
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "Attribute to use at the beginning of users dn"
msgstr ""
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "CN pattern"
msgstr ""
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "The pattern to use to build the common name field"
msgstr ""
-#: plugins/config/class_configInLdap.inc:299
+#: plugins/config/class_configInLdap.inc:298
msgid "Strict naming policy"
msgstr ""
-#: plugins/config/class_configInLdap.inc:300
+#: plugins/config/class_configInLdap.inc:299
msgid "Enables strict checking of user and group names"
msgstr ""
-#: plugins/config/class_configInLdap.inc:305
+#: plugins/config/class_configInLdap.inc:304
msgid "Group/user min id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:306
+#: plugins/config/class_configInLdap.inc:305
msgid ""
"The minimum assignable user or group id to avoid security leaks with id 0 "
"accounts."
msgstr ""
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid "Next id hook"
msgstr ""
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid ""
"A script to be called for finding the next free id number for users or "
"groups."
msgstr ""
-#: plugins/config/class_configInLdap.inc:315
+#: plugins/config/class_configInLdap.inc:314
msgid "Base number for user id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:315
msgid "Where to start looking for a new free user id."
msgstr ""
-#: plugins/config/class_configInLdap.inc:321
+#: plugins/config/class_configInLdap.inc:320
msgid "Base number for group id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:321
msgid "Where to start looking for a new free group id."
msgstr ""
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "Users RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "The branch where users are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "Groups RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "The branch where groups are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "ACL role RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "The branch where ACL roles are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Id allocation method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Method to allocate user/group ids"
msgstr ""
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Traditional"
msgstr ""
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Samba unix id pool"
msgstr ""
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Pool user id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Minimum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Pool user id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Maximum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Pool group id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Minimum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Pool group id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Maximum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:370
+#: plugins/config/class_configInLdap.inc:367
+msgid "Restrict role members"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:367
+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:373
msgid "Debugging"
msgstr "Sá»a lá»—i"
-#: plugins/config/class_configInLdap.inc:373
+#: plugins/config/class_configInLdap.inc:376
msgid "Display errors"
msgstr ""
-#: plugins/config/class_configInLdap.inc:374
+#: plugins/config/class_configInLdap.inc:377
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:378
+#: plugins/config/class_configInLdap.inc:381
msgid "Maximum LDAP query time"
msgstr "Thá»i gian truy vấn LDAP tối Ä‘a"
-#: plugins/config/class_configInLdap.inc:378
+#: plugins/config/class_configInLdap.inc:381
msgid ""
"Stop LDAP actions if there is no answer within the specified number of "
"seconds."
msgstr ""
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:386
msgid "Log LDAP statistics"
msgstr "Äăng nháºp thống kê LDAP"
-#: plugins/config/class_configInLdap.inc:384
+#: plugins/config/class_configInLdap.inc:387
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:389
+#: plugins/config/class_configInLdap.inc:392
msgid "Debug level"
msgstr "Cấp Ä‘á»™ sá»a lá»—i"
-#: plugins/config/class_configInLdap.inc:390
+#: plugins/config/class_configInLdap.inc:393
msgid "Display certain information on each page load."
msgstr ""
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:405
msgid "Miscellaneous"
msgstr ""
-#: plugins/config/class_configInLdap.inc:407
+#: plugins/config/class_configInLdap.inc:410
msgid "Hooks that are called when specific actions happens"
msgstr ""
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "tab"
msgstr ""
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "The tab that this hook concerns"
msgstr ""
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "mode"
msgstr ""
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "When to call this command"
msgstr ""
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "cmd"
msgstr ""
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "The command that will be called"
msgstr ""
-#: plugins/config/class_configInLdap.inc:429
+#: plugins/config/class_configInLdap.inc:432
msgid "Hooks"
msgstr ""
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:439
msgid "Display hook output"
msgstr ""
-#: plugins/config/class_configInLdap.inc:437
+#: plugins/config/class_configInLdap.inc:440
msgid ""
"When enabled successful hook execution output is displayed to the user using"
" a dialog."
msgstr ""
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available shells"
msgstr ""
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available POSIX shells for FD users."
msgstr ""
-#: plugins/config/class_configInLdap.inc:449
+#: plugins/config/class_configInLdap.inc:452
msgid "Show ACL tab on all objects"
msgstr ""
-#: plugins/config/class_configInLdap.inc:450
+#: plugins/config/class_configInLdap.inc:453
msgid ""
"For very specific ACL rights setting where you might need to give right on a"
" single object."
msgstr ""
-#: plugins/config/class_configInLdap.inc:464
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available department categories"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available categories in the departments dropdown"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:474
#: setup/class_setupStep_Language.inc:69
msgid "Automatic"
msgstr "Tá»± Ä‘á»™ng"
@@ -1911,80 +1956,80 @@ msgstr ""
msgid "Password recovery settings"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:44
+#: plugins/config/class_recoveryConfig.inc:45
msgid "Activate password recovery"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:45
+#: plugins/config/class_recoveryConfig.inc:46
msgid "Whether to activate or not password recovery feature"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:50
+#: plugins/config/class_recoveryConfig.inc:51
msgid "Sender email address"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:51
+#: plugins/config/class_recoveryConfig.inc:52
msgid "Email address from which mails will be sent"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:57
+#: plugins/config/class_recoveryConfig.inc:58
msgid "Link validity (minutes)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:58
+#: plugins/config/class_recoveryConfig.inc:59
msgid "Number of minutes before a recovery link expires"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:64
+#: plugins/config/class_recoveryConfig.inc:65
msgid "Salt for tokens"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:65
+#: plugins/config/class_recoveryConfig.inc:66
msgid ""
"Just a security measure, you can put anything in there, even random "
"characters"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:71
+#: plugins/config/class_recoveryConfig.inc:72
msgid "Allow the use of alternate addresses"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:72
+#: plugins/config/class_recoveryConfig.inc:73
msgid ""
"Users will also be able to enter one of theirs alternate addresses to "
"recover their password"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:79
+#: plugins/config/class_recoveryConfig.inc:80
msgid "First email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:82
-#: plugins/config/class_recoveryConfig.inc:101
+#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:102
msgid "Subject"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:84
msgid "Subject of the first email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:86
+#: plugins/config/class_recoveryConfig.inc:87
msgid "[FusionDirectory] Password recovery link"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:89
+#: plugins/config/class_recoveryConfig.inc:90
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:91
#, 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 ""
-#: plugins/config/class_recoveryConfig.inc:93
+#: plugins/config/class_recoveryConfig.inc:94
#, php-format
msgid ""
"Hello,\n"
@@ -1996,31 +2041,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:98
+#: plugins/config/class_recoveryConfig.inc:99
msgid "Second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:103
msgid "Subject of the second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:105
+#: plugins/config/class_recoveryConfig.inc:106
msgid "[FusionDirectory] Password recovery successful"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:108
+#: plugins/config/class_recoveryConfig.inc:109
#, php-format
msgid "Body (%s is login)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:110
#, php-format
msgid ""
"Body of the second email, sent to confirm the password has been changed. Use"
" %s for the user login."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:112
+#: plugins/config/class_recoveryConfig.inc:113
#, php-format
msgid ""
"Hello,\n"
@@ -2088,13 +2133,13 @@ msgstr "Lên"
msgid "Down"
msgstr "Xuống"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2633
-#: include/simpleplugin/class_attribute.inc:2634
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
+#: include/simpleplugin/class_attribute.inc:2648
msgid "Sort up"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2646
-#: include/simpleplugin/class_attribute.inc:2647
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
+#: include/simpleplugin/class_attribute.inc:2661
msgid "Sort down"
msgstr ""
@@ -2106,27 +2151,26 @@ msgstr "Chá»n tất"
#: include/class_config.inc:479 include/class_msgPool.inc:215
#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3106
-#: include/functions.inc:3127 include/functions.inc:3157
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197 include/functions.inc:3259
+#: include/class_msgPool.inc:740 include/functions.inc:3107
+#: include/functions.inc:3128 include/functions.inc:3158
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3260
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1663 include/class_CopyPasteHandler.inc:278
-#: include/simpleplugin/class_dialogAttributes.inc:733
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
-#: include/simpleplugin/class_attribute.inc:1774
-#: include/simpleplugin/class_attribute.inc:1877
-#: include/simpleplugin/class_attribute.inc:1879
+#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
+#: include/simpleplugin/class_attribute.inc:1784
+#: include/simpleplugin/class_attribute.inc:1887
+#: include/simpleplugin/class_attribute.inc:1889
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: 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:437
#: include/password-methods/class_password-methods.inc:447
-#: include/class_SnapshotHandler.inc:415 html/index.php:434 html/index.php:444
+#: include/class_SnapshotHandler.inc:415 html/index.php:473 html/index.php:483
#: setup/class_setupStep_Migrate.inc:935
#: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
msgid "Error"
@@ -2165,44 +2209,44 @@ msgstr "Danh sách reload"
msgid "Submit"
msgstr "Ná»™p"
-#: include/class_listing.inc:1586 include/class_listing.inc:1640
+#: include/class_listing.inc:1590 include/class_listing.inc:1644
msgid "Copy"
msgstr "Copy"
-#: include/class_listing.inc:1592 include/class_listing.inc:1628
+#: include/class_listing.inc:1596 include/class_listing.inc:1632
msgid "Cut"
msgstr "Cut"
-#: include/class_listing.inc:1600 include/class_listing.inc:1602
+#: include/class_listing.inc:1604 include/class_listing.inc:1606
#: include/class_CopyPasteHandler.inc:370
msgid "Paste"
msgstr "Paste"
-#: include/class_listing.inc:1628
+#: include/class_listing.inc:1632
msgid "Cut this entry"
msgstr "Cắt entry nà y"
-#: include/class_listing.inc:1640
+#: include/class_listing.inc:1644
msgid "Copy this entry"
msgstr "Copy entry nà y"
-#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_listing.inc:1677 include/class_listing.inc:1679
msgid "Restore snapshots"
msgstr ""
-#: include/class_listing.inc:1689
+#: include/class_listing.inc:1693
msgid "Export list"
msgstr ""
-#: include/class_listing.inc:1724 include/class_listing.inc:1725
+#: include/class_listing.inc:1728 include/class_listing.inc:1729
msgid "Restore snapshot"
msgstr "Phục hồi lại snapshot"
-#: include/class_listing.inc:1734
+#: include/class_listing.inc:1738
msgid "Create snapshot"
msgstr "Tạo ra snapshot"
-#: include/class_listing.inc:1735
+#: include/class_listing.inc:1739
msgid "Create a new snapshot from this object"
msgstr "Tạo ra một snapshot mới từ đối tượng nà y"
@@ -2245,7 +2289,7 @@ 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:162 include/class_config.inc:300
-#: include/class_config.inc:985 include/class_config.inc:998
+#: include/class_config.inc:915 include/class_config.inc:928
#: include/functions.inc:663 include/class_timezone.inc:51
#: include/password-methods/class_password-methods-sha.inc:71
#: include/password-methods/class_password-methods-ssha.inc:75
@@ -2262,17 +2306,17 @@ msgid ""
"while your passwords are not encrypted."
msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:917
-#: include/class_ldap.inc:1371 include/functions.inc:526
+#: include/class_config.inc:337 include/class_ldap.inc:918
+#: include/class_ldap.inc:1372 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2985 include/simpleplugin/class_simplePlugin.inc:545
-#: include/simpleplugin/class_attribute.inc:2895
+#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2909
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
#: include/class_SnapshotHandler.inc:422 include/class_SnapshotHandler.inc:425
-#: html/index.php:360 html/class_passwordRecovery.inc:497
+#: html/index.php:369 html/class_passwordRecovery.inc:497
#: setup/class_setupStep_Migrate.inc:451
#: setup/class_setupStep_Migrate.inc:1130
msgid "LDAP error"
@@ -2287,38 +2331,38 @@ msgstr "Không thể nối kết với LDAP. Xin hãy liên lạc với với ad
msgid "The selected mail method (class %s) is not available"
msgstr ""
-#: include/class_config.inc:986
+#: include/class_config.inc:916
#, 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."
-#: include/class_config.inc:999
+#: include/class_config.inc:929
#, php-format
msgid ""
"The snapshot functionality is enabled, but the required compression module "
"is missing. Please install '%s'."
msgstr ""
-#: include/class_config.inc:1104
+#: include/class_config.inc:1034
msgid "All categories"
msgstr "Tất cả các mục"
-#: include/class_config.inc:1231
+#: include/class_config.inc:1161
msgid "My account"
msgstr "Tà i khoản của tôi"
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
msgid "Performance warning"
msgstr "Cảnh báo khả năng hoạt động"
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
#, php-format
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr "Khả năng hoạt động của LDAP rất thấp: truy vấn lần cuối mất khoảng %.2fs!"
-#: include/class_ldap.inc:868 include/class_ldap.inc:904
+#: include/class_ldap.inc:869 include/class_ldap.inc:905
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
@@ -2328,39 +2372,39 @@ msgstr "Khả năng hoạt động của LDAP rất thấp: truy vấn lần cu
msgid "Internal error"
msgstr "Lá»—i ná»™i bá»™"
-#: include/class_ldap.inc:868
+#: include/class_ldap.inc:869
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:904
+#: include/class_ldap.inc:905
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1016
+#: include/class_ldap.inc:1017
#, 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:1018
+#: include/class_ldap.inc:1019
#, php-format
msgid "while operating on LDAP server %s"
msgstr "Trong khi chạy trên LDAP server %s"
-#: include/class_ldap.inc:1108
+#: include/class_ldap.inc:1109
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1220
+#: include/class_ldap.inc:1221
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr "Äây không phải là má»™t DN hợp lệ: '%s'. Khóa để chặn việc nạp thêm phải được bắt đầu vá»›i 'dn:...' trong dòng %s "
-#: include/class_ldap.inc:1231
+#: include/class_ldap.inc:1232
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2948,10 +2992,10 @@ 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"
-#: include/functions.inc:496 include/functions.inc:3294
-#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:263
-#: include/simpleplugin/class_simplePlugin.inc:268
-#: include/simpleplugin/class_simplePlugin.inc:280
+#: include/functions.inc:496 include/functions.inc:3295
+#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
+#: include/simpleplugin/class_simplePlugin.inc:269
+#: include/simpleplugin/class_simplePlugin.inc:281
#: html/class_passwordRecovery.inc:216
msgid "Fatal error"
msgstr "Lỗi nặng"
@@ -3104,98 +3148,98 @@ msgstr "Không thể viết lên revision file!"
msgid "Cannot read to revision file!"
msgstr ""
-#: include/functions.inc:2548
+#: include/functions.inc:2549
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "LDAP warning"
msgstr "Cảnh báo LDAP"
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "Cannot get schema information from server. No schema check possible!"
msgstr "Không thể dùng thông tin lược đồ từ server. Không thể kiểm tra giản đồ!"
-#: include/functions.inc:2584
+#: include/functions.inc:2585
msgid ""
"Used to lock currently edited entries to avoid multiple changes at the same "
"time."
msgstr "Äã từng khóa các entry hiện Ä‘ang được hiệu chỉnh nhằm tránh các thay đổi khác nhau tại cùng má»™t thá»i Ä‘iểm."
-#: include/functions.inc:2596
+#: include/functions.inc:2597
#, php-format
msgid "Missing required object class '%s'!"
msgstr "Lá»›p đối tượng '%s' được yêu cầu mất tÃch!"
-#: include/functions.inc:2599
+#: include/functions.inc:2600
#, php-format
msgid "Missing optional object class '%s'!"
msgstr "Lá»›p đối tượng lá»±a chá»n '%s' mất tÃch!"
-#: include/functions.inc:2603
+#: include/functions.inc:2604
#, php-format
msgid "Class(es) available"
msgstr "Äã có lá»›p"
-#: include/functions.inc:2623
+#: include/functions.inc:2624
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2625
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2628
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2629
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3106 include/functions.inc:3127
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3106
+#: include/functions.inc:3107
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3127
+#: include/functions.inc:3128
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3157
+#: include/functions.inc:3158
msgid "Cannot create sambaUnixIdPool entry!"
msgstr ""
-#: include/functions.inc:3165
+#: include/functions.inc:3166
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3177 include/functions.inc:3181
+#: include/functions.inc:3178 include/functions.inc:3182
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3197
+#: include/functions.inc:3198
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3259
+#: include/functions.inc:3260
msgid "Cannot allocate a free ID!"
msgstr "Không thể phân phối má»™t ID miá»…n phÃ!"
-#: include/functions.inc:3295
+#: include/functions.inc:3296
#, 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!"
@@ -3351,13 +3395,13 @@ msgstr ""
msgid "XML error"
msgstr ""
-#: include/class_plugin.inc:554
+#: include/class_plugin.inc:553
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/class_plugin.inc:1466
+#: include/class_plugin.inc:1467
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -3383,32 +3427,32 @@ msgstr "Tên Mẫu"
msgid "This is the name of the template"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:263
+#: include/simpleplugin/class_simplePlugin.inc:264
msgid "Only main tab can compute dn"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:270
+#: include/simpleplugin/class_simplePlugin.inc:271
#, php-format
msgid "Could not compute dn: no parent tab class for \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:282
+#: include/simpleplugin/class_simplePlugin.inc:283
#, php-format
msgid ""
"Could not compute dn: could not find objectType infos from tab class \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:638
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:644
+#: include/simpleplugin/class_simplePlugin.inc:652
msgid "Error when saving"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:638
+#: include/simpleplugin/class_simplePlugin.inc:644
#, php-format
msgid "There is already an entry with the same dn : %s"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:652
#, php-format
msgid "The entry %s is not existing"
msgstr ""
@@ -3428,27 +3472,27 @@ msgstr ""
msgid "Show %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:409
+#: include/simpleplugin/class_dialogAttributes.inc:415
#, php-format
msgid "Group %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:411
+#: include/simpleplugin/class_dialogAttributes.inc:417
#, php-format
msgid "Role %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:446
+#: include/simpleplugin/class_dialogAttributes.inc:452
msgid "Group of user"
msgstr "Nhóm ngÆ°á»i dùng"
-#: include/simpleplugin/class_dialogAttributes.inc:615
+#: include/simpleplugin/class_dialogAttributes.inc:621
#: include/simpleplugin/class_attribute.inc:1090
#: include/simpleplugin/class_attribute.inc:1124
msgid "None"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:617
+#: include/simpleplugin/class_dialogAttributes.inc:623
msgid "Unknown"
msgstr "Không rõ"
@@ -3489,11 +3533,16 @@ msgid "days"
msgstr ""
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2161
+#: include/simpleplugin/class_attribute.inc:2171
#, php-format
msgid "%s (required)"
msgstr ""
+#: include/simpleplugin/class_attribute.inc:1150
+#, php-format
+msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
+msgstr ""
+
#: include/simpleplugin/class_attribute.inc:1277
#, php-format
msgid "An integer between %d and %d"
@@ -3509,75 +3558,75 @@ msgstr ""
msgid "An integer smaller than %d"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1379
+#: include/simpleplugin/class_attribute.inc:1383
#, php-format
msgid "A float between %f and %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1381
+#: include/simpleplugin/class_attribute.inc:1385
#, php-format
msgid "A float larger than %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1383
+#: include/simpleplugin/class_attribute.inc:1387
#, php-format
msgid "A float smaller than %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1490
+#: include/simpleplugin/class_attribute.inc:1500
msgid "Error, incorrect date: "
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
#, php-format
msgid "Cannot read uploaded file: %s"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1530
+#: include/simpleplugin/class_attribute.inc:1540
msgid "file is empty"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1533
+#: include/simpleplugin/class_attribute.inc:1543
msgid "file not found"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1546
msgid "file not readable"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1569
+#: include/simpleplugin/class_attribute.inc:1579
#, php-format
msgid "%s (%d bytes)"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1616
-#: include/simpleplugin/class_attribute.inc:1793
+#: include/simpleplugin/class_attribute.inc:1626
+#: include/simpleplugin/class_attribute.inc:1803
msgid "Upload"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1621
-#: include/simpleplugin/class_attribute.inc:1622
+#: include/simpleplugin/class_attribute.inc:1631
+#: include/simpleplugin/class_attribute.inc:1632
msgid "Download"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1775
+#: include/simpleplugin/class_attribute.inc:1785
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1826
+#: include/simpleplugin/class_attribute.inc:1836
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr "Cơ sở"
-#: include/simpleplugin/class_attribute.inc:1829
+#: include/simpleplugin/class_attribute.inc:1839
msgid "Object base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:2755
+#: include/simpleplugin/class_attribute.inc:2769
#, php-format
msgid "Invalid value for %s"
msgstr ""
@@ -3711,17 +3760,17 @@ msgstr "Xin hãy kiểm tra kết hợp tên ngÆ°á»i dùng/máºt khẩu."
msgid "Account locked. Please contact your system administrator!"
msgstr "Tà i khoản bị khóa. Xin hãy liên lạc với admin quản trị hệ thống của bạn!"
-#: html/index.php:436
+#: html/index.php:475
#, php-format
msgid "CAS user \"%s\" could not be found in the LDAP"
msgstr ""
-#: html/index.php:446
+#: html/index.php:485
#, php-format
msgid "CAS user \"%s\" match several users in the LDAP"
msgstr ""
-#: html/index.php:481
+#: html/index.php:522
msgid ""
"Your browser has cookies disabled. Please enable cookies and reload this "
"page before logging in!"
@@ -4044,8 +4093,8 @@ 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
-msgid "Checking for duplicate GID numbers"
-msgstr "Kiểm tra các số ID của nhóm (GID) được nhân bản"
+msgid "Checking for duplicated GID numbers"
+msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:487
#: setup/class_setupStep_Migrate.inc:564 setup/class_setupStep_Migrate.inc:702
@@ -4054,7 +4103,7 @@ msgstr "Kiểm tra các số ID của nhóm (GID) được nhân bản"
#: setup/class_setupStep_Migrate.inc:1179
#: setup/class_setupStep_Migrate.inc:1272
#: setup/class_setupStep_Migrate.inc:1351
-#: setup/class_setupStep_Migrate.inc:1390
+#: setup/class_setupStep_Migrate.inc:1395
msgid "LDAP query failed"
msgstr "Yêu cầu LDAP thất bại"
@@ -4065,7 +4114,7 @@ msgstr "Yêu cầu LDAP thất bại"
#: setup/class_setupStep_Migrate.inc:1180
#: setup/class_setupStep_Migrate.inc:1273
#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1391
+#: setup/class_setupStep_Migrate.inc:1396
msgid "Possibly the \"root object\" is missing."
msgstr ""
@@ -4220,14 +4269,14 @@ msgstr ""
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1373
+#: setup/class_setupStep_Migrate.inc:1378
#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\"."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1412
+#: setup/class_setupStep_Migrate.inc:1422
#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\"."
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
diff --git a/locale/zh/fusiondirectory.po b/locale/zh/fusiondirectory.po
index a4cb6e69e1eaadd4ef5e42c849af73995bd3ddec..a968e78bea4d5b5f78fa299e149acd0b52cbeba7 100644
--- a/locale/zh/fusiondirectory.po
+++ b/locale/zh/fusiondirectory.po
@@ -5,12 +5,12 @@
# Translators:
msgid ""
msgstr ""
-"Project-Id-Version: FusionDirectory-109\n"
+"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-01-22 11:26+0100\n"
-"PO-Revision-Date: 2016-01-22 10:24+0000\n"
+"POT-Creation-Date: 2016-03-14 12:07+0100\n"
+"PO-Revision-Date: 2016-03-07 12:09+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-109/language/zh/)\n"
+"Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -28,31 +28,31 @@ msgstr "欢迎 %s!"
msgid "References"
msgstr "å‚考"
-#: plugins/admin/groups/class_roleGeneric.inc:30
-#: plugins/admin/groups/class_roleGeneric.inc:34
+#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:61
#: plugins/admin/groups/class_groupManagement.inc:71
#: plugins/admin/aclrole/class_aclRole.inc:78
#: plugins/admin/acl/class_aclAssignment.inc:49
msgid "Role"
msgstr "角色"
-#: plugins/admin/groups/class_roleGeneric.inc:31
+#: plugins/admin/groups/class_roleGeneric.inc:58
msgid "Role information"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:35
+#: plugins/admin/groups/class_roleGeneric.inc:62
msgid "Organizational role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:84
msgid "Informations"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:158
+#: plugins/admin/departments/class_department.inc:174
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -62,13 +62,13 @@ msgstr ""
msgid "Name"
msgstr "å称"
-#: plugins/admin/groups/class_roleGeneric.inc:61
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
msgid "Name of this group"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
#: plugins/admin/groups/class_group.inc:66
#: plugins/admin/groups/class_ogroup.inc:192
#: plugins/admin/groups/group-list.xml:41
@@ -81,26 +81,26 @@ msgstr ""
msgid "Description"
msgstr "æè¿°"
-#: plugins/admin/groups/class_roleGeneric.inc:66
+#: plugins/admin/groups/class_roleGeneric.inc:93
msgid "Description of the role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:70
+#: plugins/admin/groups/class_roleGeneric.inc:97
msgid "Phone number"
msgstr "电è¯å·ç "
-#: plugins/admin/groups/class_roleGeneric.inc:74
+#: plugins/admin/groups/class_roleGeneric.inc:101
msgid "Fax number"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
#: plugins/admin/users/class_userManagement.inc:42
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: setup/class_setupStep_Migrate.inc:871
msgid "Users"
msgstr "用户"
-#: plugins/admin/groups/class_roleGeneric.inc:78
+#: plugins/admin/groups/class_roleGeneric.inc:105
msgid "Add users for the role"
msgstr ""
@@ -147,7 +147,7 @@ msgstr ""
#: plugins/admin/groups/class_group.inc:74
#: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:403
+#: plugins/personal/posix/class_posixAccount.inc:410
msgid "GID"
msgstr "GID"
@@ -204,23 +204,23 @@ msgid "Only allow this group to connect to this list of hosts"
msgstr ""
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458 include/functions.inc:794
-#: include/functions.inc:2548 include/class_xml.inc:55
+#: plugins/personal/posix/class_posixAccount.inc:465 include/functions.inc:794
+#: include/functions.inc:2549 include/class_xml.inc:55
#: include/simpleplugin/class_simpleTabs.inc:325 html/index.php:56
-#: html/index.php:62 html/index.php:481 html/class_passwordRecovery.inc:378
+#: html/index.php:62 html/index.php:522 html/class_passwordRecovery.inc:378
#: setup/class_setupStep_Migrate.inc:572
#: setup/class_setupStep_Migrate.inc:1083
#: setup/class_setupStep_Migrate.inc:1202
#: setup/class_setupStep_Migrate.inc:1313
-#: setup/class_setupStep_Migrate.inc:1372
-#: setup/class_setupStep_Migrate.inc:1411 plugins/admin/acl/remove.tpl.c:2
+#: setup/class_setupStep_Migrate.inc:1377
+#: setup/class_setupStep_Migrate.inc:1421 plugins/admin/acl/remove.tpl.c:2
#: ihtml/themes/default/islocked.tpl.c:5 ihtml/themes/default/remove.tpl.c:2
#: ihtml/themes/default/msg_dialog.tpl.c:5 setup/setup_checks.tpl.c:8
msgid "Warning"
msgstr "è¦å‘Š"
#: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:458
+#: plugins/personal/posix/class_posixAccount.inc:465
msgid "Timeout while waiting for lock. Ignoring lock!"
msgstr ""
@@ -250,7 +250,7 @@ msgstr "æˆå‘˜å¯¹è±¡"
msgid "Objects member of this group"
msgstr ""
-#: plugins/admin/groups/class_ogroup.inc:318
+#: plugins/admin/groups/class_ogroup.inc:313
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
@@ -279,10 +279,10 @@ msgstr "创建"
#: plugins/admin/departments/dep-list.xml:79
#: plugins/admin/users/user-list.xml:105
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
-#: include/simpleplugin/class_dialogAttributes.inc:626
-#: include/simpleplugin/class_dialogAttributes.inc:627
-#: include/simpleplugin/class_attribute.inc:2661
-#: include/simpleplugin/class_attribute.inc:2662
+#: include/simpleplugin/class_dialogAttributes.inc:632
+#: include/simpleplugin/class_dialogAttributes.inc:633
+#: include/simpleplugin/class_attribute.inc:2675
+#: include/simpleplugin/class_attribute.inc:2676
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -293,8 +293,8 @@ msgstr "编辑"
#: plugins/admin/departments/dep-list.xml:67
#: plugins/admin/departments/dep-list.xml:88
#: plugins/admin/users/user-list.xml:112
-#: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_dialogAttributes.inc:637
+#: include/simpleplugin/class_dialogAttributes.inc:642
+#: include/simpleplugin/class_dialogAttributes.inc:643
#: include/simpleplugin/simple-list.xml:75
#: include/simpleplugin/simple-list.xml:125
msgid "Remove"
@@ -343,7 +343,7 @@ msgid "Show application groups"
msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Show department groups"
+msgid "Show unidentified groups"
msgstr ""
#: plugins/admin/groups/class_groupManagement.inc:137
@@ -432,51 +432,67 @@ msgid "Category of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:81
+msgid "Website"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:81
+#, php-format
+msgid "Website of this %s"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:85
#: plugins/personal/generic/class_user.inc:410
msgid "Manager"
msgstr ""
-#: plugins/admin/departments/class_department.inc:81
+#: plugins/admin/departments/class_department.inc:85
#, php-format
msgid "Manager of this %s"
msgstr ""
-#: plugins/admin/departments/class_department.inc:87
-#: plugins/admin/departments/class_department.inc:93
+#: plugins/admin/departments/class_department.inc:91
+#: plugins/admin/departments/class_department.inc:97
#: plugins/personal/generic/class_user.inc:304
msgid "Location"
msgstr "ä½ç½®"
-#: plugins/admin/departments/class_department.inc:90
+#: plugins/admin/departments/class_department.inc:94
#: plugins/personal/generic/class_user.inc:308
msgid "State"
msgstr "å·ž/çœ"
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_country.inc:29
+#: plugins/admin/departments/class_country.inc:30
+#: plugins/admin/departments/class_country.inc:33
+msgid "Country"
+msgstr "国家"
+
+#: plugins/admin/departments/class_department.inc:103
#: plugins/personal/generic/class_user.inc:312
msgid "Address"
msgstr "ä½å€"
-#: plugins/admin/departments/class_department.inc:96
+#: plugins/admin/departments/class_department.inc:103
#, php-format
msgid "A postal address for this %s"
msgstr ""
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
#: plugins/personal/generic/class_user.inc:320
msgid "Phone"
msgstr "电è¯"
-#: plugins/admin/departments/class_department.inc:100
+#: plugins/admin/departments/class_department.inc:107
msgid "Telephone number"
msgstr ""
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
#: plugins/personal/generic/class_user.inc:332
msgid "Fax"
msgstr "ä¼ çœŸ"
-#: plugins/admin/departments/class_department.inc:104
+#: plugins/admin/departments/class_department.inc:111
msgid "Facsimile telephone number"
msgstr ""
@@ -504,12 +520,6 @@ msgstr ""
msgid "locality"
msgstr ""
-#: plugins/admin/departments/class_country.inc:29
-#: plugins/admin/departments/class_country.inc:30
-#: plugins/admin/departments/class_country.inc:33
-msgid "Country"
-msgstr "国家"
-
#: plugins/admin/departments/class_country.inc:50
msgid "country"
msgstr ""
@@ -552,7 +562,8 @@ msgid "Given name"
msgstr "å"
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
+#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
msgid "Login"
@@ -665,8 +676,8 @@ msgid "Edit category ACL"
msgstr ""
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2671
-#: include/simpleplugin/class_attribute.inc:2672
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
+#: include/simpleplugin/class_attribute.inc:2686
#, php-format
msgid "Delete"
msgstr "åˆ é™¤"
@@ -771,19 +782,37 @@ msgstr ""
msgid "ACLs which are part of this group"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:38
+#: plugins/admin/acl/class_aclManagement.inc:31
+#: plugins/admin/acl/class_aclManagement.inc:32
+#: plugins/admin/acl/class_aclManagement.inc:45
+msgid "ACL assignment creation"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:33
+msgid "Create an ACL assignment on an arbitrary dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "Dn"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:49
+msgid "DN you wish to add assignments for"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:135
msgid "ACL assignments"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:39
+#: plugins/admin/acl/class_aclManagement.inc:136
msgid "ACL assignments management"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:40
+#: plugins/admin/acl/class_aclManagement.inc:137
msgid "Manage ACL roles assignments to users"
msgstr ""
-#: plugins/admin/acl/class_aclManagement.inc:78
+#: plugins/admin/acl/class_aclManagement.inc:199
#: plugins/admin/acl/class_aclAssignment.inc:263
msgid "ACL Assignment"
msgstr ""
@@ -899,7 +928,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -994,57 +1023,57 @@ msgstr ""
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:336
+msgid "Homepage"
+msgstr "个人主页"
+
+#: plugins/personal/generic/class_user.inc:336
+msgid "Personal homepage"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:342
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:343
+#: plugins/personal/generic/class_user.inc:347
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:351
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr ""
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:362
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
msgid "Display name"
msgstr "显示å称"
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:366
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:370
msgid "Home postal address"
msgstr "ä½å®…地å€"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:374
msgid "Private phone"
msgstr "ç§äººç”µè¯"
-#: plugins/personal/generic/class_user.inc:370
-msgid "Home phone number"
-msgstr ""
-
#: plugins/personal/generic/class_user.inc:374
-msgid "Homepage"
-msgstr "个人主页"
-
-#: plugins/personal/generic/class_user.inc:374
-msgid "Personal homepage"
+msgid "Home phone number"
msgstr ""
#: plugins/personal/generic/class_user.inc:380
@@ -1279,33 +1308,33 @@ msgstr "未é…ç½®"
msgid "automatic"
msgstr "自动"
-#: plugins/personal/posix/class_posixAccount.inc:309
+#: plugins/personal/posix/class_posixAccount.inc:310
msgid "expired"
msgstr "过期"
-#: plugins/personal/posix/class_posixAccount.inc:311
+#: plugins/personal/posix/class_posixAccount.inc:312
msgid "grace time active"
msgstr "时间é™åˆ¶æ¿€æ´»"
-#: plugins/personal/posix/class_posixAccount.inc:314
-#: plugins/personal/posix/class_posixAccount.inc:316
-#: plugins/personal/posix/class_posixAccount.inc:318
+#: plugins/personal/posix/class_posixAccount.inc:315
+#: plugins/personal/posix/class_posixAccount.inc:317
+#: plugins/personal/posix/class_posixAccount.inc:319
msgid "active"
msgstr "活动"
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:315
msgid "password expired"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:316
+#: plugins/personal/posix/class_posixAccount.inc:317
msgid "password not changeable"
msgstr ""
-#: plugins/personal/posix/class_posixAccount.inc:400
+#: plugins/personal/posix/class_posixAccount.inc:407
msgid "UID"
msgstr "UID"
-#: plugins/personal/posix/class_posixAccount.inc:516
+#: plugins/personal/posix/class_posixAccount.inc:525
#, php-format
msgid "Group of user %s"
msgstr ""
@@ -1477,424 +1506,440 @@ msgid "Core settings"
msgstr ""
#: plugins/config/class_configInLdap.inc:161
-msgid "Enable primary group filter"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"It is time consuming to evaluate which groups are primary and which are not,"
-" so you may want to disable it if your group plugin is slow."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:167
msgid "Display summary in listings"
msgstr ""
-#: plugins/config/class_configInLdap.inc:168
+#: 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:173
+#: plugins/config/class_configInLdap.inc:167
msgid "Edit locking"
msgstr ""
-#: plugins/config/class_configInLdap.inc:174
+#: 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:179
+#: plugins/config/class_configInLdap.inc:173
msgid "Enable logging"
msgstr ""
-#: plugins/config/class_configInLdap.inc:180
+#: plugins/config/class_configInLdap.inc:174
msgid "Event logging on FusionDirectory side."
msgstr ""
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "LDAP size limit"
msgstr ""
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:179
msgid "Defines the number of entries to get from LDAP by default."
msgstr ""
-#: plugins/config/class_configInLdap.inc:192
+#: plugins/config/class_configInLdap.inc:186
msgid "Login and session"
msgstr ""
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:189
msgid "Login attribute"
msgstr ""
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:190
msgid "Which LDAP attribute should be used as the login name during login."
msgstr ""
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:196
msgid "Enforce encrypted connections"
msgstr ""
-#: plugins/config/class_configInLdap.inc:203
+#: plugins/config/class_configInLdap.inc:197
msgid ""
"Enables PHP security checks to force encrypted access (https) to the web "
"interface."
msgstr ""
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:201
msgid "Warn if session is not encrypted"
msgstr ""
-#: plugins/config/class_configInLdap.inc:208
+#: plugins/config/class_configInLdap.inc:202
msgid "will display a warning to the user when http is used instead of https."
msgstr ""
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Session lifetime"
msgstr ""
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:207
msgid "Defines when a session will expire in seconds."
msgstr ""
-#: plugins/config/class_configInLdap.inc:220
+#: plugins/config/class_configInLdap.inc:212
+msgid "HTTP authentication"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:212
+msgid "Use HTTP authentication protocol instead of the login form."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:219
#: include/class_SnapshotDialogs.inc:186
msgid "Snapshots"
msgstr ""
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid "Enable snapshots"
msgstr ""
-#: plugins/config/class_configInLdap.inc:223
+#: plugins/config/class_configInLdap.inc:222
msgid ""
"This enables you to save certain states of entries and restore them later "
"on."
msgstr ""
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
msgid "Snapshot base"
msgstr ""
-#: plugins/config/class_configInLdap.inc:228
+#: plugins/config/class_configInLdap.inc:227
msgid "The base where snapshots should be stored inside of the LDAP."
msgstr ""
-#: plugins/config/class_configInLdap.inc:235
+#: plugins/config/class_configInLdap.inc:234
msgid "SSL"
msgstr ""
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Key path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:238
+#: plugins/config/class_configInLdap.inc:237
msgid "Path to FusionDirectory private key. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Certificate path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:242
msgid "Path to FusionDirectory certificate. Unused for now."
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:262
msgid "CA certificate path"
msgstr ""
-#: plugins/config/class_configInLdap.inc:248
+#: plugins/config/class_configInLdap.inc:247
msgid "Path to the CA certificate. Used for validating Argonaut Server host."
msgstr ""
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:254
msgid "CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "Enable CAS"
msgstr ""
-#: plugins/config/class_configInLdap.inc:258
+#: plugins/config/class_configInLdap.inc:257
msgid "CAS login will be used instead of LDAP bind"
msgstr ""
-#: plugins/config/class_configInLdap.inc:263
+#: plugins/config/class_configInLdap.inc:262
msgid "Path to the CA certificate of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host"
msgstr ""
-#: plugins/config/class_configInLdap.inc:268
+#: plugins/config/class_configInLdap.inc:267
msgid "Host of the CAS server"
msgstr ""
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port"
msgstr "端å£"
-#: plugins/config/class_configInLdap.inc:273
+#: plugins/config/class_configInLdap.inc:272
msgid "Port the CAS server is listening on"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context"
msgstr ""
-#: plugins/config/class_configInLdap.inc:278
+#: plugins/config/class_configInLdap.inc:277
msgid "CAS context to be used"
msgstr ""
-#: plugins/config/class_configInLdap.inc:285
+#: plugins/config/class_configInLdap.inc:284
msgid "People and group storage"
msgstr ""
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "People DN attribute"
msgstr ""
-#: plugins/config/class_configInLdap.inc:289
+#: plugins/config/class_configInLdap.inc:288
msgid "Attribute to use at the beginning of users dn"
msgstr ""
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "CN pattern"
msgstr ""
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:293
msgid "The pattern to use to build the common name field"
msgstr ""
-#: plugins/config/class_configInLdap.inc:299
+#: plugins/config/class_configInLdap.inc:298
msgid "Strict naming policy"
msgstr ""
-#: plugins/config/class_configInLdap.inc:300
+#: plugins/config/class_configInLdap.inc:299
msgid "Enables strict checking of user and group names"
msgstr ""
-#: plugins/config/class_configInLdap.inc:305
+#: plugins/config/class_configInLdap.inc:304
msgid "Group/user min id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:306
+#: plugins/config/class_configInLdap.inc:305
msgid ""
"The minimum assignable user or group id to avoid security leaks with id 0 "
"accounts."
msgstr ""
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid "Next id hook"
msgstr ""
-#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:310
msgid ""
"A script to be called for finding the next free id number for users or "
"groups."
msgstr ""
-#: plugins/config/class_configInLdap.inc:315
+#: plugins/config/class_configInLdap.inc:314
msgid "Base number for user id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:316
+#: plugins/config/class_configInLdap.inc:315
msgid "Where to start looking for a new free user id."
msgstr ""
-#: plugins/config/class_configInLdap.inc:321
+#: plugins/config/class_configInLdap.inc:320
msgid "Base number for group id"
msgstr ""
-#: plugins/config/class_configInLdap.inc:322
+#: plugins/config/class_configInLdap.inc:321
msgid "Where to start looking for a new free group id."
msgstr ""
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "Users RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:327
+#: plugins/config/class_configInLdap.inc:326
msgid "The branch where users are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "Groups RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:331
msgid "The branch where groups are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "ACL role RDN"
msgstr ""
-#: plugins/config/class_configInLdap.inc:337
+#: plugins/config/class_configInLdap.inc:336
msgid "The branch where ACL roles are stored."
msgstr ""
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Id allocation method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:342
+#: plugins/config/class_configInLdap.inc:341
msgid "Method to allocate user/group ids"
msgstr ""
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Traditional"
msgstr ""
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:344
msgid "Samba unix id pool"
msgstr ""
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Pool user id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:348
+#: plugins/config/class_configInLdap.inc:347
msgid "Minimum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Pool user id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:353
+#: plugins/config/class_configInLdap.inc:352
msgid "Maximum value for user id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Pool group id min"
msgstr ""
-#: plugins/config/class_configInLdap.inc:358
+#: plugins/config/class_configInLdap.inc:357
msgid "Minimum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Pool group id max"
msgstr ""
-#: plugins/config/class_configInLdap.inc:363
+#: plugins/config/class_configInLdap.inc:362
msgid "Maximum value for group id when using pool method"
msgstr ""
-#: plugins/config/class_configInLdap.inc:370
-msgid "Debugging"
+#: plugins/config/class_configInLdap.inc:367
+msgid "Restrict role members"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:367
+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:373
+msgid "Debugging"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:376
msgid "Display errors"
msgstr ""
-#: plugins/config/class_configInLdap.inc:374
+#: plugins/config/class_configInLdap.inc:377
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:378
+#: plugins/config/class_configInLdap.inc:381
msgid "Maximum LDAP query time"
msgstr ""
-#: plugins/config/class_configInLdap.inc:378
+#: plugins/config/class_configInLdap.inc:381
msgid ""
"Stop LDAP actions if there is no answer within the specified number of "
"seconds."
msgstr ""
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:386
msgid "Log LDAP statistics"
msgstr ""
-#: plugins/config/class_configInLdap.inc:384
+#: plugins/config/class_configInLdap.inc:387
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:389
+#: plugins/config/class_configInLdap.inc:392
msgid "Debug level"
msgstr ""
-#: plugins/config/class_configInLdap.inc:390
+#: plugins/config/class_configInLdap.inc:393
msgid "Display certain information on each page load."
msgstr ""
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:405
msgid "Miscellaneous"
msgstr "æ‚项"
-#: plugins/config/class_configInLdap.inc:407
+#: plugins/config/class_configInLdap.inc:410
msgid "Hooks that are called when specific actions happens"
msgstr ""
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "tab"
msgstr ""
-#: plugins/config/class_configInLdap.inc:411
+#: plugins/config/class_configInLdap.inc:414
msgid "The tab that this hook concerns"
msgstr ""
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "mode"
msgstr "模å¼"
-#: plugins/config/class_configInLdap.inc:416
+#: plugins/config/class_configInLdap.inc:419
msgid "When to call this command"
msgstr ""
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "cmd"
msgstr ""
-#: plugins/config/class_configInLdap.inc:422
+#: plugins/config/class_configInLdap.inc:425
msgid "The command that will be called"
msgstr ""
-#: plugins/config/class_configInLdap.inc:429
+#: plugins/config/class_configInLdap.inc:432
msgid "Hooks"
msgstr "é’©å"
-#: plugins/config/class_configInLdap.inc:436
+#: plugins/config/class_configInLdap.inc:439
msgid "Display hook output"
msgstr ""
-#: plugins/config/class_configInLdap.inc:437
+#: plugins/config/class_configInLdap.inc:440
msgid ""
"When enabled successful hook execution output is displayed to the user using"
" a dialog."
msgstr ""
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available shells"
msgstr ""
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:445
msgid "Available POSIX shells for FD users."
msgstr ""
-#: plugins/config/class_configInLdap.inc:449
+#: plugins/config/class_configInLdap.inc:452
msgid "Show ACL tab on all objects"
msgstr ""
-#: plugins/config/class_configInLdap.inc:450
+#: plugins/config/class_configInLdap.inc:453
msgid ""
"For very specific ACL rights setting where you might need to give right on a"
" single object."
msgstr ""
-#: plugins/config/class_configInLdap.inc:464
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available department categories"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:458
+msgid "Available categories in the departments dropdown"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:474
#: setup/class_setupStep_Language.inc:69
msgid "Automatic"
msgstr ""
@@ -1911,80 +1956,80 @@ msgstr ""
msgid "Password recovery settings"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:44
+#: plugins/config/class_recoveryConfig.inc:45
msgid "Activate password recovery"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:45
+#: plugins/config/class_recoveryConfig.inc:46
msgid "Whether to activate or not password recovery feature"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:50
+#: plugins/config/class_recoveryConfig.inc:51
msgid "Sender email address"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:51
+#: plugins/config/class_recoveryConfig.inc:52
msgid "Email address from which mails will be sent"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:57
+#: plugins/config/class_recoveryConfig.inc:58
msgid "Link validity (minutes)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:58
+#: plugins/config/class_recoveryConfig.inc:59
msgid "Number of minutes before a recovery link expires"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:64
+#: plugins/config/class_recoveryConfig.inc:65
msgid "Salt for tokens"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:65
+#: plugins/config/class_recoveryConfig.inc:66
msgid ""
"Just a security measure, you can put anything in there, even random "
"characters"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:71
+#: plugins/config/class_recoveryConfig.inc:72
msgid "Allow the use of alternate addresses"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:72
+#: plugins/config/class_recoveryConfig.inc:73
msgid ""
"Users will also be able to enter one of theirs alternate addresses to "
"recover their password"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:79
+#: plugins/config/class_recoveryConfig.inc:80
msgid "First email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:82
-#: plugins/config/class_recoveryConfig.inc:101
+#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:102
msgid "Subject"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:83
+#: plugins/config/class_recoveryConfig.inc:84
msgid "Subject of the first email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:86
+#: plugins/config/class_recoveryConfig.inc:87
msgid "[FusionDirectory] Password recovery link"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:89
+#: plugins/config/class_recoveryConfig.inc:90
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:91
#, 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 ""
-#: plugins/config/class_recoveryConfig.inc:93
+#: plugins/config/class_recoveryConfig.inc:94
#, php-format
msgid ""
"Hello,\n"
@@ -1996,31 +2041,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:98
+#: plugins/config/class_recoveryConfig.inc:99
msgid "Second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:103
msgid "Subject of the second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:105
+#: plugins/config/class_recoveryConfig.inc:106
msgid "[FusionDirectory] Password recovery successful"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:108
+#: plugins/config/class_recoveryConfig.inc:109
#, php-format
msgid "Body (%s is login)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:110
#, php-format
msgid ""
"Body of the second email, sent to confirm the password has been changed. Use"
" %s for the user login."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:112
+#: plugins/config/class_recoveryConfig.inc:113
#, php-format
msgid ""
"Hello,\n"
@@ -2088,13 +2133,13 @@ msgstr "上"
msgid "Down"
msgstr "å…³é—"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2633
-#: include/simpleplugin/class_attribute.inc:2634
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
+#: include/simpleplugin/class_attribute.inc:2648
msgid "Sort up"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2646
-#: include/simpleplugin/class_attribute.inc:2647
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
+#: include/simpleplugin/class_attribute.inc:2661
msgid "Sort down"
msgstr ""
@@ -2106,27 +2151,26 @@ msgstr ""
#: include/class_config.inc:479 include/class_msgPool.inc:215
#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3106
-#: include/functions.inc:3127 include/functions.inc:3157
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197 include/functions.inc:3259
+#: include/class_msgPool.inc:740 include/functions.inc:3107
+#: include/functions.inc:3128 include/functions.inc:3158
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3260
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1663 include/class_CopyPasteHandler.inc:278
-#: include/simpleplugin/class_dialogAttributes.inc:733
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
-#: include/simpleplugin/class_attribute.inc:1774
-#: include/simpleplugin/class_attribute.inc:1877
-#: include/simpleplugin/class_attribute.inc:1879
+#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
+#: include/simpleplugin/class_attribute.inc:1784
+#: include/simpleplugin/class_attribute.inc:1887
+#: include/simpleplugin/class_attribute.inc:1889
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: 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:437
#: include/password-methods/class_password-methods.inc:447
-#: include/class_SnapshotHandler.inc:415 html/index.php:434 html/index.php:444
+#: include/class_SnapshotHandler.inc:415 html/index.php:473 html/index.php:483
#: setup/class_setupStep_Migrate.inc:935
#: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
msgid "Error"
@@ -2165,44 +2209,44 @@ msgstr "é‡æ–°åŠ 载列表"
msgid "Submit"
msgstr "æ交"
-#: include/class_listing.inc:1586 include/class_listing.inc:1640
+#: include/class_listing.inc:1590 include/class_listing.inc:1644
msgid "Copy"
msgstr ""
-#: include/class_listing.inc:1592 include/class_listing.inc:1628
+#: include/class_listing.inc:1596 include/class_listing.inc:1632
msgid "Cut"
msgstr ""
-#: include/class_listing.inc:1600 include/class_listing.inc:1602
+#: include/class_listing.inc:1604 include/class_listing.inc:1606
#: include/class_CopyPasteHandler.inc:370
msgid "Paste"
msgstr "粘贴"
-#: include/class_listing.inc:1628
+#: include/class_listing.inc:1632
msgid "Cut this entry"
msgstr "剪切æ¡ç›®"
-#: include/class_listing.inc:1640
+#: include/class_listing.inc:1644
msgid "Copy this entry"
msgstr "æ‹·è´æ¡ç›®"
-#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_listing.inc:1677 include/class_listing.inc:1679
msgid "Restore snapshots"
msgstr ""
-#: include/class_listing.inc:1689
+#: include/class_listing.inc:1693
msgid "Export list"
msgstr ""
-#: include/class_listing.inc:1724 include/class_listing.inc:1725
+#: include/class_listing.inc:1728 include/class_listing.inc:1729
msgid "Restore snapshot"
msgstr ""
-#: include/class_listing.inc:1734
+#: include/class_listing.inc:1738
msgid "Create snapshot"
msgstr ""
-#: include/class_listing.inc:1735
+#: include/class_listing.inc:1739
msgid "Create a new snapshot from this object"
msgstr ""
@@ -2245,7 +2289,7 @@ msgid "XML error in fusiondirectory.conf: %s at line %d"
msgstr "XML 出错于 fusiondirectory.conf: %s ，行 %d"
#: include/class_config.inc:162 include/class_config.inc:300
-#: include/class_config.inc:985 include/class_config.inc:998
+#: include/class_config.inc:915 include/class_config.inc:928
#: include/functions.inc:663 include/class_timezone.inc:51
#: include/password-methods/class_password-methods-sha.inc:71
#: include/password-methods/class_password-methods-ssha.inc:75
@@ -2262,17 +2306,17 @@ msgid ""
"while your passwords are not encrypted."
msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:917
-#: include/class_ldap.inc:1371 include/functions.inc:526
+#: include/class_config.inc:337 include/class_ldap.inc:918
+#: include/class_ldap.inc:1372 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2985 include/simpleplugin/class_simplePlugin.inc:545
-#: include/simpleplugin/class_attribute.inc:2895
+#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2909
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
#: include/class_SnapshotHandler.inc:422 include/class_SnapshotHandler.inc:425
-#: html/index.php:360 html/class_passwordRecovery.inc:497
+#: html/index.php:369 html/class_passwordRecovery.inc:497
#: setup/class_setupStep_Migrate.inc:451
#: setup/class_setupStep_Migrate.inc:1130
msgid "LDAP error"
@@ -2287,38 +2331,38 @@ msgstr ""
msgid "The selected mail method (class %s) is not available"
msgstr ""
-#: include/class_config.inc:986
+#: include/class_config.inc:916
#, php-format
msgid ""
"The snapshot functionality is enabled, but the required variable '%s' is not"
" set."
msgstr ""
-#: include/class_config.inc:999
+#: include/class_config.inc:929
#, php-format
msgid ""
"The snapshot functionality is enabled, but the required compression module "
"is missing. Please install '%s'."
msgstr ""
-#: include/class_config.inc:1104
+#: include/class_config.inc:1034
msgid "All categories"
msgstr ""
-#: include/class_config.inc:1231
+#: include/class_config.inc:1161
msgid "My account"
msgstr "我的账å·"
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
msgid "Performance warning"
msgstr ""
-#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#: include/class_ldap.inc:316 include/class_ldap.inc:363
#, php-format
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr ""
-#: include/class_ldap.inc:868 include/class_ldap.inc:904
+#: include/class_ldap.inc:869 include/class_ldap.inc:905
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
@@ -2328,39 +2372,39 @@ msgstr ""
msgid "Internal error"
msgstr ""
-#: include/class_ldap.inc:868
+#: include/class_ldap.inc:869
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:904
+#: include/class_ldap.inc:905
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1016
+#: include/class_ldap.inc:1017
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr "当æ“作 '%s' 使用 LDAP æœåŠ¡å™¨ '%s' æ—¶"
-#: include/class_ldap.inc:1018
+#: include/class_ldap.inc:1019
#, php-format
msgid "while operating on LDAP server %s"
msgstr "当æ“作 LDAP æœåŠ¡å™¨ '%s' æ—¶"
-#: include/class_ldap.inc:1108
+#: include/class_ldap.inc:1109
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1220
+#: include/class_ldap.inc:1221
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr "è¿™ä¸æ˜¯ä¸€æ¡æœ‰æ•ˆçš„ DN: '%s'。导入数æ®åº”该以 'dn:...' 开始于行 %s"
-#: include/class_ldap.inc:1231
+#: include/class_ldap.inc:1232
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2948,10 +2992,10 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr ""
-#: include/functions.inc:496 include/functions.inc:3294
-#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:263
-#: include/simpleplugin/class_simplePlugin.inc:268
-#: include/simpleplugin/class_simplePlugin.inc:280
+#: include/functions.inc:496 include/functions.inc:3295
+#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
+#: include/simpleplugin/class_simplePlugin.inc:269
+#: include/simpleplugin/class_simplePlugin.inc:281
#: html/class_passwordRecovery.inc:216
msgid "Fatal error"
msgstr ""
@@ -3104,98 +3148,98 @@ msgstr ""
msgid "Cannot read to revision file!"
msgstr ""
-#: include/functions.inc:2548
+#: include/functions.inc:2549
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "LDAP warning"
msgstr ""
-#: include/functions.inc:2566
+#: include/functions.inc:2567
msgid "Cannot get schema information from server. No schema check possible!"
msgstr ""
-#: include/functions.inc:2584
+#: include/functions.inc:2585
msgid ""
"Used to lock currently edited entries to avoid multiple changes at the same "
"time."
msgstr ""
-#: include/functions.inc:2596
+#: include/functions.inc:2597
#, php-format
msgid "Missing required object class '%s'!"
msgstr ""
-#: include/functions.inc:2599
+#: include/functions.inc:2600
#, php-format
msgid "Missing optional object class '%s'!"
msgstr ""
-#: include/functions.inc:2603
+#: include/functions.inc:2604
#, php-format
msgid "Class(es) available"
msgstr ""
-#: include/functions.inc:2623
+#: include/functions.inc:2624
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2625
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2628
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2629
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3106 include/functions.inc:3127
-#: include/functions.inc:3165 include/functions.inc:3177
-#: include/functions.inc:3181 include/functions.inc:3188
-#: include/functions.inc:3197
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3166 include/functions.inc:3178
+#: include/functions.inc:3182 include/functions.inc:3189
+#: include/functions.inc:3198
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3106
+#: include/functions.inc:3107
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3127
+#: include/functions.inc:3128
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3157
+#: include/functions.inc:3158
msgid "Cannot create sambaUnixIdPool entry!"
msgstr ""
-#: include/functions.inc:3165
+#: include/functions.inc:3166
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3177 include/functions.inc:3181
+#: include/functions.inc:3178 include/functions.inc:3182
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3197
+#: include/functions.inc:3198
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3259
+#: include/functions.inc:3260
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3295
+#: include/functions.inc:3296
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
@@ -3351,13 +3395,13 @@ msgstr ""
msgid "XML error"
msgstr ""
-#: include/class_plugin.inc:554
+#: include/class_plugin.inc:553
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/class_plugin.inc:1466
+#: include/class_plugin.inc:1467
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -3383,32 +3427,32 @@ msgstr "模æ¿å称"
msgid "This is the name of the template"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:263
+#: include/simpleplugin/class_simplePlugin.inc:264
msgid "Only main tab can compute dn"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:270
+#: include/simpleplugin/class_simplePlugin.inc:271
#, php-format
msgid "Could not compute dn: no parent tab class for \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:282
+#: include/simpleplugin/class_simplePlugin.inc:283
#, php-format
msgid ""
"Could not compute dn: could not find objectType infos from tab class \"%s\""
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:638
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:644
+#: include/simpleplugin/class_simplePlugin.inc:652
msgid "Error when saving"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:638
+#: include/simpleplugin/class_simplePlugin.inc:644
#, php-format
msgid "There is already an entry with the same dn : %s"
msgstr ""
-#: include/simpleplugin/class_simplePlugin.inc:646
+#: include/simpleplugin/class_simplePlugin.inc:652
#, php-format
msgid "The entry %s is not existing"
msgstr ""
@@ -3428,27 +3472,27 @@ msgstr ""
msgid "Show %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:409
+#: include/simpleplugin/class_dialogAttributes.inc:415
#, php-format
msgid "Group %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:411
+#: include/simpleplugin/class_dialogAttributes.inc:417
#, php-format
msgid "Role %s"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:446
+#: include/simpleplugin/class_dialogAttributes.inc:452
msgid "Group of user"
msgstr "用户组"
-#: include/simpleplugin/class_dialogAttributes.inc:615
+#: include/simpleplugin/class_dialogAttributes.inc:621
#: include/simpleplugin/class_attribute.inc:1090
#: include/simpleplugin/class_attribute.inc:1124
msgid "None"
msgstr ""
-#: include/simpleplugin/class_dialogAttributes.inc:617
+#: include/simpleplugin/class_dialogAttributes.inc:623
msgid "Unknown"
msgstr "未知"
@@ -3489,11 +3533,16 @@ msgid "days"
msgstr "天"
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2161
+#: include/simpleplugin/class_attribute.inc:2171
#, php-format
msgid "%s (required)"
msgstr ""
+#: include/simpleplugin/class_attribute.inc:1150
+#, php-format
+msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
+msgstr ""
+
#: include/simpleplugin/class_attribute.inc:1277
#, php-format
msgid "An integer between %d and %d"
@@ -3509,75 +3558,75 @@ msgstr ""
msgid "An integer smaller than %d"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1379
+#: include/simpleplugin/class_attribute.inc:1383
#, php-format
msgid "A float between %f and %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1381
+#: include/simpleplugin/class_attribute.inc:1385
#, php-format
msgid "A float larger than %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1383
+#: include/simpleplugin/class_attribute.inc:1387
#, php-format
msgid "A float smaller than %f"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1490
+#: include/simpleplugin/class_attribute.inc:1500
msgid "Error, incorrect date: "
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1530
-#: include/simpleplugin/class_attribute.inc:1533
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1540
+#: include/simpleplugin/class_attribute.inc:1543
+#: include/simpleplugin/class_attribute.inc:1546
#, php-format
msgid "Cannot read uploaded file: %s"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1530
+#: include/simpleplugin/class_attribute.inc:1540
msgid "file is empty"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1533
+#: include/simpleplugin/class_attribute.inc:1543
msgid "file not found"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1536
+#: include/simpleplugin/class_attribute.inc:1546
msgid "file not readable"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1569
+#: include/simpleplugin/class_attribute.inc:1579
#, php-format
msgid "%s (%d bytes)"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1616
-#: include/simpleplugin/class_attribute.inc:1793
+#: include/simpleplugin/class_attribute.inc:1626
+#: include/simpleplugin/class_attribute.inc:1803
msgid "Upload"
msgstr "ä¸Šä¼ "
-#: include/simpleplugin/class_attribute.inc:1621
-#: include/simpleplugin/class_attribute.inc:1622
+#: include/simpleplugin/class_attribute.inc:1631
+#: include/simpleplugin/class_attribute.inc:1632
msgid "Download"
msgstr "下载"
-#: include/simpleplugin/class_attribute.inc:1775
+#: include/simpleplugin/class_attribute.inc:1785
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1826
+#: include/simpleplugin/class_attribute.inc:1836
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr "ä½ç½®"
-#: include/simpleplugin/class_attribute.inc:1829
+#: include/simpleplugin/class_attribute.inc:1839
msgid "Object base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:2755
+#: include/simpleplugin/class_attribute.inc:2769
#, php-format
msgid "Invalid value for %s"
msgstr ""
@@ -3711,17 +3760,17 @@ msgstr "请检查用户å/å£ä»¤ã€‚"
msgid "Account locked. Please contact your system administrator!"
msgstr ""
-#: html/index.php:436
+#: html/index.php:475
#, php-format
msgid "CAS user \"%s\" could not be found in the LDAP"
msgstr ""
-#: html/index.php:446
+#: html/index.php:485
#, php-format
msgid "CAS user \"%s\" match several users in the LDAP"
msgstr ""
-#: html/index.php:481
+#: html/index.php:522
msgid ""
"Your browser has cookies disabled. Please enable cookies and reload this "
"page before logging in!"
@@ -4044,7 +4093,7 @@ msgid "Checking for duplicated UID numbers"
msgstr ""
#: setup/class_setupStep_Migrate.inc:267
-msgid "Checking for duplicate GID numbers"
+msgid "Checking for duplicated GID numbers"
msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:487
@@ -4054,7 +4103,7 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:1179
#: setup/class_setupStep_Migrate.inc:1272
#: setup/class_setupStep_Migrate.inc:1351
-#: setup/class_setupStep_Migrate.inc:1390
+#: setup/class_setupStep_Migrate.inc:1395
msgid "LDAP query failed"
msgstr ""
@@ -4065,7 +4114,7 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:1180
#: setup/class_setupStep_Migrate.inc:1273
#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1391
+#: setup/class_setupStep_Migrate.inc:1396
msgid "Possibly the \"root object\" is missing."
msgstr ""
@@ -4220,14 +4269,14 @@ msgstr ""
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1373
+#: setup/class_setupStep_Migrate.inc:1378
#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\"."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1412
+#: setup/class_setupStep_Migrate.inc:1422
#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\"."
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
diff --git a/plugins/addons/dashboard/class_dashBoardUsers.inc b/plugins/addons/dashboard/class_dashBoardUsers.inc
index e8713466f1e450be58782d86c3796fe79c856196..b659948500a63c7087f466b6c43d22f339c12746 100644
--- a/plugins/addons/dashboard/class_dashBoardUsers.inc
+++ b/plugins/addons/dashboard/class_dashBoardUsers.inc
@@ -3,17 +3,17 @@
This code is part of FusionDirectory (http://www.fusiondirectory.org)
Copyright (C) 2010 Antoine Gallavardin
Copyright (C) 2011-2016 FusionDirectory project
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
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.
@@ -67,7 +67,7 @@ class dashboardUsers extends simplePlugin
/* User statistics */
$ldap = $this->config->get_ldap_link();
$ldap->cd($this->config->current['BASE']);
- $ldap->search("(objectClass=inetOrgPerson)", array("userPassword"));
+ $ldap->search('(objectClass=inetOrgPerson)', array('userPassword'));
$nb_accounts = $ldap->count();
$nb_locked_accounts = 0;
while ($attrs = $ldap->fetch()) {
diff --git a/plugins/admin/acl/class_aclManagement.inc b/plugins/admin/acl/class_aclManagement.inc
index ce5bf8ce002334cefbd77185087c905e2fd59a29..6fde38069ed1c0ac5503bec6dad289059f2872e5 100644
--- a/plugins/admin/acl/class_aclManagement.inc
+++ b/plugins/admin/acl/class_aclManagement.inc
@@ -19,6 +19,103 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+class aclAssignmentCreationDialog extends simplePlugin
+{
+ protected $post_finish = 'add_finish';
+ protected $post_cancel = 'add_cancel';
+ protected $simpleManagement;
+
+ static function plInfo()
+ {
+ return array(
+ 'plShortName' => _('ACL assignment creation'),
+ 'plShortName' => _('ACL assignment creation'),
+ 'plDescription' => _('Create an ACL assignment on an arbitrary dn'),
+ 'plCategory' => array('acl'),
+
+ 'plProvidedAcls' => array()
+ );
+ }
+
+ static function getAttributesInfo ()
+ {
+ global $config;
+ return array(
+ 'main' => array(
+ 'name' => _('ACL assignment creation'),
+ 'class' => array('fullwidth'),
+ 'attrs' => array(
+ new StringAttribute (
+ _('Dn'), _('DN you wish to add assignments for'),
+ 'baseDn', TRUE,
+ $config->current['BASE'], 'aclMode',
+ '/^([^=,]+=[^=,]+,)+'.preg_quote($config->current['BASE'], '/').'$/',
+ 'ou=people,'.$config->current['BASE']
+ ),
+ )
+ ),
+ );
+ }
+
+ function __construct ($parent)
+ {
+ global $config;
+
+ $this->simpleManagement = $parent;
+
+ parent::__construct($config, $config->current['BASE']);
+
+ $this->attributesAccess['baseDn']->setInLdap(FALSE);
+ }
+
+ function save_object()
+ {
+ parent::save_object();
+ if (isset($_POST[$this->post_cancel])) {
+ return $this->handle_cancel();
+ }
+ if (isset($_POST[$this->post_finish])) {
+ return $this->handle_finish();
+ }
+ return TRUE;
+ }
+
+ function save()
+ {
+ }
+
+ function execute()
+ {
+ if ($this->save_object()) {
+ $smarty = get_smarty();
+ $smarty->assign($this->attributesAccess['baseDn']->getAcl().'ACL', 'rwcdm');
+ return parent::execute()."\n".
+ '<p class="plugbottom">'."\n".
+ ' <input type="submit" name="'.$this->post_finish.'" value="'.msgPool::addButton().'"/> '."\n".
+ ' <input type="submit" name="'.$this->post_cancel.'" value="'.msgPool::cancelButton().'"/>'."\n".
+ '</p>';
+ }
+ }
+
+ function handle_finish ()
+ {
+ $msgs = $this->check();
+ if (count($msgs)) {
+ msg_dialog::displayChecks($msgs);
+ return TRUE;
+ }
+ $this->simpleManagement->closeDialogs();
+ $this->simpleManagement->newEntryConfirmed($this->baseDn);
+ return FALSE;
+ }
+
+ function handle_cancel ()
+ {
+ $this->simpleManagement->closeDialogs();
+ return FALSE;
+ }
+}
+
class aclManagement extends simpleManagement
{
protected $objectTypes = array('aclAssignment');
@@ -58,7 +155,8 @@ class aclManagement extends simpleManagement
$data = parent::parseXML($file);
$data['list']['table']['column'][1]['value'] = '%{filter:filterLabel(row,dn,pid,base,ou,cn,dc,o)}';
$data['list']['table']['column'][1]['sortAttribute'] = 'dn';
- array_shift($data['list']['actionmenu']['action']);
+ $data['list']['actionmenu']['action'][0]['type'] = 'entry';
+ $data['list']['actionmenu']['action'][0]['name'] = 'new';
return $data;
}
@@ -69,6 +167,29 @@ class aclManagement extends simpleManagement
parent::configureHeadpage();
}
+ /*!
+ * \brief This method intiates the object creation.
+ */
+ function newEntry($action = '', $target = array(), $all = array(), $altTabClass = '', $altTabType = '', $altAclCategory = '')
+ {
+ $this->dialogObject = new aclAssignmentCreationDialog($this);
+ }
+
+ function newEntryConfirmed($dn)
+ {
+ $type = 'aclAssignment';
+
+ $this->displayApplyBtn = FALSE;
+ $this->dn = $dn;
+ $this->is_single_edit = FALSE;
+
+ set_object_info($this->dn);
+
+ // Open object
+ $this->openTabObject(objects::open($this->dn, $type), $this->headpage->getBase());
+ @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dn, 'Creating new ACLÂ assignment');
+ }
+
static function filterLabel($row, $dn, $pid = 0, $base = "", $ou = array())
{
$ou = $ou[0];
diff --git a/plugins/admin/departments/class_department.inc b/plugins/admin/departments/class_department.inc
index 10e6635469422686f10e5e029c30b553807496f3..4467fcaaa6250bdb0d111a23a4ae5e2b07d12f09 100644
--- a/plugins/admin/departments/class_department.inc
+++ b/plugins/admin/departments/class_department.inc
@@ -73,10 +73,14 @@ class department extends simplePlugin
_('Description'), sprintf(_('Short description of this %s'), $name),
'description', TRUE
),
- new StringAttribute(
+ new SelectAttribute(
_('Category'), sprintf(_('Category of this %s'), $name),
'businessCategory', FALSE
),
+ new StringAttribute(
+ _('Website'), sprintf(_('Website of this %s'), $name),
+ 'labeledURI', FALSE
+ ),
new UserAttribute(
_('Manager'), sprintf(_('Manager of this %s'), $name),
'manager', FALSE
@@ -92,7 +96,10 @@ class department extends simplePlugin
new StringAttribute(
_('Location'), _('Location'), 'l', FALSE
),
- new TextAreaAttribute(
+ new StringAttribute(
+ _('Country'), _('Country'), 'co', FALSE
+ ),
+ new PostalAddressAttribute(
_('Address'), sprintf(_('A postal address for this %s'), $name),
'postalAddress', FALSE
),
@@ -137,6 +144,17 @@ class department extends simplePlugin
parent::__construct($config, $dn, $object);
+ $categoriesList = $this->config->get_cfg_value('DepartmentCategories', array());
+
+ /* Insert current value to possibilities */
+ if (isset($this->attributesAccess['businessCategory'])) {
+ $businessCategory = $this->attributesAccess['businessCategory']->getValue();
+ if (($businessCategory != "") && !in_array($businessCategory, $categoriesList)) {
+ $categoriesList[] = $businessCategory;
+ }
+ $this->attributesAccess['businessCategory']->setChoices($categoriesList);
+ }
+
$this->attributesAccess[$this->getNamingAttr()]->setUnique(TRUE);
}
@@ -185,14 +203,6 @@ class department extends simplePlugin
return $bases;
}
- function compute_dn()
- {
- $namingAttr = $this->getNamingAttr();
- $nAV = preg_replace('/,/', '\,', $this->$namingAttr);
- $nAV = preg_replace('/"/', '\"', $nAV);
- return @LDAP::convert($namingAttr.'='.$nAV.','.$this->base);
- }
-
function prepare_save()
{
if ($this->getNamingAttr() != 'ou') {
diff --git a/plugins/admin/groups/class_group.inc b/plugins/admin/groups/class_group.inc
index c08cef561d8c52027ed1c2e1e1dfa7725ed166cf..180c6129d860a80e21350e835a328b6e34841c40 100644
--- a/plugins/admin/groups/class_group.inc
+++ b/plugins/admin/groups/class_group.inc
@@ -208,11 +208,6 @@ class group extends simplePlugin
parent::post_save();
}
- function compute_dn()
- {
- return 'cn='.$this->attributesAccess['cn']->getValue().','.get_groups_ou().$this->base;
- }
-
function addUser($dn, $uid)
{
$this->attributesAccess['memberUid']->addValue($dn,
diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc
index e6d043818c63dabe8044811fb37a0792f409baed..f6efd98fab46c204ae6f8140af1e94c39bc8181c 100644
--- a/plugins/admin/groups/class_groupManagement.inc
+++ b/plugins/admin/groups/class_groupManagement.inc
@@ -131,7 +131,7 @@ class groupManagement extends simpleManagement
array('id' => 'PRIMARY', 'label' => _('Show primary groups')),
array('id' => 'ROLE', 'label' => _('Show organizational roles')),
array('id' => 'APPLICATION', 'label' => _('Show application groups')),
- array('id' => 'DEPARTMENT', 'label' => _('Show department groups')),
+ array('id' => 'UNKNOWN', 'label' => _('Show unidentified groups')),
);
if (class_available('mailAccount')) {
$filters[]= array('id' => 'MAIL', 'label' => _('Show mail groups'));
diff --git a/plugins/admin/groups/class_ogroup.inc b/plugins/admin/groups/class_ogroup.inc
index 5f31b7ee11320835beb3090a69eab702abeb0393..af4d93607f08be7789d4ca37feabc76d9fe4a467 100644
--- a/plugins/admin/groups/class_ogroup.inc
+++ b/plugins/admin/groups/class_ogroup.inc
@@ -268,11 +268,6 @@ class ogroup extends simplePlugin
$this->updateAttributesValues();
}
- function compute_dn()
- {
- return 'cn='.$this->attributesAccess['cn']->getValue().','.get_ou('ogroupRDN').$this->base;
- }
-
/*! \brief This function returns an LDAP filter for this plugin object classes
*/
function getObjectClassFilter ()
diff --git a/plugins/admin/groups/class_roleGeneric.inc b/plugins/admin/groups/class_roleGeneric.inc
index 4179ce19b4b51abf650e2903e3af536522dc94b3..e559de0b76aa86f07c3c1f0bd6a528938298395b 100644
--- a/plugins/admin/groups/class_roleGeneric.inc
+++ b/plugins/admin/groups/class_roleGeneric.inc
@@ -18,6 +18,33 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+class RoleMembersAttribute extends UsersAttribute
+{
+ protected $whitelistDns = NULL;
+
+ function getFilterWhiteList()
+ {
+ global $config;
+ if ($config->get_cfg_value('RestrictRoleMembers') == 'TRUE') {
+ if ($this->whitelistDns === NULL) {
+ /* Computes a list of members of all groups within our branch */
+ $groups = objects::ls('ogroup', array('member' => '*'), $this->plugin->base);
+ if (empty($groups)) {
+ $this->whitelistDns = array();
+ } else {
+ $this->whitelistDns = call_user_func_array('array_merge_recursive', $groups)['member'];
+ }
+ }
+ return array(
+ 'branches' => array($this->plugin->base),
+ 'dn' => $this->whitelistDns,
+ );
+ } else {
+ return array();
+ }
+ }
+}
+
class roleGeneric extends simplePlugin
{
var $mainTab = TRUE;
@@ -74,7 +101,7 @@ class roleGeneric extends simplePlugin
_('Fax number'), _('Fax number'),
'facsimileTelephoneNumber'
),
- new UsersAttribute(
+ new RoleMembersAttribute (
_('Users'), _('Add users for the role'),
'roleOccupant', FALSE
)
@@ -91,10 +118,5 @@ class roleGeneric extends simplePlugin
parent::__construct($config, $dn, $object);
$this->attributesAccess['cn']->setUnique(TRUE);
}
-
- function compute_dn()
- {
- return 'cn='.$this->cn.','.get_ou('roleRDN').$this->base;
- }
}
?>
diff --git a/plugins/admin/groups/group-filter.xml b/plugins/admin/groups/group-filter.xml
index da3c598c4dfce1dcf57ce46bd63db985135137a1..007abeaa1dec8e71b1df65c6fa411c62861d9ece 100644
--- a/plugins/admin/groups/group-filter.xml
+++ b/plugins/admin/groups/group-filter.xml
@@ -10,7 +10,7 @@
<search>
<query>
<backend>LDAP</backend>
- <filter>(&(|(&(objectClass=posixGroup)(|$PRIMARY$MAIL$SAMBA))$ROLE(&(objectClass=groupOfNames)(|(gosaGroupObjects=[])$USER$GROUP$APPLICATION$DEPARTMENT$SERVER$WORKSTATION$WINDOWS$TERMINAL$PRINTER$PHONE)))$NAME)</filter>
+ <filter>(&(|(&(objectClass=posixGroup)(|$PRIMARY$MAIL$SAMBA))$ROLE(&(objectClass=groupOfNames)(|(gosaGroupObjects=[])$USER$GROUP$APPLICATION$SERVER$WORKSTATION$WINDOWS$TERMINAL$PRINTER$PHONE$UNKNOWN)))$NAME)</filter>
<attribute>dn</attribute>
<attribute>objectClass</attribute>
<attribute>cn</attribute>
@@ -76,14 +76,6 @@
<set>(gosaGroupObjects=*A*)</set>
</element>
- <element>
- <type>checkbox</type>
- <tag>DEPARTMENT</tag>
- <default>true</default>
- <unset></unset>
- <set>(gosaGroupObjects=*D*)</set>
- </element>
-
<element>
<type>checkbox</type>
<tag>SERVER</tag>
@@ -132,6 +124,14 @@
<set>(gosaGroupObjects=*F*)</set>
</element>
+ <element>
+ <type>checkbox</type>
+ <tag>UNKNOWN</tag>
+ <default>false</default>
+ <unset></unset>
+ <set>(gosaGroupObjects=*I*)</set>
+ </element>
+
<element>
<type>textfield</type>
<tag>NAME</tag>
diff --git a/plugins/config/class_configInLdap.inc b/plugins/config/class_configInLdap.inc
index e59cf87e8d5cb13b2004ca565587d920050c97ca..60155f40705068affbfb1a7bd57fd70e248eb2fe 100644
--- a/plugins/config/class_configInLdap.inc
+++ b/plugins/config/class_configInLdap.inc
@@ -208,6 +208,11 @@ class configInLdap extends simplePlugin
'fdSessionLifeTime', TRUE,
0 /*min*/, FALSE /*no max*/, 1800
),
+ new BooleanAttribute (
+ _('HTTP authentication'), _('Use HTTP authentication protocol instead of the login form.'),
+ 'fdHttpAuthActivated', FALSE,
+ FALSE
+ ),
)
),
'snapshots' => array(
@@ -358,6 +363,10 @@ class configInLdap extends simplePlugin
'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'
+ ),
)
),
'debug' => array(
@@ -444,6 +453,13 @@ class configInLdap extends simplePlugin
_('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()
+ ),
)
),
);
@@ -468,6 +484,15 @@ class configInLdap extends simplePlugin
$this->fusionConfigMd5 = md5_file(CACHE_DIR."/".CLASS_CACHE);
+ $this->attributesAccess['fdHttpAuthActivated']->setManagedAttributes(
+ array(
+ 'erase' => array (
+ TRUE => array (
+ 'fdCasActivated',
+ )
+ )
+ )
+ );
$this->attributesAccess['fdEnableSnapshots']->setManagedAttributes(
array(
'disable' => array (
diff --git a/plugins/config/class_recoveryConfig.inc b/plugins/config/class_recoveryConfig.inc
index 8e97d3c0cc3c938252981956f60eafde376de643..0f80f412110f94275c9a437a66078fefbe354d37 100644
--- a/plugins/config/class_recoveryConfig.inc
+++ b/plugins/config/class_recoveryConfig.inc
@@ -37,9 +37,10 @@ class recoveryConfig extends simplePlugin
{
return array (
'settings' => array (
- 'name' => _('Password recovery settings'),
- 'class' => array ('alone'),
- 'attrs' => array (
+ 'name' => _('Password recovery settings'),
+ 'class' => array ('alone'),
+ 'template' => get_template_path('simpleplugin_section_alone.tpl'),
+ 'attrs' => array (
new BooleanAttribute (
_('Activate password recovery'),
_('Whether to activate or not password recovery feature'),
diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index 41977af0355584bbc58fd522d35698b44035da40..495350b53d1d0376921136ca68fbc76a12202c4d 100644
--- a/plugins/personal/generic/class_user.inc
+++ b/plugins/personal/generic/class_user.inc
@@ -233,6 +233,31 @@ class UserPasswordAttribute extends CompositeAttribute
}
}
+class PostalAddressAttribute extends TextAreaAttribute
+{
+ function inputValue ($ldapValue)
+ {
+ return str_replace(
+ array('$', '\24','\5C'),
+ array("\n", '$', '\\'),
+ $ldapValue
+ );
+ }
+
+ function computeLdapValue ()
+ {
+ return str_replace(
+ array("\r\n", "\n", "\r"),
+ '$',
+ str_replace(
+ array('\\', '$'),
+ array('\5C','\24'),
+ $this->getValue()
+ )
+ );
+ }
+}
+
class user extends simplePlugin
{
var $objectclasses = array('inetOrgPerson','organizationalPerson','person');
@@ -308,7 +333,7 @@ class user extends simplePlugin
_('State'), _('State'),
'st', FALSE
),
- new TextAreaAttribute (
+ new PostalAddressAttribute (
_('Address'), _('Business postal address'),
'postalAddress', FALSE
),
@@ -332,6 +357,10 @@ class user extends simplePlugin
_('Fax'), _('Business fax number'),
'facsimileTelephoneNumber', FALSE
),
+ new URLAttribute (
+ _('Homepage'), _('Personal homepage'),
+ 'labeledURI', FALSE
+ ),
)
),
'account' => array(
@@ -362,7 +391,7 @@ class user extends simplePlugin
_('Display name'), _('Name this user should appear as. Used by Exchange.'),
'displayName', FALSE
),
- new TextAreaAttribute (
+ new PostalAddressAttribute (
_('Home address'), _('Home postal address'),
'homePostalAddress', FALSE
),
@@ -370,10 +399,6 @@ class user extends simplePlugin
_('Private phone'), _('Home phone number'),
'homePhone', FALSE
),
- new URLAttribute (
- _('Homepage'), _('Personal homepage'),
- 'labeledURI', FALSE
- ),
)
),
'organization' => array(
@@ -461,14 +486,14 @@ class user extends simplePlugin
function compute_dn()
{
if ($this->is_template) {
- $dn = 'cn='.$this->_template_cn.',ou=templates,'.get_ou("userRDN").$this->base;
+ $dn = 'cn='.ldap_escape_dn($this->_template_cn).',ou=templates,'.get_ou('userRDN').$this->base;
return $dn;
}
$this->update_cn();
$attribute = $this->config->get_cfg_value('accountPrimaryAttribute', 'uid');
- return $this->create_unique_dn($attribute, get_people_ou().$this->base);
+ return $this->create_unique_dn($attribute, get_ou('userRDN').$this->base);
}
function execute()
diff --git a/plugins/personal/posix/class_posixAccount.inc b/plugins/personal/posix/class_posixAccount.inc
index a4eb1f6cd64a8f60e4a7af14466cdbc6e31c510c..bb83b6a15b4d0b87755e6f00bc52176dc9b7add1 100644
--- a/plugins/personal/posix/class_posixAccount.inc
+++ b/plugins/personal/posix/class_posixAccount.inc
@@ -298,26 +298,28 @@ class posixAccount extends simplePlugin
asort ($secondaryGroups);
$this->attributesAccess['primaryGroup']->setChoices(array_keys($secondaryGroups), array_values($secondaryGroups));
- $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");
+ 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");
}
- } 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['posixStatus']->setValue($status);
$this->attributesAccess['groupMembership']->setInLdap(FALSE);
if (class_available('mixedGroup')) {
@@ -332,13 +334,13 @@ class posixAccount extends simplePlugin
} else {
/* Groups handling */
$ldap->cd($this->config->current['BASE']);
- $ldap->search("(&(objectClass=posixGroup)(memberUid=".$this->getUid()."))", array("cn", "description"));
+ $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];
+ if (!isset($attrs['description'][0])) {
+ $entry = $attrs['cn'][0];
} else {
- $entry = $attrs["cn"][0]." [".$attrs["description"][0]."]";
+ $entry = $attrs['cn'][0].' ['.$attrs['description'][0].']';
}
$groupMembership[$ldap->getDN()] = $entry;
}
@@ -349,6 +351,11 @@ class posixAccount extends simplePlugin
$this->savedGroupMembership = array_keys($groupMembership);
}
}
+ if ($this->is_template) {
+ if (isset($this->attrs['force_ids'])) {
+ $this->force_ids = ($this->attrs['force_ids'][0] != 'FALSE');
+ }
+ }
}
function getUid()
@@ -370,7 +377,7 @@ class posixAccount extends simplePlugin
$ldap = $this->config->get_ldap_link();
$ldap->cd($this->config->current['BASE']);
- $ldap->search("(&(objectClass=posixGroup)(gidNumber=".$this->gidNumber.")(cn=".$this->getUid()."))", array("cn","gidNumber"));
+ $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 */
@@ -378,10 +385,10 @@ class posixAccount extends simplePlugin
}
$this->force_ids = FALSE;
- $this->attributesAccess['uidNumber']->setInitialValue("");
- $this->attributesAccess['gidNumber']->setInitialValue("");
- $this->uidNumber = "";
- $this->gidNumber = "";
+ $this->attributesAccess['uidNumber']->setInitialValue('');
+ $this->attributesAccess['gidNumber']->setInitialValue('');
+ $this->uidNumber = '';
+ $this->gidNumber = '';
}
function check()
@@ -470,7 +477,9 @@ class posixAccount extends simplePlugin
* - .. 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->primaryGroup == 0)) {
+ 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 */
@@ -479,16 +488,16 @@ class posixAccount extends simplePlugin
/* Are we forced to use a special gidNumber? */
if ($this->force_ids) {
- $ldap->search('(&(objectClass=posixGroup)(gidNumber='.$this->gidNumber.'))', array('cn','gidNumber'));
+ $ldap->search('(&(objectClass=posixGroup)(gidNumber='.ldap_escape_f($this->gidNumber).'))', array('cn','gidNumber'));
} else {
- $ldap->search("(&(objectClass=posixGroup)(gidNumber=*)(cn=".$this->getUid()."))", array("cn","gidNumber"));
+ $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 uniqe gidNumber, if required */
+ /* Request a new and unique gidNumber, if required */
if (!$this->force_ids) {
$this->gidNumber = get_next_id('gidNumber', $this->dn);
}
@@ -496,11 +505,11 @@ class posixAccount extends simplePlugin
/* If forced gidNumber could not be found, then check if the given group name already exists.
*/
$cnt = 0;
- $ldap->search('(&(objectClass=posixGroup)(cn='.$groupcn.'))', array('cn'));
+ $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='.$groupcn.'))', array('cn'));
+ $ldap->search('(&(objectClass=posixGroup)(cn='.ldap_escape_f($groupcn).'))', array('cn'));
}
/* Create new primary group and enforce the new gidNumber */
@@ -527,8 +536,8 @@ class posixAccount extends simplePlugin
} else {
$posixTab = $baseObject;
}
- $posixTab->force_gid = 1;
- $posixTab->gidNumber = $this->gidNumber;
+ $posixTab->force_id = 1;
+ $posixTab->gidNumber = $this->gidNumber;
$tabObject->save();
$groupdn = $tabObject->dn;
@@ -576,6 +585,15 @@ class posixAccount extends simplePlugin
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';
+ }
}
}
@@ -620,7 +638,7 @@ class posixAccount extends simplePlugin
/* Delete group only if cn is uid and there are no other members inside */
$ldap = $this->config->get_ldap_link();
$ldap->cd ($this->config->current['BASE']);
- $ldap->search ('(&(objectClass=posixGroup)(gidNumber='.$this->gidNumber.')(cn='.$this->getUid().'))', array('cn', 'memberUid'));
+ $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'])) {
@@ -644,6 +662,10 @@ class posixAccount extends simplePlugin
$this->groupMembership = array();
}
+ if (isset($this->attrs['force_ids'])) {
+ $this->force_ids = ($this->attrs['force_ids'][0] != 'FALSE');
+ }
+
$this->attributesAccess['uidNumber']->setInitialValue('');
/* Fix primary group settings */
diff --git a/setup/class_setupStep_Migrate.inc b/setup/class_setupStep_Migrate.inc
index 557db7970ed9509900d87ca1544a93137cfc4742..de24e6cc175c3dbd5c9d8d4cde9a68c813aa9274 100644
--- a/setup/class_setupStep_Migrate.inc
+++ b/setup/class_setupStep_Migrate.inc
@@ -264,7 +264,7 @@ class Step_Migrate extends setupStep
'outsideGroups' => new StepMigrateCheck($this, 'outsideGroups', _('Checking for groups outside the groups tree')),
'orgUnits' => new StepMigrateCheck($this, 'orgUnits', _('Checking for invisible departments')),
'uidNumber' => new StepMigrateCheck($this, 'uidNumber', _('Checking for duplicated UID numbers')),
- 'gidNumber' => new StepMigrateCheck($this, 'gidNumber', _('Checking for duplicate GID numbers')),
+ 'gidNumber' => new StepMigrateCheck($this, 'gidNumber', _('Checking for duplicated GID numbers')),
);
$this->checks = $checks;
@@ -1142,7 +1142,7 @@ class Step_Migrate extends setupStep
$entry['ldif'] = _('Entry will be moved from').":<br/>\t".($ldap->fix($dn)).'<br/>'._('to').":<br/>\t".($ldap->fix($d_dn));
/* Check if there are references to this object */
- $ldap->search('(&(member='.LDAP::prepare4filter($dn).')(|(objectClass=gosaGroupOfNames)(objectClass=groupOfNames)))', array('dn'));
+ $ldap->search('(&(member='.ldap_escape_f($dn).')(|(objectClass=gosaGroupOfNames)(objectClass=groupOfNames)))', array('dn'));
$refs = '';
while ($attrs = $ldap->fetch()) {
$ref_dn = $attrs['dn'];
@@ -1362,15 +1362,20 @@ class Step_Migrate extends setupStep
foreach ($tmp as $entries) {
if (count($entries) > 1) {
foreach ($entries as $entry) {
- $this->check_uidNumbers[base64_encode($entry['dn'])] = $entry;
+ $this->check_uidNumbers[$entry['dn']] = $entry;
}
}
}
if ($this->check_uidNumbers) {
+ $list = '<ul>';
+ foreach ($this->check_uidNumbers as $dn => $entry) {
+ $list .= '<li>'.$dn.' ('.$entry['uidNumber'][0].')</li>';
+ }
+ $list .= '</ul>';
throw new CheckFailedException(
"<div style='color:#F0A500'>"._("Warning")."</div>",
- sprintf(_('Found %s duplicate values for attribute "uidNumber".'), count($this->check_uidNumbers))
+ sprintf(_('Found %s duplicate values for attribute "uidNumber":%s'), count($this->check_uidNumbers), $list)
);
} else {
return '';
@@ -1401,15 +1406,20 @@ class Step_Migrate extends setupStep
foreach ($tmp as $entries) {
if (count($entries) > 1) {
foreach ($entries as $entry) {
- $this->check_gidNumbers[base64_encode($entry['dn'])] = $entry;
+ $this->check_gidNumbers[$entry['dn']] = $entry;
}
}
}
if ($this->check_gidNumbers) {
+ $list = '<ul>';
+ foreach ($this->check_gidNumbers as $dn => $entry) {
+ $list .= '<li>'.$dn.' ('.$entry['gidNumber'][0].')</li>';
+ }
+ $list .= '</ul>';
throw new CheckFailedException(
"<div style='color:#F0A500'>"._("Warning")."</div>",
- sprintf(_('Found %s duplicate values for attribute "gidNumber".'), count($this->check_gidNumbers))
+ sprintf(_('Found %s duplicate values for attribute "gidNumber":%s'), count($this->check_gidNumbers), $list)
);
} else {
return '';