diff --git a/AUTHORS b/AUTHORS
index c4a710f6a62272282c6868df4c2d7a0530cc6620..887a1bd77c3062a974815adfaadc76ceb5ee6b08 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -203,3 +203,6 @@ documentation and additional help.
* Martin Hamant <mh@ow2.org>
Adding DSA accounts into groups
+* Mathias Soupault <mathias.soupault@inalco.fr>
+ Making supannAliasLogin usage possible in password recovery
+
diff --git a/Changelog b/Changelog
index 354402bfb284bec42f5aa4db2f02631cd66cc73e..9f6b49e23e6cdd4a97deec03f6610e00f26dab50 100644
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,29 @@
FusionDirectory changelog
=========================
+* FusionDirectory 1.0.20
+
+[Fix] Bugs #5282: Documentation for Password Policy Plugin
+[Fix] Bugs #5362: PHP errors related to ogroup
+[Fix] FusionDirectory plugins - Bugs #5370: webservice doesn't provide a way to logout
+[Feature] Bugs #5397: User is able to lock their own account
+[Fix] Bugs #5410: edit conflict warning screen : "read only" button make the same page to reload
+[Fix] Bugs #5422: There seems to be a problem with TimeAttribute
+[Fix] Bugs #5426: Problems with PHP CAS on centos 7
+[Feature] FusionDirectory plugins - Bugs #5437: argonaut-ldap2zone should be able to get data from a branch
+[Feature] FusionDirectory plugins - Bugs #5438: we should add the directive check-names into the argonaut-dns service
+[Fix] FusionDirectory plugins - Bugs #5442: Document fopen activation for argonaut plugin
+[Feature] FusionDirectory plugins - Bugs #5443: argonaut ldap2zone should be able to create config for dns slave also, but not create the data
+[Feature] FusionDirectory plugins - Bugs #5444: dropdown in systems on the dns tab
+[Fix] FusionDirectory plugins - Bugs #5445: reorganize the argonaut dns plugin service
+[Fix] FusionDirectory plugins - Bugs #5446: Error message when trying to update System name in the systems page
+[Fix] Bugs #5448: Foreign keys from Services does not work
+[Fix] FusionDirectory plugins - Bugs #5452: Error when reloading dhcp service through FD
+[Fix] FusionDirectory plugins - Bugs #5457: Error modifynig DNS settings in the system's DNS tab
+[Feature] Wishlist #5424: Mail alternatif pour la récupération de mot de passe quand supann est activé
+[Feature] Wishlist #5425: Utiliser le supannAliasLogin dans les messages et les vues de récupération de mot de passe
+[Feature] Wishlist #5456: Fine grain ACL control
+
* FusionDirectory 1.0.19
[Fix] Bugs #5303: When clicking on login from user selection we end up in user edition
diff --git a/contrib/bin/fusiondirectory-setup b/contrib/bin/fusiondirectory-setup
index 3dad1bddb214feb2bb03043435ad524cd8687a03..24acc1155b82c39151caada40ba05835291f4f5a 100644
--- a/contrib/bin/fusiondirectory-setup
+++ b/contrib/bin/fusiondirectory-setup
@@ -1472,7 +1472,7 @@ sub migrate_dhcp {
);
$result->code && die "Migration of DHCP configuration entry failed, LDAP error: ".$result->error."\n";
- my $configDn = "$rdn,$dhcprdn,$entrybase";
+ my $configDn = "$rdn-$systemcn,$dhcprdn,$entrybase";
# Add DHCP service on server
$mesg = $ldap->search(
diff --git a/contrib/docs/UPGRADE b/contrib/docs/UPGRADE
index 498267ef9791ba8bb8966a21b67eaa8e14a088d3..dc7a735a6f0a95adfe70024479e004ef3d3cd844 100644
--- a/contrib/docs/UPGRADE
+++ b/contrib/docs/UPGRADE
@@ -2537,6 +2537,190 @@ No Upgrade
Enjoy :)
+Migrate FusionDirectory from 1.0.19 to 1.0.20
+=============================================
+
+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 schemas
+
+fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/core-fd-conf.schema
+
+fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/template-fd.schema
+
+- if your are using the argonaut plugin you have to update its schema
+
+fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/argonaut-fd.schema
+
+
+Check for deprecated attributes and objectClasses in your LDAP
+==============================================================
+
+The --list-deprecated option of fusiondirectory-setup show deprecated attributes and objectClasses for FusionDirectory
+
+fusiondirectory-setup --list-deprecated
+List deprecated attributes and objectclasses
+Deprecated attributes:
+ gotoLpdServer (GOto - Gonicus Terminal Concept, value lpdServer.) - 1.3.6.1.4.1.10098.1.1.1.4
+ fdPhoneMacroRDN (FusionDirectory - Phone macro RDN) - 1.3.6.1.4.1.38414.19.10.2
+ gotoCdromEnable (GOto - Gonicus Terminal Concept, value cdromEnable.) - 1.3.6.1.4.1.10098.1.1.1.8
+ gotoFontPath (GOto - Gonicus Terminal Concept, value fontPath.) - 1.3.6.1.4.1.10098.1.1.1.5
+ printerWindowsDriverDir (Path to directory that contains windows drivers for this printer) - 1.3.6.1.4.1.38414.6.10.2
+ avHttpProxyURL (How to get the updates) - 1.3.6.1.4.1.10098.1.1.9.76
+ avMaxDirectoryRecursions (Number of recursions done with directories) - 1.3.6.1.4.1.10098.1.1.9.69
+ goFonPassword (Admin password for fon server) - 1.3.6.1.4.1.10098.1.1.9.27
+ gotoFilesystem (GOto - Gonicus Terminal Concept, value filesystem.) - 1.3.6.1.4.1.10098.1.1.1.6
+ gotoPrinterPPD (GOto - Gonicus Terminal Concept, PPD data) - 1.3.6.1.4.1.10098.1.1.11.6
+ fdSnapshotAdminDn (FusionDirectory - Snaphost admin dn) - 1.3.6.1.4.1.38414.8.17.4
+ ghUsbSupport (Hardware definitions, value usbSupport) - 1.3.6.1.4.1.10098.1.1.2.3
+ gotoScannerEnable (GOto - Gonicus Terminal Concept, value scannerEnable.) - 1.3.6.1.4.1.10098.1.1.1.10
+ gotoNtpServer (GOto - Gonicus Terminal Concept, value ntpServer.) - 1.3.6.1.4.1.10098.1.1.1.2
+ goFaxPassword (Admin password for fax server) - 1.3.6.1.4.1.10098.1.1.9.23
+ gotoSysStatus (Keeps current system status - info shown in GOsa) - 1.3.6.1.4.1.10098.1.1.2.11
+ gotoUserAdminPrinter (GOto - keeps printers we are admin for) - 1.3.6.1.4.1.10098.1.1.11.13
+ ghIdeDev (Hardware definitions, value ideDev) - 1.3.6.1.4.1.10098.1.1.2.4
+ gotoSndModule (GOto - Gonicus Terminal Concept, value sound Modules.) - 1.3.6.1.4.1.10098.1.1.1.29
+ goFaxAdmin (Admin principal for fax server) - 1.3.6.1.4.1.10098.1.1.9.22
+ gotoAdaptPath (GOto - Gonicus Terminal Concept, value adaptpath.) - 1.3.6.1.4.1.10098.1.1.1.33
+ gotoScannerModel (GOto - Gonicus Terminal Concept, value scannerModel.) - 1.3.6.1.4.1.10098.1.1.1.40
+ gotoXColordepth (GOto - Gonicus Terminal Concept, value xColordepth.) - 1.3.6.1.4.1.10098.1.1.1.21
+ fdAsteriskDriver (Driver used for asterisk DB) - 1.3.6.1.4.1.10098.1.1.9.30
+ fdSipContexts (FusionDirectory - available sip contexts) - 1.3.6.1.4.1.38414.19.11.1
+ gosaObject (GOsa - DN of an object) - 1.3.6.1.4.1.10098.1.1.12.3
+ ghInventoryNumber (Unique number for inclusion in an inventory) - 1.3.6.1.4.1.10098.1.1.2.10
+ ghSoundAdapter (Hardware definitions, value soundAdapter) - 1.3.6.1.4.1.10098.1.1.2.7
+ ghGfxAdapter (Hardware definitions, value Grafikkarte) - 1.3.6.1.4.1.10098.1.1.2.9
+ gotoXDriver (GOto - Gonicus Terminal Concept, value xDriver.) - 1.3.6.1.4.1.10098.1.1.1.28
+ 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
+ gotoAutoFs (GOto - Gonicus Terminal Concept, value autofs.) - 1.3.6.1.4.1.10098.1.1.1.31
+ gotoScannerBackend (GOto - Gonicus Terminal Concept, value scannerBackend.) - 1.3.6.1.4.1.10098.1.1.1.39
+ gotoUserPrinter (GOto - keeps printers shown for this user) - 1.3.6.1.4.1.10098.1.1.11.12
+ printerWindowsInfFile (Path to windows inf file for this printer) - 1.3.6.1.4.1.38414.6.10.1
+ avChecksPerDay (Update checks per day) - 1.3.6.1.4.1.10098.1.1.9.78
+ gotoScannerClients (GOto - Gonicus Terminal Concept, value scannerClients.) - 1.3.6.1.4.1.10098.1.1.1.11
+ gotoXKbLayout (GOto - Gonicus Terminal Concept, value xKblayout.) - 1.3.6.1.4.1.10098.1.1.1.26
+ fdSnapshotAdminPassword (FusionDirectory - Snaphost admin password) - 1.3.6.1.4.1.38414.8.17.5
+ fdPersonalTitleInDN (FusionDirectory - Personal title in dn) - 1.3.6.1.4.1.38414.8.12.5
+ gotoXResolution (GOto - Gonicus Terminal Concept, value xResolution.) - 1.3.6.1.4.1.10098.1.1.1.20
+ fdPasswordHook (FusionDirectory - Password hook (external command)) - 1.3.6.1.4.1.38414.8.13.4
+ fdVoicemailContexts (FusionDirectory - available voicemail contexts) - 1.3.6.1.4.1.38414.19.11.2
+ fdIdGenerator (FusionDirectory - An automatic way to generate new user ids) - 1.3.6.1.4.1.38414.8.12.4
+ goLogPassword (Admin password for log server) - 1.3.6.1.4.1.10098.1.1.9.25
+ ghCpuType (Hardware definitions, value cpuType) - 1.3.6.1.4.1.10098.1.1.2.1
+ gotoGroupAdminPrinter (GOto - keeps printers we are admin for) - 1.3.6.1.4.1.10098.1.1.11.17
+ fdAccountRDN (FusionDirectory - use a placeholder pattern for generating account RDNs) - 1.3.6.1.4.1.38414.8.12.2
+ gotoFloppyEnable (GOto - Gonicus Terminal Concept, value floppyEnable.) - 1.3.6.1.4.1.10098.1.1.1.7
+ goFonAreaCode (Store area code) - 1.3.6.1.4.1.10098.1.1.9.28
+ avArchiveMaxRecursion (Maximum number of archive nestings) - 1.3.6.1.4.1.10098.1.1.9.73
+ gotoRootPasswd (GOto - Gonicus Terminal Concept, value rootPasswd.) - 1.3.6.1.4.1.10098.1.1.1.14
+ fdPrimaryGroupFilter (FusionDirectory - Primary group filter) - 1.3.6.1.4.1.38414.8.14.1
+ goFonCountryCode (Store country code) - 1.3.6.1.4.1.10098.1.1.9.29
+ avArchiveMaxFileSize (Maximum archive file size) - 1.3.6.1.4.1.10098.1.1.9.72
+ gotoProfileServer (GOto - specifies the profile server) - 1.3.6.1.4.1.10098.1.1.11.8
+ goLogAdmin (Admin user for log server) - 1.3.6.1.4.1.10098.1.1.9.24
+ fdPhoneConferenceRDN (FusionDirectory - Phone conference RDN) - 1.3.6.1.4.1.38414.19.10.3
+ goFonAdmin (Admin user for fon server) - 1.3.6.1.4.1.10098.1.1.9.26
+ goLogDriver (FD logging MDB2 driver name) - 1.3.6.1.4.1.10098.1.1.9.84
+ gotoLpdEnable (GOto - Gonicus Terminal Concept, value lpdEnable.) - 1.3.6.1.4.1.10098.1.1.1.9
+ gotoModules (GOto - Gonicus Terminal Concept, value kernel modules.) - 1.3.6.1.4.1.10098.1.1.1.32
+ gotoProfileQuota (GOto - save quota for home) - 1.3.6.1.4.1.10098.1.1.11.15
+ avFlags (Special flags for the antivirus scan engine) - 1.3.6.1.4.1.10098.1.1.9.71
+ avUser (Username to run antivirus with) - 1.3.6.1.4.1.10098.1.1.9.70
+ ghMemSize (Hardware definitions, value memSize) - 1.3.6.1.4.1.10098.1.1.2.2
+ gotoXMonitor (GOto - Gonicus Terminal Concept, value xMonitor.) - 1.3.6.1.4.1.10098.1.1.1.17
+ gotoGroupPrinter (GOto - keeps printers shown for this user) - 1.3.6.1.4.1.10098.1.1.11.16
+ fdRfc2307bis (FusionDirectory - rfc2307bis) - 1.3.6.1.4.1.38414.8.10.1
+ gotoProfileFlags (GOto - Flags for Profile handling - C is for caching) - 1.3.6.1.4.1.10098.1.1.11.7
+ fdMailMethod (FusionDirectory - Mail method) - 1.3.6.1.4.1.38414.10.10.1
+ gotoXKbVariant (GOto - Gonicus Terminal Concept, value xKbvariant.) - 1.3.6.1.4.1.10098.1.1.1.27
+ gotoXMouseport (GOto - Gonicus Terminal Concept, value xMouseport.) - 1.3.6.1.4.1.10098.1.1.1.22
+ fdSnapshotURI (FusionDirectory - Snaphost URI) - 1.3.6.1.4.1.38414.8.17.3
+ gotoHardwareChecksum (GOto - quick way to see if something has changed) - 1.3.6.1.4.1.10098.1.1.2.12
+ printerWindowsDriverName (Windows name of the printer driver) - 1.3.6.1.4.1.38414.6.10.3
+ ghScsiDev (Hardware definitions, value scsiDev) - 1.3.6.1.4.1.10098.1.1.2.5
+ gotoXMouseType (Hardware definitions, value Type of mouse) - 1.3.6.1.4.1.10098.1.1.1.34
+ gotoXVsync (GOto - Gonicus Terminal Concept, value xVsync.) - 1.3.6.1.4.1.10098.1.1.1.19
+ goSyslogSection (What sections wants the server for its syslog service? i.e. *.*) - 1.3.6.1.4.1.10098.1.1.9.9
+ avDatabaseMirror (Where to find updates) - 1.3.6.1.4.1.10098.1.1.9.75
+ goLogDB (GOsa logging DB name) - 1.3.6.1.4.1.10098.1.1.9.83
+ gosaUser (GOsa - DN of a user) - 1.3.6.1.4.1.10098.1.1.12.2
+ gotoXHsync (GOto - Gonicus Terminal Concept, value xHsync.) - 1.3.6.1.4.1.10098.1.1.1.18
+ avMaxThreads (Number of AV scanning threads) - 1.3.6.1.4.1.10098.1.1.9.68
+ gotoXMouseButtons (GOto - Gonicus Terminal Concept, value xMouseButtons.) - 1.3.6.1.4.1.10098.1.1.1.23
+ avArchiveMaxCompressionRatio (Maximum compression ratio) - 1.3.6.1.4.1.10098.1.1.9.74
+ ghNetNic (Hardware definitions, value Network Device) - 1.3.6.1.4.1.10098.1.1.2.8
+ gotoXKbModel (GOto - Gonicus Terminal Concept, value xKbmodel.) - 1.3.6.1.4.1.10098.1.1.1.25
+Deprecated objectClasses:
+ goFaxServer (Fax server description) - 1.3.6.1.4.1.10098.1.2.1.26
+ goSyslogServer (Syslog server description) - 1.3.6.1.4.1.10098.1.2.1.21
+ goCupsServer (CUPS server description) - 1.3.6.1.4.1.10098.1.2.1.23
+ goNtpServer (Time server description) - 1.3.6.1.4.1.10098.1.2.1.20
+ gosaLockEntry (GOsa - Class for GOsa locking) - 1.3.6.1.4.1.10098.1.2.1.19.2
+ goVirusServer (Virus server definition) - 1.3.6.1.4.1.10098.1.2.1.39
+ gosaUserTemplate (GOsa - Class for GOsa User Templates) - 1.3.6.1.4.1.10098.1.2.1.19.11
+ goNfsServer (NFS server description) - 1.3.6.1.4.1.10098.1.2.1.19
+ goFonServer (Fon server description) - 1.3.6.1.4.1.10098.1.2.1.29
+ goLogDBServer (Log DB server description) - 1.3.6.1.4.1.10098.1.2.1.28
+
+The --check-deprecated option will output a list of dn using old attributes and objectClasses of they are present in your ldap server
+
+fusiondirectory-setup --check-deprecated
+List LDAP entries using deprecated attributes or objectclasses
+There are no entries in the LDAP using obsolete attributes
+There are no entries in the LDAP using obsolete classes
+
+The --ldif-deprecated option will output an ldif file on the console that you can use with ldapmodify to clean you ldap server from old attributes.
+
+fusiondirectory-setup --ldif-deprecated > remove_deprecated.ldif
+
+If they are old objectClasses it will warn you and you will have to remove them by hand, they have been specified at the --check-deprecated step.
+
+!! Please read it carefully before applying !!
+
+Correcting acl editownpwd
+=========================
+
+!!!! to fix the error in the installed editownpwd, you need to go !!!!
+
+ * Acl roles
+ * Open the editownpwd acl
+ * Save it
+
+Its very important you do it, to know why look at https://forge.fusiondirectory.org/issues/5276
+
+Checking your indexed attributes
+================================
+
+Check that all you index still match with valid attributes present in your ldap directory
+
+
+
+
---
* Further information
diff --git a/contrib/man/fusiondirectory-insert-schema.1 b/contrib/man/fusiondirectory-insert-schema.1
index 89600d8e6ce9a48458c6bf6f53cde565aca6aae5..2f0c5152ca86cb238294f544a3fdf0f077a5be0c 100644
--- a/contrib/man/fusiondirectory-insert-schema.1
+++ b/contrib/man/fusiondirectory-insert-schema.1
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "FUSIONDIRECTORY-INSERT-SCHEMA 1"
-.TH FUSIONDIRECTORY-INSERT-SCHEMA 1 "2017-01-19" "FusionDirectory 1.0.19" "FusionDirectory Documentation"
+.TH FUSIONDIRECTORY-INSERT-SCHEMA 1 "2017-01-23" "FusionDirectory 1.0.20" "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 670244dea49b8d08d64a1ddeb88bb0f946f09d53..e73902fc6c3ea4d5a18394653d3f532e0ff78267 100644
--- a/contrib/man/fusiondirectory-setup.1
+++ b/contrib/man/fusiondirectory-setup.1
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "FUSIONDIRECTORY-SETUP 1"
-.TH FUSIONDIRECTORY-SETUP 1 "2017-01-19" "FusionDirectory 1.0.19" "FusionDirectory Documentation"
+.TH FUSIONDIRECTORY-SETUP 1 "2017-03-29" "FusionDirectory 1.0.20" "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.conf.5 b/contrib/man/fusiondirectory.conf.5
index dbf11f82be594694227012fc9d028eb77a529e88..4b2e1698d3e81550ed53e67799ac9c44e73a4611 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-11-02" "FusionDirectory 1.0.19" "FusionDirectory Documentation"
+.TH FUSIONDIRECTORY.CONF 1 "2017-03-29" "FusionDirectory 1.0.20" "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 b3e113fb5c45769185604bee42f5349e78f600ce..88d151570d0a89296d35c47e8f4f5859c71aa44e 100644
--- a/contrib/openldap/core-fd-conf.schema
+++ b/contrib/openldap/core-fd-conf.schema
@@ -580,6 +580,12 @@ attributetype ( 1.3.6.1.4.1.38414.8.110.9 NAME 'fdPasswordRecoveryUseAlternate'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
SINGLE-VALUE )
+attributetype ( 1.3.6.1.4.1.38414.8.110.10 NAME 'fdPasswordRecoveryLoginAttribute'
+ DESC 'Fusion Directory - Password recovery login attribute (usually uid)'
+ EQUALITY caseExactIA5Match
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+ SINGLE-VALUE )
+
# Object Class
objectclass ( 1.3.6.1.4.1.38414.8.2.1 NAME 'fusionDirectoryConf'
@@ -627,7 +633,7 @@ objectclass ( 1.3.6.1.4.1.38414.8.2.3 NAME 'fdPasswordRecoveryConf'
fdPasswordRecoveryMailSubject $ fdPasswordRecoveryMailBody $
fdPasswordRecoveryMail2Subject $ fdPasswordRecoveryMail2Body $
fdPasswordRecoveryValidity $ fdPasswordRecoverySalt $
- fdPasswordRecoveryUseAlternate
+ fdPasswordRecoveryUseAlternate $ fdPasswordRecoveryLoginAttribute
) )
# Dashboard Object Class
diff --git a/contrib/openldap/template-fd.schema b/contrib/openldap/template-fd.schema
index 2ac801bebb615fcd42eb98314504f8e76544adbf..1a4047072ffe7fabc25b8b6b7ff9322a0a06219e 100644
--- a/contrib/openldap/template-fd.schema
+++ b/contrib/openldap/template-fd.schema
@@ -5,8 +5,8 @@
# Attributes
attributetype ( 1.3.6.1.4.1.38414.38.1.1 NAME 'fdTemplateField'
DESC 'FusionDirectory - template field'
- EQUALITY caseExactMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
+ EQUALITY octetStringMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.40)
# Objectclasses
objectclass (1.3.6.1.4.1.38414.38.2.1 NAME 'fdTemplate'
diff --git a/html/class_passwordRecovery.inc b/html/class_passwordRecovery.inc
index 5886aa8444d8a0eeaae9a85286e3d27291826044..d120f845842822a48c07b27cc7402f5af1051470 100644
--- a/html/class_passwordRecovery.inc
+++ b/html/class_passwordRecovery.inc
@@ -237,7 +237,8 @@ class standAlonePage {
}
class passwordRecovery extends standAlonePage {
- var $uid;
+ protected $loginAttribute;
+ protected $login;
var $message = array();
var $email_address;
@@ -266,19 +267,19 @@ class passwordRecovery extends standAlonePage {
{
parent::__construct($interactive);
- if (isset($_GET['email_address']) && $_GET['email_address'] != "") {
+ if (isset($_GET['email_address']) && ($_GET['email_address'] != '')) {
$this->email_address = validate($_GET['email_address']);
} elseif (isset($_POST['email_address'])) {
$this->email_address = validate($_POST['email_address']);
}
/* Check for selected user... */
- if (isset($_GET['uid']) && $_GET['uid'] != "") {
- $this->uid = validate($_GET['uid']);
- } elseif (isset($_POST['uid'])) {
- $this->uid = validate($_POST['uid']);
+ if (isset($_GET['login']) && $_GET['login'] != '') {
+ $this->login = validate($_GET['login']);
+ } elseif (isset($_POST['login'])) {
+ $this->login = validate($_POST['login']);
} else {
- $this->uid = '';
+ $this->login = '';
}
}
@@ -289,7 +290,7 @@ class passwordRecovery extends standAlonePage {
}
/* Got a formular answer, validate and try to log in */
- if ($_SERVER["REQUEST_METHOD"] == "POST") {
+ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
if (session::global_is_set('_LAST_PAGE_REQUEST')) {
session::global_set('_LAST_PAGE_REQUEST', time());
}
@@ -307,7 +308,7 @@ class passwordRecovery extends standAlonePage {
$this->step3();
}
}
- } elseif ($_SERVER["REQUEST_METHOD"] == "GET") {
+ } elseif ($_SERVER['REQUEST_METHOD'] == 'GET') {
if (isset($_GET['uniq'])) {
$this->step4();
}
@@ -373,6 +374,8 @@ class passwordRecovery extends standAlonePage {
$this->usealternates = $config->get_cfg_value('passwordRecoveryUseAlternate');
+ $this->loginAttribute = $config->get_cfg_value('passwordRecoveryLoginAttribute', 'uid');
+
@DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $config->get_cfg_value('passwordRecoveryActivated'), "passwordRecoveryActivated");
return ($config->get_cfg_value('passwordRecoveryActivated') == "TRUE");
}
@@ -400,16 +403,16 @@ class passwordRecovery extends standAlonePage {
fusiondirectory_log("Created token branch ".$token);
}
- $dn = "ou=".$this->uid.",$token";
+ $dn = 'ou='.$this->login.','.$token;
$ldap->cat($dn, array('dn'));
$add = ($ldap->count() == 0);
/* We store the token and its validity due date */
$attrs = array(
- 'objectClass' => array('organizationalUnit'),
- 'ou' => $this->uid,
- 'userPassword' => $sha1_temp_password,
- 'description' => time() + $this->delay_allowed * 60,
- );
+ 'objectClass' => array('organizationalUnit'),
+ 'ou' => $this->login,
+ 'userPassword' => $sha1_temp_password,
+ 'description' => time() + $this->delay_allowed * 60,
+ );
$ldap->cd($dn);
if ($add) {
$ldap->add($attrs);
@@ -435,7 +438,7 @@ class passwordRecovery extends standAlonePage {
$ldap = $config->get_ldap_link();
$token = get_ou('recoveryTokenRDN').get_ou('fusiondirectoryRDN').$config->current['BASE'];
- $dn = "ou=".$this->uid.",$token";
+ $dn = 'ou='.$this->login.','.$token;
$ldap->cat($dn);
$attrs = $ldap->fetch();
@@ -460,15 +463,15 @@ class passwordRecovery extends standAlonePage {
if (class_available('supannAccount') && ($config->get_cfg_value('supannPasswordRecovery', 'TRUE') == 'TRUE')) {
$objectClasses[] = 'supannPerson';
}
- $filter = '(&(|(objectClass='.join(')(objectClass=', $objectClasses).'))(uid='.$this->uid.'))';
+ $filter = '(&(|(objectClass='.join(')(objectClass=', $objectClasses).'))('.$this->loginAttribute.'='.ldap_escape_f($this->login).'))';
$ldap->cd($config->current['BASE']);
$ldap->search($filter, array('dn'));
if ($ldap->count() < 1) {
- $this->message[] = sprintf(_('Did not find an account with login "%s"'), $this->uid);
+ $this->message[] = sprintf(_('Did not find an account with login "%s"'), $this->login);
return;
} elseif ($ldap->count() > 1) {
- $this->message[] = sprintf(_('Found multiple accounts with login "%s"'), $this->uid);
+ $this->message[] = sprintf(_('Found multiple accounts with login "%s"'), $this->login);
return;
}
@@ -477,28 +480,29 @@ class passwordRecovery extends standAlonePage {
return $attrs['dn'];
}
- /* find the uid of for the given email address */
+ /* Find the login of for the given email address */
function step2()
{
global $config;
- /* Search uid corresponding to the mail */
+ /* Search login corresponding to the mail */
+ $address_escaped = ldap_escape_f($this->email_address);
if ($this->usealternates) {
- $filter = '(&(objectClass=gosaMailAccount)(|(mail='.$this->email_address.')(gosaMailAlternateAddress='.$this->email_address.')))';
+ $filter = '(&(objectClass=gosaMailAccount)(|(mail='.$address_escaped.')(gosaMailAlternateAddress='.$address_escaped.')))';
} else {
- $filter = '(&(objectClass=gosaMailAccount)(mail='.$this->email_address.'))';
+ $filter = '(&(objectClass=gosaMailAccount)(mail='.$address_escaped.'))';
}
if (class_available('personalInfo') && ($config->get_cfg_value('privateEmailPasswordRecovery', 'FALSE') == 'TRUE')) {
- $filter = '(|'.$filter.'(&(objectClass=fdPersonalInfo)(fdPrivateMail='.$this->email_address.')))';
+ $filter = '(|'.$filter.'(&(objectClass=fdPersonalInfo)(fdPrivateMail='.$address_escaped.')))';
}
if (class_available('supannAccount') && ($config->get_cfg_value('supannPasswordRecovery', 'TRUE') == 'TRUE')) {
- $filter = '(|'.$filter.'(&(objectClass=supannPerson)(supannMailPerso='.$this->email_address.')))';
+ $filter = '(|'.$filter.'(&(objectClass=supannPerson)(supannMailPerso='.$address_escaped.')))';
}
$ldap = $config->get_ldap_link();
$ldap->cd($config->current['BASE']);
- $ldap->search($filter, array('dn', 'userPassword', 'uid'));
+ $ldap->search($filter, array('dn', 'userPassword', $this->loginAttribute));
- /* Only one uid should be found */
+ /* Only one ldap node should be found */
if ($ldap->count() < 1) {
$this->message[] = sprintf(_('There is no account using email "%s"'), $this->email_address);
return;
@@ -514,15 +518,15 @@ class passwordRecovery extends standAlonePage {
$this->message[] = sprintf(_('The user using email "%s" is locked. Please contact your administrator.'), $this->email_address);
return;
}
- $this->uid = $attrs['uid'][0];
+ $this->login = $attrs[$this->loginAttribute][0];
$this->step = 2;
if ($this->interactive) {
$smarty = get_smarty();
- $smarty->assign('uid', $this->uid);
+ $smarty->assign('login', $this->login);
$smarty->assign('email_address', $this->email_address);
- $params = $this->encodeParams(array('uid', 'directory', 'email_address'));
+ $params = $this->encodeParams(array('login', 'directory', 'email_address'));
$smarty->assign('params', $params);
}
@@ -554,14 +558,14 @@ class passwordRecovery extends standAlonePage {
}
$reinit_link = $this->getPageURL();
- $reinit_link .= "?uniq=".urlencode($token);
- $reinit_link .= "&uid=".urlencode($this->uid);
- $reinit_link .= "&email_address=".urlencode($this->email_address);
+ $reinit_link .= '?uniq='.urlencode($token);
+ $reinit_link .= '&login='.urlencode($this->login);
+ $reinit_link .= '&email_address='.urlencode($this->email_address);
- @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $reinit_link, "Setting link to");
+ @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $reinit_link, 'Setting link to');
/* Send the mail */
- $mail_body = sprintf($this->mail_body, $this->uid, $reinit_link);
+ $mail_body = sprintf($this->mail_body, $this->login, $reinit_link);
if (mail_utf8($this->email_address, FALSE, $this->from_mail, $this->mail_subject, $mail_body)) {
$this->step = 3;
@@ -570,7 +574,7 @@ class passwordRecovery extends standAlonePage {
}
$smarty = get_smarty();
- $smarty->assign('uid', $this->uid);
+ $smarty->assign('login', $this->login);
}
/* check if the given token is the good one */
@@ -588,8 +592,8 @@ class passwordRecovery extends standAlonePage {
$smarty->assign('uniq', $uniq_id_from_mail);
$this->uniq = $uniq_id_from_mail;
$this->step = 4;
- $smarty->assign('uid', $this->uid);
- $params = $this->encodeParams(array('uid', 'directory', 'email_address', 'uniq'));
+ $smarty->assign('login', $this->login);
+ $params = $this->encodeParams(array('login', 'directory', 'email_address', 'uniq'));
$smarty->assign('params', $params);
if (isset($_POST['change'])) {
@@ -623,7 +627,7 @@ class passwordRecovery extends standAlonePage {
$userTabs->save_object();
$userTabs->save();
- fusiondirectory_log('User '.$this->uid.' password has been changed');
+ fusiondirectory_log('User '.$this->login.' password has been changed');
return TRUE;
}
@@ -637,7 +641,7 @@ class passwordRecovery extends standAlonePage {
}
/* Send the mail */
- $mail_body = sprintf($this->mail2_body, $this->uid);
+ $mail_body = sprintf($this->mail2_body, $this->login);
if (mail_utf8($this->email_address, FALSE, $this->from_mail, $this->mail2_subject, $mail_body)) {
$smarty = get_smarty();
diff --git a/html/index.php b/html/index.php
index ef48b50e857e3e004dac01bf79340fab6aa9c446..65165dcadd6390e28e2174e56f12abd1acda3c80 100644
--- a/html/index.php
+++ b/html/index.php
@@ -113,9 +113,9 @@ if (isset($_REQUEST['signout']) && $_REQUEST['signout']) {
$config = session::global_get('config');
if ($config->get_cfg_value('casActivated') == 'TRUE') {
require_once('CAS.php');
- /* Move CASÂ autoload before FD autoload */
- spl_autoload_unregister('CAS_autoload');
- spl_autoload_register('CAS_autoload', TRUE, TRUE);
+ /* Move FD autoload after CAS autoload */
+ spl_autoload_unregister('__fusiondirectory_autoload');
+ spl_autoload_register('__fusiondirectory_autoload');
phpCAS::client(
CAS_VERSION_2_0,
$config->get_cfg_value('casHost', 'localhost'),
@@ -582,9 +582,9 @@ 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');
- spl_autoload_register('CAS_autoload', TRUE, TRUE);
+ /* Move FD autoload after CAS autoload */
+ spl_autoload_unregister('__fusiondirectory_autoload');
+ spl_autoload_register('__fusiondirectory_autoload');
Index::casLoginProcess();
} elseif ($config->get_cfg_value('httpHeaderAuthActivated') == 'TRUE') {
Index::headerAuthLoginProcess();
diff --git a/html/themes/breezy/style.css b/html/themes/breezy/style.css
index 7df9446c135bdef1f41783af9eabc1c9ac2fc4b1..e8f4846d596d2fc831a6ea70db4ed8da85523294 100644
--- a/html/themes/breezy/style.css
+++ b/html/themes/breezy/style.css
@@ -591,7 +591,7 @@ border-color: #ffd324;
color: #412701;
}
.success {
-background: ##f3f4f4;
+background: #f3f4f4;
color: #264409;
border-color: #f3f4f4;
}
diff --git a/ihtml/themes/breezy/framework.tpl b/ihtml/themes/breezy/framework.tpl
index d1061fe2821622203d72f5cd9a4e8a4f95ec1a95..3c6bc51335a2c76cd9a73c039acf91ef043bc093 100644
--- a/ihtml/themes/breezy/framework.tpl
+++ b/ihtml/themes/breezy/framework.tpl
@@ -19,7 +19,7 @@
</div>
<div id="header-right">
<a><span class="optional">{t}Signed in:{/t} </span><b>{$username}</b></a>
- {if ($sessionLifetime > 0)}
+ {if ($sessionLifetime >= 1)}
<div class="logout-label">
<canvas id="sTimeout" width="22" height="22" title="{$sessionLifetime}|{t}Session expires in %d!{/t}"></canvas>
</div>
@@ -67,7 +67,7 @@
}
{/literal}
- {if ($sessionLifetime > 0)}
+ {if ($sessionLifetime >= 1)}
logout.delay({$sessionLifetime});
{/if}
diff --git a/ihtml/themes/breezy/msg_dialog.tpl b/ihtml/themes/breezy/msg_dialog.tpl
index a10127140680a8124569ef8e4e63e28309590cdf..5a03eec79dbb9c1467bb2493cdbdf14a66e1a6da 100644
--- a/ihtml/themes/breezy/msg_dialog.tpl
+++ b/ihtml/themes/breezy/msg_dialog.tpl
@@ -12,7 +12,7 @@
background-image:url(images/opacity_black.png);">
{else}
- {if $s_Trace != "" && $i_TraceCnt != 0}
+ {if $s_Trace != "" && $i_TraceCnt >= 1}
<div id="trace_{$i_ID}"
style="
display:none;
@@ -49,7 +49,7 @@
{$s_Message}
</div>
<div class="plugbottom">
- {if $s_Trace != "" && $i_TraceCnt != 0}
+ {if $s_Trace != "" && $i_TraceCnt >= 1}
<input type="button" id="Trace" name="Trace"
onClick="$('trace_{$i_ID}').toggle();" value="{t}Trace{/t}"/>
{/if}
diff --git a/ihtml/themes/breezy/recovery.tpl b/ihtml/themes/breezy/recovery.tpl
index e8193d514760dbbcca9042becaaa847c151b3c4e..9c702f7202e853a95b014505fe9ef7bb849afe22 100644
--- a/ihtml/themes/breezy/recovery.tpl
+++ b/ihtml/themes/breezy/recovery.tpl
@@ -29,7 +29,7 @@
{if $step==3}
<p class="infotext">
- {t 1=$uid 2=$email_address}Information to reset password for %1 has been sent to email address %2{/t}<br/>
+ {t 1=$login 2=$email_address}Information to reset password for %1 has been sent to email address %2{/t}<br/>
<span class="warning">{t 1=$delay_allowed}Warning : this email is only valid for %1 minutes.{/t}</span>
</p>
</div>
@@ -52,9 +52,9 @@
</tr>
{/if}
<tr>
- <td><label for="uid">{t}Login{/t}</label></td>
+ <td><label for="login">{t}Login{/t}</label></td>
<td>
- <i>{$uid}</i>
+ <i>{$login}</i>
</td>
</tr>
<tr>
@@ -138,7 +138,7 @@
<!-- Place cursor in email field -->
<script type="text/javascript">
<!-- // First input field on page
- focus_field('error_accept','uid','directory','username','current_password','email_address');
+ focus_field('error_accept','login','directory','username','current_password','email_address');
next_msg_dialog();
-->
</script>
diff --git a/include/class_baseSelector.inc b/include/class_baseSelector.inc
index 9c2d585182e138187538f42516b1efff946f83ae..4727f62bba8f58a8a108a6052c3270a63de096f9 100644
--- a/include/class_baseSelector.inc
+++ b/include/class_baseSelector.inc
@@ -142,7 +142,7 @@ class baseSelector {
{
global $config;
- if (!isset($this->base) || ($this->base == "")) {
+ if (!isset($this->base) || ($this->base == '')) {
$this->lastState = FALSE;
return FALSE;
}
@@ -179,7 +179,6 @@ class baseSelector {
}
}
}
-
}
/* Skip if there's no change */
diff --git a/include/class_management.inc b/include/class_management.inc
index dd372dee0c7564495660f1c9c609fb1abf9719c3..7b384c8c987e84ba49572ce9caf34aed869867ff 100644
--- a/include/class_management.inc
+++ b/include/class_management.inc
@@ -147,7 +147,7 @@ class management
function execute()
{
// Ensure that html posts and gets are kept even if we see a 'Entry islocked' dialog.
- $vars = array('/^act$/','/^listing/','/^PID$/','/^FILTER_PID$/');
+ $vars = array('/^act$/','/^listing/','/^PID$/');
session::set('LOCK_VARS_TO_USE', $vars);
/* Display the copy & paste dialog, if it is currently open */
diff --git a/include/class_objects.inc b/include/class_objects.inc
index 03c94d7c846b6a39c23a25bc0c09bfa787941d57..f8c56856308707e336b1e2689794439286f66102 100644
--- a/include/class_objects.inc
+++ b/include/class_objects.inc
@@ -22,9 +22,9 @@
class objects
{
/*!
- * \brief Get list of object of objectType $type in $ou
+ * \brief Get list of object of objectTypes from $types in $ou
*
- * \param string $type the objectType to list
+ * \param array $types the objectTypes to list
* \param mixed $attrs The attributes to fetch.
* If this is a single value, the resulting associative array will have for each dn the value of this attribute.
* If this is an array, the keys must be the wanted attributes, and the values can be either 1, '*' or 'raw'
@@ -32,14 +32,36 @@ class objects
* Other values are considered to be 1.
* \param string $ou the LDAP branch to search in, base will be used if it is NULL
* \param string $filter an additional filter to use in the LDAP search.
+ * \param boolean $checkAcl should ACL be ignored or checked? Defaults to FALSE.
*
* \return The list of objects as an associative array (keys are dns)
*/
- static function ls ($type, $attrs = NULL, $ou = NULL, $filter = '')
+ static function ls ($types, $attrs = NULL, $ou = NULL, $filter = '', $checkAcl = FALSE)
{
+ global $ui;
+
+ if (!is_array($types)) {
+ $types = array($types);
+ }
+
+ if ($checkAcl) {
+ if (count($types) > 1) {
+ throw new FusionDirectoryException('Cannot evaluate ACL for several types');
+ }
+ $infos = static::infos(reset($types));
+ $acl = $infos['aclCategory'].'/'.$infos['mainTab'];
+ }
+
if ($attrs === NULL) {
- $infos = static::infos($type);
- $attrs = $infos['mainAttr'];
+ $attrs = array();
+ foreach ($types as $type) {
+ $infos = static::infos($type);
+ $attrs[] = $infos['mainAttr'];
+ }
+ $attrs = array_unique($attrs);
+ if (count($attrs) == 1) {
+ $attrs = $attrs[0];
+ }
}
if (is_array($attrs)) {
@@ -48,13 +70,16 @@ class objects
$search_attrs = array($attrs);
}
try {
- $ldap = static::search($type, $search_attrs, $ou, $filter);
+ $ldap = static::search($types, $search_attrs, $ou, $filter);
} catch (NonExistingBranchException $e) {
return array();
}
$result = array();
while ($fetched_attrs = $ldap->fetch()) {
$key = $fetched_attrs['dn'];
+ if ($checkAcl && !preg_match('/r/', $ui->get_permissions($key, $acl))) {
+ continue;
+ }
if (is_array($attrs)) {
$result[$key] = array();
foreach ($attrs as $attr => $mode) {
@@ -79,18 +104,18 @@ class objects
}
/*!
- * \brief Get count of objects of objectType $type in $ou
+ * \brief Get count of objects of objectTypes from $types in $ou
*
- * \param string $type the objectType to list
+ * \param array $types the objectTypes to list
* \param string $ou the LDAP branch to search in, base will be used if it is NULL
* \param string $filter an additional filter to use in the LDAP search.
*
* \return The number of objects of type $type in $ou
*/
- static function count ($type, $ou = NULL, $filter = '')
+ static function count ($types, $ou = NULL, $filter = '')
{
try {
- $ldap = static::search($type, array('dn'), $ou, $filter);
+ $ldap = static::search($types, array('dn'), $ou, $filter);
} catch (EmptyFilterException $e) {
return 0;
} catch (NonExistingBranchException $e) {
@@ -99,16 +124,28 @@ class objects
return $ldap->count();
}
- private static function search ($type, $search_attrs, $ou = NULL, $filter = '')
+ private static function search ($types, $search_attrs, $ou = NULL, $filter = '')
{
global $config;
+ if (!is_array($types)) {
+ $types = array($types);
+ }
+
if ($ou === NULL) {
$ou = $config->current['BASE'];
}
- $infos = static::infos($type);
- if ($infos['filter'] == '') {
+ $typeFilters = array();
+ foreach ($types as $type) {
+ $infos = static::infos($type);
+
+ if ($infos['filter'] == '') {
+ continue;
+ }
+ $typeFilters[] = $infos['filter'];
+ }
+ if (empty($typeFilters)) {
throw new EmptyFilterException();
}
@@ -117,12 +154,12 @@ class objects
throw new NonExistingBranchException();
}
if (empty($filter)) {
- $filter = $infos['filter'];
+ $filter = '(|'.implode($typeFilters).')';
} else {
if (!preg_match('/^\(.*\)$/', $filter)) {
$filter = '('.$filter.')';
}
- $filter = '(&'.$filter.$infos['filter'].')';
+ $filter = '(&'.$filter.'(|'.implode($typeFilters).'))';
}
$ldap->cd($ou);
$ldap->search($filter, $search_attrs);
diff --git a/include/class_plugin.inc b/include/class_plugin.inc
index 408497a3fcf80de945eeffbb17cb6a4a6e481460..00cfa8206bd4f9d110493a75b222d5d5a7827df6 100644
--- a/include/class_plugin.inc
+++ b/include/class_plugin.inc
@@ -252,6 +252,12 @@ class plugin
}
}
+ /* Used by prepare_save and template::apply */
+ public function mergeObjectClasses(array $oc)
+ {
+ return array_merge_unique($oc, $this->objectclasses);
+ }
+
protected function templateLoadAttrs($template_attrs)
{
$this->is_template = TRUE;
@@ -459,7 +465,7 @@ class plugin
$is_new = empty($oc);
/* Load (minimum) attributes, add missing ones */
- $this->attrs['objectClass'] = array_merge_unique($oc, $this->objectclasses);
+ $this->attrs['objectClass'] = $this->mergeObjectClasses($oc);
/* Copy standard attributes */
foreach ($this->attributes as $val) {
@@ -924,6 +930,10 @@ class plugin
*/
static function tpl_parse_string($string, $attrs, $escapeMethod = NULL)
{
+ if (preg_match('/^%%/', $string)) {
+ /* Special case: %% at beginning of string means do not touch it. Used by binary attributes. */
+ return preg_replace('/^%%/', '', $string);
+ }
$offset = 0;
while (preg_match('/%([^%]+)%/', $string, $m, PREG_OFFSET_CAPTURE, $offset)) {
$replace = static::tpl_parse_mask($m[1][0], $attrs);
@@ -1206,7 +1216,12 @@ class plugin
$ofield = $ref[1];
$filter = $ref[2];
$cinfos = pluglist::pluginInfos($class);
- foreach ($cinfos['plObjectType'] as $key => $objectType) {
+ if (is_subclass_of($class, 'simpleService')) {
+ $objectTypes = array('server');
+ } else {
+ $objectTypes = $cinfos['plObjectType'];
+ }
+ foreach ($objectTypes as $key => $objectType) {
if (!is_numeric($key)) {
$objectType = $key;
}
@@ -1275,11 +1290,12 @@ class plugin
// For each tab concerned
foreach ($tabRefs['refs'] as $tab => $fieldRefs) {
// If the tab is activated on this object
- if (isset($tabobject->by_object[$tab]) && ($tabobject->by_object[$tab]->is_account || $tabobject->by_object[$tab]->ignore_account)) {
+ $pluginobject = $tabobject->getTabOrServiceObject($tab);
+ if ($pluginobject !== FALSE) {
// For each field
foreach ($fieldRefs as $ofield => $field) {
// call plugin::foreignKeyUpdate(ldapname, oldvalue, newvalue, source) on the object
- $tabobject->by_object[$tab]->foreignKeyUpdate(
+ $pluginobject->foreignKeyUpdate(
$ofield,
$field['oldvalue'],
$field['newvalue'],
@@ -1291,18 +1307,19 @@ class plugin
)
);
}
- $tabobject->by_object[$tab]->save_object();
- $tabobject->by_object[$tab]->save();
+ $pluginobject->save_object();
+ $pluginobject->save();
}
}
} elseif ($mode == 'references') {
// For each tab concerned
foreach ($tabRefs['refs'] as $tab => $tab_infos) {
// If the tab is activated on this object
- if (isset($tabobject->by_object[$tab])) {
+ $pluginobject = $tabobject->getTabOrServiceObject($tab);
+ if ($pluginobject !== FALSE) {
// For each field
foreach ($tab_infos['fields'] as $ofield => $field) {
- if ($tabobject->by_object[$tab]->foreignKeyCheck(
+ if ($pluginobject->foreignKeyCheck(
$ofield,
$field['value'],
array(
@@ -1329,7 +1346,11 @@ class plugin
'fields' => array(),
);
try {
- $refs[$dn]['tabs'][$tab]['link'] = objects::link($dn, $objectType, "tab_$tab", sprintf(_('Tab "%s"'), $tab_infos['name']));
+ if (is_subclass_of($tab, 'simpleService')) {
+ $refs[$dn]['tabs'][$tab]['link'] = objects::link($dn, $objectType, "service_$tab", sprintf(_('Service "%s"'), $tab_infos['name']));
+ } else {
+ $refs[$dn]['tabs'][$tab]['link'] = objects::link($dn, $objectType, "tab_$tab", sprintf(_('Tab "%s"'), $tab_infos['name']));
+ }
} catch (Exception $e) {
trigger_error("Could not create link to $dn $tab: ".$e->getMessage());
$refs[$dn]['tabs'][$tab]['link'] = $tab;
diff --git a/include/class_session.inc b/include/class_session.inc
index e466be12a2dc80527620b5660ba1cdc93cfc41e0..b9e0f6012df15e5c3d35bf3ee2471f4f3dfa683a 100644
--- a/include/class_session.inc
+++ b/include/class_session.inc
@@ -134,11 +134,25 @@ class session {
}
/*!
- * \brief Accessor of a session
+ * \brief Accessor of a session var
*
- * \param string $name Name of the session
+ * \param string $name Name of the session var
+ */
+ public static function global_get($name)
+ {
+ if (isset($_SESSION[$name])) {
+ return $_SESSION[$name];
+ } else {
+ return NULL;
+ }
+ }
+
+ /*!
+ * \brief Accessor of a session var by reference
+ *
+ * \param string $name Name of the session var
*/
- public static function &global_get($name)
+ public static function &global_get_ref($name)
{
$ret = &$_SESSION[$name];
return $ret;
diff --git a/include/class_template.inc b/include/class_template.inc
index ebb73833d03b8dc032bc970490d862a4952e2a20..31c4c5b5b80ee4006dcdb9cfb225bd36696114e2 100644
--- a/include/class_template.inc
+++ b/include/class_template.inc
@@ -191,6 +191,12 @@ class template
{
if ($targetdn !== NULL) {
$this->tabObject = objects::open($targetdn, $this->type);
+ unset($this->attrs['objectClass']['count']);
+ foreach ($this->tabObject->by_object as $class => &$plugin) {
+ if ($plugin->is_account || $plugin->ignore_account) {
+ $this->attrs['objectClass'] = $plugin->mergeObjectClasses($this->attrs['objectClass']);
+ }
+ }
} elseif ($this->applied) {
trigger_error('Templates can’t be applied twice without calling reset before');
return;
diff --git a/include/class_userinfo.inc b/include/class_userinfo.inc
index 081ef3b59716b113eb543343a5c85d8643143883..16aa80affe9b39bc6cce5481a35455391a840ecb 100644
--- a/include/class_userinfo.inc
+++ b/include/class_userinfo.inc
@@ -428,7 +428,7 @@ class userinfo
}
/* Push cache answer? */
- $ACL_CACHE = &session::global_get('ACL_CACHE');
+ $ACL_CACHE = &session::global_get_ref('ACL_CACHE');
if (isset($ACL_CACHE["$dn+$object+$attribute"])) {
$ret = $ACL_CACHE["$dn+$object+$attribute"];
if ($skip_write) {
@@ -635,7 +635,7 @@ class userinfo
}
/* Use cached results if possilbe */
- $ACL_CACHE = &session::global_get('ACL_CACHE');
+ $ACL_CACHE = &session::global_get_ref('ACL_CACHE');
if (!is_array($module)) {
$module = array($module);
diff --git a/include/functions.inc b/include/functions.inc
index c4754566541486f7ab58c15647fb5f5c539290ce..3f908f80f98f169f812de50cfd70505ed79a086c 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -582,11 +582,13 @@ function ldap_login_user ($username, $password)
/* password check, bind as user with supplied password */
$ldap->disconnect();
- $ldap = new ldapMultiplexer(new LDAP($ui->dn, $password, $config->current['SERVER'],
- isset($config->current['LDAPFOLLOWREFERRALS']) &&
- $config->current['LDAPFOLLOWREFERRALS'] == 'TRUE',
- isset($config->current['LDAPTLS'])
- && $config->current['LDAPTLS'] == 'TRUE'));
+ $ldapObj = new LDAP($ui->dn, $password, $config->current['SERVER'],
+ isset($config->current['LDAPFOLLOWREFERRALS']) &&
+ $config->current['LDAPFOLLOWREFERRALS'] == 'TRUE',
+ isset($config->current['LDAPTLS'])
+ && $config->current['LDAPTLS'] == 'TRUE'
+ );
+ $ldap = new ldapMultiplexer($ldapObj);
if (!$ldap->success()) {
return NULL;
}
@@ -635,7 +637,7 @@ function add_lock($object, $user)
return;
}
- $cache = &session::global_get('LOCK_CACHE');
+ $cache = &session::global_get_ref('LOCK_CACHE');
if (isset($_POST['open_readonly'])) {
$cache['READ_ONLY'][$object] = TRUE;
return;
@@ -708,7 +710,7 @@ function del_lock ($object)
skip removing the lock entry, there wasn't any lock created.
*/
if (session::global_is_set('LOCK_CACHE')) {
- $cache = &session::global_get('LOCK_CACHE');
+ $cache = &session::global_get_ref('LOCK_CACHE');
if (isset($cache['READ_ONLY'][$object])) {
unset($cache['READ_ONLY'][$object]);
return;
@@ -794,10 +796,13 @@ function get_lock($object)
*
* \param mixed $objects Array of dns for which a lock will be searched or dn of a single object
*
+ * \param boolean $allow_readonly TRUE if readonly access should be permitted,
+ * FALSE if not (default).
+ *
* \return A numbered array containing all found locks as an array with key 'object'
* and key 'user', or FALSE if an error occured.
*/
-function get_locks($objects)
+function get_locks($objects, $allow_readonly = FALSE)
{
global $config;
@@ -805,12 +810,19 @@ function get_locks($objects)
$objects = reset($objects);
}
if (is_array($objects)) {
+ if ($allow_readonly) {
+ trigger_error('Read only is not possible for several objects');
+ }
$filter = '(&(objectClass=fdLockEntry)(|';
foreach ($objects as $obj) {
$filter .= '(fdObjectDn='.base64_encode($obj).')';
}
$filter .= '))';
} else {
+ if ($allow_readonly && isset($_POST['open_readonly'])) {
+ /* If readonly is allowed and asked and there is only one object, bypass lock detection */
+ return array();
+ }
$filter = '(&(objectClass=fdLockEntry)(fdObjectDn='.base64_encode($objects).'))';
}
@@ -2535,7 +2547,8 @@ function check_schema($cfg)
$checks = array();
/* Get objectclasses */
- $ldap = new ldapMultiplexer(new LDAP($cfg['admin'], $cfg['password'], $cfg['connection'], FALSE, $cfg['tls']));
+ $ldapObj = new LDAP($cfg['admin'], $cfg['password'], $cfg['connection'], FALSE, $cfg['tls']);
+ $ldap = new ldapMultiplexer($ldapObj);
$objectclasses = $ldap->get_objectclasses(TRUE);
if (count($objectclasses) == 0) {
msg_dialog::display(_('LDAP warning'), _('Cannot get schema information from server. No schema check possible!'), WARNING_DIALOG);
@@ -3450,4 +3463,23 @@ function mail_utf8($to, $from_user, $from_email, $subject, $message, $type = 'pl
return mail($to, $subject, $message, $headers, $additional_parameters);
}
+
+/* Calls fopen, gives errors as an array if any, file handle if successful */
+function fopenWithErrorHandling()
+{
+ $args = func_get_args();
+ $errors = array();
+ set_error_handler(
+ function ($errno, $errstr, $errfile, $errline, $errcontext) use (&$errors)
+ {
+ $errors[] = $errstr;
+ }
+ );
+ $fh = @call_user_func_array('fopen', $args);
+ restore_error_handler();
+ if ($fh !== FALSE) {
+ return $fh;
+ }
+ return $errors;
+}
?>
diff --git a/include/php_setup.inc b/include/php_setup.inc
index c7901d14e4c6331e97595fe74a699c0a324ab511..f38ddf6378433240a0a448a635d574bf676d3517 100644
--- a/include/php_setup.inc
+++ b/include/php_setup.inc
@@ -169,7 +169,7 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
/* Return if error reporting is set to zero */
if (error_reporting() == 0) {
set_error_handler('gosaRaiseError', E_WARNING | E_NOTICE | E_USER_ERROR | E_USER_WARNING | E_USER_NOTICE | E_STRICT);
- return;
+ return FALSE;
}
/* Workaround for buggy imap_open error outputs */
diff --git a/include/simpleplugin/attributes/class_FileAttribute.inc b/include/simpleplugin/attributes/class_FileAttribute.inc
index b045482e90fe4b2c1aae9eddf387bb2072e4282c..179bea0662c4f4cafa51493cf7fd745d69508cd9 100644
--- a/include/simpleplugin/attributes/class_FileAttribute.inc
+++ b/include/simpleplugin/attributes/class_FileAttribute.inc
@@ -349,4 +349,28 @@ class ImageAttribute extends FileAttribute
$id = $this->getHtmlId();
return array($id.'_img',$id,'upload'.$id);
}
+
+ /*! \brief Fill LDAP value in the attrs array
+ */
+ function fillLdapValue (&$attrs)
+ {
+ if ($this->isInLdap()) {
+ $value = $this->computeLdapValue();
+ if ($value !== '') {
+ if (isset($this->plugin) && $this->plugin->is_template) {
+ /* Add %% to provide template from parsing binary string */
+ $value = '%%'.$value;
+ }
+ $attrs[$this->getLdapName()] = $value;
+ } else {
+ $attrs[$this->getLdapName()] = array();
+ }
+ }
+ }
+
+ function inputValue ($value)
+ {
+ /* Remove %% that might be there in case of templating */
+ return preg_replace('/^%%/', '', $value);
+ }
}
diff --git a/include/simpleplugin/class_helpersAttribute.inc b/include/simpleplugin/class_helpersAttribute.inc
index 15f59224363dc9ba1a3a10c4ac22b368e15cb669..c6fe058b3cf4f4e26071a868d7a727a7ef138444 100644
--- a/include/simpleplugin/class_helpersAttribute.inc
+++ b/include/simpleplugin/class_helpersAttribute.inc
@@ -237,7 +237,7 @@ class UnitIntAttribute extends CompositeAttribute
$i = (count($choices) - 1);
($value % $choices[$i] != 0) && ($i > 0);
$i--
- )
+ );
return array($value / $choices[$i], $choices[$i]);
}
diff --git a/include/simpleplugin/class_simpleManagement.inc b/include/simpleplugin/class_simpleManagement.inc
index 6fb5f62d5cfb1807ee8ee07b81fb0091560d43ed..1d99769d9b5958992c280288dfc8d45f726c65a2 100644
--- a/include/simpleplugin/class_simpleManagement.inc
+++ b/include/simpleplugin/class_simpleManagement.inc
@@ -590,7 +590,7 @@ class simpleManagement extends management
// Get the dn of the object and creates lock
$this->dn = array_pop($target);
set_object_info($this->dn);
- if ($locks = get_locks($this->dn)) {
+ if ($locks = get_locks($this->dn, TRUE)) {
return gen_locked_message($locks, $this->dn, TRUE);
}
add_lock ($this->dn, $ui->dn);
diff --git a/include/simpleplugin/class_simpleTabs.inc b/include/simpleplugin/class_simpleTabs.inc
index 1cd9c4aaa327e87143a5fad819a5edd2b52a8dd3..d14864cce3d298f8237a823ce312c8e1aa5f5a8e 100644
--- a/include/simpleplugin/class_simpleTabs.inc
+++ b/include/simpleplugin/class_simpleTabs.inc
@@ -522,6 +522,18 @@ class simpleTabs
}
return objects::infos($this->objectType);
}
+
+ /* Return tab or service if activated, FALSEÂ otherwise */
+ function getTabOrServiceObject($tab)
+ {
+ if (isset($this->by_object[$tab]) && ($this->by_object[$tab]->is_account || $this->by_object[$tab]->ignore_account)) {
+ return $this->by_object[$tab];
+ } elseif (is_subclass_of($tab, 'simpleService') && isset($this->by_object['ServerService']->plugins[$tab]) && $this->by_object['ServerService']->plugins[$tab]->is_account) {
+ return $this->by_object['ServerService']->plugins[$tab];
+ } else {
+ return FALSE;
+ }
+ }
}
class simpleTabs_noSpecial extends simpleTabs
diff --git a/include/variables_common.inc b/include/variables_common.inc
index 5901ed06cf2a732b877cd5c04a3b9c2dc224d810..fc039148d6043f0dd818d30a1e46a95300d58aa7 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.19"); /*! Define FusionDirectory version */
+define ("FD_VERSION", "1.0.20"); /*! Define FusionDirectory version */
/*!
* \brief FusionDirectory config object RDN
diff --git a/locale/ar/fusiondirectory.po b/locale/ar/fusiondirectory.po
index 04d076b9a39c9fbde242f27f8530b662f6594f27..e2a1aa1c8eb9f4159494759fdf6541a99cbc76aa 100644
--- a/locale/ar/fusiondirectory.po
+++ b/locale/ar/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-11 19:09+0100\n"
-"PO-Revision-Date: 2017-01-10 14:53+0000\n"
+"POT-Creation-Date: 2017-03-29 21:46+0200\n"
+"PO-Revision-Date: 2017-03-26 15:51+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:382
+#: plugins/personal/generic/class_user.inc:385
msgid "Preferred language"
msgstr ""
@@ -316,30 +316,30 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
+#: setup/class_setupStep_Migrate.inc:981
+#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1180
+#: setup/class_setupStep_Migrate.inc:1273
+#: setup/class_setupStep_Migrate.inc:1352
+#: setup/class_setupStep_Migrate.inc:1396
+msgid "LDAP query failed"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
+#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
#: setup/class_setupStep_Migrate.inc:982
#: setup/class_setupStep_Migrate.inc:1058
#: setup/class_setupStep_Migrate.inc:1181
#: setup/class_setupStep_Migrate.inc:1274
#: setup/class_setupStep_Migrate.inc:1353
#: setup/class_setupStep_Migrate.inc:1397
-msgid "LDAP query failed"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:983
-#: setup/class_setupStep_Migrate.inc:1059
-#: setup/class_setupStep_Migrate.inc:1182
-#: setup/class_setupStep_Migrate.inc:1275
-#: setup/class_setupStep_Migrate.inc:1354
-#: setup/class_setupStep_Migrate.inc:1398
msgid "Possibly the \"root object\" is missing."
msgstr ""
#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:866
-#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
+#: setup/class_setupStep_Migrate.inc:880
msgid "Failed"
msgstr "خطأ"
@@ -360,11 +360,11 @@ msgid ""
msgstr ""
#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:677
-#: include/functions.inc:724 include/functions.inc:822
-#: include/functions.inc:2988 include/functions.inc:3165
+#: include/functions.inc:522 include/functions.inc:679
+#: include/functions.inc:726 include/functions.inc:834
+#: include/functions.inc:3001 include/functions.inc:3178
#: include/class_config.inc:322 include/class_ldap.inc:924
#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
#: include/simpleplugin/attributes/class_SetAttribute.inc:726
@@ -386,13 +386,13 @@ msgid "The specified user \"%s\" does not have full access to your ldap database
msgstr ""
#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1085
-#: setup/class_setupStep_Migrate.inc:1204
-#: setup/class_setupStep_Migrate.inc:1315
-#: setup/class_setupStep_Migrate.inc:1379
-#: setup/class_setupStep_Migrate.inc:1423 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:838
-#: include/functions.inc:2523 include/simpleplugin/class_simpleTabs.inc:322
+#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1203
+#: setup/class_setupStep_Migrate.inc:1314
+#: setup/class_setupStep_Migrate.inc:1378
+#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
+#: include/class_xml.inc:55 include/functions.inc:850
+#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
#: html/index.php:597 html/main.php:158
#: plugins/personal/posix/class_posixAccount.inc:482
#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
@@ -413,7 +413,7 @@ msgid "User migration"
msgstr ""
#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1029
+#: setup/class_setupStep_Migrate.inc:1028
msgid "Migration error"
msgstr ""
@@ -422,64 +422,64 @@ msgstr ""
msgid "Cannot migrate entry \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:859
+#: setup/class_setupStep_Migrate.inc:858
#, php-format
msgid "FD 1.0.7 administrative accounts found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:862
+#: setup/class_setupStep_Migrate.inc:861
#, php-format
msgid "FD 1.0.7 administrative groups found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:864
+#: setup/class_setupStep_Migrate.inc:863
msgid ""
"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
"file at the end of the setup to migrate it.<br/>"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:867
+#: setup/class_setupStep_Migrate.inc:866
msgid ""
"There is no valid FusionDirectory 1.0.8 administrator account inside your "
"LDAP."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:868 setup/class_setupStep_Migrate.inc:883
+#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
#: include/simpleplugin/simple-list.xml:59
#: plugins/admin/departments/dep-list.xml:48
#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
msgid "Create"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:873
+#: setup/class_setupStep_Migrate.inc:872
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: plugins/admin/users/class_userManagement.inc:42
msgid "Users"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:876
+#: setup/class_setupStep_Migrate.inc:875
msgid "Groups"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStep_Migrate.inc:881
msgid "There is no FusionDirectory administrator account inside your LDAP."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:920
+#: setup/class_setupStep_Migrate.inc:919
msgid "Gives all rights on all objects"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:937 include/class_management.inc:697
+#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
#: include/class_listing.inc:551 include/class_xml.inc:58
#: include/password-methods/class_password-methods-sasl.inc:60
#: include/password-methods/class_password-methods-sasl.inc:86
#: include/password-methods/class_password-methods.inc:393
#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3112
-#: include/functions.inc:3133 include/functions.inc:3173
-#: include/functions.inc:3185 include/functions.inc:3189
-#: include/functions.inc:3196 include/functions.inc:3205
-#: include/functions.inc:3267 include/class_msg_dialog.inc:128
+#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
+#: include/functions.inc:3146 include/functions.inc:3186
+#: include/functions.inc:3198 include/functions.inc:3202
+#: include/functions.inc:3209 include/functions.inc:3218
+#: include/functions.inc:3280 include/class_msg_dialog.inc:128
#: include/class_msg_dialog.inc:164 include/class_config.inc:357
#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
@@ -492,82 +492,82 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:34
#: include/simpleplugin/attributes/class_FileAttribute.inc:37
#: include/simpleplugin/attributes/class_FileAttribute.inc:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:801
-#: include/class_plugin.inc:1534 html/index.php:453 html/index.php:474
+#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
+#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
#: html/index.php:484 html/index.php:546 html/index.php:556
#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
msgid "Error"
msgstr "خطأ"
-#: setup/class_setupStep_Migrate.inc:997
+#: setup/class_setupStep_Migrate.inc:996
msgid "Default ACL roles have not been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:999
+#: setup/class_setupStep_Migrate.inc:998
msgid "Some default ACL roles are missing"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1001
+#: setup/class_setupStep_Migrate.inc:1000
msgid "Default ACL roles have been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1031
+#: setup/class_setupStep_Migrate.inc:1030
#, php-format
msgid "Cannot add ACL role \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1086
+#: setup/class_setupStep_Migrate.inc:1085
#, php-format
msgid "Found %s user(s) outside the configured tree \"%s\"."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1100
-#: setup/class_setupStep_Migrate.inc:1114
+#: setup/class_setupStep_Migrate.inc:1099
+#: setup/class_setupStep_Migrate.inc:1113
msgid "Move users into configured user tree"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
msgid "Cannot move entries to the requested department!"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "Entry will be moved from"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "to"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1154
+#: setup/class_setupStep_Migrate.inc:1153
msgid "The following references will be updated"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1205
+#: setup/class_setupStep_Migrate.inc:1204
#, php-format
msgid "Found %s groups outside the configured tree '%s'."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1219
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1218
+#: setup/class_setupStep_Migrate.inc:1232
msgid "Move groups into configured groups tree"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1316
+#: setup/class_setupStep_Migrate.inc:1315
#, php-format
msgid "Found %s department(s) that will not be visible in FusionDirectory."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1325
-#: setup/class_setupStep_Migrate.inc:1330
+#: setup/class_setupStep_Migrate.inc:1324
+#: setup/class_setupStep_Migrate.inc:1329
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1380
+#: setup/class_setupStep_Migrate.inc:1379
#, php-format
msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1424
+#: setup/class_setupStep_Migrate.inc:1423
#, php-format
msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
@@ -743,10 +743,10 @@ msgstr ""
#: include/class_logging.inc:80 include/class_session.inc:50
#: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:649
-#: include/functions.inc:770 include/functions.inc:1189
-#: include/functions.inc:2243 include/functions.inc:2285
-#: include/functions.inc:2314 include/class_ldap.inc:873
+#: include/functions.inc:564 include/functions.inc:651
+#: include/functions.inc:772 include/functions.inc:1201
+#: include/functions.inc:2255 include/functions.inc:2297
+#: include/functions.inc:2326 include/class_ldap.inc:873
#: include/class_ldap.inc:911 include/class_acl.inc:118
msgid "Internal error"
msgstr "خطأ داخلي"
@@ -813,12 +813,12 @@ msgid ""
"plugin instance!"
msgstr ""
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1188
+#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
#: include/class_listing.inc:1190
msgid "Root"
msgstr ""
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
msgid "Submit"
msgstr ""
@@ -919,7 +919,7 @@ msgid "Create a new snapshot from this object"
msgstr ""
#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3302 include/simpleplugin/class_simplePlugin.inc:272
+#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
#: include/simpleplugin/class_simplePlugin.inc:277
#: include/simpleplugin/class_simplePlugin.inc:289
#: html/class_passwordRecovery.inc:116
@@ -952,7 +952,7 @@ msgstr ""
#: include/password-methods/class_password-methods-sha.inc:69
#: include/password-methods/class_password-methods-ssha.inc:73
#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:659 include/class_timezone.inc:51
+#: include/functions.inc:661 include/class_timezone.inc:51
#: include/class_config.inc:159 include/class_config.inc:284
#: include/class_config.inc:843 include/class_config.inc:856
#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
@@ -990,7 +990,7 @@ msgid "Cannot paste"
msgstr ""
#: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
#: plugins/personal/generic/paste_generic.tpl.c:11
msgid "Login"
@@ -1034,245 +1034,245 @@ msgid ""
"administrator."
msgstr ""
-#: include/functions.inc:597
+#: include/functions.inc:599
msgid "Authentication error"
msgstr ""
-#: include/functions.inc:598
+#: include/functions.inc:600
msgid ""
"It seems your user password has expired. Please use <a "
"href=\"recovery.php\">password recovery</a> to change it."
msgstr ""
-#: include/functions.inc:649 include/functions.inc:770
+#: include/functions.inc:651 include/functions.inc:772
msgid "Error while adding a lock. Contact the developers!"
msgstr ""
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid ""
"Cannot create locking information in LDAP tree. Please contact your "
"administrator!"
msgstr ""
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid "LDAP server returned: %s"
msgstr ""
-#: include/functions.inc:838
+#: include/functions.inc:850
msgid ""
"Found multiple locks for object to be locked. This should not happen - "
"cleaning up multiple references."
msgstr ""
-#: include/functions.inc:1109
+#: include/functions.inc:1121
#, php-format
msgid "The size limit of %d entries is exceed!"
msgstr ""
-#: include/functions.inc:1111
+#: include/functions.inc:1123
#, php-format
msgid ""
"Set the new size limit to %s and show me this message if the limit still "
"exceeds"
msgstr ""
-#: include/functions.inc:1128
+#: include/functions.inc:1140
msgid "Configure"
msgstr ""
-#: include/functions.inc:1133
+#: include/functions.inc:1145
msgid "incomplete"
msgstr ""
-#: include/functions.inc:1534
+#: include/functions.inc:1546
msgid "Continue anyway"
msgstr ""
-#: include/functions.inc:1536
+#: include/functions.inc:1548
msgid "Edit anyway"
msgstr ""
-#: include/functions.inc:1538
+#: include/functions.inc:1550
#, php-format
msgid "You're going to edit the LDAP entry/entries %s"
msgstr ""
-#: include/functions.inc:1766
+#: include/functions.inc:1778
msgid "Entries per page"
msgstr ""
-#: include/functions.inc:1797 include/class_filter.inc:353
+#: include/functions.inc:1809 include/class_filter.inc:353
msgid "Apply filter"
msgstr ""
-#: include/functions.inc:2065
+#: include/functions.inc:2077
#, php-format
msgid "%sB"
msgstr ""
-#: include/functions.inc:2066
+#: include/functions.inc:2078
#, php-format
msgid "%sKiB"
msgstr ""
-#: include/functions.inc:2067
+#: include/functions.inc:2079
#, php-format
msgid "%sMiB"
msgstr ""
-#: include/functions.inc:2068
+#: include/functions.inc:2080
#, php-format
msgid "%sGiB"
msgstr ""
-#: include/functions.inc:2069
+#: include/functions.inc:2081
#, php-format
msgid "%sTiB"
msgstr ""
-#: include/functions.inc:2070
+#: include/functions.inc:2082
#, php-format
msgid "%sPiB"
msgstr ""
-#: include/functions.inc:2071
+#: include/functions.inc:2083
#, php-format
msgid "%sEiB"
msgstr ""
-#: include/functions.inc:2072
+#: include/functions.inc:2084
#, php-format
msgid "%sZiB"
msgstr ""
-#: include/functions.inc:2073
+#: include/functions.inc:2085
#, php-format
msgid "%sYiB"
msgstr ""
-#: include/functions.inc:2105 include/class_filter.inc:315
+#: include/functions.inc:2117 include/class_filter.inc:315
msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
msgstr ""
-#: include/functions.inc:2243
+#: include/functions.inc:2255
#, php-format
msgid ""
"File '%s' could not be deleted. Try fusiondirectory-setup --check-"
"directories to fix permissions."
msgstr ""
-#: include/functions.inc:2285
+#: include/functions.inc:2297
msgid "Cannot write to revision file!"
msgstr ""
-#: include/functions.inc:2314
+#: include/functions.inc:2326
msgid "Cannot read to revision file!"
msgstr ""
-#: include/functions.inc:2523
+#: include/functions.inc:2535
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "LDAP warning"
msgstr ""
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "Cannot get schema information from server. No schema check possible!"
msgstr ""
-#: include/functions.inc:2564
+#: include/functions.inc:2577
msgid "Main FusionDirectory schema"
msgstr ""
-#: include/functions.inc:2571
+#: include/functions.inc:2584
msgid "Schema used to store FusionDirectory configuration"
msgstr ""
-#: include/functions.inc:2578
+#: include/functions.inc:2591
msgid "Used to store trust mode information in users or groups."
msgstr ""
-#: include/functions.inc:2585
+#: include/functions.inc:2598
msgid "Used to store templates."
msgstr ""
-#: include/functions.inc:2592
+#: include/functions.inc:2605
msgid "Used to store POSIX information."
msgstr ""
-#: include/functions.inc:2599
+#: include/functions.inc:2612
#, php-format
msgid "Missing required object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2601
+#: include/functions.inc:2614
#, php-format
msgid "Missing optional object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2605
+#: include/functions.inc:2618
#, php-format
msgid "Class(es) available"
msgstr ""
-#: include/functions.inc:2623
+#: include/functions.inc:2636
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2637
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2640
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2641
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3112 include/functions.inc:3133
-#: include/functions.inc:3173 include/functions.inc:3185
-#: include/functions.inc:3189 include/functions.inc:3196
-#: include/functions.inc:3205
+#: include/functions.inc:3125 include/functions.inc:3146
+#: include/functions.inc:3186 include/functions.inc:3198
+#: include/functions.inc:3202 include/functions.inc:3209
+#: include/functions.inc:3218
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3112
+#: include/functions.inc:3125
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3133
+#: include/functions.inc:3146
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3173
+#: include/functions.inc:3186
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3185 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3202
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3205
+#: include/functions.inc:3218
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3267
+#: include/functions.inc:3280
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3303
+#: include/functions.inc:3316
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
@@ -2102,7 +2102,7 @@ msgstr "الإسم"
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
#: plugins/admin/departments/class_department.inc:72
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/groups/class_roleGeneric.inc:91
@@ -2282,7 +2282,7 @@ msgid "The entry %s is not existing"
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:548
+#: include/class_plugin.inc:554
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!"
@@ -2398,14 +2398,19 @@ msgstr ""
msgid "There was a problem uncompressing snapshot data"
msgstr ""
-#: include/class_plugin.inc:803
+#: include/class_plugin.inc:809
#, php-format
msgid ""
"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
msgstr ""
-#: include/class_plugin.inc:1332
+#: include/class_plugin.inc:1350
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/class_plugin.inc:1352
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -2553,44 +2558,44 @@ msgstr ""
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr ""
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
msgid "Email address"
msgstr ""
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
#, php-format
msgid "Did not find an account with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
#, php-format
msgid "Found multiple accounts with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
#, php-format
msgid "There is no account using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There are several accounts using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
#, php-format
msgid "The user using email \"%s\" is locked. Please contact your administrator."
msgstr ""
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
msgid "Contact your administrator, there was a problem with mail server"
msgstr ""
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
msgid "This token is invalid"
msgstr ""
-#: html/class_passwordRecovery.inc:647
+#: html/class_passwordRecovery.inc:651
msgid "There was a problem with mail server, confirmation email not sent"
msgstr ""
@@ -2902,7 +2907,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
#: setup/setup_migrate_adminAccount.tpl.c:14
#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2939,258 +2944,262 @@ msgstr ""
msgid "User account"
msgstr ""
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:296
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:307
msgid "Personal information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "الإسم العائلي"
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
msgid "Last name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "الإسم الأول"
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
msgid "First name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
msgid "Short description of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "Picture"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "The avatar for this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:330
+#: plugins/personal/generic/class_user.inc:333
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:334
+#: plugins/personal/generic/class_user.inc:337
#: plugins/admin/departments/class_department.inc:90
#: plugins/admin/departments/class_department.inc:96
msgid "Location"
msgstr ""
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:341
#: plugins/admin/departments/class_department.inc:93
msgid "State"
msgstr ""
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
#: plugins/admin/departments/class_department.inc:102
msgid "Address"
msgstr "العنوان"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
msgid "Business postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
#: plugins/admin/departments/class_department.inc:106
msgid "Phone"
msgstr "الهاتÙ"
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
msgid "Business phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Mobile"
msgstr "الهات٠المØمول"
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Business mobile number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Pager"
msgstr ""
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
#: plugins/admin/departments/class_department.inc:110
msgid "Fax"
msgstr "الÙاكس"
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:373
+#: plugins/personal/generic/class_user.inc:376
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:393
+#: plugins/personal/generic/class_user.inc:396
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Display name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Private phone"
msgstr ""
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Home phone number"
msgstr "رقم المنزل"
-#: plugins/personal/generic/class_user.inc:411
+#: plugins/personal/generic/class_user.inc:414
msgid "Organizational information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
msgid "Title"
msgstr ""
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
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:421
+#: plugins/personal/generic/class_user.inc:424
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
msgid "Organization"
msgstr ""
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
#: plugins/admin/departments/class_department.inc:33
#: plugins/admin/departments/class_department.inc:39
#: plugins/admin/departments/dep-list.xml:21
msgid "Department"
msgstr "القسم"
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
msgid "Department to which the user belongs"
msgstr ""
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:437
+#: plugins/personal/generic/class_user.inc:440
msgid "Employee type"
msgstr ""
-#: plugins/personal/generic/class_user.inc:441
+#: plugins/personal/generic/class_user.inc:444
#: plugins/admin/departments/class_department.inc:84
msgid "Manager"
msgstr ""
-#: plugins/personal/generic/class_user.inc:608
+#: plugins/personal/generic/class_user.inc:611
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:614
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:622
+#: plugins/personal/generic/class_user.inc:625
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:636
+#: plugins/personal/generic/class_user.inc:639
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:641
-#: plugins/personal/generic/class_user.inc:645
+#: plugins/personal/generic/class_user.inc:644
+#: plugins/personal/generic/class_user.inc:648
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:652
+#: plugins/personal/generic/class_user.inc:655
msgid "You need to specify your current password in order to proceed."
msgstr ""
-#: plugins/personal/generic/class_user.inc:654
+#: plugins/personal/generic/class_user.inc:657
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:656
+#: plugins/personal/generic/class_user.inc:659
#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
msgid "New password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:658
+#: plugins/personal/generic/class_user.inc:661
msgid "The password used as new and current are too similar."
msgstr ""
-#: plugins/personal/generic/class_user.inc:660
+#: plugins/personal/generic/class_user.inc:663
msgid "The password used as new is to short."
msgstr ""
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:665
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
@@ -3298,36 +3307,46 @@ msgid ""
"recover their password"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:189
+msgid "Login attribute"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
msgid "First email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
msgid "Subject"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
msgid "Subject of the first email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
msgid "[FusionDirectory] Password recovery link"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
#, php-format
msgid ""
"Body of the first email, sent when the user ask for a new password. Use %s "
"for the login and the recovery link."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
#, php-format
msgid ""
"Hello,\n"
@@ -3339,31 +3358,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
msgid "Second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
msgid "Subject of the second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
msgid "[FusionDirectory] Password recovery successful"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
#, php-format
msgid "Body (%s is login)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
#, 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
+#: plugins/config/class_recoveryConfig.inc:118
#, php-format
msgid ""
"Hello,\n"
@@ -3530,10 +3549,6 @@ msgstr ""
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 ""
@@ -4396,7 +4411,7 @@ msgstr ""
msgid "Only allow this group to connect to this list of hosts"
msgstr ""
-#: plugins/admin/groups/class_ogroup.inc:321
+#: plugins/admin/groups/class_ogroup.inc:322
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
diff --git a/locale/ca/fusiondirectory.po b/locale/ca/fusiondirectory.po
index 65533d678a4e600d78765ba9f988b71a3cd7550c..a07482350ecbe696190edad223263c91360d5f55 100644
--- a/locale/ca/fusiondirectory.po
+++ b/locale/ca/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-11 19:09+0100\n"
-"PO-Revision-Date: 2017-01-10 14:53+0000\n"
+"POT-Creation-Date: 2017-03-29 21:46+0200\n"
+"PO-Revision-Date: 2017-03-26 15:51+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:382
+#: plugins/personal/generic/class_user.inc:385
msgid "Preferred language"
msgstr "Llengua preferida"
@@ -316,30 +316,30 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
+#: setup/class_setupStep_Migrate.inc:981
+#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1180
+#: setup/class_setupStep_Migrate.inc:1273
+#: setup/class_setupStep_Migrate.inc:1352
+#: setup/class_setupStep_Migrate.inc:1396
+msgid "LDAP query failed"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
+#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
#: setup/class_setupStep_Migrate.inc:982
#: setup/class_setupStep_Migrate.inc:1058
#: setup/class_setupStep_Migrate.inc:1181
#: setup/class_setupStep_Migrate.inc:1274
#: setup/class_setupStep_Migrate.inc:1353
#: setup/class_setupStep_Migrate.inc:1397
-msgid "LDAP query failed"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:983
-#: setup/class_setupStep_Migrate.inc:1059
-#: setup/class_setupStep_Migrate.inc:1182
-#: setup/class_setupStep_Migrate.inc:1275
-#: setup/class_setupStep_Migrate.inc:1354
-#: setup/class_setupStep_Migrate.inc:1398
msgid "Possibly the \"root object\" is missing."
msgstr ""
#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:866
-#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
+#: setup/class_setupStep_Migrate.inc:880
msgid "Failed"
msgstr "Error"
@@ -360,11 +360,11 @@ msgid ""
msgstr ""
#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:677
-#: include/functions.inc:724 include/functions.inc:822
-#: include/functions.inc:2988 include/functions.inc:3165
+#: include/functions.inc:522 include/functions.inc:679
+#: include/functions.inc:726 include/functions.inc:834
+#: include/functions.inc:3001 include/functions.inc:3178
#: include/class_config.inc:322 include/class_ldap.inc:924
#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
#: include/simpleplugin/attributes/class_SetAttribute.inc:726
@@ -386,13 +386,13 @@ msgid "The specified user \"%s\" does not have full access to your ldap database
msgstr ""
#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1085
-#: setup/class_setupStep_Migrate.inc:1204
-#: setup/class_setupStep_Migrate.inc:1315
-#: setup/class_setupStep_Migrate.inc:1379
-#: setup/class_setupStep_Migrate.inc:1423 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:838
-#: include/functions.inc:2523 include/simpleplugin/class_simpleTabs.inc:322
+#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1203
+#: setup/class_setupStep_Migrate.inc:1314
+#: setup/class_setupStep_Migrate.inc:1378
+#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
+#: include/class_xml.inc:55 include/functions.inc:850
+#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
#: html/index.php:597 html/main.php:158
#: plugins/personal/posix/class_posixAccount.inc:482
#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
@@ -413,7 +413,7 @@ msgid "User migration"
msgstr ""
#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1029
+#: setup/class_setupStep_Migrate.inc:1028
msgid "Migration error"
msgstr ""
@@ -422,64 +422,64 @@ msgstr ""
msgid "Cannot migrate entry \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:859
+#: setup/class_setupStep_Migrate.inc:858
#, php-format
msgid "FD 1.0.7 administrative accounts found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:862
+#: setup/class_setupStep_Migrate.inc:861
#, php-format
msgid "FD 1.0.7 administrative groups found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:864
+#: setup/class_setupStep_Migrate.inc:863
msgid ""
"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
"file at the end of the setup to migrate it.<br/>"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:867
+#: setup/class_setupStep_Migrate.inc:866
msgid ""
"There is no valid FusionDirectory 1.0.8 administrator account inside your "
"LDAP."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:868 setup/class_setupStep_Migrate.inc:883
+#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
#: include/simpleplugin/simple-list.xml:59
#: plugins/admin/departments/dep-list.xml:48
#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
msgid "Create"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:873
+#: setup/class_setupStep_Migrate.inc:872
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: plugins/admin/users/class_userManagement.inc:42
msgid "Users"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:876
+#: setup/class_setupStep_Migrate.inc:875
msgid "Groups"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStep_Migrate.inc:881
msgid "There is no FusionDirectory administrator account inside your LDAP."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:920
+#: setup/class_setupStep_Migrate.inc:919
msgid "Gives all rights on all objects"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:937 include/class_management.inc:697
+#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
#: include/class_listing.inc:551 include/class_xml.inc:58
#: include/password-methods/class_password-methods-sasl.inc:60
#: include/password-methods/class_password-methods-sasl.inc:86
#: include/password-methods/class_password-methods.inc:393
#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3112
-#: include/functions.inc:3133 include/functions.inc:3173
-#: include/functions.inc:3185 include/functions.inc:3189
-#: include/functions.inc:3196 include/functions.inc:3205
-#: include/functions.inc:3267 include/class_msg_dialog.inc:128
+#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
+#: include/functions.inc:3146 include/functions.inc:3186
+#: include/functions.inc:3198 include/functions.inc:3202
+#: include/functions.inc:3209 include/functions.inc:3218
+#: include/functions.inc:3280 include/class_msg_dialog.inc:128
#: include/class_msg_dialog.inc:164 include/class_config.inc:357
#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
@@ -492,82 +492,82 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:34
#: include/simpleplugin/attributes/class_FileAttribute.inc:37
#: include/simpleplugin/attributes/class_FileAttribute.inc:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:801
-#: include/class_plugin.inc:1534 html/index.php:453 html/index.php:474
+#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
+#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
#: html/index.php:484 html/index.php:546 html/index.php:556
#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
msgid "Error"
msgstr "Error"
-#: setup/class_setupStep_Migrate.inc:997
+#: setup/class_setupStep_Migrate.inc:996
msgid "Default ACL roles have not been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:999
+#: setup/class_setupStep_Migrate.inc:998
msgid "Some default ACL roles are missing"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1001
+#: setup/class_setupStep_Migrate.inc:1000
msgid "Default ACL roles have been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1031
+#: setup/class_setupStep_Migrate.inc:1030
#, php-format
msgid "Cannot add ACL role \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1086
+#: setup/class_setupStep_Migrate.inc:1085
#, php-format
msgid "Found %s user(s) outside the configured tree \"%s\"."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1100
-#: setup/class_setupStep_Migrate.inc:1114
+#: setup/class_setupStep_Migrate.inc:1099
+#: setup/class_setupStep_Migrate.inc:1113
msgid "Move users into configured user tree"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
msgid "Cannot move entries to the requested department!"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "Entry will be moved from"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "to"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1154
+#: setup/class_setupStep_Migrate.inc:1153
msgid "The following references will be updated"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1205
+#: setup/class_setupStep_Migrate.inc:1204
#, php-format
msgid "Found %s groups outside the configured tree '%s'."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1219
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1218
+#: setup/class_setupStep_Migrate.inc:1232
msgid "Move groups into configured groups tree"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1316
+#: setup/class_setupStep_Migrate.inc:1315
#, php-format
msgid "Found %s department(s) that will not be visible in FusionDirectory."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1325
-#: setup/class_setupStep_Migrate.inc:1330
+#: setup/class_setupStep_Migrate.inc:1324
+#: setup/class_setupStep_Migrate.inc:1329
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1380
+#: setup/class_setupStep_Migrate.inc:1379
#, php-format
msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1424
+#: setup/class_setupStep_Migrate.inc:1423
#, php-format
msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
@@ -743,10 +743,10 @@ msgstr ""
#: include/class_logging.inc:80 include/class_session.inc:50
#: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:649
-#: include/functions.inc:770 include/functions.inc:1189
-#: include/functions.inc:2243 include/functions.inc:2285
-#: include/functions.inc:2314 include/class_ldap.inc:873
+#: include/functions.inc:564 include/functions.inc:651
+#: include/functions.inc:772 include/functions.inc:1201
+#: include/functions.inc:2255 include/functions.inc:2297
+#: include/functions.inc:2326 include/class_ldap.inc:873
#: include/class_ldap.inc:911 include/class_acl.inc:118
msgid "Internal error"
msgstr ""
@@ -813,12 +813,12 @@ msgid ""
"plugin instance!"
msgstr ""
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1188
+#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
#: include/class_listing.inc:1190
msgid "Root"
msgstr ""
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
msgid "Submit"
msgstr ""
@@ -919,7 +919,7 @@ msgid "Create a new snapshot from this object"
msgstr ""
#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3302 include/simpleplugin/class_simplePlugin.inc:272
+#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
#: include/simpleplugin/class_simplePlugin.inc:277
#: include/simpleplugin/class_simplePlugin.inc:289
#: html/class_passwordRecovery.inc:116
@@ -952,7 +952,7 @@ msgstr ""
#: include/password-methods/class_password-methods-sha.inc:69
#: include/password-methods/class_password-methods-ssha.inc:73
#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:659 include/class_timezone.inc:51
+#: include/functions.inc:661 include/class_timezone.inc:51
#: include/class_config.inc:159 include/class_config.inc:284
#: include/class_config.inc:843 include/class_config.inc:856
#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
@@ -990,7 +990,7 @@ msgid "Cannot paste"
msgstr ""
#: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
#: plugins/personal/generic/paste_generic.tpl.c:11
msgid "Login"
@@ -1034,245 +1034,245 @@ msgid ""
"administrator."
msgstr ""
-#: include/functions.inc:597
+#: include/functions.inc:599
msgid "Authentication error"
msgstr "Error d'autenticació."
-#: include/functions.inc:598
+#: include/functions.inc:600
msgid ""
"It seems your user password has expired. Please use <a "
"href=\"recovery.php\">password recovery</a> to change it."
msgstr ""
-#: include/functions.inc:649 include/functions.inc:770
+#: include/functions.inc:651 include/functions.inc:772
msgid "Error while adding a lock. Contact the developers!"
msgstr ""
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid ""
"Cannot create locking information in LDAP tree. Please contact your "
"administrator!"
msgstr ""
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid "LDAP server returned: %s"
msgstr ""
-#: include/functions.inc:838
+#: include/functions.inc:850
msgid ""
"Found multiple locks for object to be locked. This should not happen - "
"cleaning up multiple references."
msgstr ""
-#: include/functions.inc:1109
+#: include/functions.inc:1121
#, php-format
msgid "The size limit of %d entries is exceed!"
msgstr ""
-#: include/functions.inc:1111
+#: include/functions.inc:1123
#, php-format
msgid ""
"Set the new size limit to %s and show me this message if the limit still "
"exceeds"
msgstr ""
-#: include/functions.inc:1128
+#: include/functions.inc:1140
msgid "Configure"
msgstr ""
-#: include/functions.inc:1133
+#: include/functions.inc:1145
msgid "incomplete"
msgstr ""
-#: include/functions.inc:1534
+#: include/functions.inc:1546
msgid "Continue anyway"
msgstr ""
-#: include/functions.inc:1536
+#: include/functions.inc:1548
msgid "Edit anyway"
msgstr ""
-#: include/functions.inc:1538
+#: include/functions.inc:1550
#, php-format
msgid "You're going to edit the LDAP entry/entries %s"
msgstr ""
-#: include/functions.inc:1766
+#: include/functions.inc:1778
msgid "Entries per page"
msgstr ""
-#: include/functions.inc:1797 include/class_filter.inc:353
+#: include/functions.inc:1809 include/class_filter.inc:353
msgid "Apply filter"
msgstr ""
-#: include/functions.inc:2065
+#: include/functions.inc:2077
#, php-format
msgid "%sB"
msgstr ""
-#: include/functions.inc:2066
+#: include/functions.inc:2078
#, php-format
msgid "%sKiB"
msgstr ""
-#: include/functions.inc:2067
+#: include/functions.inc:2079
#, php-format
msgid "%sMiB"
msgstr ""
-#: include/functions.inc:2068
+#: include/functions.inc:2080
#, php-format
msgid "%sGiB"
msgstr ""
-#: include/functions.inc:2069
+#: include/functions.inc:2081
#, php-format
msgid "%sTiB"
msgstr ""
-#: include/functions.inc:2070
+#: include/functions.inc:2082
#, php-format
msgid "%sPiB"
msgstr ""
-#: include/functions.inc:2071
+#: include/functions.inc:2083
#, php-format
msgid "%sEiB"
msgstr ""
-#: include/functions.inc:2072
+#: include/functions.inc:2084
#, php-format
msgid "%sZiB"
msgstr ""
-#: include/functions.inc:2073
+#: include/functions.inc:2085
#, php-format
msgid "%sYiB"
msgstr ""
-#: include/functions.inc:2105 include/class_filter.inc:315
+#: include/functions.inc:2117 include/class_filter.inc:315
msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
msgstr ""
-#: include/functions.inc:2243
+#: include/functions.inc:2255
#, php-format
msgid ""
"File '%s' could not be deleted. Try fusiondirectory-setup --check-"
"directories to fix permissions."
msgstr ""
-#: include/functions.inc:2285
+#: include/functions.inc:2297
msgid "Cannot write to revision file!"
msgstr ""
-#: include/functions.inc:2314
+#: include/functions.inc:2326
msgid "Cannot read to revision file!"
msgstr ""
-#: include/functions.inc:2523
+#: include/functions.inc:2535
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "LDAP warning"
msgstr ""
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "Cannot get schema information from server. No schema check possible!"
msgstr ""
-#: include/functions.inc:2564
+#: include/functions.inc:2577
msgid "Main FusionDirectory schema"
msgstr ""
-#: include/functions.inc:2571
+#: include/functions.inc:2584
msgid "Schema used to store FusionDirectory configuration"
msgstr ""
-#: include/functions.inc:2578
+#: include/functions.inc:2591
msgid "Used to store trust mode information in users or groups."
msgstr ""
-#: include/functions.inc:2585
+#: include/functions.inc:2598
msgid "Used to store templates."
msgstr ""
-#: include/functions.inc:2592
+#: include/functions.inc:2605
msgid "Used to store POSIX information."
msgstr ""
-#: include/functions.inc:2599
+#: include/functions.inc:2612
#, php-format
msgid "Missing required object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2601
+#: include/functions.inc:2614
#, php-format
msgid "Missing optional object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2605
+#: include/functions.inc:2618
#, php-format
msgid "Class(es) available"
msgstr ""
-#: include/functions.inc:2623
+#: include/functions.inc:2636
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2637
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2640
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2641
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3112 include/functions.inc:3133
-#: include/functions.inc:3173 include/functions.inc:3185
-#: include/functions.inc:3189 include/functions.inc:3196
-#: include/functions.inc:3205
+#: include/functions.inc:3125 include/functions.inc:3146
+#: include/functions.inc:3186 include/functions.inc:3198
+#: include/functions.inc:3202 include/functions.inc:3209
+#: include/functions.inc:3218
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3112
+#: include/functions.inc:3125
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3133
+#: include/functions.inc:3146
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3173
+#: include/functions.inc:3186
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3185 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3202
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3205
+#: include/functions.inc:3218
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3267
+#: include/functions.inc:3280
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3303
+#: include/functions.inc:3316
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
@@ -2102,7 +2102,7 @@ msgstr "Nom"
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
#: plugins/admin/departments/class_department.inc:72
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/groups/class_roleGeneric.inc:91
@@ -2282,7 +2282,7 @@ msgid "The entry %s is not existing"
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:548
+#: include/class_plugin.inc:554
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!"
@@ -2398,14 +2398,19 @@ msgstr ""
msgid "There was a problem uncompressing snapshot data"
msgstr ""
-#: include/class_plugin.inc:803
+#: include/class_plugin.inc:809
#, php-format
msgid ""
"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
msgstr ""
-#: include/class_plugin.inc:1332
+#: include/class_plugin.inc:1350
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/class_plugin.inc:1352
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -2553,44 +2558,44 @@ msgstr "El vostre navegador té les galetes inhabilitades. Habiliteu les galetes
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr "La configuració %s/%s del FusionDirectori no és llegible. S'està avortant."
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
msgid "Email address"
msgstr ""
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
#, php-format
msgid "Did not find an account with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
#, php-format
msgid "Found multiple accounts with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
#, php-format
msgid "There is no account using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There are several accounts using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
#, php-format
msgid "The user using email \"%s\" is locked. Please contact your administrator."
msgstr ""
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
msgid "Contact your administrator, there was a problem with mail server"
msgstr ""
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
msgid "This token is invalid"
msgstr ""
-#: html/class_passwordRecovery.inc:647
+#: html/class_passwordRecovery.inc:651
msgid "There was a problem with mail server, confirmation email not sent"
msgstr ""
@@ -2902,7 +2907,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
#: setup/setup_migrate_adminAccount.tpl.c:14
#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2939,258 +2944,262 @@ msgstr ""
msgid "User account"
msgstr ""
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:296
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:307
msgid "Personal information"
msgstr "Informació personal"
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "Cognoms"
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
msgid "Last name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "Nom"
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
msgid "First name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
msgid "Short description of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "Picture"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "The avatar for this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:330
+#: plugins/personal/generic/class_user.inc:333
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:334
+#: plugins/personal/generic/class_user.inc:337
#: plugins/admin/departments/class_department.inc:90
#: plugins/admin/departments/class_department.inc:96
msgid "Location"
msgstr "Localització"
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:341
#: plugins/admin/departments/class_department.inc:93
msgid "State"
msgstr "ProvÃncia"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
#: plugins/admin/departments/class_department.inc:102
msgid "Address"
msgstr "Adreça"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
msgid "Business postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room No."
msgstr "Núm de sala"
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room number"
msgstr "Número de sala"
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
#: plugins/admin/departments/class_department.inc:106
msgid "Phone"
msgstr "Telèfon"
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
msgid "Business phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Mobile"
msgstr "Mòbil"
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Business mobile number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Pager"
msgstr "Buscapersones"
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
#: plugins/admin/departments/class_department.inc:110
msgid "Fax"
msgstr "Fax"
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Homepage"
msgstr "PÃ gina principal"
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:373
+#: plugins/personal/generic/class_user.inc:376
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:393
+#: plugins/personal/generic/class_user.inc:396
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Display name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home postal address"
msgstr "Adreça postal personal"
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Private phone"
msgstr "Telèfon privat"
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Home phone number"
msgstr "Número de telèfon personal"
-#: plugins/personal/generic/class_user.inc:411
+#: plugins/personal/generic/class_user.inc:414
msgid "Organizational information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
msgid "Title"
msgstr ""
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
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:421
+#: plugins/personal/generic/class_user.inc:424
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
msgid "Organization"
msgstr "Organització"
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
#: plugins/admin/departments/class_department.inc:33
#: plugins/admin/departments/class_department.inc:39
#: plugins/admin/departments/dep-list.xml:21
msgid "Department"
msgstr "Departament"
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
msgid "Department to which the user belongs"
msgstr ""
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department No."
msgstr "Núm de department"
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department number"
msgstr "Número de departament"
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee No."
msgstr "Núm d'empleat"
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee number"
msgstr "Número d'empleat"
-#: plugins/personal/generic/class_user.inc:437
+#: plugins/personal/generic/class_user.inc:440
msgid "Employee type"
msgstr "Categoria professional"
-#: plugins/personal/generic/class_user.inc:441
+#: plugins/personal/generic/class_user.inc:444
#: plugins/admin/departments/class_department.inc:84
msgid "Manager"
msgstr "Responsable"
-#: plugins/personal/generic/class_user.inc:608
+#: plugins/personal/generic/class_user.inc:611
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:614
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:622
+#: plugins/personal/generic/class_user.inc:625
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:636
+#: plugins/personal/generic/class_user.inc:639
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:641
-#: plugins/personal/generic/class_user.inc:645
+#: plugins/personal/generic/class_user.inc:644
+#: plugins/personal/generic/class_user.inc:648
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:652
+#: plugins/personal/generic/class_user.inc:655
msgid "You need to specify your current password in order to proceed."
msgstr ""
-#: plugins/personal/generic/class_user.inc:654
+#: plugins/personal/generic/class_user.inc:657
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:656
+#: plugins/personal/generic/class_user.inc:659
#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
msgid "New password"
msgstr "Contrasenya nova"
-#: plugins/personal/generic/class_user.inc:658
+#: plugins/personal/generic/class_user.inc:661
msgid "The password used as new and current are too similar."
msgstr "La contrasenya nova i l'actual són massa similars."
-#: plugins/personal/generic/class_user.inc:660
+#: plugins/personal/generic/class_user.inc:663
msgid "The password used as new is to short."
msgstr "La contrasenya nova és massa curta."
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:665
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
@@ -3298,36 +3307,46 @@ msgid ""
"recover their password"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:189
+msgid "Login attribute"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
msgid "First email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
msgid "Subject"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
msgid "Subject of the first email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
msgid "[FusionDirectory] Password recovery link"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
#, php-format
msgid ""
"Body of the first email, sent when the user ask for a new password. Use %s "
"for the login and the recovery link."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
#, php-format
msgid ""
"Hello,\n"
@@ -3339,31 +3358,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
msgid "Second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
msgid "Subject of the second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
msgid "[FusionDirectory] Password recovery successful"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
#, php-format
msgid "Body (%s is login)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
#, 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
+#: plugins/config/class_recoveryConfig.inc:118
#, php-format
msgid ""
"Hello,\n"
@@ -3530,10 +3549,6 @@ msgstr ""
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 ""
@@ -4396,7 +4411,7 @@ msgstr ""
msgid "Only allow this group to connect to this list of hosts"
msgstr ""
-#: plugins/admin/groups/class_ogroup.inc:321
+#: plugins/admin/groups/class_ogroup.inc:322
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
diff --git a/locale/cs_CZ/fusiondirectory.po b/locale/cs_CZ/fusiondirectory.po
index 89b0d52d3668ac5291e7ba070ee1f356a535a4c7..670a32857c256d4e132eb443ddb94ebeb43917f9 100644
--- a/locale/cs_CZ/fusiondirectory.po
+++ b/locale/cs_CZ/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-11 19:09+0100\n"
-"PO-Revision-Date: 2017-01-10 14:53+0000\n"
+"POT-Creation-Date: 2017-03-29 21:46+0200\n"
+"PO-Revision-Date: 2017-03-26 15:51+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:382
+#: plugins/personal/generic/class_user.inc:385
msgid "Preferred language"
msgstr "Upřednostňovaný jazyk"
@@ -316,30 +316,30 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
+#: setup/class_setupStep_Migrate.inc:981
+#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1180
+#: setup/class_setupStep_Migrate.inc:1273
+#: setup/class_setupStep_Migrate.inc:1352
+#: setup/class_setupStep_Migrate.inc:1396
+msgid "LDAP query failed"
+msgstr "Dotaz do LDAP nebyl úspěšný"
+
+#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
+#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
#: setup/class_setupStep_Migrate.inc:982
#: setup/class_setupStep_Migrate.inc:1058
#: setup/class_setupStep_Migrate.inc:1181
#: setup/class_setupStep_Migrate.inc:1274
#: setup/class_setupStep_Migrate.inc:1353
#: setup/class_setupStep_Migrate.inc:1397
-msgid "LDAP query failed"
-msgstr "Dotaz do LDAP nebyl úspěšný"
-
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:983
-#: setup/class_setupStep_Migrate.inc:1059
-#: setup/class_setupStep_Migrate.inc:1182
-#: setup/class_setupStep_Migrate.inc:1275
-#: setup/class_setupStep_Migrate.inc:1354
-#: setup/class_setupStep_Migrate.inc:1398
msgid "Possibly the \"root object\" is missing."
msgstr "Možná chybà kořenový objekt."
#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:866
-#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
+#: setup/class_setupStep_Migrate.inc:880
msgid "Failed"
msgstr "Nezdařilo se"
@@ -360,11 +360,11 @@ msgid ""
msgstr "Nedařà se manipulace s typem struktury koÅ™enového objektu. ProsÃm pokuste se pÅ™idat tÅ™Ãdu objektů '%s' ruÄnÃm zásahem."
#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:677
-#: include/functions.inc:724 include/functions.inc:822
-#: include/functions.inc:2988 include/functions.inc:3165
+#: include/functions.inc:522 include/functions.inc:679
+#: include/functions.inc:726 include/functions.inc:834
+#: include/functions.inc:3001 include/functions.inc:3178
#: include/class_config.inc:322 include/class_ldap.inc:924
#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
#: include/simpleplugin/attributes/class_SetAttribute.inc:726
@@ -386,13 +386,13 @@ msgid "The specified user \"%s\" does not have full access to your ldap database
msgstr "Zvolený uživatel %s nemá plný pÅ™Ãstup do LDAP databáze."
#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1085
-#: setup/class_setupStep_Migrate.inc:1204
-#: setup/class_setupStep_Migrate.inc:1315
-#: setup/class_setupStep_Migrate.inc:1379
-#: setup/class_setupStep_Migrate.inc:1423 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:838
-#: include/functions.inc:2523 include/simpleplugin/class_simpleTabs.inc:322
+#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1203
+#: setup/class_setupStep_Migrate.inc:1314
+#: setup/class_setupStep_Migrate.inc:1378
+#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
+#: include/class_xml.inc:55 include/functions.inc:850
+#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
#: html/index.php:597 html/main.php:158
#: plugins/personal/posix/class_posixAccount.inc:482
#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
@@ -413,7 +413,7 @@ msgid "User migration"
msgstr "PÅ™emÃstÄ›nà uživatele"
#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1029
+#: setup/class_setupStep_Migrate.inc:1028
msgid "Migration error"
msgstr "Chyba pÅ™emisÅ¥ovánÃ"
@@ -422,64 +422,64 @@ msgstr "Chyba pÅ™emisÅ¥ovánÃ"
msgid "Cannot migrate entry \"%s\":"
msgstr "Položku %s nelze pÅ™emÃstit:"
-#: setup/class_setupStep_Migrate.inc:859
+#: setup/class_setupStep_Migrate.inc:858
#, php-format
msgid "FD 1.0.7 administrative accounts found: %s"
msgstr "Nalezeny správcovské úÄty z F.D. 1.0.7: %s"
-#: setup/class_setupStep_Migrate.inc:862
+#: setup/class_setupStep_Migrate.inc:861
#, php-format
msgid "FD 1.0.7 administrative groups found: %s"
msgstr "Nalezeny správcovské skupiny z F.D. 1.0.7: %s"
-#: setup/class_setupStep_Migrate.inc:864
+#: setup/class_setupStep_Migrate.inc:863
msgid ""
"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
"file at the end of the setup to migrate it.<br/>"
msgstr "Na konci nastavenà je možné spustit <i>fusiondirectory-setup --migrate-acls</i> a pÅ™emÃstit ho.<br/>"
-#: setup/class_setupStep_Migrate.inc:867
+#: setup/class_setupStep_Migrate.inc:866
msgid ""
"There is no valid FusionDirectory 1.0.8 administrator account inside your "
"LDAP."
msgstr "Ve vaÅ¡Ã LDAP databázi se nenacházà žádný použitelný úÄet správce FusionDirectory 1.0.8."
-#: setup/class_setupStep_Migrate.inc:868 setup/class_setupStep_Migrate.inc:883
+#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
#: include/simpleplugin/simple-list.xml:59
#: plugins/admin/departments/dep-list.xml:48
#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
msgid "Create"
msgstr "Vytvořit"
-#: setup/class_setupStep_Migrate.inc:873
+#: setup/class_setupStep_Migrate.inc:872
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: plugins/admin/users/class_userManagement.inc:42
msgid "Users"
msgstr "Uživatelé"
-#: setup/class_setupStep_Migrate.inc:876
+#: setup/class_setupStep_Migrate.inc:875
msgid "Groups"
msgstr "Skupiny"
-#: setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStep_Migrate.inc:881
msgid "There is no FusionDirectory administrator account inside your LDAP."
msgstr "Ve vaÅ¡Ã LDAP databázi se nenacházà žádný úÄet správce FusionDirectory."
-#: setup/class_setupStep_Migrate.inc:920
+#: setup/class_setupStep_Migrate.inc:919
msgid "Gives all rights on all objects"
msgstr "Uděluje veškerá práva na veškerých objektech"
-#: setup/class_setupStep_Migrate.inc:937 include/class_management.inc:697
+#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
#: include/class_listing.inc:551 include/class_xml.inc:58
#: include/password-methods/class_password-methods-sasl.inc:60
#: include/password-methods/class_password-methods-sasl.inc:86
#: include/password-methods/class_password-methods.inc:393
#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3112
-#: include/functions.inc:3133 include/functions.inc:3173
-#: include/functions.inc:3185 include/functions.inc:3189
-#: include/functions.inc:3196 include/functions.inc:3205
-#: include/functions.inc:3267 include/class_msg_dialog.inc:128
+#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
+#: include/functions.inc:3146 include/functions.inc:3186
+#: include/functions.inc:3198 include/functions.inc:3202
+#: include/functions.inc:3209 include/functions.inc:3218
+#: include/functions.inc:3280 include/class_msg_dialog.inc:128
#: include/class_msg_dialog.inc:164 include/class_config.inc:357
#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
@@ -492,82 +492,82 @@ msgstr "Uděluje veškerá práva na veškerých objektech"
#: include/simpleplugin/attributes/class_FileAttribute.inc:34
#: include/simpleplugin/attributes/class_FileAttribute.inc:37
#: include/simpleplugin/attributes/class_FileAttribute.inc:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:801
-#: include/class_plugin.inc:1534 html/index.php:453 html/index.php:474
+#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
+#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
#: html/index.php:484 html/index.php:546 html/index.php:556
#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
msgid "Error"
msgstr "Chyba"
-#: setup/class_setupStep_Migrate.inc:997
+#: setup/class_setupStep_Migrate.inc:996
msgid "Default ACL roles have not been inserted"
msgstr "Výchozà ACL úlohy nebyly vloženy"
-#: setup/class_setupStep_Migrate.inc:999
+#: setup/class_setupStep_Migrate.inc:998
msgid "Some default ACL roles are missing"
msgstr "Chybà některé výchozà ACL úlohy"
-#: setup/class_setupStep_Migrate.inc:1001
+#: setup/class_setupStep_Migrate.inc:1000
msgid "Default ACL roles have been inserted"
msgstr "Výchozà ACL úlohy byly vloženy"
-#: setup/class_setupStep_Migrate.inc:1031
+#: setup/class_setupStep_Migrate.inc:1030
#, php-format
msgid "Cannot add ACL role \"%s\":"
msgstr "Nelze přidat ACL úlohu %s:"
-#: setup/class_setupStep_Migrate.inc:1086
+#: setup/class_setupStep_Migrate.inc:1085
#, php-format
msgid "Found %s user(s) outside the configured tree \"%s\"."
msgstr "Nalezeno %s uživatelů, nacházejÃcÃch se mimo nastavený strom %s."
-#: setup/class_setupStep_Migrate.inc:1100
-#: setup/class_setupStep_Migrate.inc:1114
+#: setup/class_setupStep_Migrate.inc:1099
+#: setup/class_setupStep_Migrate.inc:1113
msgid "Move users into configured user tree"
msgstr "PÅ™esunout uživatele do pÅ™ÃsluÅ¡ného stromu"
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
msgid "Cannot move entries to the requested department!"
msgstr "Položky nelze pÅ™esunout do požadovaného oddÄ›lenÃ!"
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "Entry will be moved from"
msgstr "Položka bude přesunuta z"
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "to"
msgstr "do"
-#: setup/class_setupStep_Migrate.inc:1154
+#: setup/class_setupStep_Migrate.inc:1153
msgid "The following references will be updated"
msgstr "Tyto odkazy budou aktualizovány"
-#: setup/class_setupStep_Migrate.inc:1205
+#: setup/class_setupStep_Migrate.inc:1204
#, php-format
msgid "Found %s groups outside the configured tree '%s'."
msgstr "Bylo nalezeno %s úÄtů skupin, nacházejÃcÃch se mimo pÅ™ÃsluÅ¡ný strom '%s'."
-#: setup/class_setupStep_Migrate.inc:1219
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1218
+#: setup/class_setupStep_Migrate.inc:1232
msgid "Move groups into configured groups tree"
msgstr "PÅ™esunout skupiny do pÅ™ÃsluÅ¡ného stromu"
-#: setup/class_setupStep_Migrate.inc:1316
+#: setup/class_setupStep_Migrate.inc:1315
#, php-format
msgid "Found %s department(s) that will not be visible in FusionDirectory."
msgstr "Bylo nalezeno %s oddÄ›lenÃ, která nebudou viditelná z FusionDirectory."
-#: setup/class_setupStep_Migrate.inc:1325
-#: setup/class_setupStep_Migrate.inc:1330
+#: setup/class_setupStep_Migrate.inc:1324
+#: setup/class_setupStep_Migrate.inc:1329
msgid "Department migration"
msgstr "PÅ™emÃstÄ›nà oddÄ›lenÃ"
-#: setup/class_setupStep_Migrate.inc:1380
+#: setup/class_setupStep_Migrate.inc:1379
#, php-format
msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1424
+#: setup/class_setupStep_Migrate.inc:1423
#, php-format
msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
@@ -743,10 +743,10 @@ msgstr "DalÅ¡Ã"
#: include/class_logging.inc:80 include/class_session.inc:50
#: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:649
-#: include/functions.inc:770 include/functions.inc:1189
-#: include/functions.inc:2243 include/functions.inc:2285
-#: include/functions.inc:2314 include/class_ldap.inc:873
+#: include/functions.inc:564 include/functions.inc:651
+#: include/functions.inc:772 include/functions.inc:1201
+#: include/functions.inc:2255 include/functions.inc:2297
+#: include/functions.inc:2326 include/class_ldap.inc:873
#: include/class_ldap.inc:911 include/class_acl.inc:118
msgid "Internal error"
msgstr "Vnitřnà chyba"
@@ -813,12 +813,12 @@ msgid ""
"plugin instance!"
msgstr "Deklarace panelu pro %s nenà uvedena v souboru s nastavenÃmi. Nelze proto vytvoÅ™it instanci zásuvného modulu!"
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1188
+#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
#: include/class_listing.inc:1190
msgid "Root"
msgstr "Kořen"
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
msgid "Submit"
msgstr "Odeslat"
@@ -919,7 +919,7 @@ msgid "Create a new snapshot from this object"
msgstr "vytvoÅ™it nový snÃmek tohoto objektu"
#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3302 include/simpleplugin/class_simplePlugin.inc:272
+#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
#: include/simpleplugin/class_simplePlugin.inc:277
#: include/simpleplugin/class_simplePlugin.inc:289
#: html/class_passwordRecovery.inc:116
@@ -952,7 +952,7 @@ msgstr "Aby bylo možné použÃvat SASL, je tÅ™eba vyplnit kolonky saslRealm ne
#: include/password-methods/class_password-methods-sha.inc:69
#: include/password-methods/class_password-methods-ssha.inc:73
#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:659 include/class_timezone.inc:51
+#: include/functions.inc:661 include/class_timezone.inc:51
#: include/class_config.inc:159 include/class_config.inc:284
#: include/class_config.inc:843 include/class_config.inc:856
#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
@@ -990,7 +990,7 @@ msgid "Cannot paste"
msgstr "Nelze vložit"
#: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
#: plugins/personal/generic/paste_generic.tpl.c:11
msgid "Login"
@@ -1034,245 +1034,245 @@ msgid ""
"administrator."
msgstr "PÅ™ihlaÅ¡ovacà údaj (uid) nenà v rámci LDAP stromu jedineÄný! Kontaktujte svého správce systémů."
-#: include/functions.inc:597
+#: include/functions.inc:599
msgid "Authentication error"
msgstr "Chyba ověřenÃ"
-#: include/functions.inc:598
+#: include/functions.inc:600
msgid ""
"It seems your user password has expired. Please use <a "
"href=\"recovery.php\">password recovery</a> to change it."
msgstr "Zdá se, že platnost vaÅ¡eho hesla skonÄila. Změňte jej pomocà funkce <a href=\"recovery.php\">obnovenà hesla</a>."
-#: include/functions.inc:649 include/functions.inc:770
+#: include/functions.inc:651 include/functions.inc:772
msgid "Error while adding a lock. Contact the developers!"
msgstr "Nastala chyba pÅ™i pokusu o pÅ™idánà zámku. Nahlaste to prosÃm vývojářům!"
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid ""
"Cannot create locking information in LDAP tree. Please contact your "
"administrator!"
msgstr "Nedařà se vytvořit informaci o zamykánà ve stromu LDAP. Kontaktujte svého správce systémů!"
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid "LDAP server returned: %s"
msgstr "LDAP server odpověděl: %s"
-#: include/functions.inc:838
+#: include/functions.inc:850
msgid ""
"Found multiple locks for object to be locked. This should not happen - "
"cleaning up multiple references."
msgstr "PÅ™i pokusu o vyhrazenà pÅ™Ãstupu k objektu bylo nalezeno nÄ›kolik již existujÃcÃch zámků. To by se nemÄ›lo stávat – probÃhá jejich odstraňovánÃ."
-#: include/functions.inc:1109
+#: include/functions.inc:1121
#, php-format
msgid "The size limit of %d entries is exceed!"
msgstr "Limit velikosti položek %d je pÅ™ekroÄen!"
-#: include/functions.inc:1111
+#: include/functions.inc:1123
#, php-format
msgid ""
"Set the new size limit to %s and show me this message if the limit still "
"exceeds"
msgstr "nastavit novou hodnotu limitu %s a v pÅ™ÃpadÄ›, že ani to nebude staÄit, zobrazit toto hlášenà znovu"
-#: include/functions.inc:1128
+#: include/functions.inc:1140
msgid "Configure"
msgstr "Nastavit"
-#: include/functions.inc:1133
+#: include/functions.inc:1145
msgid "incomplete"
msgstr "neúplné"
-#: include/functions.inc:1534
+#: include/functions.inc:1546
msgid "Continue anyway"
msgstr "PÅ™esto pokraÄovat"
-#: include/functions.inc:1536
+#: include/functions.inc:1548
msgid "Edit anyway"
msgstr "Přesto upravit"
-#: include/functions.inc:1538
+#: include/functions.inc:1550
#, php-format
msgid "You're going to edit the LDAP entry/entries %s"
msgstr "chystáte se upravit položky LDAPu %s"
-#: include/functions.inc:1766
+#: include/functions.inc:1778
msgid "Entries per page"
msgstr "Položek na stránku"
-#: include/functions.inc:1797 include/class_filter.inc:353
+#: include/functions.inc:1809 include/class_filter.inc:353
msgid "Apply filter"
msgstr "PoužÃt filtr"
-#: include/functions.inc:2065
+#: include/functions.inc:2077
#, php-format
msgid "%sB"
msgstr "%sB"
-#: include/functions.inc:2066
+#: include/functions.inc:2078
#, php-format
msgid "%sKiB"
msgstr "%sKiB"
-#: include/functions.inc:2067
+#: include/functions.inc:2079
#, php-format
msgid "%sMiB"
msgstr "%sMiB"
-#: include/functions.inc:2068
+#: include/functions.inc:2080
#, php-format
msgid "%sGiB"
msgstr "%sGiB"
-#: include/functions.inc:2069
+#: include/functions.inc:2081
#, php-format
msgid "%sTiB"
msgstr "%sTiB"
-#: include/functions.inc:2070
+#: include/functions.inc:2082
#, php-format
msgid "%sPiB"
msgstr "%sPiB"
-#: include/functions.inc:2071
+#: include/functions.inc:2083
#, php-format
msgid "%sEiB"
msgstr "%sEiB"
-#: include/functions.inc:2072
+#: include/functions.inc:2084
#, php-format
msgid "%sZiB"
msgstr "%sZiB"
-#: include/functions.inc:2073
+#: include/functions.inc:2085
#, php-format
msgid "%sYiB"
msgstr "%sYiB"
-#: include/functions.inc:2105 include/class_filter.inc:315
+#: include/functions.inc:2117 include/class_filter.inc:315
msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
-#: include/functions.inc:2243
+#: include/functions.inc:2255
#, php-format
msgid ""
"File '%s' could not be deleted. Try fusiondirectory-setup --check-"
"directories to fix permissions."
msgstr "Soubor %s nebylo možné smazat. Zkuste opravit pÅ™Ãstupová práva spuÅ¡tÄ›nÃm pÅ™Ãkazu fusiondirectory-setup --check-directories"
-#: include/functions.inc:2285
+#: include/functions.inc:2297
msgid "Cannot write to revision file!"
msgstr "Nelze zapsat do souboru s revizemi!"
-#: include/functions.inc:2314
+#: include/functions.inc:2326
msgid "Cannot read to revision file!"
msgstr "Nelze ÄÃst ze souboru s revizemi!"
-#: include/functions.inc:2523
+#: include/functions.inc:2535
msgid "'nextIdHook' is not available. Using default base!"
msgstr "nextIdHook nenà k dispozici. Bude použit výchozà základ!"
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "LDAP warning"
msgstr "Varovánà LDAP"
-#: include/functions.inc:2541
+#: include/functions.inc:2554
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:2564
+#: include/functions.inc:2577
msgid "Main FusionDirectory schema"
msgstr ""
-#: include/functions.inc:2571
+#: include/functions.inc:2584
msgid "Schema used to store FusionDirectory configuration"
msgstr ""
-#: include/functions.inc:2578
+#: include/functions.inc:2591
msgid "Used to store trust mode information in users or groups."
msgstr ""
-#: include/functions.inc:2585
+#: include/functions.inc:2598
msgid "Used to store templates."
msgstr ""
-#: include/functions.inc:2592
+#: include/functions.inc:2605
msgid "Used to store POSIX information."
msgstr ""
-#: include/functions.inc:2599
+#: include/functions.inc:2612
#, php-format
msgid "Missing required object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2601
+#: include/functions.inc:2614
#, php-format
msgid "Missing optional object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2605
+#: include/functions.inc:2618
#, php-format
msgid "Class(es) available"
msgstr "Dostupné tÅ™Ãdy"
-#: include/functions.inc:2623
+#: include/functions.inc:2636
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:2637
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:2640
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:2641
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr "Je tÅ™eba, aby ObjectClass posixGroup bylo STRUKTURÃLNÃ"
-#: include/functions.inc:3112 include/functions.inc:3133
-#: include/functions.inc:3173 include/functions.inc:3185
-#: include/functions.inc:3189 include/functions.inc:3196
-#: include/functions.inc:3205
+#: include/functions.inc:3125 include/functions.inc:3146
+#: include/functions.inc:3186 include/functions.inc:3198
+#: include/functions.inc:3202 include/functions.inc:3209
+#: include/functions.inc:3218
msgid "Cannot allocate a free ID:"
msgstr "Nenà k dispozici volné ID:"
-#: include/functions.inc:3112
+#: include/functions.inc:3125
msgid "unknown idAllocation method!"
msgstr "Neznámá metoda idAllocation (přiřazovánà ID)!"
-#: include/functions.inc:3133
+#: include/functions.inc:3146
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3173
+#: include/functions.inc:3186
msgid "sambaUnixIdPool is not unique!"
msgstr "Identifikátor sambaUnixIdPool nenà jedineÄný!"
-#: include/functions.inc:3185 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3202
msgid "no ID available!"
msgstr "Nenà k dispozici ID!"
-#: include/functions.inc:3205
+#: include/functions.inc:3218
msgid "maximum tries exceeded!"
msgstr "PÅ™ekroÄen nejvyÅ¡Å¡Ã pÅ™ijatelný poÄet neúspěšných pokusů!"
-#: include/functions.inc:3267
+#: include/functions.inc:3280
msgid "Cannot allocate a free ID!"
msgstr "Nenà k dispozici volné ID – nenà co přidělit!"
-#: include/functions.inc:3303
+#: include/functions.inc:3316
#, 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)"
@@ -2102,7 +2102,7 @@ msgstr "Název"
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
#: plugins/admin/departments/class_department.inc:72
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/groups/class_roleGeneric.inc:91
@@ -2282,7 +2282,7 @@ msgid "The entry %s is not existing"
msgstr "Položka %s neexistuje"
#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:548
+#: include/class_plugin.inc:554
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!"
@@ -2398,14 +2398,19 @@ msgstr "Desetinné ÄÃslo menÅ¡Ã než %f"
msgid "There was a problem uncompressing snapshot data"
msgstr "DoÅ¡lo k problému s rozbalovánÃm dat zachyceného stavu"
-#: include/class_plugin.inc:803
+#: include/class_plugin.inc:809
#, php-format
msgid ""
"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
msgstr ""
-#: include/class_plugin.inc:1332
+#: include/class_plugin.inc:1350
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/class_plugin.inc:1352
#, php-format
msgid "Tab \"%s\""
msgstr "Panel %s"
@@ -2553,44 +2558,44 @@ msgstr "Váš webový prohlÞeÄ má zakázané cookies. ProsÃm povolte je a
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr "Nastavenà %s/%s FusionDirectory nenà Äitelné. Akce byla zruÅ¡ena."
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
msgid "Email address"
msgstr "E-mailová adresa"
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
#, php-format
msgid "Did not find an account with login \"%s\""
msgstr "ÚÄet s uživatelským jménem %s nebyl nalezen"
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
#, php-format
msgid "Found multiple accounts with login \"%s\""
msgstr "Bylo nalezeno hned nÄ›kolik úÄtů s uživatelským jménem %s"
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
#, php-format
msgid "There is no account using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There are several accounts using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
#, php-format
msgid "The user using email \"%s\" is locked. Please contact your administrator."
msgstr ""
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
msgid "Contact your administrator, there was a problem with mail server"
msgstr "Nastal problém s poÅ¡tovnÃm serverem – obraÅ¥te se na svého správce systémů."
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
msgid "This token is invalid"
msgstr "tato poukázka (token) je neplatná"
-#: html/class_passwordRecovery.inc:647
+#: html/class_passwordRecovery.inc:651
msgid "There was a problem with mail server, confirmation email not sent"
msgstr "Vyskytl se problém s poÅ¡tovnÃm serverem, potvrzovacà e-mail proto nebyl odeslán"
@@ -2902,7 +2907,7 @@ msgid "Password hash method to use"
msgstr "Metoda otisku hesla"
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
#: setup/setup_migrate_adminAccount.tpl.c:14
#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2939,258 +2944,262 @@ msgstr "Informace o uživatelském úÄtu"
msgid "User account"
msgstr "Uživatelský úÄet"
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:296
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:307
msgid "Personal information"
msgstr "Osobnà údaje"
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "PÅ™ÃjmenÃ"
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
msgid "Last name of this user"
msgstr "PÅ™Ãjmenà tohoto uživatele"
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "Jméno"
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
msgid "First name of this user"
msgstr "Křestnà jméno tohoto uživatele"
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
msgid "Short description of the user"
msgstr "StruÄný popis uživatele"
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "Picture"
msgstr "Fotografie"
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "The avatar for this user"
msgstr "Obrázek pro tohoto uživatele"
-#: plugins/personal/generic/class_user.inc:330
+#: plugins/personal/generic/class_user.inc:333
msgid "Organizational contact information"
msgstr "OrganizaÄnà kontaktnà údaje"
-#: plugins/personal/generic/class_user.inc:334
+#: plugins/personal/generic/class_user.inc:337
#: plugins/admin/departments/class_department.inc:90
#: plugins/admin/departments/class_department.inc:96
msgid "Location"
msgstr "UmÃstÄ›nÃ"
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:341
#: plugins/admin/departments/class_department.inc:93
msgid "State"
msgstr "Stav"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
#: plugins/admin/departments/class_department.inc:102
msgid "Address"
msgstr "Adresa"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
msgid "Business postal address"
msgstr "Firemnà poštovnà adresa"
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room No."
msgstr "ÄŒÃslo mÃstnosti"
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room number"
msgstr "ÄŒÃslo mÃstnosti"
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
#: plugins/admin/departments/class_department.inc:106
msgid "Phone"
msgstr "Telefon"
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
msgid "Business phone number"
msgstr "Služebnà telefonà ÄÃslo"
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Mobile"
msgstr "MobilnÃ"
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Business mobile number"
msgstr "ÄŒÃslo služebnÃho mobilnÃho telefonu"
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Pager"
msgstr "Pager"
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Business pager number"
msgstr "ÄŒÃslo na pracovnà pager"
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
#: plugins/admin/departments/class_department.inc:110
msgid "Fax"
msgstr "Fax"
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
msgid "Business fax number"
msgstr "ÄŒÃslo služebnÃho faxu"
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Homepage"
msgstr "Webové stránky"
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Personal homepage"
msgstr "Osobnà webové stránky"
-#: plugins/personal/generic/class_user.inc:373
+#: plugins/personal/generic/class_user.inc:376
msgid "Account information"
msgstr "Informace o úÄtu"
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
msgid "Login of this user"
msgstr "Přihlašovacà jméno tohoto uživatele"
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
msgid "Password of the user"
msgstr "Uživatelovo heslo"
-#: plugins/personal/generic/class_user.inc:393
+#: plugins/personal/generic/class_user.inc:396
msgid "Personal contact information"
msgstr "Osobnà kontaktnà údaje"
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Display name"
msgstr "Zobrazovaný název"
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
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:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home address"
msgstr "Adresa bydliště"
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home postal address"
msgstr "Soukromá poštovnà adresa"
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Private phone"
msgstr "Soukromý telefon"
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Home phone number"
msgstr "Telefonnà ÄÃslo domů"
-#: plugins/personal/generic/class_user.inc:411
+#: plugins/personal/generic/class_user.inc:414
msgid "Organizational information"
msgstr "OrganizaÄnà údaje"
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
msgid "Title"
msgstr "Titul"
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
msgid ""
"Title of a person in their organizational context. Each title is one value "
"of this multi-valued attribute"
msgstr "Titul osoby v kontextu organizace. Každý z titulů je hodnota tohoto vÃcehodnotového atributu"
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:424
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
msgid "Organization"
msgstr "Organizace"
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
#: plugins/admin/departments/class_department.inc:33
#: plugins/admin/departments/class_department.inc:39
#: plugins/admin/departments/dep-list.xml:21
msgid "Department"
msgstr "OddÄ›lenÃ"
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
msgid "Department to which the user belongs"
msgstr ""
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department No."
msgstr "ÄŒÃslo oddÄ›lenÃ"
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department number"
msgstr "ÄŒÃslo oddÄ›lenÃ"
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee No."
msgstr "ÄŒÃslo zamÄ›stnance"
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee number"
msgstr "ÄŒÃslo zamÄ›stnance"
-#: plugins/personal/generic/class_user.inc:437
+#: plugins/personal/generic/class_user.inc:440
msgid "Employee type"
msgstr "Typ zaměstnaneckého poměru"
-#: plugins/personal/generic/class_user.inc:441
+#: plugins/personal/generic/class_user.inc:444
#: plugins/admin/departments/class_department.inc:84
msgid "Manager"
msgstr "NadÅ™Ãzený"
-#: plugins/personal/generic/class_user.inc:608
+#: plugins/personal/generic/class_user.inc:611
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr "Ppolicy %s nebyla nalezena v LDAP!"
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:614
msgid "You are not allowed to change your own password"
msgstr "Nejste oprávněni ke změně svého hesla"
-#: plugins/personal/generic/class_user.inc:622
+#: plugins/personal/generic/class_user.inc:625
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr "Je tÅ™eba, abyste poÄkali %d sekund než budete moci znovu mÄ›nit své heslo"
-#: plugins/personal/generic/class_user.inc:636
+#: plugins/personal/generic/class_user.inc:639
msgid "Password is in history of old passwords"
msgstr "Toto heslo už bylo nedávno použito"
-#: plugins/personal/generic/class_user.inc:641
-#: plugins/personal/generic/class_user.inc:645
+#: plugins/personal/generic/class_user.inc:644
+#: plugins/personal/generic/class_user.inc:648
msgid "Password is not being changed from existing value"
msgstr "Bylo zadáno naprosto stejné heslo, jako je to stávajÃcÃ"
-#: plugins/personal/generic/class_user.inc:652
+#: plugins/personal/generic/class_user.inc:655
msgid "You need to specify your current password in order to proceed."
msgstr "Pro pokraÄovánà je tÅ™eba zadat své stávajÃcà heslo."
-#: plugins/personal/generic/class_user.inc:654
+#: plugins/personal/generic/class_user.inc:657
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr "Zadánà v kolonkách Nové heslo a Zopakovánà nového hesla se neshodujÃ."
-#: plugins/personal/generic/class_user.inc:656
+#: plugins/personal/generic/class_user.inc:659
#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
msgid "New password"
msgstr "Nové heslo"
-#: plugins/personal/generic/class_user.inc:658
+#: plugins/personal/generic/class_user.inc:661
msgid "The password used as new and current are too similar."
msgstr "Nové a staré heslo jsou si pÅ™ÃliÅ¡ podobné."
-#: plugins/personal/generic/class_user.inc:660
+#: plugins/personal/generic/class_user.inc:663
msgid "The password used as new is to short."
msgstr "Nové heslo nelze použÃt – je pÅ™ÃliÅ¡ krátké (nenà bezpeÄné)."
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:665
msgid "The password contains possibly problematic Unicode characters!"
msgstr "Heslo obsahuje znaky, které mohou být problematické (napÅ™. se nenacházejà pÅ™Ãmo na klávesnici)."
@@ -3298,36 +3307,46 @@ msgid ""
"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:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:189
+msgid "Login attribute"
+msgstr "atribut použitý pro pÅ™ihlaÅ¡ovánÃ"
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
msgid "First email"
msgstr "Prvnà e-mail"
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
msgid "Subject"
msgstr "Předmět"
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
msgid "Subject of the first email"
msgstr "PÅ™edmÄ›t prvnÃho e-mailu"
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
msgid "[FusionDirectory] Password recovery link"
msgstr "[FusionDirectory] Odkaz pro obnovu hesla"
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
#, 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:91
+#: plugins/config/class_recoveryConfig.inc:96
#, php-format
msgid ""
"Body of the first email, sent when the user ask for a new password. Use %s "
"for the login and the recovery link."
msgstr "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:94
+#: plugins/config/class_recoveryConfig.inc:99
#, php-format
msgid ""
"Hello,\n"
@@ -3339,31 +3358,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
msgid "Second email"
msgstr "Druhý e-mail"
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
msgid "Subject of the second email"
msgstr "Předmět druhého e-mailu"
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
msgid "[FusionDirectory] Password recovery successful"
msgstr "[FusionDirectory] Obnova ztraceného hesla proběhla úspěšně"
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
#, php-format
msgid "Body (%s is login)"
msgstr "Tělo zprávy (%s je přihlašovacà jméno)"
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
#, 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:113
+#: plugins/config/class_recoveryConfig.inc:118
#, php-format
msgid ""
"Hello,\n"
@@ -3530,10 +3549,6 @@ msgstr "UrÄuje poÄet položek, které budou ve výchozÃm nastavenà zÃskáv
msgid "Login and session"
msgstr "PÅ™ihlaÅ¡ovánà a sezenÃ"
-#: plugins/config/class_configInLdap.inc:189
-msgid "Login attribute"
-msgstr "atribut použitý pro pÅ™ihlaÅ¡ovánÃ"
-
#: 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Ã."
@@ -4396,7 +4411,7 @@ msgstr "Objekty spadajÃcà do této skupiny"
msgid "Only allow this group to connect to this list of hosts"
msgstr "Této skupinÄ› umožnit pÅ™ipojenà pouze na poÄÃtaÄe z tohoto seznamu"
-#: plugins/admin/groups/class_ogroup.inc:321
+#: plugins/admin/groups/class_ogroup.inc:322
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr "Nenà možné umÃstit poÄÃtaÄe a terminály do jedné skupiny"
diff --git a/locale/de/fusiondirectory.po b/locale/de/fusiondirectory.po
index 6bdade49b88dedd56b9eb1b913ef56b718fa3fe9..a115519bc3ee8da8d5ade5e7034adfcf78a26f64 100644
--- a/locale/de/fusiondirectory.po
+++ b/locale/de/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-11 19:09+0100\n"
-"PO-Revision-Date: 2017-01-10 14:53+0000\n"
+"POT-Creation-Date: 2017-03-29 21:46+0200\n"
+"PO-Revision-Date: 2017-03-26 15:51+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:382
+#: plugins/personal/generic/class_user.inc:385
msgid "Preferred language"
msgstr "Bevorzugte Sprache"
@@ -316,30 +316,30 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
+#: setup/class_setupStep_Migrate.inc:981
+#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1180
+#: setup/class_setupStep_Migrate.inc:1273
+#: setup/class_setupStep_Migrate.inc:1352
+#: setup/class_setupStep_Migrate.inc:1396
+msgid "LDAP query failed"
+msgstr "LDAP-Abfrage fehlgeschlagen."
+
+#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
+#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
#: setup/class_setupStep_Migrate.inc:982
#: setup/class_setupStep_Migrate.inc:1058
#: setup/class_setupStep_Migrate.inc:1181
#: setup/class_setupStep_Migrate.inc:1274
#: setup/class_setupStep_Migrate.inc:1353
#: setup/class_setupStep_Migrate.inc:1397
-msgid "LDAP query failed"
-msgstr "LDAP-Abfrage fehlgeschlagen."
-
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:983
-#: setup/class_setupStep_Migrate.inc:1059
-#: setup/class_setupStep_Migrate.inc:1182
-#: setup/class_setupStep_Migrate.inc:1275
-#: setup/class_setupStep_Migrate.inc:1354
-#: setup/class_setupStep_Migrate.inc:1398
msgid "Possibly the \"root object\" is missing."
msgstr ""
#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:866
-#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
+#: setup/class_setupStep_Migrate.inc:880
msgid "Failed"
msgstr "Fehlgeschlagen"
@@ -360,11 +360,11 @@ msgid ""
msgstr "Die strukturelle Objekt-Typ Ihres Wurzel-Objektes kann nicht konvertiert werden. Bitte fügen Sie die Objekt-Klasse '%s' manuell hinzu."
#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:677
-#: include/functions.inc:724 include/functions.inc:822
-#: include/functions.inc:2988 include/functions.inc:3165
+#: include/functions.inc:522 include/functions.inc:679
+#: include/functions.inc:726 include/functions.inc:834
+#: include/functions.inc:3001 include/functions.inc:3178
#: include/class_config.inc:322 include/class_ldap.inc:924
#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
#: include/simpleplugin/attributes/class_SetAttribute.inc:726
@@ -386,13 +386,13 @@ msgid "The specified user \"%s\" does not have full access to your ldap database
msgstr ""
#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1085
-#: setup/class_setupStep_Migrate.inc:1204
-#: setup/class_setupStep_Migrate.inc:1315
-#: setup/class_setupStep_Migrate.inc:1379
-#: setup/class_setupStep_Migrate.inc:1423 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:838
-#: include/functions.inc:2523 include/simpleplugin/class_simpleTabs.inc:322
+#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1203
+#: setup/class_setupStep_Migrate.inc:1314
+#: setup/class_setupStep_Migrate.inc:1378
+#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
+#: include/class_xml.inc:55 include/functions.inc:850
+#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
#: html/index.php:597 html/main.php:158
#: plugins/personal/posix/class_posixAccount.inc:482
#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
@@ -413,7 +413,7 @@ msgid "User migration"
msgstr "Benutzermigration"
#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1029
+#: setup/class_setupStep_Migrate.inc:1028
msgid "Migration error"
msgstr "Migrationsfehler"
@@ -422,64 +422,64 @@ msgstr "Migrationsfehler"
msgid "Cannot migrate entry \"%s\":"
msgstr "Kann Eintrag \"%s\" nicht migrieren:"
-#: setup/class_setupStep_Migrate.inc:859
+#: setup/class_setupStep_Migrate.inc:858
#, php-format
msgid "FD 1.0.7 administrative accounts found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:862
+#: setup/class_setupStep_Migrate.inc:861
#, php-format
msgid "FD 1.0.7 administrative groups found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:864
+#: setup/class_setupStep_Migrate.inc:863
msgid ""
"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
"file at the end of the setup to migrate it.<br/>"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:867
+#: setup/class_setupStep_Migrate.inc:866
msgid ""
"There is no valid FusionDirectory 1.0.8 administrator account inside your "
"LDAP."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:868 setup/class_setupStep_Migrate.inc:883
+#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
#: include/simpleplugin/simple-list.xml:59
#: plugins/admin/departments/dep-list.xml:48
#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
msgid "Create"
msgstr "Anlegen"
-#: setup/class_setupStep_Migrate.inc:873
+#: setup/class_setupStep_Migrate.inc:872
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: plugins/admin/users/class_userManagement.inc:42
msgid "Users"
msgstr "Benutzer"
-#: setup/class_setupStep_Migrate.inc:876
+#: setup/class_setupStep_Migrate.inc:875
msgid "Groups"
msgstr "Gruppen"
-#: setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStep_Migrate.inc:881
msgid "There is no FusionDirectory administrator account inside your LDAP."
msgstr "Es gibt kein FusionDirectory Administratorkonto innerhalb Ihres LDAP."
-#: setup/class_setupStep_Migrate.inc:920
+#: setup/class_setupStep_Migrate.inc:919
msgid "Gives all rights on all objects"
msgstr "Gibt alle Rechte auf alle Objekte"
-#: setup/class_setupStep_Migrate.inc:937 include/class_management.inc:697
+#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
#: include/class_listing.inc:551 include/class_xml.inc:58
#: include/password-methods/class_password-methods-sasl.inc:60
#: include/password-methods/class_password-methods-sasl.inc:86
#: include/password-methods/class_password-methods.inc:393
#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3112
-#: include/functions.inc:3133 include/functions.inc:3173
-#: include/functions.inc:3185 include/functions.inc:3189
-#: include/functions.inc:3196 include/functions.inc:3205
-#: include/functions.inc:3267 include/class_msg_dialog.inc:128
+#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
+#: include/functions.inc:3146 include/functions.inc:3186
+#: include/functions.inc:3198 include/functions.inc:3202
+#: include/functions.inc:3209 include/functions.inc:3218
+#: include/functions.inc:3280 include/class_msg_dialog.inc:128
#: include/class_msg_dialog.inc:164 include/class_config.inc:357
#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
@@ -492,89 +492,89 @@ msgstr "Gibt alle Rechte auf alle Objekte"
#: include/simpleplugin/attributes/class_FileAttribute.inc:34
#: include/simpleplugin/attributes/class_FileAttribute.inc:37
#: include/simpleplugin/attributes/class_FileAttribute.inc:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:801
-#: include/class_plugin.inc:1534 html/index.php:453 html/index.php:474
+#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
+#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
#: html/index.php:484 html/index.php:546 html/index.php:556
#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
msgid "Error"
msgstr "Fehler"
-#: setup/class_setupStep_Migrate.inc:997
+#: setup/class_setupStep_Migrate.inc:996
msgid "Default ACL roles have not been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:999
+#: setup/class_setupStep_Migrate.inc:998
msgid "Some default ACL roles are missing"
msgstr "Einige Standard-ACL-Rollen fehlen"
-#: setup/class_setupStep_Migrate.inc:1001
+#: setup/class_setupStep_Migrate.inc:1000
msgid "Default ACL roles have been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1031
+#: setup/class_setupStep_Migrate.inc:1030
#, php-format
msgid "Cannot add ACL role \"%s\":"
msgstr "Kann ACL-Rolle \"%s\" nicht hinzufügen:"
-#: setup/class_setupStep_Migrate.inc:1086
+#: setup/class_setupStep_Migrate.inc:1085
#, php-format
msgid "Found %s user(s) outside the configured tree \"%s\"."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1100
-#: setup/class_setupStep_Migrate.inc:1114
+#: setup/class_setupStep_Migrate.inc:1099
+#: setup/class_setupStep_Migrate.inc:1113
msgid "Move users into configured user tree"
msgstr "Benutzer in den konfigurierten Benutzerbaum verschieben"
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
msgid "Cannot move entries to the requested department!"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "Entry will be moved from"
msgstr "Eintrag wird verschoben von"
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "to"
msgstr "an"
-#: setup/class_setupStep_Migrate.inc:1154
+#: setup/class_setupStep_Migrate.inc:1153
msgid "The following references will be updated"
msgstr "Die folgenden Referenzen werden aktualisiert"
-#: setup/class_setupStep_Migrate.inc:1205
+#: setup/class_setupStep_Migrate.inc:1204
#, php-format
msgid "Found %s groups outside the configured tree '%s'."
msgstr "Es wurden %s Gruppen ausserhalb des konfigurierten Baums '%s' gefunden."
-#: setup/class_setupStep_Migrate.inc:1219
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1218
+#: setup/class_setupStep_Migrate.inc:1232
msgid "Move groups into configured groups tree"
msgstr "Gruppen in den konfigurierten Gruppenbaum verschieben"
-#: setup/class_setupStep_Migrate.inc:1316
+#: setup/class_setupStep_Migrate.inc:1315
#, php-format
msgid "Found %s department(s) that will not be visible in FusionDirectory."
msgstr "Fand %s Abteilungen, die nicht in FusionDirectory sichtbar sein werden."
-#: setup/class_setupStep_Migrate.inc:1325
-#: setup/class_setupStep_Migrate.inc:1330
+#: setup/class_setupStep_Migrate.inc:1324
+#: setup/class_setupStep_Migrate.inc:1329
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1380
+#: setup/class_setupStep_Migrate.inc:1379
#, php-format
msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1424
+#: setup/class_setupStep_Migrate.inc:1423
#, php-format
msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
#: setup/class_setupStep_Ldap.inc:33
msgid "LDAP connection"
-msgstr ""
+msgstr "LDAP-Verbindung"
#: setup/class_setupStep_Ldap.inc:36
msgid "Location name"
@@ -743,10 +743,10 @@ msgstr "Vor"
#: include/class_logging.inc:80 include/class_session.inc:50
#: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:649
-#: include/functions.inc:770 include/functions.inc:1189
-#: include/functions.inc:2243 include/functions.inc:2285
-#: include/functions.inc:2314 include/class_ldap.inc:873
+#: include/functions.inc:564 include/functions.inc:651
+#: include/functions.inc:772 include/functions.inc:1201
+#: include/functions.inc:2255 include/functions.inc:2297
+#: include/functions.inc:2326 include/class_ldap.inc:873
#: include/class_ldap.inc:911 include/class_acl.inc:118
msgid "Internal error"
msgstr "Interner Fehler"
@@ -813,12 +813,12 @@ msgid ""
"plugin instance!"
msgstr "Es wurde keine TAB-Definition für '%s' in der Konfigurationsdatei gefunden. Kann keine Plugin-Instanz erzeugen!"
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1188
+#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
#: include/class_listing.inc:1190
msgid "Root"
msgstr "Wurzel"
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
msgid "Submit"
msgstr "Ãœbertragen"
@@ -919,7 +919,7 @@ msgid "Create a new snapshot from this object"
msgstr "Erstelle einen neuen Snapshot dieses Objekts"
#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3302 include/simpleplugin/class_simplePlugin.inc:272
+#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
#: include/simpleplugin/class_simplePlugin.inc:277
#: include/simpleplugin/class_simplePlugin.inc:289
#: html/class_passwordRecovery.inc:116
@@ -952,7 +952,7 @@ msgstr ""
#: include/password-methods/class_password-methods-sha.inc:69
#: include/password-methods/class_password-methods-ssha.inc:73
#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:659 include/class_timezone.inc:51
+#: include/functions.inc:661 include/class_timezone.inc:51
#: include/class_config.inc:159 include/class_config.inc:284
#: include/class_config.inc:843 include/class_config.inc:856
#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
@@ -990,7 +990,7 @@ msgid "Cannot paste"
msgstr "Kann nicht einfügen"
#: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
#: plugins/personal/generic/paste_generic.tpl.c:11
msgid "Login"
@@ -1034,245 +1034,245 @@ msgid ""
"administrator."
msgstr ""
-#: include/functions.inc:597
+#: include/functions.inc:599
msgid "Authentication error"
msgstr "Authentifizierungsfehler"
-#: include/functions.inc:598
+#: include/functions.inc:600
msgid ""
"It seems your user password has expired. Please use <a "
"href=\"recovery.php\">password recovery</a> to change it."
msgstr ""
-#: include/functions.inc:649 include/functions.inc:770
+#: include/functions.inc:651 include/functions.inc:772
msgid "Error while adding a lock. Contact the developers!"
msgstr "Fehler beim Setzen einer Sperre. Bitte kontaktieren Sie die Entwickler!"
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid ""
"Cannot create locking information in LDAP tree. Please contact your "
"administrator!"
msgstr "Kann Sperrinformation für LDAP-Baum nicht erzeugen. Bitte kontaktieren Sie Ihren Administrator!"
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid "LDAP server returned: %s"
msgstr "Der LDAP-Server meldete: %s"
-#: include/functions.inc:838
+#: include/functions.inc:850
msgid ""
"Found multiple locks for object to be locked. This should not happen - "
"cleaning up multiple references."
msgstr "Mehrere Sperren für das zu sperrende Objekt gefunden. Dies sollte nicht passieren - räume mehrere Referenzen auf."
-#: include/functions.inc:1109
+#: include/functions.inc:1121
#, php-format
msgid "The size limit of %d entries is exceed!"
msgstr "Die Größenbeschränkung von %d Einträgen ist überschritten!"
-#: include/functions.inc:1111
+#: include/functions.inc:1123
#, php-format
msgid ""
"Set the new size limit to %s and show me this message if the limit still "
"exceeds"
msgstr "Verwende eine neue Größenbeschränkung von %s Einträgen und zeige diese Meldung bei Überschreitung wieder an"
-#: include/functions.inc:1128
+#: include/functions.inc:1140
msgid "Configure"
msgstr "Konfigurieren"
-#: include/functions.inc:1133
+#: include/functions.inc:1145
msgid "incomplete"
msgstr "unvollständig"
-#: include/functions.inc:1534
+#: include/functions.inc:1546
msgid "Continue anyway"
msgstr "Trotzdem Fortsetzen"
-#: include/functions.inc:1536
+#: include/functions.inc:1548
msgid "Edit anyway"
msgstr "Trotzdem bearbeiten"
-#: include/functions.inc:1538
+#: include/functions.inc:1550
#, php-format
msgid "You're going to edit the LDAP entry/entries %s"
msgstr "Sie bearbeiten gerade den/die LDAP Eintrag/Einträge %s"
-#: include/functions.inc:1766
+#: include/functions.inc:1778
msgid "Entries per page"
msgstr "Einträge pro Seite"
-#: include/functions.inc:1797 include/class_filter.inc:353
+#: include/functions.inc:1809 include/class_filter.inc:353
msgid "Apply filter"
msgstr "Filter anwenden"
-#: include/functions.inc:2065
+#: include/functions.inc:2077
#, php-format
msgid "%sB"
msgstr "%sB"
-#: include/functions.inc:2066
+#: include/functions.inc:2078
#, php-format
msgid "%sKiB"
msgstr "%sKiB"
-#: include/functions.inc:2067
+#: include/functions.inc:2079
#, php-format
msgid "%sMiB"
msgstr "%sMiB"
-#: include/functions.inc:2068
+#: include/functions.inc:2080
#, php-format
msgid "%sGiB"
msgstr "%sGiB"
-#: include/functions.inc:2069
+#: include/functions.inc:2081
#, php-format
msgid "%sTiB"
msgstr "%sTiB"
-#: include/functions.inc:2070
+#: include/functions.inc:2082
#, php-format
msgid "%sPiB"
msgstr "%sPiB"
-#: include/functions.inc:2071
+#: include/functions.inc:2083
#, php-format
msgid "%sEiB"
msgstr "%sEiB"
-#: include/functions.inc:2072
+#: include/functions.inc:2084
#, php-format
msgid "%sZiB"
msgstr "%sZiB"
-#: include/functions.inc:2073
+#: include/functions.inc:2085
#, php-format
msgid "%sYiB"
msgstr "%sYiB"
-#: include/functions.inc:2105 include/class_filter.inc:315
+#: include/functions.inc:2117 include/class_filter.inc:315
msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
-#: include/functions.inc:2243
+#: include/functions.inc:2255
#, php-format
msgid ""
"File '%s' could not be deleted. Try fusiondirectory-setup --check-"
"directories to fix permissions."
msgstr "Datei '%s' konnte nicht gelöscht werden. Versuchen Sie fusiondirectory-setup --check-directories um die Rechte zu beheben."
-#: include/functions.inc:2285
+#: include/functions.inc:2297
msgid "Cannot write to revision file!"
msgstr "Kann nicht in Revisions-Datei schreiben!"
-#: include/functions.inc:2314
+#: include/functions.inc:2326
msgid "Cannot read to revision file!"
msgstr "Kann nicht von Revisionsdatei lesen!"
-#: include/functions.inc:2523
+#: include/functions.inc:2535
msgid "'nextIdHook' is not available. Using default base!"
msgstr "'nextIdHook' ist nicht verfügbar. Benutze Standardbasis!"
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "LDAP warning"
msgstr "LDAP-Warnung"
-#: include/functions.inc:2541
+#: include/functions.inc:2554
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:2564
+#: include/functions.inc:2577
msgid "Main FusionDirectory schema"
msgstr ""
-#: include/functions.inc:2571
+#: include/functions.inc:2584
msgid "Schema used to store FusionDirectory configuration"
msgstr ""
-#: include/functions.inc:2578
+#: include/functions.inc:2591
msgid "Used to store trust mode information in users or groups."
msgstr ""
-#: include/functions.inc:2585
+#: include/functions.inc:2598
msgid "Used to store templates."
msgstr ""
-#: include/functions.inc:2592
+#: include/functions.inc:2605
msgid "Used to store POSIX information."
msgstr ""
-#: include/functions.inc:2599
+#: include/functions.inc:2612
#, php-format
msgid "Missing required object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2601
+#: include/functions.inc:2614
#, php-format
msgid "Missing optional object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2605
+#: include/functions.inc:2618
#, php-format
msgid "Class(es) available"
msgstr "Verfügbare Klasse(n)"
-#: include/functions.inc:2623
+#: include/functions.inc:2636
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2637
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2640
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2641
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3112 include/functions.inc:3133
-#: include/functions.inc:3173 include/functions.inc:3185
-#: include/functions.inc:3189 include/functions.inc:3196
-#: include/functions.inc:3205
+#: include/functions.inc:3125 include/functions.inc:3146
+#: include/functions.inc:3186 include/functions.inc:3198
+#: include/functions.inc:3202 include/functions.inc:3209
+#: include/functions.inc:3218
msgid "Cannot allocate a free ID:"
msgstr "Konnte keine freie ID allozieren:"
-#: include/functions.inc:3112
+#: include/functions.inc:3125
msgid "unknown idAllocation method!"
msgstr "unbekannte idAllocation-Methode!"
-#: include/functions.inc:3133
+#: include/functions.inc:3146
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr "%sPoolMin >= %sPoolMax!"
-#: include/functions.inc:3173
+#: include/functions.inc:3186
msgid "sambaUnixIdPool is not unique!"
msgstr "sambaUnixIdPool ist nicht eindeutig!"
-#: include/functions.inc:3185 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3202
msgid "no ID available!"
msgstr "keine ID verfügbar!"
-#: include/functions.inc:3205
+#: include/functions.inc:3218
msgid "maximum tries exceeded!"
msgstr "maximale Anzahl von Versuchen abgelaufen!"
-#: include/functions.inc:3267
+#: include/functions.inc:3280
msgid "Cannot allocate a free ID!"
msgstr "Konnte keine freie ID allozieren!"
-#: include/functions.inc:3303
+#: include/functions.inc:3316
#, 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"
@@ -1937,7 +1937,7 @@ msgstr ""
#: include/class_SnapshotDialogs.inc:41
msgid "Reason"
-msgstr ""
+msgstr "Grund"
#: include/class_SnapshotDialogs.inc:41
msgid "Reason for creating this snapshot"
@@ -2102,7 +2102,7 @@ msgstr "Name"
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
#: plugins/admin/departments/class_department.inc:72
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/groups/class_roleGeneric.inc:91
@@ -2116,7 +2116,7 @@ msgstr "Beschreibung"
#: include/simpleplugin/class_dialogAttributes.inc:426
#, php-format
msgid "POSIX group %s"
-msgstr ""
+msgstr "POSIX-Gruppe %s"
#: include/simpleplugin/class_dialogAttributes.inc:428
#, php-format
@@ -2282,7 +2282,7 @@ msgid "The entry %s is not existing"
msgstr "Der Eintrag %s existiert nicht"
#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:548
+#: include/class_plugin.inc:554
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!"
@@ -2291,7 +2291,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1039
#, php-format
msgid "Unknown field \"%s\""
-msgstr ""
+msgstr "Unbekanntes Feld \"%s\""
#: include/simpleplugin/class_Attribute.inc:555
#: include/simpleplugin/attributes/class_SetAttribute.inc:230
@@ -2362,7 +2362,7 @@ msgstr "Ungültiger Wert für %s"
#: include/simpleplugin/attributes/class_DateAttribute.inc:131
#, php-format
msgid "Error, incorrect date: %s"
-msgstr ""
+msgstr "Fehler, falsches Datum: %s"
#: include/simpleplugin/attributes/class_IntAttribute.inc:50
#, php-format
@@ -2398,14 +2398,19 @@ msgstr "Ein Float kleiner als %f"
msgid "There was a problem uncompressing snapshot data"
msgstr ""
-#: include/class_plugin.inc:803
+#: include/class_plugin.inc:809
#, php-format
msgid ""
"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
msgstr ""
-#: include/class_plugin.inc:1332
+#: include/class_plugin.inc:1350
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/class_plugin.inc:1352
#, php-format
msgid "Tab \"%s\""
msgstr "Tab \"%s\""
@@ -2553,44 +2558,44 @@ msgstr "Ihr Browser hat Cookies deaktiviert. Bitte aktivieren Sie zunächst Cook
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr "FusionDirectory Konfiguration %s/%s ist nicht lesbar. Abgebrochen."
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
msgid "Email address"
msgstr "Email-Adresse"
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
#, php-format
msgid "Did not find an account with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
#, php-format
msgid "Found multiple accounts with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
#, php-format
msgid "There is no account using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There are several accounts using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
#, php-format
msgid "The user using email \"%s\" is locked. Please contact your administrator."
msgstr ""
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
msgid "Contact your administrator, there was a problem with mail server"
msgstr "Kontaktieren Sie Ihren Administrator, es gab ein Problem mit dem Mailserver"
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
msgid "This token is invalid"
msgstr "Das Token ist nicht gültig"
-#: html/class_passwordRecovery.inc:647
+#: html/class_passwordRecovery.inc:651
msgid "There was a problem with mail server, confirmation email not sent"
msgstr "Es gab ein Problem mit dem Mailserver, Bestätigungsmail wurde nicht verschickt"
@@ -2735,17 +2740,17 @@ msgstr "Benutzer muss beim ersten Anmelden sein Passwort ändern"
msgid ""
"User must change password on first login (needs a value for Delay before "
"forcing password change)"
-msgstr ""
+msgstr "Benutzer muss das Passwort bei der ersten Anmeldung ändern (benötigt einen Wert für die Verzögerung, bevor die Passwortänderung erzwungen wird)"
#: plugins/personal/posix/class_posixAccount.inc:167
msgid "Minimum delay between password changes (days)"
-msgstr ""
+msgstr "Mindestverzögerung zwischen Passwortänderungen (Tage)"
#: plugins/personal/posix/class_posixAccount.inc:167
msgid ""
"The user won't be able to change his password before this number of days "
"(leave empty to disable)"
-msgstr ""
+msgstr "Der Benutzer kann sein Passwort nicht vor dieser Anzahl an Tagen ändern (zum Deaktivieren leer lassen)"
#: plugins/personal/posix/class_posixAccount.inc:172
msgid "Delay before forcing password change (days)"
@@ -2902,7 +2907,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:387
+#: plugins/personal/generic/class_user.inc:390
#: setup/setup_migrate_adminAccount.tpl.c:14
#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2939,258 +2944,262 @@ msgstr "Benutzerkontoinformation"
msgid "User account"
msgstr "Benutzerkonto"
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:296
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:307
msgid "Personal information"
msgstr "Persönliche Informationen"
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "Nachname"
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
msgid "Last name of this user"
msgstr "Nachname von diesem Benutzer"
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "Vorname"
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
msgid "First name of this user"
msgstr "Vorname von diesem Benutzer"
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
msgid "Short description of the user"
msgstr "Kurze Beschreibung des Benutzers"
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "Picture"
msgstr "Bild"
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "The avatar for this user"
msgstr "Der Avatar für diesen Benutzer"
-#: plugins/personal/generic/class_user.inc:330
+#: plugins/personal/generic/class_user.inc:333
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:334
+#: plugins/personal/generic/class_user.inc:337
#: plugins/admin/departments/class_department.inc:90
#: plugins/admin/departments/class_department.inc:96
msgid "Location"
msgstr "Ort"
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:341
#: plugins/admin/departments/class_department.inc:93
msgid "State"
msgstr "Land"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
#: plugins/admin/departments/class_department.inc:102
msgid "Address"
msgstr "Adresse"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
msgid "Business postal address"
msgstr "Geschäftliche Adresse"
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room No."
msgstr "Zimmer-Nr."
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room number"
msgstr "Raumnummer"
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
#: plugins/admin/departments/class_department.inc:106
msgid "Phone"
msgstr "Telefon"
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
msgid "Business phone number"
msgstr "Geschäftliche Telefonnummer"
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Mobile"
msgstr "Mobiltelefon"
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Business mobile number"
msgstr "Geschäftliche Mobiltelefonnummer"
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Pager"
msgstr "Pager"
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
#: plugins/admin/departments/class_department.inc:110
msgid "Fax"
msgstr "Fax"
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
msgid "Business fax number"
msgstr "Geschäftliche Faxnummer"
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Homepage"
msgstr "Homepage"
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:373
+#: plugins/personal/generic/class_user.inc:376
msgid "Account information"
msgstr "Kontoinformation"
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
msgid "Password of the user"
msgstr "Passwort des Benutzers"
-#: plugins/personal/generic/class_user.inc:393
+#: plugins/personal/generic/class_user.inc:396
msgid "Personal contact information"
msgstr "Persönliche Kontaktinformation"
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Display name"
msgstr "Anzeigename"
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home postal address"
msgstr "Private Adresse"
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Private phone"
msgstr "Privat-Telefon"
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Home phone number"
msgstr "Telefonnummer (privat)"
-#: plugins/personal/generic/class_user.inc:411
+#: plugins/personal/generic/class_user.inc:414
msgid "Organizational information"
msgstr "Angabe zur Organisationseinheit"
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
msgid "Title"
msgstr "Titel"
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
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:421
+#: plugins/personal/generic/class_user.inc:424
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
msgid "Organization"
msgstr "Organisation"
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
#: plugins/admin/departments/class_department.inc:33
#: plugins/admin/departments/class_department.inc:39
#: plugins/admin/departments/dep-list.xml:21
msgid "Department"
msgstr "Abteilung"
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
msgid "Department to which the user belongs"
msgstr ""
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department No."
msgstr "Abteilungs-Nr."
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department number"
msgstr "Abteilungsnummer"
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee No."
msgstr "Angestellten-Nr."
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee number"
msgstr "Personalnummer"
-#: plugins/personal/generic/class_user.inc:437
+#: plugins/personal/generic/class_user.inc:440
msgid "Employee type"
msgstr "Anstellungsart"
-#: plugins/personal/generic/class_user.inc:441
+#: plugins/personal/generic/class_user.inc:444
#: plugins/admin/departments/class_department.inc:84
msgid "Manager"
msgstr "Verwalter"
-#: plugins/personal/generic/class_user.inc:608
+#: plugins/personal/generic/class_user.inc:611
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:614
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:622
+#: plugins/personal/generic/class_user.inc:625
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:636
+#: plugins/personal/generic/class_user.inc:639
msgid "Password is in history of old passwords"
msgstr "Passwörter ist im Verlauf alter Passwörter"
-#: plugins/personal/generic/class_user.inc:641
-#: plugins/personal/generic/class_user.inc:645
+#: plugins/personal/generic/class_user.inc:644
+#: plugins/personal/generic/class_user.inc:648
msgid "Password is not being changed from existing value"
msgstr "Bestehender Wert das Passworts wurde nicht geändert"
-#: plugins/personal/generic/class_user.inc:652
+#: plugins/personal/generic/class_user.inc:655
msgid "You need to specify your current password in order to proceed."
msgstr "Sie müssen das aktuelle Passwort eingeben, um fortfahren zu können."
-#: plugins/personal/generic/class_user.inc:654
+#: plugins/personal/generic/class_user.inc:657
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:656
+#: plugins/personal/generic/class_user.inc:659
#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
msgid "New password"
msgstr "Neues Passwort"
-#: plugins/personal/generic/class_user.inc:658
+#: plugins/personal/generic/class_user.inc:661
msgid "The password used as new and current are too similar."
msgstr "Das alte und neue Passwort sind sich zu ähnlich."
-#: plugins/personal/generic/class_user.inc:660
+#: plugins/personal/generic/class_user.inc:663
msgid "The password used as new is to short."
msgstr "Das Passwort, welches Sie als 'Neues Passwort' eingegeben haben, ist zu kurz."
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:665
msgid "The password contains possibly problematic Unicode characters!"
msgstr "Das Passwort beinhaltet möglicherweise problematische Unicode-Zeichen!"
@@ -3232,7 +3241,7 @@ msgstr "Statistiken"
#: plugins/addons/dashboard/class_dashBoardPasswords.inc:26
msgid "Passwords"
-msgstr ""
+msgstr "Passwörter"
#: plugins/addons/dashboard/class_dashBoardPasswords.inc:27
msgid "Statistics about passwords"
@@ -3298,36 +3307,46 @@ msgid ""
"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:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:189
+msgid "Login attribute"
+msgstr "Anmeldeattribut"
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
msgid "First email"
msgstr "Erste Email"
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
msgid "Subject"
msgstr "Betreff"
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
msgid "Subject of the first email"
msgstr "Betreff der ersten Email"
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
msgid "[FusionDirectory] Password recovery link"
msgstr "[FusionDirectory] Password recovery link"
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
#, 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:91
+#: plugins/config/class_recoveryConfig.inc:96
#, php-format
msgid ""
"Body of the first email, sent when the user ask for a new password. Use %s "
"for the login and the recovery link."
msgstr "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:94
+#: plugins/config/class_recoveryConfig.inc:99
#, php-format
msgid ""
"Hello,\n"
@@ -3339,31 +3358,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
msgid "Second email"
msgstr "Zweite Email"
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
msgid "Subject of the second email"
msgstr "Betreff der zweiten Email"
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
msgid "[FusionDirectory] Password recovery successful"
msgstr "[FusionDirectory] Passwortwiederherstellung erfolgreich"
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
#, php-format
msgid "Body (%s is login)"
msgstr "Body (%s ist Login)"
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
#, 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:113
+#: plugins/config/class_recoveryConfig.inc:118
#, php-format
msgid ""
"Hello,\n"
@@ -3530,10 +3549,6 @@ msgstr "Definiert die Anzahl der Einträge, die standardmäßig von LDAP geholt
msgid "Login and session"
msgstr "Anmeldung und Sitzung"
-#: plugins/config/class_configInLdap.inc:189
-msgid "Login attribute"
-msgstr "Anmeldeattribut"
-
#: 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."
@@ -3582,7 +3597,7 @@ msgstr ""
#: plugins/config/class_configInLdap.inc:222
msgid "Header name"
-msgstr ""
+msgstr "Kopfdatenname"
#: plugins/config/class_configInLdap.inc:222
msgid "Name of the header containing user identifier."
@@ -3637,7 +3652,7 @@ msgstr ""
#: plugins/config/class_configInLdap.inc:264
msgid "CAS"
-msgstr ""
+msgstr "CAS"
#: plugins/config/class_configInLdap.inc:267
msgid "Enable CAS"
@@ -4073,7 +4088,7 @@ msgstr "Kategorie von diesem %s"
#: plugins/admin/departments/class_department.inc:80
msgid "Website"
-msgstr ""
+msgstr "Webseite"
#: plugins/admin/departments/class_department.inc:80
#, php-format
@@ -4269,7 +4284,7 @@ msgstr "Faxnummer"
#: plugins/admin/groups/class_roleGeneric.inc:105
msgid "Role members"
-msgstr ""
+msgstr "Rollenmitglieder"
#: plugins/admin/groups/class_roleGeneric.inc:108
msgid "Add users for the role"
@@ -4328,7 +4343,7 @@ msgstr "Samba-Gruppen anzeigen"
#: plugins/admin/groups/class_groupManagement.inc:141
msgid "Show DSA entries"
-msgstr ""
+msgstr "DSA-Einträge anzeigen"
#: plugins/admin/groups/class_groupManagement.inc:147
msgid "Show server groups"
@@ -4396,7 +4411,7 @@ msgstr "Objektmitglied dieser Gruppe"
msgid "Only allow this group to connect to this list of hosts"
msgstr "Nur dieser Gruppe erlauben, dieser Liste von Hosts zu verbinden"
-#: plugins/admin/groups/class_ogroup.inc:321
+#: plugins/admin/groups/class_ogroup.inc:322
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
@@ -4573,7 +4588,7 @@ msgstr "Alle Objekte im aktuellen Teilbaum"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:217
#, php-format
msgid "Edit ACL for \"%s\""
-msgstr ""
+msgstr "ACL für \"%s\" bearbeiten"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:258
#: plugins/admin/aclrole/class_aclEditionDialog.inc:357
@@ -4615,7 +4630,7 @@ msgstr "ACL-Rollenverwaltung"
#: plugins/admin/aclrole/class_aclRoleManagement.inc:36
msgid "Manage ACL roles"
-msgstr ""
+msgstr "ACL-Rollen verwalten"
#: plugins/admin/aclrole/class_aclRole.inc:38
#, php-format
diff --git a/locale/el_GR/fusiondirectory.po b/locale/el_GR/fusiondirectory.po
index 31a39744f5a3f0371a4e4aa78336a4d5e3c2ae01..32a5ba0071c823fe91bf9589a01f65fc82df4166 100644
--- a/locale/el_GR/fusiondirectory.po
+++ b/locale/el_GR/fusiondirectory.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-11 19:09+0100\n"
-"PO-Revision-Date: 2017-01-10 14:53+0000\n"
+"POT-Creation-Date: 2017-03-29 21:46+0200\n"
+"PO-Revision-Date: 2017-03-26 15:51+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
"MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:382
+#: plugins/personal/generic/class_user.inc:385
msgid "Preferred language"
msgstr "Î Ïοτιμώμενη γλώσσα"
@@ -322,30 +322,30 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
+#: setup/class_setupStep_Migrate.inc:981
+#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1180
+#: setup/class_setupStep_Migrate.inc:1273
+#: setup/class_setupStep_Migrate.inc:1352
+#: setup/class_setupStep_Migrate.inc:1396
+msgid "LDAP query failed"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
+#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
#: setup/class_setupStep_Migrate.inc:982
#: setup/class_setupStep_Migrate.inc:1058
#: setup/class_setupStep_Migrate.inc:1181
#: setup/class_setupStep_Migrate.inc:1274
#: setup/class_setupStep_Migrate.inc:1353
#: setup/class_setupStep_Migrate.inc:1397
-msgid "LDAP query failed"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:983
-#: setup/class_setupStep_Migrate.inc:1059
-#: setup/class_setupStep_Migrate.inc:1182
-#: setup/class_setupStep_Migrate.inc:1275
-#: setup/class_setupStep_Migrate.inc:1354
-#: setup/class_setupStep_Migrate.inc:1398
msgid "Possibly the \"root object\" is missing."
msgstr ""
#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:866
-#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
+#: setup/class_setupStep_Migrate.inc:880
msgid "Failed"
msgstr ""
@@ -366,11 +366,11 @@ msgid ""
msgstr ""
#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:677
-#: include/functions.inc:724 include/functions.inc:822
-#: include/functions.inc:2988 include/functions.inc:3165
+#: include/functions.inc:522 include/functions.inc:679
+#: include/functions.inc:726 include/functions.inc:834
+#: include/functions.inc:3001 include/functions.inc:3178
#: include/class_config.inc:322 include/class_ldap.inc:924
#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
#: include/simpleplugin/attributes/class_SetAttribute.inc:726
@@ -392,13 +392,13 @@ msgid "The specified user \"%s\" does not have full access to your ldap database
msgstr ""
#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1085
-#: setup/class_setupStep_Migrate.inc:1204
-#: setup/class_setupStep_Migrate.inc:1315
-#: setup/class_setupStep_Migrate.inc:1379
-#: setup/class_setupStep_Migrate.inc:1423 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:838
-#: include/functions.inc:2523 include/simpleplugin/class_simpleTabs.inc:322
+#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1203
+#: setup/class_setupStep_Migrate.inc:1314
+#: setup/class_setupStep_Migrate.inc:1378
+#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
+#: include/class_xml.inc:55 include/functions.inc:850
+#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
#: html/index.php:597 html/main.php:158
#: plugins/personal/posix/class_posixAccount.inc:482
#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
@@ -419,7 +419,7 @@ msgid "User migration"
msgstr ""
#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1029
+#: setup/class_setupStep_Migrate.inc:1028
msgid "Migration error"
msgstr ""
@@ -428,64 +428,64 @@ msgstr ""
msgid "Cannot migrate entry \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:859
+#: setup/class_setupStep_Migrate.inc:858
#, php-format
msgid "FD 1.0.7 administrative accounts found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:862
+#: setup/class_setupStep_Migrate.inc:861
#, php-format
msgid "FD 1.0.7 administrative groups found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:864
+#: setup/class_setupStep_Migrate.inc:863
msgid ""
"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
"file at the end of the setup to migrate it.<br/>"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:867
+#: setup/class_setupStep_Migrate.inc:866
msgid ""
"There is no valid FusionDirectory 1.0.8 administrator account inside your "
"LDAP."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:868 setup/class_setupStep_Migrate.inc:883
+#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
#: include/simpleplugin/simple-list.xml:59
#: plugins/admin/departments/dep-list.xml:48
#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
msgid "Create"
msgstr "ΔημιουÏγία"
-#: setup/class_setupStep_Migrate.inc:873
+#: setup/class_setupStep_Migrate.inc:872
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: plugins/admin/users/class_userManagement.inc:42
msgid "Users"
msgstr "ΧÏήστες"
-#: setup/class_setupStep_Migrate.inc:876
+#: setup/class_setupStep_Migrate.inc:875
msgid "Groups"
msgstr "Ομάδες"
-#: setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStep_Migrate.inc:881
msgid "There is no FusionDirectory administrator account inside your LDAP."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:920
+#: setup/class_setupStep_Migrate.inc:919
msgid "Gives all rights on all objects"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:937 include/class_management.inc:697
+#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
#: include/class_listing.inc:551 include/class_xml.inc:58
#: include/password-methods/class_password-methods-sasl.inc:60
#: include/password-methods/class_password-methods-sasl.inc:86
#: include/password-methods/class_password-methods.inc:393
#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3112
-#: include/functions.inc:3133 include/functions.inc:3173
-#: include/functions.inc:3185 include/functions.inc:3189
-#: include/functions.inc:3196 include/functions.inc:3205
-#: include/functions.inc:3267 include/class_msg_dialog.inc:128
+#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
+#: include/functions.inc:3146 include/functions.inc:3186
+#: include/functions.inc:3198 include/functions.inc:3202
+#: include/functions.inc:3209 include/functions.inc:3218
+#: include/functions.inc:3280 include/class_msg_dialog.inc:128
#: include/class_msg_dialog.inc:164 include/class_config.inc:357
#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
@@ -498,82 +498,82 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:34
#: include/simpleplugin/attributes/class_FileAttribute.inc:37
#: include/simpleplugin/attributes/class_FileAttribute.inc:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:801
-#: include/class_plugin.inc:1534 html/index.php:453 html/index.php:474
+#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
+#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
#: html/index.php:484 html/index.php:546 html/index.php:556
#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
msgid "Error"
msgstr "Σφάλμα"
-#: setup/class_setupStep_Migrate.inc:997
+#: setup/class_setupStep_Migrate.inc:996
msgid "Default ACL roles have not been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:999
+#: setup/class_setupStep_Migrate.inc:998
msgid "Some default ACL roles are missing"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1001
+#: setup/class_setupStep_Migrate.inc:1000
msgid "Default ACL roles have been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1031
+#: setup/class_setupStep_Migrate.inc:1030
#, php-format
msgid "Cannot add ACL role \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1086
+#: setup/class_setupStep_Migrate.inc:1085
#, php-format
msgid "Found %s user(s) outside the configured tree \"%s\"."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1100
-#: setup/class_setupStep_Migrate.inc:1114
+#: setup/class_setupStep_Migrate.inc:1099
+#: setup/class_setupStep_Migrate.inc:1113
msgid "Move users into configured user tree"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
msgid "Cannot move entries to the requested department!"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "Entry will be moved from"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "to"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1154
+#: setup/class_setupStep_Migrate.inc:1153
msgid "The following references will be updated"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1205
+#: setup/class_setupStep_Migrate.inc:1204
#, php-format
msgid "Found %s groups outside the configured tree '%s'."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1219
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1218
+#: setup/class_setupStep_Migrate.inc:1232
msgid "Move groups into configured groups tree"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1316
+#: setup/class_setupStep_Migrate.inc:1315
#, php-format
msgid "Found %s department(s) that will not be visible in FusionDirectory."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1325
-#: setup/class_setupStep_Migrate.inc:1330
+#: setup/class_setupStep_Migrate.inc:1324
+#: setup/class_setupStep_Migrate.inc:1329
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1380
+#: setup/class_setupStep_Migrate.inc:1379
#, php-format
msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1424
+#: setup/class_setupStep_Migrate.inc:1423
#, php-format
msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
@@ -749,10 +749,10 @@ msgstr ""
#: include/class_logging.inc:80 include/class_session.inc:50
#: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:649
-#: include/functions.inc:770 include/functions.inc:1189
-#: include/functions.inc:2243 include/functions.inc:2285
-#: include/functions.inc:2314 include/class_ldap.inc:873
+#: include/functions.inc:564 include/functions.inc:651
+#: include/functions.inc:772 include/functions.inc:1201
+#: include/functions.inc:2255 include/functions.inc:2297
+#: include/functions.inc:2326 include/class_ldap.inc:873
#: include/class_ldap.inc:911 include/class_acl.inc:118
msgid "Internal error"
msgstr "ΕσωτεÏικό σφάλμα"
@@ -819,12 +819,12 @@ msgid ""
"plugin instance!"
msgstr ""
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1188
+#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
#: include/class_listing.inc:1190
msgid "Root"
msgstr "Root"
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
msgid "Submit"
msgstr "Υποβολή"
@@ -925,7 +925,7 @@ msgid "Create a new snapshot from this object"
msgstr "ΔημιουÏγία νÎου στιγμιότυπου από αυτό το αντικείμενο"
#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3302 include/simpleplugin/class_simplePlugin.inc:272
+#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
#: include/simpleplugin/class_simplePlugin.inc:277
#: include/simpleplugin/class_simplePlugin.inc:289
#: html/class_passwordRecovery.inc:116
@@ -958,7 +958,7 @@ msgstr ""
#: include/password-methods/class_password-methods-sha.inc:69
#: include/password-methods/class_password-methods-ssha.inc:73
#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:659 include/class_timezone.inc:51
+#: include/functions.inc:661 include/class_timezone.inc:51
#: include/class_config.inc:159 include/class_config.inc:284
#: include/class_config.inc:843 include/class_config.inc:856
#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
@@ -996,7 +996,7 @@ msgid "Cannot paste"
msgstr "Αδυναμία επικόλλησης"
#: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
#: plugins/personal/generic/paste_generic.tpl.c:11
msgid "Login"
@@ -1040,245 +1040,245 @@ msgid ""
"administrator."
msgstr "Η σÏνδεση (uid) δεν είναι μοναδική μÎσα στο δÎντÏο LDAP. ΠαÏακαλοÏμε επικοινωνήστε με τον διαχειÏιστή του συστήματος σας."
-#: include/functions.inc:597
+#: include/functions.inc:599
msgid "Authentication error"
msgstr "Σφάλμα πιστοποίησης"
-#: include/functions.inc:598
+#: include/functions.inc:600
msgid ""
"It seems your user password has expired. Please use <a "
"href=\"recovery.php\">password recovery</a> to change it."
msgstr ""
-#: include/functions.inc:649 include/functions.inc:770
+#: include/functions.inc:651 include/functions.inc:772
msgid "Error while adding a lock. Contact the developers!"
msgstr "Σφάλμα κατά την Ï€Ïοσθήκη κλειδώματος. Επικοινωνήστε με τους Ï€ÏογÏαμματιστÎÏ‚!"
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid ""
"Cannot create locking information in LDAP tree. Please contact your "
"administrator!"
msgstr "Αποτυχία δημιουÏγίας κλειδώματος στο δÎντÏο LDAP. ΠαÏακαλοÏμε επικοινωνήστε με τον διαχειÏιστή του συστήματος σας."
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid "LDAP server returned: %s"
msgstr "Ο διακομιστής LDAP επίστÏεψε: %s"
-#: include/functions.inc:838
+#: include/functions.inc:850
msgid ""
"Found multiple locks for object to be locked. This should not happen - "
"cleaning up multiple references."
msgstr ""
-#: include/functions.inc:1109
+#: include/functions.inc:1121
#, php-format
msgid "The size limit of %d entries is exceed!"
msgstr "Έχει ξεπεÏαστεί το ÏŒÏιο %d καταχωÏίσεων!"
-#: include/functions.inc:1111
+#: include/functions.inc:1123
#, php-format
msgid ""
"Set the new size limit to %s and show me this message if the limit still "
"exceeds"
msgstr ""
-#: include/functions.inc:1128
+#: include/functions.inc:1140
msgid "Configure"
msgstr "ΡÏθμιση"
-#: include/functions.inc:1133
+#: include/functions.inc:1145
msgid "incomplete"
msgstr "ελλιπής"
-#: include/functions.inc:1534
+#: include/functions.inc:1546
msgid "Continue anyway"
msgstr "ΣυνÎχεια οπωσδήποτε"
-#: include/functions.inc:1536
+#: include/functions.inc:1548
msgid "Edit anyway"
msgstr "ΕπεξεÏγασία οπωσδήποτε"
-#: include/functions.inc:1538
+#: include/functions.inc:1550
#, php-format
msgid "You're going to edit the LDAP entry/entries %s"
msgstr ""
-#: include/functions.inc:1766
+#: include/functions.inc:1778
msgid "Entries per page"
msgstr "ΚαταχωÏήσεις ανά σελίδα"
-#: include/functions.inc:1797 include/class_filter.inc:353
+#: include/functions.inc:1809 include/class_filter.inc:353
msgid "Apply filter"
msgstr "ΕφαÏμογή φίλτÏου"
-#: include/functions.inc:2065
+#: include/functions.inc:2077
#, php-format
msgid "%sB"
msgstr "%sB"
-#: include/functions.inc:2066
+#: include/functions.inc:2078
#, php-format
msgid "%sKiB"
msgstr ""
-#: include/functions.inc:2067
+#: include/functions.inc:2079
#, php-format
msgid "%sMiB"
msgstr ""
-#: include/functions.inc:2068
+#: include/functions.inc:2080
#, php-format
msgid "%sGiB"
msgstr ""
-#: include/functions.inc:2069
+#: include/functions.inc:2081
#, php-format
msgid "%sTiB"
msgstr ""
-#: include/functions.inc:2070
+#: include/functions.inc:2082
#, php-format
msgid "%sPiB"
msgstr ""
-#: include/functions.inc:2071
+#: include/functions.inc:2083
#, php-format
msgid "%sEiB"
msgstr ""
-#: include/functions.inc:2072
+#: include/functions.inc:2084
#, php-format
msgid "%sZiB"
msgstr ""
-#: include/functions.inc:2073
+#: include/functions.inc:2085
#, php-format
msgid "%sYiB"
msgstr ""
-#: include/functions.inc:2105 include/class_filter.inc:315
+#: include/functions.inc:2117 include/class_filter.inc:315
msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
-#: include/functions.inc:2243
+#: include/functions.inc:2255
#, php-format
msgid ""
"File '%s' could not be deleted. Try fusiondirectory-setup --check-"
"directories to fix permissions."
msgstr ""
-#: include/functions.inc:2285
+#: include/functions.inc:2297
msgid "Cannot write to revision file!"
msgstr "ΑδÏνατη η εγγÏαφή σε αÏχείο αναθεώÏησης!"
-#: include/functions.inc:2314
+#: include/functions.inc:2326
msgid "Cannot read to revision file!"
msgstr "ΑδÏνατη η ανάγνωση σε αÏχείο αναθεώÏησης!"
-#: include/functions.inc:2523
+#: include/functions.inc:2535
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "LDAP warning"
msgstr "Î Ïοειδοποίηση LDAP "
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "Cannot get schema information from server. No schema check possible!"
msgstr "Αδυναμία λήψης πληÏοφοÏιών σχήματος για τον εξυπηÏετητή. Δεν υπάÏχει η δυνατότητα ελÎγχου σχήματος!"
-#: include/functions.inc:2564
+#: include/functions.inc:2577
msgid "Main FusionDirectory schema"
msgstr ""
-#: include/functions.inc:2571
+#: include/functions.inc:2584
msgid "Schema used to store FusionDirectory configuration"
msgstr ""
-#: include/functions.inc:2578
+#: include/functions.inc:2591
msgid "Used to store trust mode information in users or groups."
msgstr ""
-#: include/functions.inc:2585
+#: include/functions.inc:2598
msgid "Used to store templates."
msgstr ""
-#: include/functions.inc:2592
+#: include/functions.inc:2605
msgid "Used to store POSIX information."
msgstr ""
-#: include/functions.inc:2599
+#: include/functions.inc:2612
#, php-format
msgid "Missing required object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2601
+#: include/functions.inc:2614
#, php-format
msgid "Missing optional object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2605
+#: include/functions.inc:2618
#, php-format
msgid "Class(es) available"
msgstr "ΔαθÎσιμες κλάσεις"
-#: include/functions.inc:2623
+#: include/functions.inc:2636
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2637
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2640
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2641
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3112 include/functions.inc:3133
-#: include/functions.inc:3173 include/functions.inc:3185
-#: include/functions.inc:3189 include/functions.inc:3196
-#: include/functions.inc:3205
+#: include/functions.inc:3125 include/functions.inc:3146
+#: include/functions.inc:3186 include/functions.inc:3198
+#: include/functions.inc:3202 include/functions.inc:3209
+#: include/functions.inc:3218
msgid "Cannot allocate a free ID:"
msgstr "Δεν είναι δυνατό να ανατεθεί μια free ID:"
-#: include/functions.inc:3112
+#: include/functions.inc:3125
msgid "unknown idAllocation method!"
msgstr "αγνωστη μÎθοδος idAllocation"
-#: include/functions.inc:3133
+#: include/functions.inc:3146
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3173
+#: include/functions.inc:3186
msgid "sambaUnixIdPool is not unique!"
msgstr "sambaUnixIdPool δεν είναι μοναδική!"
-#: include/functions.inc:3185 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3202
msgid "no ID available!"
msgstr "Μη διαθÎσιμη ID!"
-#: include/functions.inc:3205
+#: include/functions.inc:3218
msgid "maximum tries exceeded!"
msgstr "ΥπÎÏβαση μεγίστου οÏίου Ï€Ïοσπαθειών!"
-#: include/functions.inc:3267
+#: include/functions.inc:3280
msgid "Cannot allocate a free ID!"
msgstr "Δεν είναι δυνατή η διάθεση μιας free ID!"
-#: include/functions.inc:3303
+#: include/functions.inc:3316
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr "ΑδÏνατος ο εντοπισμός του αÏχείου '%s' - ΠαÏακαλώ εκτελÎστε την εντολή '%s' για να το διοÏθώσετε"
@@ -2108,7 +2108,7 @@ msgstr "Όνομα"
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
#: plugins/admin/departments/class_department.inc:72
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/groups/class_roleGeneric.inc:91
@@ -2288,7 +2288,7 @@ msgid "The entry %s is not existing"
msgstr "Η καταχώÏιση %s δεν υπάÏχει."
#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:548
+#: include/class_plugin.inc:554
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!"
@@ -2404,14 +2404,19 @@ msgstr ""
msgid "There was a problem uncompressing snapshot data"
msgstr ""
-#: include/class_plugin.inc:803
+#: include/class_plugin.inc:809
#, php-format
msgid ""
"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
msgstr ""
-#: include/class_plugin.inc:1332
+#: include/class_plugin.inc:1350
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/class_plugin.inc:1352
#, php-format
msgid "Tab \"%s\""
msgstr "Tab \"%s\""
@@ -2559,44 +2564,44 @@ msgstr ""
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr "Οι Ïυθμίσεις FusionDirectory %s/%s δεν είναι αναγνώσιμες. ΑκÏÏωση."
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
msgid "Email address"
msgstr "ΔιευθÏνση ηλεκτÏονικής αλληλογγÏαφίας"
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
#, php-format
msgid "Did not find an account with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
#, php-format
msgid "Found multiple accounts with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
#, php-format
msgid "There is no account using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There are several accounts using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
#, php-format
msgid "The user using email \"%s\" is locked. Please contact your administrator."
msgstr ""
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
msgid "Contact your administrator, there was a problem with mail server"
msgstr ""
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
msgid "This token is invalid"
msgstr ""
-#: html/class_passwordRecovery.inc:647
+#: html/class_passwordRecovery.inc:651
msgid "There was a problem with mail server, confirmation email not sent"
msgstr ""
@@ -2908,7 +2913,7 @@ msgid "Password hash method to use"
msgstr "ÎœÎθοδος hash για χÏήση κωδικοÏ"
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
#: setup/setup_migrate_adminAccount.tpl.c:14
#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2945,258 +2950,262 @@ msgstr "ΠληÏοφοÏίες λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï Ï‡Ïήστη"
msgid "User account"
msgstr "ΛογαÏιασμός χÏήστη"
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:296
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:307
msgid "Personal information"
msgstr "Î ÏοσωπικÎÏ‚ πληÏοφοÏίες"
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "Επίθετο"
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
msgid "Last name of this user"
msgstr "Το επίθετο του χÏήστη."
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "Όνομα"
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
msgid "First name of this user"
msgstr "Το όνομα του χÏήστη"
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
msgid "Short description of the user"
msgstr "ΣÏντομη πεÏιγÏαφή του χÏήστη"
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "Picture"
msgstr "Εικόνα"
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "The avatar for this user"
msgstr "Το Î¬Î²Î±Ï„Î±Ï Ï„Î¿Ï… χÏήστη"
-#: plugins/personal/generic/class_user.inc:330
+#: plugins/personal/generic/class_user.inc:333
msgid "Organizational contact information"
msgstr "ΠληÏοφοÏιών επαφή οÏγανισμοÏ"
-#: plugins/personal/generic/class_user.inc:334
+#: plugins/personal/generic/class_user.inc:337
#: plugins/admin/departments/class_department.inc:90
#: plugins/admin/departments/class_department.inc:96
msgid "Location"
msgstr "Τοποθεσία"
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:341
#: plugins/admin/departments/class_department.inc:93
msgid "State"
msgstr "Πολιτεία"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
#: plugins/admin/departments/class_department.inc:102
msgid "Address"
msgstr "ΔιεÏθυνση"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
msgid "Business postal address"
msgstr "ΤαχυδÏομική διεÏθυνση εταιÏίας"
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room No."
msgstr "ΑÏ. δωματίου"
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room number"
msgstr "ΑÏιθμός δωματίου"
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
#: plugins/admin/departments/class_department.inc:106
msgid "Phone"
msgstr "ΤηλÎφωνο"
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
msgid "Business phone number"
msgstr "ΑÏιθμός τηλεφώνου εÏγασίας"
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Mobile"
msgstr "Κινητό"
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Business mobile number"
msgstr "ΑÏιθμός ÎºÎ¹Î½Î·Ï„Î¿Ï Ï„Î·Î»ÎµÏ†ÏŽÎ½Î¿Ï… εÏγασίας"
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Pager"
msgstr "Βομβητής"
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Business pager number"
msgstr "ΑÏιθμός βομβητή εÏγασίας"
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
#: plugins/admin/departments/class_department.inc:110
msgid "Fax"
msgstr "Φαξ"
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
msgid "Business fax number"
msgstr "ΑÏιθμός φαξ εÏγασίας"
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Homepage"
msgstr "Ιστοσελίδα"
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Personal homepage"
msgstr "Î Ïοσωπική ιστοσελίδα"
-#: plugins/personal/generic/class_user.inc:373
+#: plugins/personal/generic/class_user.inc:376
msgid "Account information"
msgstr "ΠληÏοφοÏίες λογαÏιασμοÏ"
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
msgid "Login of this user"
msgstr "ΛογαÏιασμός σÏνδεσης Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… χÏήστη."
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
msgid "Password of the user"
msgstr "Ο κωδικός του χÏήστη"
-#: plugins/personal/generic/class_user.inc:393
+#: plugins/personal/generic/class_user.inc:396
msgid "Personal contact information"
msgstr "Î ÏοσωπικÎÏ‚ πληÏοφοÏίες επαφής"
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Display name"
msgstr "Όνομα που εμφανίζεται"
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Name this user should appear as. Used by Exchange."
msgstr "Το όνομα με το οποίο Ï€ÏÎπει να εμφανίζεται ο χÏήστης. ΧÏησιμοποιείται από το Exchange."
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home address"
msgstr "ΔιεÏθυνση οικίας"
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home postal address"
msgstr "ΤαχυδÏομική διεÏθυνση οικίας"
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Private phone"
msgstr "Ιδιωτικό τηλÎφωνο"
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Home phone number"
msgstr "ΤηλÎφωνο οικίας"
-#: plugins/personal/generic/class_user.inc:411
+#: plugins/personal/generic/class_user.inc:414
msgid "Organizational information"
msgstr "ΠληÏοφοÏίες οÏγανισμοÏ"
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
msgid "Title"
msgstr "Τίτλος"
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
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:421
+#: plugins/personal/generic/class_user.inc:424
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
msgid "Organization"
msgstr "ΟÏγανισμός"
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
#: plugins/admin/departments/class_department.inc:33
#: plugins/admin/departments/class_department.inc:39
#: plugins/admin/departments/dep-list.xml:21
msgid "Department"
msgstr "Τμήμα"
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
msgid "Department to which the user belongs"
msgstr ""
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department No."
msgstr "ΑÏ. τμήματος"
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department number"
msgstr "ΑÏιθμός τμήματος"
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee No."
msgstr "ΑÏ. Υπαλλήλου"
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee number"
msgstr "ΑÏιθμός Υπαλλήλου"
-#: plugins/personal/generic/class_user.inc:437
+#: plugins/personal/generic/class_user.inc:440
msgid "Employee type"
msgstr "ΤÏπος υπαλλήλου"
-#: plugins/personal/generic/class_user.inc:441
+#: plugins/personal/generic/class_user.inc:444
#: plugins/admin/departments/class_department.inc:84
msgid "Manager"
msgstr "ΔιαχειÏιστής"
-#: plugins/personal/generic/class_user.inc:608
+#: plugins/personal/generic/class_user.inc:611
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr "Δεν ήταν δυνατή η εÏÏεση του Ppolicy \"%s\" στο LDAP!"
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:614
msgid "You are not allowed to change your own password"
msgstr "Δεν Îχετε δικαίωμα αλλαγής του ÎºÏ‰Î´Î¹ÎºÎ¿Ï ÏƒÎ±Ï‚"
-#: plugins/personal/generic/class_user.inc:622
+#: plugins/personal/generic/class_user.inc:625
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr "Θα Ï€ÏÎπει να πεÏιμÎνετε %d δευτεÏόλεπτα για να αλλάξετε το κωδικό σας"
-#: plugins/personal/generic/class_user.inc:636
+#: plugins/personal/generic/class_user.inc:639
msgid "Password is in history of old passwords"
msgstr "Ο κωδικός είναι στο ιστοÏικό παλιών κωδικών Ï€Ïόσβασης."
-#: plugins/personal/generic/class_user.inc:641
-#: plugins/personal/generic/class_user.inc:645
+#: plugins/personal/generic/class_user.inc:644
+#: plugins/personal/generic/class_user.inc:648
msgid "Password is not being changed from existing value"
msgstr "Ο κωδικός Ï€Ïόσβασής σας δεν Îχει αλλάξει από την Ï„ÏÎχουσα τιμή"
-#: plugins/personal/generic/class_user.inc:652
+#: plugins/personal/generic/class_user.inc:655
msgid "You need to specify your current password in order to proceed."
msgstr "Θα Ï€ÏÎπει να εισάγετε τον κÏÏιο κωδικό σας για να συνεχίσετε"
-#: plugins/personal/generic/class_user.inc:654
+#: plugins/personal/generic/class_user.inc:657
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr "Οι κωδικοί εισάγατε ως \"ÎÎο κωδικό\" και \"Επανάληψη νÎου κωδικοÏ\" δεν ταιÏιάζουν."
-#: plugins/personal/generic/class_user.inc:656
+#: plugins/personal/generic/class_user.inc:659
#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
msgid "New password"
msgstr "ÎÎος κωδικός "
-#: plugins/personal/generic/class_user.inc:658
+#: plugins/personal/generic/class_user.inc:661
msgid "The password used as new and current are too similar."
msgstr "Ο παλιός και ο νÎος κωδικός Ï€Ïόσβασης μοιάζουν πολÏ"
-#: plugins/personal/generic/class_user.inc:660
+#: plugins/personal/generic/class_user.inc:663
msgid "The password used as new is to short."
msgstr "Ο κωδικός που εισάγατε είναι Ï€Î¿Î»Ï Î¼Î¹ÎºÏός"
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:665
msgid "The password contains possibly problematic Unicode characters!"
msgstr "Ο νÎος κωδικός Ï€Ïόσβασης πεÏιÎχει Ï€ÏοβληματικοÏÏ‚ χαÏακτήÏες Unicode!"
@@ -3304,36 +3313,46 @@ msgid ""
"recover their password"
msgstr "Οι χÏήστες θα Îχουν επίσης τη δυνατότητα να εισάγουν μία από τις εναλλακτικÎÏ‚ τους διευθÏνσεις για να ανακτήσουν τον κωδικό τους"
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:189
+msgid "Login attribute"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
msgid "First email"
msgstr "Î Ïώτο email"
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
msgid "Subject"
msgstr "ΘÎμα"
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
msgid "Subject of the first email"
msgstr "ΘÎμα του Ï€Ïώτου email"
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
msgid "[FusionDirectory] Password recovery link"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
#, php-format
msgid ""
"Body of the first email, sent when the user ask for a new password. Use %s "
"for the login and the recovery link."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
#, php-format
msgid ""
"Hello,\n"
@@ -3345,31 +3364,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
msgid "Second email"
msgstr "ΔεÏτεÏο email"
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
msgid "Subject of the second email"
msgstr "ΘÎμα του δεÏτεÏου email"
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
msgid "[FusionDirectory] Password recovery successful"
msgstr "[FusionDirectory] Επιτυχής επαναφοÏά ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï€Ïόσβασης"
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
#, php-format
msgid "Body (%s is login)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
#, 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
+#: plugins/config/class_recoveryConfig.inc:118
#, php-format
msgid ""
"Hello,\n"
@@ -3536,10 +3555,6 @@ msgstr ""
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 ""
@@ -4402,7 +4417,7 @@ msgstr "Αντικείμενα μÎλους για αυτή την ομάδα"
msgid "Only allow this group to connect to this list of hosts"
msgstr "ΕπιτÏÎπεται σ'αυτή την ομάδα να συνδÎεται στην ακόλουθη λίστα διακομιστών"
-#: plugins/admin/groups/class_ogroup.inc:321
+#: plugins/admin/groups/class_ogroup.inc:322
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr "Τοποθετηση σταθμών εÏγασίας και τεÏματικών στην ίδια ομάδα δεν επιτÏÎπεται"
diff --git a/locale/en/fusiondirectory.po b/locale/en/fusiondirectory.po
index 370004d88c6bfa7c0f490020434948d1c5dafeec..72e3a415721269c151ae3bf1a612db3afe14964b 100644
--- a/locale/en/fusiondirectory.po
+++ b/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory VERSION\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-11 19:09+0100\n"
+"POT-Creation-Date: 2017-03-26 17:52+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
"Language-Team: English\n"
@@ -19,7 +19,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:382
+#: plugins/personal/generic/class_user.inc:385
msgid "Preferred language"
msgstr ""
@@ -315,30 +315,30 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
+#: setup/class_setupStep_Migrate.inc:981
+#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1180
+#: setup/class_setupStep_Migrate.inc:1273
+#: setup/class_setupStep_Migrate.inc:1352
+#: setup/class_setupStep_Migrate.inc:1396
+msgid "LDAP query failed"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
+#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
#: setup/class_setupStep_Migrate.inc:982
#: setup/class_setupStep_Migrate.inc:1058
#: setup/class_setupStep_Migrate.inc:1181
#: setup/class_setupStep_Migrate.inc:1274
#: setup/class_setupStep_Migrate.inc:1353
#: setup/class_setupStep_Migrate.inc:1397
-msgid "LDAP query failed"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:983
-#: setup/class_setupStep_Migrate.inc:1059
-#: setup/class_setupStep_Migrate.inc:1182
-#: setup/class_setupStep_Migrate.inc:1275
-#: setup/class_setupStep_Migrate.inc:1354
-#: setup/class_setupStep_Migrate.inc:1398
msgid "Possibly the \"root object\" is missing."
msgstr ""
#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:866
-#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
+#: setup/class_setupStep_Migrate.inc:880
msgid "Failed"
msgstr ""
@@ -359,11 +359,11 @@ msgid ""
msgstr ""
#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:677
-#: include/functions.inc:724 include/functions.inc:822
-#: include/functions.inc:2988 include/functions.inc:3165
+#: include/functions.inc:522 include/functions.inc:679
+#: include/functions.inc:726 include/functions.inc:834
+#: include/functions.inc:3001 include/functions.inc:3178
#: include/class_config.inc:322 include/class_ldap.inc:924
#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
#: include/simpleplugin/attributes/class_SetAttribute.inc:726
@@ -387,13 +387,13 @@ msgid ""
msgstr ""
#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1085
-#: setup/class_setupStep_Migrate.inc:1204
-#: setup/class_setupStep_Migrate.inc:1315
-#: setup/class_setupStep_Migrate.inc:1379
-#: setup/class_setupStep_Migrate.inc:1423 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:838
-#: include/functions.inc:2523 include/simpleplugin/class_simpleTabs.inc:322
+#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1203
+#: setup/class_setupStep_Migrate.inc:1314
+#: setup/class_setupStep_Migrate.inc:1378
+#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
+#: include/class_xml.inc:55 include/functions.inc:850
+#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
#: html/index.php:597 html/main.php:158
#: plugins/personal/posix/class_posixAccount.inc:482
#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
@@ -414,7 +414,7 @@ msgid "User migration"
msgstr ""
#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1029
+#: setup/class_setupStep_Migrate.inc:1028
msgid "Migration error"
msgstr ""
@@ -423,64 +423,64 @@ msgstr ""
msgid "Cannot migrate entry \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:859
+#: setup/class_setupStep_Migrate.inc:858
#, php-format
msgid "FD 1.0.7 administrative accounts found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:862
+#: setup/class_setupStep_Migrate.inc:861
#, php-format
msgid "FD 1.0.7 administrative groups found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:864
+#: setup/class_setupStep_Migrate.inc:863
msgid ""
"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
"file at the end of the setup to migrate it.<br/>"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:867
+#: setup/class_setupStep_Migrate.inc:866
msgid ""
"There is no valid FusionDirectory 1.0.8 administrator account inside your "
"LDAP."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:868 setup/class_setupStep_Migrate.inc:883
+#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
#: include/simpleplugin/simple-list.xml:59
#: plugins/admin/departments/dep-list.xml:48
#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
msgid "Create"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:873
+#: setup/class_setupStep_Migrate.inc:872
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: plugins/admin/users/class_userManagement.inc:42
msgid "Users"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:876
+#: setup/class_setupStep_Migrate.inc:875
msgid "Groups"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStep_Migrate.inc:881
msgid "There is no FusionDirectory administrator account inside your LDAP."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:920
+#: setup/class_setupStep_Migrate.inc:919
msgid "Gives all rights on all objects"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:937 include/class_management.inc:697
+#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
#: include/class_listing.inc:551 include/class_xml.inc:58
#: include/password-methods/class_password-methods-sasl.inc:60
#: include/password-methods/class_password-methods-sasl.inc:86
#: include/password-methods/class_password-methods.inc:393
#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3112
-#: include/functions.inc:3133 include/functions.inc:3173
-#: include/functions.inc:3185 include/functions.inc:3189
-#: include/functions.inc:3196 include/functions.inc:3205
-#: include/functions.inc:3267 include/class_msg_dialog.inc:128
+#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
+#: include/functions.inc:3146 include/functions.inc:3186
+#: include/functions.inc:3198 include/functions.inc:3202
+#: include/functions.inc:3209 include/functions.inc:3218
+#: include/functions.inc:3280 include/class_msg_dialog.inc:128
#: include/class_msg_dialog.inc:164 include/class_config.inc:357
#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
@@ -493,82 +493,82 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:34
#: include/simpleplugin/attributes/class_FileAttribute.inc:37
#: include/simpleplugin/attributes/class_FileAttribute.inc:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:801
-#: include/class_plugin.inc:1534 html/index.php:453 html/index.php:474
+#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
+#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
#: html/index.php:484 html/index.php:546 html/index.php:556
#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
msgid "Error"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:997
+#: setup/class_setupStep_Migrate.inc:996
msgid "Default ACL roles have not been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:999
+#: setup/class_setupStep_Migrate.inc:998
msgid "Some default ACL roles are missing"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1001
+#: setup/class_setupStep_Migrate.inc:1000
msgid "Default ACL roles have been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1031
+#: setup/class_setupStep_Migrate.inc:1030
#, php-format
msgid "Cannot add ACL role \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1086
+#: setup/class_setupStep_Migrate.inc:1085
#, php-format
msgid "Found %s user(s) outside the configured tree \"%s\"."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1100
-#: setup/class_setupStep_Migrate.inc:1114
+#: setup/class_setupStep_Migrate.inc:1099
+#: setup/class_setupStep_Migrate.inc:1113
msgid "Move users into configured user tree"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
msgid "Cannot move entries to the requested department!"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "Entry will be moved from"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "to"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1154
+#: setup/class_setupStep_Migrate.inc:1153
msgid "The following references will be updated"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1205
+#: setup/class_setupStep_Migrate.inc:1204
#, php-format
msgid "Found %s groups outside the configured tree '%s'."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1219
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1218
+#: setup/class_setupStep_Migrate.inc:1232
msgid "Move groups into configured groups tree"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1316
+#: setup/class_setupStep_Migrate.inc:1315
#, php-format
msgid "Found %s department(s) that will not be visible in FusionDirectory."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1325
-#: setup/class_setupStep_Migrate.inc:1330
+#: setup/class_setupStep_Migrate.inc:1324
+#: setup/class_setupStep_Migrate.inc:1329
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1380
+#: setup/class_setupStep_Migrate.inc:1379
#, php-format
msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1424
+#: setup/class_setupStep_Migrate.inc:1423
#, php-format
msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
@@ -744,10 +744,10 @@ msgstr ""
#: include/class_logging.inc:80 include/class_session.inc:50
#: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:649
-#: include/functions.inc:770 include/functions.inc:1189
-#: include/functions.inc:2243 include/functions.inc:2285
-#: include/functions.inc:2314 include/class_ldap.inc:873
+#: include/functions.inc:564 include/functions.inc:651
+#: include/functions.inc:772 include/functions.inc:1201
+#: include/functions.inc:2255 include/functions.inc:2297
+#: include/functions.inc:2326 include/class_ldap.inc:873
#: include/class_ldap.inc:911 include/class_acl.inc:118
msgid "Internal error"
msgstr ""
@@ -814,12 +814,12 @@ msgid ""
"plugin instance!"
msgstr ""
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1188
+#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
#: include/class_listing.inc:1190
msgid "Root"
msgstr ""
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
msgid "Submit"
msgstr ""
@@ -920,7 +920,7 @@ msgid "Create a new snapshot from this object"
msgstr ""
#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3302 include/simpleplugin/class_simplePlugin.inc:272
+#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
#: include/simpleplugin/class_simplePlugin.inc:277
#: include/simpleplugin/class_simplePlugin.inc:289
#: html/class_passwordRecovery.inc:116
@@ -953,7 +953,7 @@ msgstr ""
#: include/password-methods/class_password-methods-sha.inc:69
#: include/password-methods/class_password-methods-ssha.inc:73
#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:659 include/class_timezone.inc:51
+#: include/functions.inc:661 include/class_timezone.inc:51
#: include/class_config.inc:159 include/class_config.inc:284
#: include/class_config.inc:843 include/class_config.inc:856
#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
@@ -991,7 +991,7 @@ msgid "Cannot paste"
msgstr ""
#: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
#: plugins/personal/generic/paste_generic.tpl.c:11
msgid "Login"
@@ -1035,244 +1035,244 @@ msgid ""
"administrator."
msgstr ""
-#: include/functions.inc:597
+#: include/functions.inc:599
msgid "Authentication error"
msgstr ""
-#: include/functions.inc:598
+#: include/functions.inc:600
msgid ""
"It seems your user password has expired. Please use <a href=\"recovery.php"
"\">password recovery</a> to change it."
msgstr ""
-#: include/functions.inc:649 include/functions.inc:770
+#: include/functions.inc:651 include/functions.inc:772
msgid "Error while adding a lock. Contact the developers!"
msgstr ""
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid ""
"Cannot create locking information in LDAP tree. Please contact your "
"administrator!"
msgstr ""
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid "LDAP server returned: %s"
msgstr ""
-#: include/functions.inc:838
+#: include/functions.inc:850
msgid ""
"Found multiple locks for object to be locked. This should not happen - "
"cleaning up multiple references."
msgstr ""
-#: include/functions.inc:1109
+#: include/functions.inc:1121
#, php-format
msgid "The size limit of %d entries is exceed!"
msgstr ""
-#: include/functions.inc:1111
+#: include/functions.inc:1123
#, php-format
msgid ""
"Set the new size limit to %s and show me this message if the limit still "
"exceeds"
msgstr ""
-#: include/functions.inc:1128
+#: include/functions.inc:1140
msgid "Configure"
msgstr ""
-#: include/functions.inc:1133
+#: include/functions.inc:1145
msgid "incomplete"
msgstr ""
-#: include/functions.inc:1534
+#: include/functions.inc:1546
msgid "Continue anyway"
msgstr ""
-#: include/functions.inc:1536
+#: include/functions.inc:1548
msgid "Edit anyway"
msgstr ""
-#: include/functions.inc:1538
+#: include/functions.inc:1550
#, php-format
msgid "You're going to edit the LDAP entry/entries %s"
msgstr ""
-#: include/functions.inc:1766
+#: include/functions.inc:1778
msgid "Entries per page"
msgstr ""
-#: include/functions.inc:1797 include/class_filter.inc:353
+#: include/functions.inc:1809 include/class_filter.inc:353
msgid "Apply filter"
msgstr ""
-#: include/functions.inc:2065
+#: include/functions.inc:2077
#, php-format
msgid "%sB"
msgstr ""
-#: include/functions.inc:2066
+#: include/functions.inc:2078
#, php-format
msgid "%sKiB"
msgstr ""
-#: include/functions.inc:2067
+#: include/functions.inc:2079
#, php-format
msgid "%sMiB"
msgstr ""
-#: include/functions.inc:2068
+#: include/functions.inc:2080
#, php-format
msgid "%sGiB"
msgstr ""
-#: include/functions.inc:2069
+#: include/functions.inc:2081
#, php-format
msgid "%sTiB"
msgstr ""
-#: include/functions.inc:2070
+#: include/functions.inc:2082
#, php-format
msgid "%sPiB"
msgstr ""
-#: include/functions.inc:2071
+#: include/functions.inc:2083
#, php-format
msgid "%sEiB"
msgstr ""
-#: include/functions.inc:2072
+#: include/functions.inc:2084
#, php-format
msgid "%sZiB"
msgstr ""
-#: include/functions.inc:2073
+#: include/functions.inc:2085
#, php-format
msgid "%sYiB"
msgstr ""
-#: include/functions.inc:2105 include/class_filter.inc:315
+#: include/functions.inc:2117 include/class_filter.inc:315
msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
msgstr ""
-#: include/functions.inc:2243
+#: include/functions.inc:2255
#, php-format
msgid ""
"File '%s' could not be deleted. Try fusiondirectory-setup --check-"
"directories to fix permissions."
msgstr ""
-#: include/functions.inc:2285
+#: include/functions.inc:2297
msgid "Cannot write to revision file!"
msgstr ""
-#: include/functions.inc:2314
+#: include/functions.inc:2326
msgid "Cannot read to revision file!"
msgstr ""
-#: include/functions.inc:2523
+#: include/functions.inc:2535
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "LDAP warning"
msgstr ""
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "Cannot get schema information from server. No schema check possible!"
msgstr ""
-#: include/functions.inc:2564
+#: include/functions.inc:2577
msgid "Main FusionDirectory schema"
msgstr ""
-#: include/functions.inc:2571
+#: include/functions.inc:2584
msgid "Schema used to store FusionDirectory configuration"
msgstr ""
-#: include/functions.inc:2578
+#: include/functions.inc:2591
msgid "Used to store trust mode information in users or groups."
msgstr ""
-#: include/functions.inc:2585
+#: include/functions.inc:2598
msgid "Used to store templates."
msgstr ""
-#: include/functions.inc:2592
+#: include/functions.inc:2605
msgid "Used to store POSIX information."
msgstr ""
-#: include/functions.inc:2599
+#: include/functions.inc:2612
#, php-format
msgid "Missing required object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2601
+#: include/functions.inc:2614
#, php-format
msgid "Missing optional object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2605
+#: include/functions.inc:2618
#, php-format
msgid "Class(es) available"
msgstr ""
-#: include/functions.inc:2623
+#: include/functions.inc:2636
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2637
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2640
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2641
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3112 include/functions.inc:3133
-#: include/functions.inc:3173 include/functions.inc:3185
-#: include/functions.inc:3189 include/functions.inc:3196
-#: include/functions.inc:3205
+#: include/functions.inc:3125 include/functions.inc:3146
+#: include/functions.inc:3186 include/functions.inc:3198
+#: include/functions.inc:3202 include/functions.inc:3209
+#: include/functions.inc:3218
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3112
+#: include/functions.inc:3125
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3133
+#: include/functions.inc:3146
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3173
+#: include/functions.inc:3186
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3185 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3202
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3205
+#: include/functions.inc:3218
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3267
+#: include/functions.inc:3280
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3303
+#: include/functions.inc:3316
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
@@ -2102,7 +2102,7 @@ msgstr ""
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
#: plugins/admin/departments/class_department.inc:72
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/groups/class_roleGeneric.inc:91
@@ -2282,7 +2282,7 @@ msgid "The entry %s is not existing"
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:548
+#: include/class_plugin.inc:554
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!"
@@ -2399,14 +2399,19 @@ msgstr ""
msgid "There was a problem uncompressing snapshot data"
msgstr ""
-#: include/class_plugin.inc:803
+#: include/class_plugin.inc:809
#, php-format
msgid ""
"Recursive dependency in the template fields: \"%1$s\" cannot depend on \"%2$s"
"\" as \"%2$s\" already depends on \"%1$s\""
msgstr ""
-#: include/class_plugin.inc:1332
+#: include/class_plugin.inc:1350
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/class_plugin.inc:1352
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -2555,45 +2560,45 @@ msgstr ""
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr ""
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
msgid "Email address"
msgstr ""
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
#, php-format
msgid "Did not find an account with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
#, php-format
msgid "Found multiple accounts with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
#, php-format
msgid "There is no account using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There are several accounts using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
#, php-format
msgid ""
"The user using email \"%s\" is locked. Please contact your administrator."
msgstr ""
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
msgid "Contact your administrator, there was a problem with mail server"
msgstr ""
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
msgid "This token is invalid"
msgstr ""
-#: html/class_passwordRecovery.inc:647
+#: html/class_passwordRecovery.inc:651
msgid "There was a problem with mail server, confirmation email not sent"
msgstr ""
@@ -2905,7 +2910,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
#: setup/setup_migrate_adminAccount.tpl.c:14
#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2942,258 +2947,262 @@ msgstr ""
msgid "User account"
msgstr ""
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:296
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:307
msgid "Personal information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
msgid "Last name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
msgid "First name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
msgid "Short description of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "Picture"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "The avatar for this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:330
+#: plugins/personal/generic/class_user.inc:333
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:334
+#: plugins/personal/generic/class_user.inc:337
#: plugins/admin/departments/class_department.inc:90
#: plugins/admin/departments/class_department.inc:96
msgid "Location"
msgstr ""
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:341
#: plugins/admin/departments/class_department.inc:93
msgid "State"
msgstr ""
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
#: plugins/admin/departments/class_department.inc:102
msgid "Address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
msgid "Business postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
#: plugins/admin/departments/class_department.inc:106
msgid "Phone"
msgstr ""
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
msgid "Business phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Mobile"
msgstr ""
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Business mobile number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Pager"
msgstr ""
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
#: plugins/admin/departments/class_department.inc:110
msgid "Fax"
msgstr ""
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:373
+#: plugins/personal/generic/class_user.inc:376
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:393
+#: plugins/personal/generic/class_user.inc:396
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Display name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Private phone"
msgstr ""
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Home phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:411
+#: plugins/personal/generic/class_user.inc:414
msgid "Organizational information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
msgid "Title"
msgstr ""
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
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:421
+#: plugins/personal/generic/class_user.inc:424
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
msgid "Organization"
msgstr ""
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
#: plugins/admin/departments/class_department.inc:33
#: plugins/admin/departments/class_department.inc:39
#: plugins/admin/departments/dep-list.xml:21
msgid "Department"
msgstr ""
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
msgid "Department to which the user belongs"
msgstr ""
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:437
+#: plugins/personal/generic/class_user.inc:440
msgid "Employee type"
msgstr ""
-#: plugins/personal/generic/class_user.inc:441
+#: plugins/personal/generic/class_user.inc:444
#: plugins/admin/departments/class_department.inc:84
msgid "Manager"
msgstr ""
-#: plugins/personal/generic/class_user.inc:608
+#: plugins/personal/generic/class_user.inc:611
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:614
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:622
+#: plugins/personal/generic/class_user.inc:625
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:636
+#: plugins/personal/generic/class_user.inc:639
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:641
-#: plugins/personal/generic/class_user.inc:645
+#: plugins/personal/generic/class_user.inc:644
+#: plugins/personal/generic/class_user.inc:648
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:652
+#: plugins/personal/generic/class_user.inc:655
msgid "You need to specify your current password in order to proceed."
msgstr ""
-#: plugins/personal/generic/class_user.inc:654
+#: plugins/personal/generic/class_user.inc:657
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new password"
"\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:656
+#: plugins/personal/generic/class_user.inc:659
#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
msgid "New password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:658
+#: plugins/personal/generic/class_user.inc:661
msgid "The password used as new and current are too similar."
msgstr ""
-#: plugins/personal/generic/class_user.inc:660
+#: plugins/personal/generic/class_user.inc:663
msgid "The password used as new is to short."
msgstr ""
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:665
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
@@ -3301,36 +3310,45 @@ msgid ""
"recover their password"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:189
+msgid "Login attribute"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid "Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
msgid "First email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
msgid "Subject"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
msgid "Subject of the first email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
msgid "[FusionDirectory] Password recovery link"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
#, php-format
msgid ""
"Body of the first email, sent when the user ask for a new password. Use %s "
"for the login and the recovery link."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
#, php-format
msgid ""
"Hello,\n"
@@ -3342,31 +3360,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
msgid "Second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
msgid "Subject of the second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
msgid "[FusionDirectory] Password recovery successful"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
#, php-format
msgid "Body (%s is login)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
#, 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
+#: plugins/config/class_recoveryConfig.inc:118
#, php-format
msgid ""
"Hello,\n"
@@ -3533,10 +3551,6 @@ msgstr ""
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 ""
@@ -4398,7 +4412,7 @@ msgstr ""
msgid "Only allow this group to connect to this list of hosts"
msgstr ""
-#: plugins/admin/groups/class_ogroup.inc:321
+#: plugins/admin/groups/class_ogroup.inc:322
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
diff --git a/locale/es/fusiondirectory.po b/locale/es/fusiondirectory.po
index 64cd7134b8cb5db972d9d6e7b8bdb7b1d2cd8be3..4c9458696a526913e6437be0e16cbfa5e758ae26 100644
--- a/locale/es/fusiondirectory.po
+++ b/locale/es/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-11 19:09+0100\n"
-"PO-Revision-Date: 2017-01-10 14:53+0000\n"
+"POT-Creation-Date: 2017-03-29 21:46+0200\n"
+"PO-Revision-Date: 2017-03-26 15:51+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:382
+#: plugins/personal/generic/class_user.inc:385
msgid "Preferred language"
msgstr "Idioma preferido"
@@ -316,30 +316,30 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
+#: setup/class_setupStep_Migrate.inc:981
+#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1180
+#: setup/class_setupStep_Migrate.inc:1273
+#: setup/class_setupStep_Migrate.inc:1352
+#: setup/class_setupStep_Migrate.inc:1396
+msgid "LDAP query failed"
+msgstr "La consulta LDAP ha fallado"
+
+#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
+#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
#: setup/class_setupStep_Migrate.inc:982
#: setup/class_setupStep_Migrate.inc:1058
#: setup/class_setupStep_Migrate.inc:1181
#: setup/class_setupStep_Migrate.inc:1274
#: setup/class_setupStep_Migrate.inc:1353
#: setup/class_setupStep_Migrate.inc:1397
-msgid "LDAP query failed"
-msgstr "La consulta LDAP ha fallado"
-
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:983
-#: setup/class_setupStep_Migrate.inc:1059
-#: setup/class_setupStep_Migrate.inc:1182
-#: setup/class_setupStep_Migrate.inc:1275
-#: setup/class_setupStep_Migrate.inc:1354
-#: setup/class_setupStep_Migrate.inc:1398
msgid "Possibly the \"root object\" is missing."
msgstr ""
#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:866
-#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
+#: setup/class_setupStep_Migrate.inc:880
msgid "Failed"
msgstr "Error"
@@ -360,11 +360,11 @@ msgid ""
msgstr "No se puede un tipo de objeto estructural en su entrada raÃz. Por favor intente añadir la clase de objeto '%s' manualmente."
#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:677
-#: include/functions.inc:724 include/functions.inc:822
-#: include/functions.inc:2988 include/functions.inc:3165
+#: include/functions.inc:522 include/functions.inc:679
+#: include/functions.inc:726 include/functions.inc:834
+#: include/functions.inc:3001 include/functions.inc:3178
#: include/class_config.inc:322 include/class_ldap.inc:924
#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
#: include/simpleplugin/attributes/class_SetAttribute.inc:726
@@ -386,13 +386,13 @@ msgid "The specified user \"%s\" does not have full access to your ldap database
msgstr ""
#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1085
-#: setup/class_setupStep_Migrate.inc:1204
-#: setup/class_setupStep_Migrate.inc:1315
-#: setup/class_setupStep_Migrate.inc:1379
-#: setup/class_setupStep_Migrate.inc:1423 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:838
-#: include/functions.inc:2523 include/simpleplugin/class_simpleTabs.inc:322
+#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1203
+#: setup/class_setupStep_Migrate.inc:1314
+#: setup/class_setupStep_Migrate.inc:1378
+#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
+#: include/class_xml.inc:55 include/functions.inc:850
+#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
#: html/index.php:597 html/main.php:158
#: plugins/personal/posix/class_posixAccount.inc:482
#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
@@ -413,7 +413,7 @@ msgid "User migration"
msgstr ""
#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1029
+#: setup/class_setupStep_Migrate.inc:1028
msgid "Migration error"
msgstr "Error de migración"
@@ -422,64 +422,64 @@ msgstr "Error de migración"
msgid "Cannot migrate entry \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:859
+#: setup/class_setupStep_Migrate.inc:858
#, php-format
msgid "FD 1.0.7 administrative accounts found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:862
+#: setup/class_setupStep_Migrate.inc:861
#, php-format
msgid "FD 1.0.7 administrative groups found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:864
+#: setup/class_setupStep_Migrate.inc:863
msgid ""
"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
"file at the end of the setup to migrate it.<br/>"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:867
+#: setup/class_setupStep_Migrate.inc:866
msgid ""
"There is no valid FusionDirectory 1.0.8 administrator account inside your "
"LDAP."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:868 setup/class_setupStep_Migrate.inc:883
+#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
#: include/simpleplugin/simple-list.xml:59
#: plugins/admin/departments/dep-list.xml:48
#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
msgid "Create"
msgstr "Crear"
-#: setup/class_setupStep_Migrate.inc:873
+#: setup/class_setupStep_Migrate.inc:872
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: plugins/admin/users/class_userManagement.inc:42
msgid "Users"
msgstr "Usuarios"
-#: setup/class_setupStep_Migrate.inc:876
+#: setup/class_setupStep_Migrate.inc:875
msgid "Groups"
msgstr "Grupos"
-#: setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStep_Migrate.inc:881
msgid "There is no FusionDirectory administrator account inside your LDAP."
msgstr "No hay una cuenta de administrador FusionDirectory dentro de su LDAP."
-#: setup/class_setupStep_Migrate.inc:920
+#: setup/class_setupStep_Migrate.inc:919
msgid "Gives all rights on all objects"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:937 include/class_management.inc:697
+#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
#: include/class_listing.inc:551 include/class_xml.inc:58
#: include/password-methods/class_password-methods-sasl.inc:60
#: include/password-methods/class_password-methods-sasl.inc:86
#: include/password-methods/class_password-methods.inc:393
#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3112
-#: include/functions.inc:3133 include/functions.inc:3173
-#: include/functions.inc:3185 include/functions.inc:3189
-#: include/functions.inc:3196 include/functions.inc:3205
-#: include/functions.inc:3267 include/class_msg_dialog.inc:128
+#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
+#: include/functions.inc:3146 include/functions.inc:3186
+#: include/functions.inc:3198 include/functions.inc:3202
+#: include/functions.inc:3209 include/functions.inc:3218
+#: include/functions.inc:3280 include/class_msg_dialog.inc:128
#: include/class_msg_dialog.inc:164 include/class_config.inc:357
#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
@@ -492,82 +492,82 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:34
#: include/simpleplugin/attributes/class_FileAttribute.inc:37
#: include/simpleplugin/attributes/class_FileAttribute.inc:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:801
-#: include/class_plugin.inc:1534 html/index.php:453 html/index.php:474
+#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
+#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
#: html/index.php:484 html/index.php:546 html/index.php:556
#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
msgid "Error"
msgstr "Error"
-#: setup/class_setupStep_Migrate.inc:997
+#: setup/class_setupStep_Migrate.inc:996
msgid "Default ACL roles have not been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:999
+#: setup/class_setupStep_Migrate.inc:998
msgid "Some default ACL roles are missing"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1001
+#: setup/class_setupStep_Migrate.inc:1000
msgid "Default ACL roles have been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1031
+#: setup/class_setupStep_Migrate.inc:1030
#, php-format
msgid "Cannot add ACL role \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1086
+#: setup/class_setupStep_Migrate.inc:1085
#, php-format
msgid "Found %s user(s) outside the configured tree \"%s\"."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1100
-#: setup/class_setupStep_Migrate.inc:1114
+#: setup/class_setupStep_Migrate.inc:1099
+#: setup/class_setupStep_Migrate.inc:1113
msgid "Move users into configured user tree"
msgstr "Mover usuarios al árbol de usuarios configurado"
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
msgid "Cannot move entries to the requested department!"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "Entry will be moved from"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "to"
msgstr "a"
-#: setup/class_setupStep_Migrate.inc:1154
+#: setup/class_setupStep_Migrate.inc:1153
msgid "The following references will be updated"
msgstr "Las siguientes referencias se actualizaran"
-#: setup/class_setupStep_Migrate.inc:1205
+#: setup/class_setupStep_Migrate.inc:1204
#, php-format
msgid "Found %s groups outside the configured tree '%s'."
msgstr "Encontrados '%s' grupos fuera del árbol configurado '%s'."
-#: setup/class_setupStep_Migrate.inc:1219
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1218
+#: setup/class_setupStep_Migrate.inc:1232
msgid "Move groups into configured groups tree"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1316
+#: setup/class_setupStep_Migrate.inc:1315
#, php-format
msgid "Found %s department(s) that will not be visible in FusionDirectory."
msgstr "Se encontraron %s departamentos que no serán visibles en FusionDirectory"
-#: setup/class_setupStep_Migrate.inc:1325
-#: setup/class_setupStep_Migrate.inc:1330
+#: setup/class_setupStep_Migrate.inc:1324
+#: setup/class_setupStep_Migrate.inc:1329
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1380
+#: setup/class_setupStep_Migrate.inc:1379
#, php-format
msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1424
+#: setup/class_setupStep_Migrate.inc:1423
#, php-format
msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
@@ -743,10 +743,10 @@ msgstr "Siguiente"
#: include/class_logging.inc:80 include/class_session.inc:50
#: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:649
-#: include/functions.inc:770 include/functions.inc:1189
-#: include/functions.inc:2243 include/functions.inc:2285
-#: include/functions.inc:2314 include/class_ldap.inc:873
+#: include/functions.inc:564 include/functions.inc:651
+#: include/functions.inc:772 include/functions.inc:1201
+#: include/functions.inc:2255 include/functions.inc:2297
+#: include/functions.inc:2326 include/class_ldap.inc:873
#: include/class_ldap.inc:911 include/class_acl.inc:118
msgid "Internal error"
msgstr "error interno"
@@ -813,12 +813,12 @@ msgid ""
"plugin instance!"
msgstr "No hay declaración de pestaña para '%s' en su archivo de configuración. ¡No se puede crear la instancia del plugin!"
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1188
+#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
#: include/class_listing.inc:1190
msgid "Root"
msgstr "RaÃz"
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
msgid "Submit"
msgstr "Enviar"
@@ -919,7 +919,7 @@ msgid "Create a new snapshot from this object"
msgstr "¡Crear una nueva instantánea de este objeto!"
#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3302 include/simpleplugin/class_simplePlugin.inc:272
+#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
#: include/simpleplugin/class_simplePlugin.inc:277
#: include/simpleplugin/class_simplePlugin.inc:289
#: html/class_passwordRecovery.inc:116
@@ -952,7 +952,7 @@ msgstr ""
#: include/password-methods/class_password-methods-sha.inc:69
#: include/password-methods/class_password-methods-ssha.inc:73
#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:659 include/class_timezone.inc:51
+#: include/functions.inc:661 include/class_timezone.inc:51
#: include/class_config.inc:159 include/class_config.inc:284
#: include/class_config.inc:843 include/class_config.inc:856
#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
@@ -990,7 +990,7 @@ msgid "Cannot paste"
msgstr "No puedo pegar"
#: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
#: plugins/personal/generic/paste_generic.tpl.c:11
msgid "Login"
@@ -1034,245 +1034,245 @@ msgid ""
"administrator."
msgstr ""
-#: include/functions.inc:597
+#: include/functions.inc:599
msgid "Authentication error"
msgstr "Error de Autenticación"
-#: include/functions.inc:598
+#: include/functions.inc:600
msgid ""
"It seems your user password has expired. Please use <a "
"href=\"recovery.php\">password recovery</a> to change it."
msgstr ""
-#: include/functions.inc:649 include/functions.inc:770
+#: include/functions.inc:651 include/functions.inc:772
msgid "Error while adding a lock. Contact the developers!"
msgstr "Ha ocurrido un problema al añadir un bloqueo. ¡Contacte con los desarrolladores!"
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid ""
"Cannot create locking information in LDAP tree. Please contact your "
"administrator!"
msgstr "No puedo crear información de bloqueos en el árbol LDAP. ¡Por favor contacte con su Administrador!"
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid "LDAP server returned: %s"
msgstr "El servidor LDAP devolvio: %s"
-#: include/functions.inc:838
+#: include/functions.inc:850
msgid ""
"Found multiple locks for object to be locked. This should not happen - "
"cleaning up multiple references."
msgstr "Se han encontrado varios bloqueos para un objeto que iba a ser bloqueado. Esto no deberÃa ocurrir - limpiando referencias multiples."
-#: include/functions.inc:1109
+#: include/functions.inc:1121
#, php-format
msgid "The size limit of %d entries is exceed!"
msgstr "¡El lÃmite máximo de %d entradas se ha sobrepasado!"
-#: include/functions.inc:1111
+#: include/functions.inc:1123
#, php-format
msgid ""
"Set the new size limit to %s and show me this message if the limit still "
"exceeds"
msgstr "Introduzca un nuevo lÃmite máximo a %s y se volvera a mostrar este mensaje si se supera el lÃmite máximo"
-#: include/functions.inc:1128
+#: include/functions.inc:1140
msgid "Configure"
msgstr "Configurar"
-#: include/functions.inc:1133
+#: include/functions.inc:1145
msgid "incomplete"
msgstr "incompleto"
-#: include/functions.inc:1534
+#: include/functions.inc:1546
msgid "Continue anyway"
msgstr "Continuar de cualquier manera"
-#: include/functions.inc:1536
+#: include/functions.inc:1548
msgid "Edit anyway"
msgstr "Editar de cualquier manera"
-#: include/functions.inc:1538
+#: include/functions.inc:1550
#, php-format
msgid "You're going to edit the LDAP entry/entries %s"
msgstr "Has decidido editar las siguientes entradas LDAP %s"
-#: include/functions.inc:1766
+#: include/functions.inc:1778
msgid "Entries per page"
msgstr "Entradas por página"
-#: include/functions.inc:1797 include/class_filter.inc:353
+#: include/functions.inc:1809 include/class_filter.inc:353
msgid "Apply filter"
msgstr "Aplicar filtro"
-#: include/functions.inc:2065
+#: include/functions.inc:2077
#, php-format
msgid "%sB"
msgstr ""
-#: include/functions.inc:2066
+#: include/functions.inc:2078
#, php-format
msgid "%sKiB"
msgstr ""
-#: include/functions.inc:2067
+#: include/functions.inc:2079
#, php-format
msgid "%sMiB"
msgstr ""
-#: include/functions.inc:2068
+#: include/functions.inc:2080
#, php-format
msgid "%sGiB"
msgstr ""
-#: include/functions.inc:2069
+#: include/functions.inc:2081
#, php-format
msgid "%sTiB"
msgstr ""
-#: include/functions.inc:2070
+#: include/functions.inc:2082
#, php-format
msgid "%sPiB"
msgstr ""
-#: include/functions.inc:2071
+#: include/functions.inc:2083
#, php-format
msgid "%sEiB"
msgstr ""
-#: include/functions.inc:2072
+#: include/functions.inc:2084
#, php-format
msgid "%sZiB"
msgstr ""
-#: include/functions.inc:2073
+#: include/functions.inc:2085
#, php-format
msgid "%sYiB"
msgstr ""
-#: include/functions.inc:2105 include/class_filter.inc:315
+#: include/functions.inc:2117 include/class_filter.inc:315
msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
-#: include/functions.inc:2243
+#: include/functions.inc:2255
#, php-format
msgid ""
"File '%s' could not be deleted. Try fusiondirectory-setup --check-"
"directories to fix permissions."
msgstr ""
-#: include/functions.inc:2285
+#: include/functions.inc:2297
msgid "Cannot write to revision file!"
msgstr "¡No se puede escribir en el archivo de revisión!"
-#: include/functions.inc:2314
+#: include/functions.inc:2326
msgid "Cannot read to revision file!"
msgstr "No se puede leer el archivo de revisión!"
-#: include/functions.inc:2523
+#: include/functions.inc:2535
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "LDAP warning"
msgstr "Aviso LDAP"
-#: include/functions.inc:2541
+#: include/functions.inc:2554
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:2564
+#: include/functions.inc:2577
msgid "Main FusionDirectory schema"
msgstr ""
-#: include/functions.inc:2571
+#: include/functions.inc:2584
msgid "Schema used to store FusionDirectory configuration"
msgstr ""
-#: include/functions.inc:2578
+#: include/functions.inc:2591
msgid "Used to store trust mode information in users or groups."
msgstr ""
-#: include/functions.inc:2585
+#: include/functions.inc:2598
msgid "Used to store templates."
msgstr ""
-#: include/functions.inc:2592
+#: include/functions.inc:2605
msgid "Used to store POSIX information."
msgstr ""
-#: include/functions.inc:2599
+#: include/functions.inc:2612
#, php-format
msgid "Missing required object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2601
+#: include/functions.inc:2614
#, php-format
msgid "Missing optional object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2605
+#: include/functions.inc:2618
#, php-format
msgid "Class(es) available"
msgstr "Clase(s) disponibles"
-#: include/functions.inc:2623
+#: include/functions.inc:2636
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2637
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2640
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2641
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3112 include/functions.inc:3133
-#: include/functions.inc:3173 include/functions.inc:3185
-#: include/functions.inc:3189 include/functions.inc:3196
-#: include/functions.inc:3205
+#: include/functions.inc:3125 include/functions.inc:3146
+#: include/functions.inc:3186 include/functions.inc:3198
+#: include/functions.inc:3202 include/functions.inc:3209
+#: include/functions.inc:3218
msgid "Cannot allocate a free ID:"
msgstr "No se puede asignar un identificador (ID) libre:"
-#: include/functions.inc:3112
+#: include/functions.inc:3125
msgid "unknown idAllocation method!"
msgstr "¡método de asignación de id desconocido!"
-#: include/functions.inc:3133
+#: include/functions.inc:3146
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr "¡%sPoolMin >= %sPoolMax!"
-#: include/functions.inc:3173
+#: include/functions.inc:3186
msgid "sambaUnixIdPool is not unique!"
msgstr "¡sambaUnixIdPool no es único!"
-#: include/functions.inc:3185 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3202
msgid "no ID available!"
msgstr "¡No hay ID disponibles!"
-#: include/functions.inc:3205
+#: include/functions.inc:3218
msgid "maximum tries exceeded!"
msgstr "¡Excedido el número de intentos máximo!"
-#: include/functions.inc:3267
+#: include/functions.inc:3280
msgid "Cannot allocate a free ID!"
msgstr "¡No se puede asignar un identificador (ID) libre!"
-#: include/functions.inc:3303
+#: include/functions.inc:3316
#, 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"
@@ -2102,7 +2102,7 @@ msgstr "Nombre"
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
#: plugins/admin/departments/class_department.inc:72
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/groups/class_roleGeneric.inc:91
@@ -2282,7 +2282,7 @@ msgid "The entry %s is not existing"
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:548
+#: include/class_plugin.inc:554
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!"
@@ -2398,14 +2398,19 @@ msgstr ""
msgid "There was a problem uncompressing snapshot data"
msgstr ""
-#: include/class_plugin.inc:803
+#: include/class_plugin.inc:809
#, php-format
msgid ""
"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
msgstr ""
-#: include/class_plugin.inc:1332
+#: include/class_plugin.inc:1350
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/class_plugin.inc:1352
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -2553,44 +2558,44 @@ msgstr "Su navegador tiene las cookies desactivadas. ¡Porfavor active las cooki
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr "La configuración de FusionDirectory %s/%s no se puede leer. Cancelado."
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
msgid "Email address"
msgstr "Dirección de correo"
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
#, php-format
msgid "Did not find an account with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
#, php-format
msgid "Found multiple accounts with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
#, php-format
msgid "There is no account using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There are several accounts using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
#, php-format
msgid "The user using email \"%s\" is locked. Please contact your administrator."
msgstr ""
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
msgid "Contact your administrator, there was a problem with mail server"
msgstr "Contacte a su administrador, hubo un problema con el servidor de correo"
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
msgid "This token is invalid"
msgstr "Esta prenda es invalida"
-#: html/class_passwordRecovery.inc:647
+#: html/class_passwordRecovery.inc:651
msgid "There was a problem with mail server, confirmation email not sent"
msgstr ""
@@ -2902,7 +2907,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
#: setup/setup_migrate_adminAccount.tpl.c:14
#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2939,258 +2944,262 @@ msgstr ""
msgid "User account"
msgstr ""
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:296
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:307
msgid "Personal information"
msgstr "Información personal"
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "Apellido"
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
msgid "Last name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "Nombre"
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
msgid "First name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
msgid "Short description of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "Picture"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "The avatar for this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:330
+#: plugins/personal/generic/class_user.inc:333
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:334
+#: plugins/personal/generic/class_user.inc:337
#: plugins/admin/departments/class_department.inc:90
#: plugins/admin/departments/class_department.inc:96
msgid "Location"
msgstr "Localización"
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:341
#: plugins/admin/departments/class_department.inc:93
msgid "State"
msgstr "Provincia"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
#: plugins/admin/departments/class_department.inc:102
msgid "Address"
msgstr "Dirección"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
msgid "Business postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room No."
msgstr "Número sala"
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room number"
msgstr "Número de habitación"
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
#: plugins/admin/departments/class_department.inc:106
msgid "Phone"
msgstr "Teléfono"
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
msgid "Business phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Mobile"
msgstr "Móvil"
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Business mobile number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Pager"
msgstr "Buscapersonas"
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
#: plugins/admin/departments/class_department.inc:110
msgid "Fax"
msgstr "Fax"
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Homepage"
msgstr "Página Web"
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:373
+#: plugins/personal/generic/class_user.inc:376
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:393
+#: plugins/personal/generic/class_user.inc:396
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Display name"
msgstr "Nombre a Mostrar"
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home postal address"
msgstr "Dirección Postal personal"
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Private phone"
msgstr "Teléfono privado"
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Home phone number"
msgstr "Número de teléfono personal"
-#: plugins/personal/generic/class_user.inc:411
+#: plugins/personal/generic/class_user.inc:414
msgid "Organizational information"
msgstr "Información corporativa"
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
msgid "Title"
msgstr "TÃtulo"
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
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:421
+#: plugins/personal/generic/class_user.inc:424
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
msgid "Organization"
msgstr "Organización"
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
#: plugins/admin/departments/class_department.inc:33
#: plugins/admin/departments/class_department.inc:39
#: plugins/admin/departments/dep-list.xml:21
msgid "Department"
msgstr "Departamento"
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
msgid "Department to which the user belongs"
msgstr ""
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department No."
msgstr "Número departamento"
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department number"
msgstr "Número del departamento"
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee No."
msgstr "Número empleado"
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee number"
msgstr "Número de empleado"
-#: plugins/personal/generic/class_user.inc:437
+#: plugins/personal/generic/class_user.inc:440
msgid "Employee type"
msgstr "CategorÃa profesional"
-#: plugins/personal/generic/class_user.inc:441
+#: plugins/personal/generic/class_user.inc:444
#: plugins/admin/departments/class_department.inc:84
msgid "Manager"
msgstr "Gestor"
-#: plugins/personal/generic/class_user.inc:608
+#: plugins/personal/generic/class_user.inc:611
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:614
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:622
+#: plugins/personal/generic/class_user.inc:625
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:636
+#: plugins/personal/generic/class_user.inc:639
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:641
-#: plugins/personal/generic/class_user.inc:645
+#: plugins/personal/generic/class_user.inc:644
+#: plugins/personal/generic/class_user.inc:648
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:652
+#: plugins/personal/generic/class_user.inc:655
msgid "You need to specify your current password in order to proceed."
msgstr "Necesita introducir su contraseña actual para continuar."
-#: plugins/personal/generic/class_user.inc:654
+#: plugins/personal/generic/class_user.inc:657
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:656
+#: plugins/personal/generic/class_user.inc:659
#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
msgid "New password"
msgstr "Nueva contraseña"
-#: plugins/personal/generic/class_user.inc:658
+#: plugins/personal/generic/class_user.inc:661
msgid "The password used as new and current are too similar."
msgstr "La contraseña actual y la introducida como nueva son demasiado parecidas."
-#: plugins/personal/generic/class_user.inc:660
+#: plugins/personal/generic/class_user.inc:663
msgid "The password used as new is to short."
msgstr "La nueva contraseña es demasiado corta."
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:665
msgid "The password contains possibly problematic Unicode characters!"
msgstr "La clave contiene caracteres unicode posiblemente problemáticos!"
@@ -3298,36 +3307,46 @@ msgid ""
"recover their password"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:189
+msgid "Login attribute"
+msgstr "Atributo de inicio de sesión"
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
msgid "First email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
msgid "Subject"
msgstr "Asunto"
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
msgid "Subject of the first email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
msgid "[FusionDirectory] Password recovery link"
msgstr "[FusionDirectory] Enlace de recuperación de clave"
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
#, php-format
msgid ""
"Body of the first email, sent when the user ask for a new password. Use %s "
"for the login and the recovery link."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
#, php-format
msgid ""
"Hello,\n"
@@ -3339,31 +3358,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
msgid "Second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
msgid "Subject of the second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
msgid "[FusionDirectory] Password recovery successful"
msgstr "[FusionDirectory] Recuperación de clave realizada con exito"
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
#, php-format
msgid "Body (%s is login)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
#, 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
+#: plugins/config/class_recoveryConfig.inc:118
#, php-format
msgid ""
"Hello,\n"
@@ -3530,10 +3549,6 @@ msgstr ""
msgid "Login and session"
msgstr "Inicio y sesión"
-#: plugins/config/class_configInLdap.inc:189
-msgid "Login attribute"
-msgstr "Atributo de inicio de sesión"
-
#: plugins/config/class_configInLdap.inc:190
msgid "Which LDAP attribute should be used as the login name during login."
msgstr ""
@@ -4396,7 +4411,7 @@ msgstr ""
msgid "Only allow this group to connect to this list of hosts"
msgstr ""
-#: plugins/admin/groups/class_ogroup.inc:321
+#: plugins/admin/groups/class_ogroup.inc:322
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
diff --git a/locale/es_CO/fusiondirectory.po b/locale/es_CO/fusiondirectory.po
index 4984083845b9c80a2b0ad89f7836040a4ec12bf6..8934aee6dded29ad022c7ff92fa47b8ea2a19d70 100644
--- a/locale/es_CO/fusiondirectory.po
+++ b/locale/es_CO/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-11 19:09+0100\n"
-"PO-Revision-Date: 2017-01-10 14:53+0000\n"
+"POT-Creation-Date: 2017-03-29 21:46+0200\n"
+"PO-Revision-Date: 2017-03-26 15:51+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
"MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:382
+#: plugins/personal/generic/class_user.inc:385
msgid "Preferred language"
msgstr "Idioma preferido"
@@ -317,30 +317,30 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
+#: setup/class_setupStep_Migrate.inc:981
+#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1180
+#: setup/class_setupStep_Migrate.inc:1273
+#: setup/class_setupStep_Migrate.inc:1352
+#: setup/class_setupStep_Migrate.inc:1396
+msgid "LDAP query failed"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
+#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
#: setup/class_setupStep_Migrate.inc:982
#: setup/class_setupStep_Migrate.inc:1058
#: setup/class_setupStep_Migrate.inc:1181
#: setup/class_setupStep_Migrate.inc:1274
#: setup/class_setupStep_Migrate.inc:1353
#: setup/class_setupStep_Migrate.inc:1397
-msgid "LDAP query failed"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:983
-#: setup/class_setupStep_Migrate.inc:1059
-#: setup/class_setupStep_Migrate.inc:1182
-#: setup/class_setupStep_Migrate.inc:1275
-#: setup/class_setupStep_Migrate.inc:1354
-#: setup/class_setupStep_Migrate.inc:1398
msgid "Possibly the \"root object\" is missing."
msgstr ""
#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:866
-#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
+#: setup/class_setupStep_Migrate.inc:880
msgid "Failed"
msgstr "Falló"
@@ -361,11 +361,11 @@ msgid ""
msgstr "No es posible utilizar el tipo de objeto estructurado de su objeto 'root'. Por favor intente agregar el objeto clase '%s' manualmente."
#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:677
-#: include/functions.inc:724 include/functions.inc:822
-#: include/functions.inc:2988 include/functions.inc:3165
+#: include/functions.inc:522 include/functions.inc:679
+#: include/functions.inc:726 include/functions.inc:834
+#: include/functions.inc:3001 include/functions.inc:3178
#: include/class_config.inc:322 include/class_ldap.inc:924
#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
#: include/simpleplugin/attributes/class_SetAttribute.inc:726
@@ -387,13 +387,13 @@ msgid "The specified user \"%s\" does not have full access to your ldap database
msgstr "El usuario \"%s\" especificado no tiene acceso completo a la base de datos ldap."
#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1085
-#: setup/class_setupStep_Migrate.inc:1204
-#: setup/class_setupStep_Migrate.inc:1315
-#: setup/class_setupStep_Migrate.inc:1379
-#: setup/class_setupStep_Migrate.inc:1423 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:838
-#: include/functions.inc:2523 include/simpleplugin/class_simpleTabs.inc:322
+#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1203
+#: setup/class_setupStep_Migrate.inc:1314
+#: setup/class_setupStep_Migrate.inc:1378
+#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
+#: include/class_xml.inc:55 include/functions.inc:850
+#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
#: html/index.php:597 html/main.php:158
#: plugins/personal/posix/class_posixAccount.inc:482
#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
@@ -414,7 +414,7 @@ msgid "User migration"
msgstr "Migración de Usuario"
#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1029
+#: setup/class_setupStep_Migrate.inc:1028
msgid "Migration error"
msgstr "Error de migración"
@@ -423,64 +423,64 @@ msgstr "Error de migración"
msgid "Cannot migrate entry \"%s\":"
msgstr "No se puede migrar la entrada \"%s\":"
-#: setup/class_setupStep_Migrate.inc:859
+#: setup/class_setupStep_Migrate.inc:858
#, php-format
msgid "FD 1.0.7 administrative accounts found: %s"
msgstr "Se encontraron cuentas administrativas de FD 1.0.7: %s"
-#: setup/class_setupStep_Migrate.inc:862
+#: setup/class_setupStep_Migrate.inc:861
#, php-format
msgid "FD 1.0.7 administrative groups found: %s"
msgstr "Se encontraron grupos administrativos de FD 1.0.7: %s"
-#: setup/class_setupStep_Migrate.inc:864
+#: setup/class_setupStep_Migrate.inc:863
msgid ""
"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
"file at the end of the setup to migrate it.<br/>"
msgstr "Usted debe ejecutar <i>fusiondirectory-setup-migrate-acls</i> después de salvar su archivo de configuración al terminar la configuración general para migrarlo. <br/>"
-#: setup/class_setupStep_Migrate.inc:867
+#: setup/class_setupStep_Migrate.inc:866
msgid ""
"There is no valid FusionDirectory 1.0.8 administrator account inside your "
"LDAP."
msgstr "No hay un administrador válido de FusionDirectory 1.0.8 en su LDAP."
-#: setup/class_setupStep_Migrate.inc:868 setup/class_setupStep_Migrate.inc:883
+#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
#: include/simpleplugin/simple-list.xml:59
#: plugins/admin/departments/dep-list.xml:48
#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
msgid "Create"
msgstr "Crear"
-#: setup/class_setupStep_Migrate.inc:873
+#: setup/class_setupStep_Migrate.inc:872
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: plugins/admin/users/class_userManagement.inc:42
msgid "Users"
msgstr "Usuarios"
-#: setup/class_setupStep_Migrate.inc:876
+#: setup/class_setupStep_Migrate.inc:875
msgid "Groups"
msgstr "Grupos"
-#: setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStep_Migrate.inc:881
msgid "There is no FusionDirectory administrator account inside your LDAP."
msgstr "No hay una cuenta de administrador de FusionDirectory en su LDAP."
-#: setup/class_setupStep_Migrate.inc:920
+#: setup/class_setupStep_Migrate.inc:919
msgid "Gives all rights on all objects"
msgstr "Dar permisos en todos los objetos."
-#: setup/class_setupStep_Migrate.inc:937 include/class_management.inc:697
+#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
#: include/class_listing.inc:551 include/class_xml.inc:58
#: include/password-methods/class_password-methods-sasl.inc:60
#: include/password-methods/class_password-methods-sasl.inc:86
#: include/password-methods/class_password-methods.inc:393
#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3112
-#: include/functions.inc:3133 include/functions.inc:3173
-#: include/functions.inc:3185 include/functions.inc:3189
-#: include/functions.inc:3196 include/functions.inc:3205
-#: include/functions.inc:3267 include/class_msg_dialog.inc:128
+#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
+#: include/functions.inc:3146 include/functions.inc:3186
+#: include/functions.inc:3198 include/functions.inc:3202
+#: include/functions.inc:3209 include/functions.inc:3218
+#: include/functions.inc:3280 include/class_msg_dialog.inc:128
#: include/class_msg_dialog.inc:164 include/class_config.inc:357
#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
@@ -493,82 +493,82 @@ msgstr "Dar permisos en todos los objetos."
#: include/simpleplugin/attributes/class_FileAttribute.inc:34
#: include/simpleplugin/attributes/class_FileAttribute.inc:37
#: include/simpleplugin/attributes/class_FileAttribute.inc:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:801
-#: include/class_plugin.inc:1534 html/index.php:453 html/index.php:474
+#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
+#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
#: html/index.php:484 html/index.php:546 html/index.php:556
#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
msgid "Error"
msgstr "Error"
-#: setup/class_setupStep_Migrate.inc:997
+#: setup/class_setupStep_Migrate.inc:996
msgid "Default ACL roles have not been inserted"
msgstr "Los roles ACL por defecto no han sido insertados"
-#: setup/class_setupStep_Migrate.inc:999
+#: setup/class_setupStep_Migrate.inc:998
msgid "Some default ACL roles are missing"
msgstr "No se encuentran algunos de los roles ACL por defecto"
-#: setup/class_setupStep_Migrate.inc:1001
+#: setup/class_setupStep_Migrate.inc:1000
msgid "Default ACL roles have been inserted"
msgstr "Los roles ACL por defecto han sido insertados"
-#: setup/class_setupStep_Migrate.inc:1031
+#: setup/class_setupStep_Migrate.inc:1030
#, php-format
msgid "Cannot add ACL role \"%s\":"
msgstr "No es posible agregar el rol ACL \"%s\":"
-#: setup/class_setupStep_Migrate.inc:1086
+#: setup/class_setupStep_Migrate.inc:1085
#, php-format
msgid "Found %s user(s) outside the configured tree \"%s\"."
msgstr "Se encontraron %s usuario(s) fuera del árbol configurado \"%s\"."
-#: setup/class_setupStep_Migrate.inc:1100
-#: setup/class_setupStep_Migrate.inc:1114
+#: setup/class_setupStep_Migrate.inc:1099
+#: setup/class_setupStep_Migrate.inc:1113
msgid "Move users into configured user tree"
msgstr "Mover usuarios dentro del árbol configurado"
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
msgid "Cannot move entries to the requested department!"
msgstr "¡No se pueden mover entradas en la División seleccionada!"
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "Entry will be moved from"
msgstr "La entrada será movida desde "
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "to"
msgstr "a"
-#: setup/class_setupStep_Migrate.inc:1154
+#: setup/class_setupStep_Migrate.inc:1153
msgid "The following references will be updated"
msgstr "Las siguientes referencias serán actualizadas"
-#: setup/class_setupStep_Migrate.inc:1205
+#: setup/class_setupStep_Migrate.inc:1204
#, php-format
msgid "Found %s groups outside the configured tree '%s'."
msgstr "Se encontraron %s grupos fuera del árbol configurado '%s'."
-#: setup/class_setupStep_Migrate.inc:1219
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1218
+#: setup/class_setupStep_Migrate.inc:1232
msgid "Move groups into configured groups tree"
msgstr "Mover grupos dentro del árbol configurado"
-#: setup/class_setupStep_Migrate.inc:1316
+#: setup/class_setupStep_Migrate.inc:1315
#, php-format
msgid "Found %s department(s) that will not be visible in FusionDirectory."
msgstr "Se encontraron %s Division(es) que no serán visibles en FusionDirectory."
-#: setup/class_setupStep_Migrate.inc:1325
-#: setup/class_setupStep_Migrate.inc:1330
+#: setup/class_setupStep_Migrate.inc:1324
+#: setup/class_setupStep_Migrate.inc:1329
msgid "Department migration"
msgstr "Migración de Divisiones."
-#: setup/class_setupStep_Migrate.inc:1380
+#: setup/class_setupStep_Migrate.inc:1379
#, php-format
msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1424
+#: setup/class_setupStep_Migrate.inc:1423
#, php-format
msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
@@ -744,10 +744,10 @@ msgstr "Siguiente"
#: include/class_logging.inc:80 include/class_session.inc:50
#: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:649
-#: include/functions.inc:770 include/functions.inc:1189
-#: include/functions.inc:2243 include/functions.inc:2285
-#: include/functions.inc:2314 include/class_ldap.inc:873
+#: include/functions.inc:564 include/functions.inc:651
+#: include/functions.inc:772 include/functions.inc:1201
+#: include/functions.inc:2255 include/functions.inc:2297
+#: include/functions.inc:2326 include/class_ldap.inc:873
#: include/class_ldap.inc:911 include/class_acl.inc:118
msgid "Internal error"
msgstr "Error Interno"
@@ -814,12 +814,12 @@ msgid ""
"plugin instance!"
msgstr "No se encontró la etiqueta '%s' en su archivo de configuración. ¡No se puede crear la instancia del plugin!"
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1188
+#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
#: include/class_listing.inc:1190
msgid "Root"
msgstr "Root"
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
msgid "Submit"
msgstr "Enviar"
@@ -920,7 +920,7 @@ msgid "Create a new snapshot from this object"
msgstr "Crear un nuevo 'snapshot' de este objeto"
#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3302 include/simpleplugin/class_simplePlugin.inc:272
+#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
#: include/simpleplugin/class_simplePlugin.inc:277
#: include/simpleplugin/class_simplePlugin.inc:289
#: html/class_passwordRecovery.inc:116
@@ -953,7 +953,7 @@ msgstr "Usted debe completar saslRealm o saslExop en la pantalla de configuraci
#: include/password-methods/class_password-methods-sha.inc:69
#: include/password-methods/class_password-methods-ssha.inc:73
#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:659 include/class_timezone.inc:51
+#: include/functions.inc:661 include/class_timezone.inc:51
#: include/class_config.inc:159 include/class_config.inc:284
#: include/class_config.inc:843 include/class_config.inc:856
#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
@@ -991,7 +991,7 @@ msgid "Cannot paste"
msgstr "No se puede pegar"
#: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
#: plugins/personal/generic/paste_generic.tpl.c:11
msgid "Login"
@@ -1035,245 +1035,245 @@ msgid ""
"administrator."
msgstr "¡Login (uid) no es un valor único en el árbol LDAP!. Por favor contacte a su administrador."
-#: include/functions.inc:597
+#: include/functions.inc:599
msgid "Authentication error"
msgstr "Error de autenticación"
-#: include/functions.inc:598
+#: include/functions.inc:600
msgid ""
"It seems your user password has expired. Please use <a "
"href=\"recovery.php\">password recovery</a> to change it."
msgstr "Al parecer tu contraseña expiró. Por favor acceda a<a href=\"recovery.php\">Recuperar contraseña</a> y cámbiela."
-#: include/functions.inc:649 include/functions.inc:770
+#: include/functions.inc:651 include/functions.inc:772
msgid "Error while adding a lock. Contact the developers!"
msgstr "Error mientras agregando un bloqueo. ¡Contacte a los desarrolladores!"
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid ""
"Cannot create locking information in LDAP tree. Please contact your "
"administrator!"
msgstr "No se puede crear un bloqueo de información en el árbol de 'LDAP'. ¡Por favor contacte a su administrador!"
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid "LDAP server returned: %s"
msgstr "El servidor LDAP respondió: %s"
-#: include/functions.inc:838
+#: include/functions.inc:850
msgid ""
"Found multiple locks for object to be locked. This should not happen - "
"cleaning up multiple references."
msgstr "Se encontraron varios 'locks' en el objeto lo cual impide bloquearlo. Esto no deberÃa suceder - borrando varias referencias."
-#: include/functions.inc:1109
+#: include/functions.inc:1121
#, php-format
msgid "The size limit of %d entries is exceed!"
msgstr ""
-#: include/functions.inc:1111
+#: include/functions.inc:1123
#, php-format
msgid ""
"Set the new size limit to %s and show me this message if the limit still "
"exceeds"
msgstr ""
-#: include/functions.inc:1128
+#: include/functions.inc:1140
msgid "Configure"
msgstr "Configurar"
-#: include/functions.inc:1133
+#: include/functions.inc:1145
msgid "incomplete"
msgstr "incompleto"
-#: include/functions.inc:1534
+#: include/functions.inc:1546
msgid "Continue anyway"
msgstr "Continuar de todos modos"
-#: include/functions.inc:1536
+#: include/functions.inc:1548
msgid "Edit anyway"
msgstr "Editar de todos modos"
-#: include/functions.inc:1538
+#: include/functions.inc:1550
#, php-format
msgid "You're going to edit the LDAP entry/entries %s"
msgstr "Usted está a punto de editar las entradas de LDAP: %s"
-#: include/functions.inc:1766
+#: include/functions.inc:1778
msgid "Entries per page"
msgstr "Resultados por página"
-#: include/functions.inc:1797 include/class_filter.inc:353
+#: include/functions.inc:1809 include/class_filter.inc:353
msgid "Apply filter"
msgstr "Aplicar filtro"
-#: include/functions.inc:2065
+#: include/functions.inc:2077
#, php-format
msgid "%sB"
msgstr "%sB"
-#: include/functions.inc:2066
+#: include/functions.inc:2078
#, php-format
msgid "%sKiB"
msgstr "%sKiB"
-#: include/functions.inc:2067
+#: include/functions.inc:2079
#, php-format
msgid "%sMiB"
msgstr "%sMiB"
-#: include/functions.inc:2068
+#: include/functions.inc:2080
#, php-format
msgid "%sGiB"
msgstr "%sGiB"
-#: include/functions.inc:2069
+#: include/functions.inc:2081
#, php-format
msgid "%sTiB"
msgstr "%sTiB"
-#: include/functions.inc:2070
+#: include/functions.inc:2082
#, php-format
msgid "%sPiB"
msgstr "%sPiB"
-#: include/functions.inc:2071
+#: include/functions.inc:2083
#, php-format
msgid "%sEiB"
msgstr "%sEiB"
-#: include/functions.inc:2072
+#: include/functions.inc:2084
#, php-format
msgid "%sZiB"
msgstr "%sZiB"
-#: include/functions.inc:2073
+#: include/functions.inc:2085
#, php-format
msgid "%sYiB"
msgstr "%sYiB"
-#: include/functions.inc:2105 include/class_filter.inc:315
+#: include/functions.inc:2117 include/class_filter.inc:315
msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
-#: include/functions.inc:2243
+#: include/functions.inc:2255
#, php-format
msgid ""
"File '%s' could not be deleted. Try fusiondirectory-setup --check-"
"directories to fix permissions."
msgstr "El archivo '%s' no se puede borrar. Intente ejecutar fusiondirectory-setup-check-directories para arreglar los permisos."
-#: include/functions.inc:2285
+#: include/functions.inc:2297
msgid "Cannot write to revision file!"
msgstr ""
-#: include/functions.inc:2314
+#: include/functions.inc:2326
msgid "Cannot read to revision file!"
msgstr ""
-#: include/functions.inc:2523
+#: include/functions.inc:2535
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "LDAP warning"
msgstr "LDAP - Advertencia"
-#: include/functions.inc:2541
+#: include/functions.inc:2554
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:2564
+#: include/functions.inc:2577
msgid "Main FusionDirectory schema"
msgstr ""
-#: include/functions.inc:2571
+#: include/functions.inc:2584
msgid "Schema used to store FusionDirectory configuration"
msgstr ""
-#: include/functions.inc:2578
+#: include/functions.inc:2591
msgid "Used to store trust mode information in users or groups."
msgstr ""
-#: include/functions.inc:2585
+#: include/functions.inc:2598
msgid "Used to store templates."
msgstr ""
-#: include/functions.inc:2592
+#: include/functions.inc:2605
msgid "Used to store POSIX information."
msgstr ""
-#: include/functions.inc:2599
+#: include/functions.inc:2612
#, php-format
msgid "Missing required object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2601
+#: include/functions.inc:2614
#, php-format
msgid "Missing optional object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2605
+#: include/functions.inc:2618
#, php-format
msgid "Class(es) available"
msgstr ""
-#: include/functions.inc:2623
+#: include/functions.inc:2636
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:2637
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2640
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:2641
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3112 include/functions.inc:3133
-#: include/functions.inc:3173 include/functions.inc:3185
-#: include/functions.inc:3189 include/functions.inc:3196
-#: include/functions.inc:3205
+#: include/functions.inc:3125 include/functions.inc:3146
+#: include/functions.inc:3186 include/functions.inc:3198
+#: include/functions.inc:3202 include/functions.inc:3209
+#: include/functions.inc:3218
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3112
+#: include/functions.inc:3125
msgid "unknown idAllocation method!"
msgstr "¡método 'idAllocation' desconocido!"
-#: include/functions.inc:3133
+#: include/functions.inc:3146
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr "%sPoolMin >= %sPoolMax!"
-#: include/functions.inc:3173
+#: include/functions.inc:3186
msgid "sambaUnixIdPool is not unique!"
msgstr "!sambaUnixIdPool no es un valor único!"
-#: include/functions.inc:3185 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3202
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3205
+#: include/functions.inc:3218
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3267
+#: include/functions.inc:3280
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3303
+#: include/functions.inc:3316
#, 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."
@@ -2103,7 +2103,7 @@ msgstr "Nombre"
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
#: plugins/admin/departments/class_department.inc:72
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/groups/class_roleGeneric.inc:91
@@ -2283,7 +2283,7 @@ msgid "The entry %s is not existing"
msgstr "La entrada %s no existe"
#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:548
+#: include/class_plugin.inc:554
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!"
@@ -2399,14 +2399,19 @@ msgstr "Un número flotante menor que %f"
msgid "There was a problem uncompressing snapshot data"
msgstr "Hubo un problema descomprimiendo la información del snapshot."
-#: include/class_plugin.inc:803
+#: include/class_plugin.inc:809
#, php-format
msgid ""
"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
msgstr ""
-#: include/class_plugin.inc:1332
+#: include/class_plugin.inc:1350
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/class_plugin.inc:1352
#, php-format
msgid "Tab \"%s\""
msgstr "Pestaña \"%s\""
@@ -2554,44 +2559,44 @@ msgstr "Su navegador tiene las cookies deshabilitadas. ¡Por favor habilÃtelas
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr "La configuración %s/%s de FusionDirectory no tiene permisos de lectura. Abortado."
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
msgid "Email address"
msgstr "Dirección de correo"
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
#, php-format
msgid "Did not find an account with login \"%s\""
msgstr "No se encontró la cuenta de usuario: \"%s\""
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
#, php-format
msgid "Found multiple accounts with login \"%s\""
msgstr "Se encontraron varias cuentas identificadas como: \"%s\""
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
#, php-format
msgid "There is no account using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There are several accounts using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
#, php-format
msgid "The user using email \"%s\" is locked. Please contact your administrator."
msgstr ""
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
msgid "Contact your administrator, there was a problem with mail server"
msgstr "Contacte a su administrador, hubo un problema con el servidor de correo."
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
msgid "This token is invalid"
msgstr "Este token es inválido"
-#: html/class_passwordRecovery.inc:647
+#: html/class_passwordRecovery.inc:651
msgid "There was a problem with mail server, confirmation email not sent"
msgstr "Hay un problema con el servidor de correo, la confirmación de email no será enviada."
@@ -2903,7 +2908,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:387
+#: plugins/personal/generic/class_user.inc:390
#: setup/setup_migrate_adminAccount.tpl.c:14
#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2940,258 +2945,262 @@ msgstr "Información de Cuentas de Usuario"
msgid "User account"
msgstr "Cuenta de Usuario"
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:296
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:307
msgid "Personal information"
msgstr "Información personal"
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "Apellido"
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
msgid "Last name of this user"
msgstr "Apellido de este usuario"
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "Primer nombre"
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
msgid "First name of this user"
msgstr "Primer nombre de este usuario"
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
msgid "Short description of the user"
msgstr "Descripción corta para éste usuario"
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "Picture"
msgstr "Imagen"
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "The avatar for this user"
msgstr "El avatar para este usuario"
-#: plugins/personal/generic/class_user.inc:330
+#: plugins/personal/generic/class_user.inc:333
msgid "Organizational contact information"
msgstr "Información de contacto Profesional"
-#: plugins/personal/generic/class_user.inc:334
+#: plugins/personal/generic/class_user.inc:337
#: plugins/admin/departments/class_department.inc:90
#: plugins/admin/departments/class_department.inc:96
msgid "Location"
msgstr "Ubicación"
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:341
#: plugins/admin/departments/class_department.inc:93
msgid "State"
msgstr "Estado"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
#: plugins/admin/departments/class_department.inc:102
msgid "Address"
msgstr "Dirección"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
msgid "Business postal address"
msgstr "Dirección postal de trabajo"
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room No."
msgstr "Habitación Nro."
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room number"
msgstr "Número de habitación"
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
#: plugins/admin/departments/class_department.inc:106
msgid "Phone"
msgstr "Teléfono"
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
msgid "Business phone number"
msgstr "Número telefónico de trabajo"
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Mobile"
msgstr "Celular"
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Business mobile number"
msgstr "Celular de trabajo"
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Pager"
msgstr "BÃper"
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Business pager number"
msgstr "BÃper laboral"
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
#: plugins/admin/departments/class_department.inc:110
msgid "Fax"
msgstr "Fax"
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
msgid "Business fax number"
msgstr "Nro. Fax de trabajo"
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Homepage"
msgstr "Página web"
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Personal homepage"
msgstr "Página web personal"
-#: plugins/personal/generic/class_user.inc:373
+#: plugins/personal/generic/class_user.inc:376
msgid "Account information"
msgstr "Información de cuenta"
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
msgid "Login of this user"
msgstr "Cuenta de este usuario"
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
msgid "Password of the user"
msgstr "Contraseña del usuario"
-#: plugins/personal/generic/class_user.inc:393
+#: plugins/personal/generic/class_user.inc:396
msgid "Personal contact information"
msgstr "Información de contacto 'Personal'"
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Display name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home address"
msgstr "Dirección personal"
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home postal address"
msgstr "Código postal personal"
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Private phone"
msgstr "Teléfono personal"
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Home phone number"
msgstr "Teléfono de domicilio personal"
-#: plugins/personal/generic/class_user.inc:411
+#: plugins/personal/generic/class_user.inc:414
msgid "Organizational information"
msgstr "Información Profesional"
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
msgid "Title"
msgstr "Tratamiento 'Sr, Sra...'"
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
msgid ""
"Title of a person in their organizational context. Each title is one value "
"of this multi-valued attribute"
msgstr "Tratamiento 'Dr, Ing, Sr, Sra ...' en un contexto profesional. Cada tratamiento es un valor de sus múltiples atributos."
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:424
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
msgid "Organization"
msgstr "Organización"
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
#: plugins/admin/departments/class_department.inc:33
#: plugins/admin/departments/class_department.inc:39
#: plugins/admin/departments/dep-list.xml:21
msgid "Department"
msgstr "División"
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
msgid "Department to which the user belongs"
msgstr ""
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department No."
msgstr "División No."
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department number"
msgstr "Número de División"
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee No."
msgstr "Empleado N°"
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee number"
msgstr "Número de empleado"
-#: plugins/personal/generic/class_user.inc:437
+#: plugins/personal/generic/class_user.inc:440
msgid "Employee type"
msgstr "Tipo de empleado"
-#: plugins/personal/generic/class_user.inc:441
+#: plugins/personal/generic/class_user.inc:444
#: plugins/admin/departments/class_department.inc:84
msgid "Manager"
msgstr "Mánager"
-#: plugins/personal/generic/class_user.inc:608
+#: plugins/personal/generic/class_user.inc:611
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr "¡No se pudo encontrar la polÃtica \"%s\" en LDAP!"
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:614
msgid "You are not allowed to change your own password"
msgstr "Usted no tiene permitido cambiar su propia contraseña."
-#: plugins/personal/generic/class_user.inc:622
+#: plugins/personal/generic/class_user.inc:625
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr "Usted debe esperar %d segundos antes de cambiar su contraseña de nuevo."
-#: plugins/personal/generic/class_user.inc:636
+#: plugins/personal/generic/class_user.inc:639
msgid "Password is in history of old passwords"
msgstr "La contraseña está en el historial de viejas contraseñas."
-#: plugins/personal/generic/class_user.inc:641
-#: plugins/personal/generic/class_user.inc:645
+#: plugins/personal/generic/class_user.inc:644
+#: plugins/personal/generic/class_user.inc:648
msgid "Password is not being changed from existing value"
msgstr "La contraseña no será cambiada por este valor"
-#: plugins/personal/generic/class_user.inc:652
+#: plugins/personal/generic/class_user.inc:655
msgid "You need to specify your current password in order to proceed."
msgstr "Usted debe especificar su contraseña actual para poder proceder."
-#: plugins/personal/generic/class_user.inc:654
+#: plugins/personal/generic/class_user.inc:657
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr "Las contraseñas que usted ingresó como \"Nueva contraseña\" y \"Repetir nueva contraseña\" no coinciden."
-#: plugins/personal/generic/class_user.inc:656
+#: plugins/personal/generic/class_user.inc:659
#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
msgid "New password"
msgstr "Nueva contraseña"
-#: plugins/personal/generic/class_user.inc:658
+#: plugins/personal/generic/class_user.inc:661
msgid "The password used as new and current are too similar."
msgstr "La contraseña anterior y la nueva son muy parecidas."
-#: plugins/personal/generic/class_user.inc:660
+#: plugins/personal/generic/class_user.inc:663
msgid "The password used as new is to short."
msgstr "La contraseña nueva es muy corta."
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:665
msgid "The password contains possibly problematic Unicode characters!"
msgstr "La contraseña posiblemente contiene caracteres 'Unicoide' que son problemáticos."
@@ -3299,36 +3308,46 @@ msgid ""
"recover their password"
msgstr "Los usuarios también podrán una dirección alternativa para recuperar su contraseña."
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:189
+msgid "Login attribute"
+msgstr "Cuenta de Usuario"
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
msgid "First email"
msgstr "Correo principal"
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
msgid "Subject"
msgstr "Asunto"
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
msgid "Subject of the first email"
msgstr "Asunto del correo principal"
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
msgid "[FusionDirectory] Password recovery link"
msgstr "[FusionDirectory] Enlace para recuperar contraseña"
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
#, 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:91
+#: plugins/config/class_recoveryConfig.inc:96
#, php-format
msgid ""
"Body of the first email, sent when the user ask for a new password. Use %s "
"for the login and the recovery link."
msgstr "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:94
+#: plugins/config/class_recoveryConfig.inc:99
#, php-format
msgid ""
"Hello,\n"
@@ -3340,31 +3359,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
msgid "Second email"
msgstr "Email secundario"
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
msgid "Subject of the second email"
msgstr "Asunto del email secundario"
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
msgid "[FusionDirectory] Password recovery successful"
msgstr "[FusionDirectory] ¡Recuperación de contraseña satisfactoria!"
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
#, php-format
msgid "Body (%s is login)"
msgstr "Mensaje (%s es cuenta de usuario)"
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
#, 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:113
+#: plugins/config/class_recoveryConfig.inc:118
#, php-format
msgid ""
"Hello,\n"
@@ -3531,10 +3550,6 @@ msgstr "Determine cuántas entradas se traerán de LDAP por defecto."
msgid "Login and session"
msgstr "Cuenta de Usuario y sesión"
-#: plugins/config/class_configInLdap.inc:189
-msgid "Login attribute"
-msgstr "Cuenta de Usuario"
-
#: 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."
@@ -4397,7 +4412,7 @@ msgstr "Objetos miembro de este grupo"
msgid "Only allow this group to connect to this list of hosts"
msgstr "Habilitar solamente a éste grupo para conectarse a ésta lista de equipos."
-#: plugins/admin/groups/class_ogroup.inc:321
+#: plugins/admin/groups/class_ogroup.inc:322
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr "Alojar estaciones de trabajo y terminales en el mismo grupo no está permitido."
diff --git a/locale/es_VE/fusiondirectory.po b/locale/es_VE/fusiondirectory.po
index a6e621a74d6fe8c383b8827817ad1c371003754c..3fdbf78c6f4035ef8405c94b4e3cb609ab0f41d2 100644
--- a/locale/es_VE/fusiondirectory.po
+++ b/locale/es_VE/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-11 19:09+0100\n"
-"PO-Revision-Date: 2017-01-10 14:53+0000\n"
+"POT-Creation-Date: 2017-03-29 21:46+0200\n"
+"PO-Revision-Date: 2017-03-26 15:51+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
"MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:382
+#: plugins/personal/generic/class_user.inc:385
msgid "Preferred language"
msgstr "Idioma preferido"
@@ -316,30 +316,30 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
+#: setup/class_setupStep_Migrate.inc:981
+#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1180
+#: setup/class_setupStep_Migrate.inc:1273
+#: setup/class_setupStep_Migrate.inc:1352
+#: setup/class_setupStep_Migrate.inc:1396
+msgid "LDAP query failed"
+msgstr "La consulta LDAP ha fallado"
+
+#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
+#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
#: setup/class_setupStep_Migrate.inc:982
#: setup/class_setupStep_Migrate.inc:1058
#: setup/class_setupStep_Migrate.inc:1181
#: setup/class_setupStep_Migrate.inc:1274
#: setup/class_setupStep_Migrate.inc:1353
#: setup/class_setupStep_Migrate.inc:1397
-msgid "LDAP query failed"
-msgstr "La consulta LDAP ha fallado"
-
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:983
-#: setup/class_setupStep_Migrate.inc:1059
-#: setup/class_setupStep_Migrate.inc:1182
-#: setup/class_setupStep_Migrate.inc:1275
-#: setup/class_setupStep_Migrate.inc:1354
-#: setup/class_setupStep_Migrate.inc:1398
msgid "Possibly the \"root object\" is missing."
msgstr ""
#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:866
-#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
+#: setup/class_setupStep_Migrate.inc:880
msgid "Failed"
msgstr "Error"
@@ -360,11 +360,11 @@ msgid ""
msgstr "No se puede un tipo de objeto estructural en su entrada raÃz. Por favor intente añadir la clase de objeto '%s' manualmente."
#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:677
-#: include/functions.inc:724 include/functions.inc:822
-#: include/functions.inc:2988 include/functions.inc:3165
+#: include/functions.inc:522 include/functions.inc:679
+#: include/functions.inc:726 include/functions.inc:834
+#: include/functions.inc:3001 include/functions.inc:3178
#: include/class_config.inc:322 include/class_ldap.inc:924
#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
#: include/simpleplugin/attributes/class_SetAttribute.inc:726
@@ -386,13 +386,13 @@ msgid "The specified user \"%s\" does not have full access to your ldap database
msgstr ""
#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1085
-#: setup/class_setupStep_Migrate.inc:1204
-#: setup/class_setupStep_Migrate.inc:1315
-#: setup/class_setupStep_Migrate.inc:1379
-#: setup/class_setupStep_Migrate.inc:1423 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:838
-#: include/functions.inc:2523 include/simpleplugin/class_simpleTabs.inc:322
+#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1203
+#: setup/class_setupStep_Migrate.inc:1314
+#: setup/class_setupStep_Migrate.inc:1378
+#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
+#: include/class_xml.inc:55 include/functions.inc:850
+#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
#: html/index.php:597 html/main.php:158
#: plugins/personal/posix/class_posixAccount.inc:482
#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
@@ -413,7 +413,7 @@ msgid "User migration"
msgstr ""
#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1029
+#: setup/class_setupStep_Migrate.inc:1028
msgid "Migration error"
msgstr "Error de migración"
@@ -422,64 +422,64 @@ msgstr "Error de migración"
msgid "Cannot migrate entry \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:859
+#: setup/class_setupStep_Migrate.inc:858
#, php-format
msgid "FD 1.0.7 administrative accounts found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:862
+#: setup/class_setupStep_Migrate.inc:861
#, php-format
msgid "FD 1.0.7 administrative groups found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:864
+#: setup/class_setupStep_Migrate.inc:863
msgid ""
"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
"file at the end of the setup to migrate it.<br/>"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:867
+#: setup/class_setupStep_Migrate.inc:866
msgid ""
"There is no valid FusionDirectory 1.0.8 administrator account inside your "
"LDAP."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:868 setup/class_setupStep_Migrate.inc:883
+#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
#: include/simpleplugin/simple-list.xml:59
#: plugins/admin/departments/dep-list.xml:48
#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
msgid "Create"
msgstr "Crear"
-#: setup/class_setupStep_Migrate.inc:873
+#: setup/class_setupStep_Migrate.inc:872
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: plugins/admin/users/class_userManagement.inc:42
msgid "Users"
msgstr "Usuarios"
-#: setup/class_setupStep_Migrate.inc:876
+#: setup/class_setupStep_Migrate.inc:875
msgid "Groups"
msgstr "Grupos"
-#: setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStep_Migrate.inc:881
msgid "There is no FusionDirectory administrator account inside your LDAP."
msgstr "No hay una cuenta de administrador FusionDirectory dentro de su LDAP."
-#: setup/class_setupStep_Migrate.inc:920
+#: setup/class_setupStep_Migrate.inc:919
msgid "Gives all rights on all objects"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:937 include/class_management.inc:697
+#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
#: include/class_listing.inc:551 include/class_xml.inc:58
#: include/password-methods/class_password-methods-sasl.inc:60
#: include/password-methods/class_password-methods-sasl.inc:86
#: include/password-methods/class_password-methods.inc:393
#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3112
-#: include/functions.inc:3133 include/functions.inc:3173
-#: include/functions.inc:3185 include/functions.inc:3189
-#: include/functions.inc:3196 include/functions.inc:3205
-#: include/functions.inc:3267 include/class_msg_dialog.inc:128
+#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
+#: include/functions.inc:3146 include/functions.inc:3186
+#: include/functions.inc:3198 include/functions.inc:3202
+#: include/functions.inc:3209 include/functions.inc:3218
+#: include/functions.inc:3280 include/class_msg_dialog.inc:128
#: include/class_msg_dialog.inc:164 include/class_config.inc:357
#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
@@ -492,82 +492,82 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:34
#: include/simpleplugin/attributes/class_FileAttribute.inc:37
#: include/simpleplugin/attributes/class_FileAttribute.inc:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:801
-#: include/class_plugin.inc:1534 html/index.php:453 html/index.php:474
+#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
+#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
#: html/index.php:484 html/index.php:546 html/index.php:556
#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
msgid "Error"
msgstr "Error"
-#: setup/class_setupStep_Migrate.inc:997
+#: setup/class_setupStep_Migrate.inc:996
msgid "Default ACL roles have not been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:999
+#: setup/class_setupStep_Migrate.inc:998
msgid "Some default ACL roles are missing"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1001
+#: setup/class_setupStep_Migrate.inc:1000
msgid "Default ACL roles have been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1031
+#: setup/class_setupStep_Migrate.inc:1030
#, php-format
msgid "Cannot add ACL role \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1086
+#: setup/class_setupStep_Migrate.inc:1085
#, php-format
msgid "Found %s user(s) outside the configured tree \"%s\"."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1100
-#: setup/class_setupStep_Migrate.inc:1114
+#: setup/class_setupStep_Migrate.inc:1099
+#: setup/class_setupStep_Migrate.inc:1113
msgid "Move users into configured user tree"
msgstr "Mover usuarios al árbol de usuarios configurado"
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
msgid "Cannot move entries to the requested department!"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "Entry will be moved from"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "to"
msgstr "a"
-#: setup/class_setupStep_Migrate.inc:1154
+#: setup/class_setupStep_Migrate.inc:1153
msgid "The following references will be updated"
msgstr "Las siguientes referencias se actualizaran"
-#: setup/class_setupStep_Migrate.inc:1205
+#: setup/class_setupStep_Migrate.inc:1204
#, php-format
msgid "Found %s groups outside the configured tree '%s'."
msgstr "Encontrados '%s' grupos fuera del árbol configurado '%s'."
-#: setup/class_setupStep_Migrate.inc:1219
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1218
+#: setup/class_setupStep_Migrate.inc:1232
msgid "Move groups into configured groups tree"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1316
+#: setup/class_setupStep_Migrate.inc:1315
#, php-format
msgid "Found %s department(s) that will not be visible in FusionDirectory."
msgstr "Se encontraron %s departamentos que no serán visibles en FusionDirectory"
-#: setup/class_setupStep_Migrate.inc:1325
-#: setup/class_setupStep_Migrate.inc:1330
+#: setup/class_setupStep_Migrate.inc:1324
+#: setup/class_setupStep_Migrate.inc:1329
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1380
+#: setup/class_setupStep_Migrate.inc:1379
#, php-format
msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1424
+#: setup/class_setupStep_Migrate.inc:1423
#, php-format
msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
@@ -743,10 +743,10 @@ msgstr "Siguiente"
#: include/class_logging.inc:80 include/class_session.inc:50
#: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:649
-#: include/functions.inc:770 include/functions.inc:1189
-#: include/functions.inc:2243 include/functions.inc:2285
-#: include/functions.inc:2314 include/class_ldap.inc:873
+#: include/functions.inc:564 include/functions.inc:651
+#: include/functions.inc:772 include/functions.inc:1201
+#: include/functions.inc:2255 include/functions.inc:2297
+#: include/functions.inc:2326 include/class_ldap.inc:873
#: include/class_ldap.inc:911 include/class_acl.inc:118
msgid "Internal error"
msgstr "error interno"
@@ -813,12 +813,12 @@ msgid ""
"plugin instance!"
msgstr "No hay declaración de pestaña para '%s' en su archivo de configuración. ¡No se puede crear la instancia del plugin!"
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1188
+#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
#: include/class_listing.inc:1190
msgid "Root"
msgstr "RaÃz"
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
msgid "Submit"
msgstr "Enviar"
@@ -919,7 +919,7 @@ msgid "Create a new snapshot from this object"
msgstr "¡Crear una nueva instantánea de este objeto!"
#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3302 include/simpleplugin/class_simplePlugin.inc:272
+#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
#: include/simpleplugin/class_simplePlugin.inc:277
#: include/simpleplugin/class_simplePlugin.inc:289
#: html/class_passwordRecovery.inc:116
@@ -952,7 +952,7 @@ msgstr ""
#: include/password-methods/class_password-methods-sha.inc:69
#: include/password-methods/class_password-methods-ssha.inc:73
#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:659 include/class_timezone.inc:51
+#: include/functions.inc:661 include/class_timezone.inc:51
#: include/class_config.inc:159 include/class_config.inc:284
#: include/class_config.inc:843 include/class_config.inc:856
#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
@@ -990,7 +990,7 @@ msgid "Cannot paste"
msgstr "No puedo pegar"
#: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
#: plugins/personal/generic/paste_generic.tpl.c:11
msgid "Login"
@@ -1034,245 +1034,245 @@ msgid ""
"administrator."
msgstr ""
-#: include/functions.inc:597
+#: include/functions.inc:599
msgid "Authentication error"
msgstr "Error de Autenticación"
-#: include/functions.inc:598
+#: include/functions.inc:600
msgid ""
"It seems your user password has expired. Please use <a "
"href=\"recovery.php\">password recovery</a> to change it."
msgstr ""
-#: include/functions.inc:649 include/functions.inc:770
+#: include/functions.inc:651 include/functions.inc:772
msgid "Error while adding a lock. Contact the developers!"
msgstr "Ha ocurrido un problema al añadir un bloqueo. ¡Contacte con los desarrolladores!"
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid ""
"Cannot create locking information in LDAP tree. Please contact your "
"administrator!"
msgstr "No puedo crear información de bloqueos en el árbol LDAP. ¡Por favor contacte con su Administrador!"
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid "LDAP server returned: %s"
msgstr "El servidor LDAP devolvio: %s"
-#: include/functions.inc:838
+#: include/functions.inc:850
msgid ""
"Found multiple locks for object to be locked. This should not happen - "
"cleaning up multiple references."
msgstr "Se han encontrado varios bloqueos para un objeto que iba a ser bloqueado. Esto no deberÃa ocurrir - limpiando referencias multiples."
-#: include/functions.inc:1109
+#: include/functions.inc:1121
#, php-format
msgid "The size limit of %d entries is exceed!"
msgstr "¡El lÃmite máximo de %d entradas se ha sobrepasado!"
-#: include/functions.inc:1111
+#: include/functions.inc:1123
#, php-format
msgid ""
"Set the new size limit to %s and show me this message if the limit still "
"exceeds"
msgstr "Introduzca un nuevo lÃmite máximo a %s y se volvera a mostrar este mensaje si se supera el lÃmite máximo"
-#: include/functions.inc:1128
+#: include/functions.inc:1140
msgid "Configure"
msgstr "Configurar"
-#: include/functions.inc:1133
+#: include/functions.inc:1145
msgid "incomplete"
msgstr "incompleto"
-#: include/functions.inc:1534
+#: include/functions.inc:1546
msgid "Continue anyway"
msgstr "Continuar de cualquier manera"
-#: include/functions.inc:1536
+#: include/functions.inc:1548
msgid "Edit anyway"
msgstr "Editar de cualquier manera"
-#: include/functions.inc:1538
+#: include/functions.inc:1550
#, php-format
msgid "You're going to edit the LDAP entry/entries %s"
msgstr "Has decidido editar las siguientes entradas LDAP %s"
-#: include/functions.inc:1766
+#: include/functions.inc:1778
msgid "Entries per page"
msgstr "Entradas por página"
-#: include/functions.inc:1797 include/class_filter.inc:353
+#: include/functions.inc:1809 include/class_filter.inc:353
msgid "Apply filter"
msgstr "Aplicar filtro"
-#: include/functions.inc:2065
+#: include/functions.inc:2077
#, php-format
msgid "%sB"
msgstr ""
-#: include/functions.inc:2066
+#: include/functions.inc:2078
#, php-format
msgid "%sKiB"
msgstr ""
-#: include/functions.inc:2067
+#: include/functions.inc:2079
#, php-format
msgid "%sMiB"
msgstr ""
-#: include/functions.inc:2068
+#: include/functions.inc:2080
#, php-format
msgid "%sGiB"
msgstr ""
-#: include/functions.inc:2069
+#: include/functions.inc:2081
#, php-format
msgid "%sTiB"
msgstr ""
-#: include/functions.inc:2070
+#: include/functions.inc:2082
#, php-format
msgid "%sPiB"
msgstr ""
-#: include/functions.inc:2071
+#: include/functions.inc:2083
#, php-format
msgid "%sEiB"
msgstr ""
-#: include/functions.inc:2072
+#: include/functions.inc:2084
#, php-format
msgid "%sZiB"
msgstr ""
-#: include/functions.inc:2073
+#: include/functions.inc:2085
#, php-format
msgid "%sYiB"
msgstr ""
-#: include/functions.inc:2105 include/class_filter.inc:315
+#: include/functions.inc:2117 include/class_filter.inc:315
msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
-#: include/functions.inc:2243
+#: include/functions.inc:2255
#, php-format
msgid ""
"File '%s' could not be deleted. Try fusiondirectory-setup --check-"
"directories to fix permissions."
msgstr ""
-#: include/functions.inc:2285
+#: include/functions.inc:2297
msgid "Cannot write to revision file!"
msgstr "¡No se puede escribir en el archivo de revisión!"
-#: include/functions.inc:2314
+#: include/functions.inc:2326
msgid "Cannot read to revision file!"
msgstr "No se puede leer el archivo de revisión!"
-#: include/functions.inc:2523
+#: include/functions.inc:2535
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "LDAP warning"
msgstr "Aviso LDAP"
-#: include/functions.inc:2541
+#: include/functions.inc:2554
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:2564
+#: include/functions.inc:2577
msgid "Main FusionDirectory schema"
msgstr ""
-#: include/functions.inc:2571
+#: include/functions.inc:2584
msgid "Schema used to store FusionDirectory configuration"
msgstr ""
-#: include/functions.inc:2578
+#: include/functions.inc:2591
msgid "Used to store trust mode information in users or groups."
msgstr ""
-#: include/functions.inc:2585
+#: include/functions.inc:2598
msgid "Used to store templates."
msgstr ""
-#: include/functions.inc:2592
+#: include/functions.inc:2605
msgid "Used to store POSIX information."
msgstr ""
-#: include/functions.inc:2599
+#: include/functions.inc:2612
#, php-format
msgid "Missing required object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2601
+#: include/functions.inc:2614
#, php-format
msgid "Missing optional object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2605
+#: include/functions.inc:2618
#, php-format
msgid "Class(es) available"
msgstr "Clase(s) disponibles"
-#: include/functions.inc:2623
+#: include/functions.inc:2636
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2637
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2640
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2641
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3112 include/functions.inc:3133
-#: include/functions.inc:3173 include/functions.inc:3185
-#: include/functions.inc:3189 include/functions.inc:3196
-#: include/functions.inc:3205
+#: include/functions.inc:3125 include/functions.inc:3146
+#: include/functions.inc:3186 include/functions.inc:3198
+#: include/functions.inc:3202 include/functions.inc:3209
+#: include/functions.inc:3218
msgid "Cannot allocate a free ID:"
msgstr "No se puede asignar un identificador (ID) libre:"
-#: include/functions.inc:3112
+#: include/functions.inc:3125
msgid "unknown idAllocation method!"
msgstr "¡método de asignación de id desconocido!"
-#: include/functions.inc:3133
+#: include/functions.inc:3146
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr "¡%sPoolMin >= %sPoolMax!"
-#: include/functions.inc:3173
+#: include/functions.inc:3186
msgid "sambaUnixIdPool is not unique!"
msgstr "¡sambaUnixIdPool no es único!"
-#: include/functions.inc:3185 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3202
msgid "no ID available!"
msgstr "¡No hay ID disponibles!"
-#: include/functions.inc:3205
+#: include/functions.inc:3218
msgid "maximum tries exceeded!"
msgstr "¡Excedido el número de intentos máximo!"
-#: include/functions.inc:3267
+#: include/functions.inc:3280
msgid "Cannot allocate a free ID!"
msgstr "¡No se puede asignar un identificador (ID) libre!"
-#: include/functions.inc:3303
+#: include/functions.inc:3316
#, 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"
@@ -2102,7 +2102,7 @@ msgstr "Nombre"
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
#: plugins/admin/departments/class_department.inc:72
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/groups/class_roleGeneric.inc:91
@@ -2282,7 +2282,7 @@ msgid "The entry %s is not existing"
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:548
+#: include/class_plugin.inc:554
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!"
@@ -2398,14 +2398,19 @@ msgstr ""
msgid "There was a problem uncompressing snapshot data"
msgstr ""
-#: include/class_plugin.inc:803
+#: include/class_plugin.inc:809
#, php-format
msgid ""
"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
msgstr ""
-#: include/class_plugin.inc:1332
+#: include/class_plugin.inc:1350
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/class_plugin.inc:1352
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -2553,44 +2558,44 @@ msgstr "Su navegador tiene las cookies desactivadas. ¡Porfavor active las cooki
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr "La configuración de FusionDirectory %s/%s no se puede leer. Cancelado."
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
msgid "Email address"
msgstr "Dirección de correo"
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
#, php-format
msgid "Did not find an account with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
#, php-format
msgid "Found multiple accounts with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
#, php-format
msgid "There is no account using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There are several accounts using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
#, php-format
msgid "The user using email \"%s\" is locked. Please contact your administrator."
msgstr ""
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
msgid "Contact your administrator, there was a problem with mail server"
msgstr "Contacte a su administrador, hubo un problema con el servidor de correo"
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
msgid "This token is invalid"
msgstr "Esta prenda es invalida"
-#: html/class_passwordRecovery.inc:647
+#: html/class_passwordRecovery.inc:651
msgid "There was a problem with mail server, confirmation email not sent"
msgstr ""
@@ -2902,7 +2907,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
#: setup/setup_migrate_adminAccount.tpl.c:14
#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2939,258 +2944,262 @@ msgstr ""
msgid "User account"
msgstr ""
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:296
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:307
msgid "Personal information"
msgstr "Información personal"
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "Apellido"
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
msgid "Last name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "Nombre"
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
msgid "First name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
msgid "Short description of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "Picture"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "The avatar for this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:330
+#: plugins/personal/generic/class_user.inc:333
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:334
+#: plugins/personal/generic/class_user.inc:337
#: plugins/admin/departments/class_department.inc:90
#: plugins/admin/departments/class_department.inc:96
msgid "Location"
msgstr "Localización"
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:341
#: plugins/admin/departments/class_department.inc:93
msgid "State"
msgstr "Provincia"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
#: plugins/admin/departments/class_department.inc:102
msgid "Address"
msgstr "Dirección"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
msgid "Business postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room No."
msgstr "Número sala"
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room number"
msgstr "Número de habitación"
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
#: plugins/admin/departments/class_department.inc:106
msgid "Phone"
msgstr "Teléfono"
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
msgid "Business phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Mobile"
msgstr "Móvil"
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Business mobile number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Pager"
msgstr "Buscapersonas"
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
#: plugins/admin/departments/class_department.inc:110
msgid "Fax"
msgstr "Fax"
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Homepage"
msgstr "Página Web"
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:373
+#: plugins/personal/generic/class_user.inc:376
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:393
+#: plugins/personal/generic/class_user.inc:396
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Display name"
msgstr "Nombre a Mostrar"
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home postal address"
msgstr "Dirección Postal personal"
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Private phone"
msgstr "Teléfono privado"
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Home phone number"
msgstr "Número de teléfono personal"
-#: plugins/personal/generic/class_user.inc:411
+#: plugins/personal/generic/class_user.inc:414
msgid "Organizational information"
msgstr "Información corporativa"
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
msgid "Title"
msgstr "TÃtulo"
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
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:421
+#: plugins/personal/generic/class_user.inc:424
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
msgid "Organization"
msgstr "Organización"
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
#: plugins/admin/departments/class_department.inc:33
#: plugins/admin/departments/class_department.inc:39
#: plugins/admin/departments/dep-list.xml:21
msgid "Department"
msgstr "Departamento"
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
msgid "Department to which the user belongs"
msgstr ""
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department No."
msgstr "Número departamento"
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department number"
msgstr "Número del departamento"
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee No."
msgstr "Número empleado"
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee number"
msgstr "Número de empleado"
-#: plugins/personal/generic/class_user.inc:437
+#: plugins/personal/generic/class_user.inc:440
msgid "Employee type"
msgstr "CategorÃa profesional"
-#: plugins/personal/generic/class_user.inc:441
+#: plugins/personal/generic/class_user.inc:444
#: plugins/admin/departments/class_department.inc:84
msgid "Manager"
msgstr "Gestor"
-#: plugins/personal/generic/class_user.inc:608
+#: plugins/personal/generic/class_user.inc:611
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:614
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:622
+#: plugins/personal/generic/class_user.inc:625
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:636
+#: plugins/personal/generic/class_user.inc:639
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:641
-#: plugins/personal/generic/class_user.inc:645
+#: plugins/personal/generic/class_user.inc:644
+#: plugins/personal/generic/class_user.inc:648
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:652
+#: plugins/personal/generic/class_user.inc:655
msgid "You need to specify your current password in order to proceed."
msgstr "Necesita introducir su contraseña actual para continuar."
-#: plugins/personal/generic/class_user.inc:654
+#: plugins/personal/generic/class_user.inc:657
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:656
+#: plugins/personal/generic/class_user.inc:659
#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
msgid "New password"
msgstr "Nueva contraseña"
-#: plugins/personal/generic/class_user.inc:658
+#: plugins/personal/generic/class_user.inc:661
msgid "The password used as new and current are too similar."
msgstr "La contraseña actual y la introducida como nueva son demasiado parecidas."
-#: plugins/personal/generic/class_user.inc:660
+#: plugins/personal/generic/class_user.inc:663
msgid "The password used as new is to short."
msgstr "La nueva contraseña es demasiado corta."
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:665
msgid "The password contains possibly problematic Unicode characters!"
msgstr "La clave contiene caracteres unicode posiblemente problemáticos!"
@@ -3298,36 +3307,46 @@ msgid ""
"recover their password"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:189
+msgid "Login attribute"
+msgstr "Atributo de inicio de sesión"
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
msgid "First email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
msgid "Subject"
msgstr "Asunto"
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
msgid "Subject of the first email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
msgid "[FusionDirectory] Password recovery link"
msgstr "[FusionDirectory] Enlace de recuperación de clave"
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
#, php-format
msgid ""
"Body of the first email, sent when the user ask for a new password. Use %s "
"for the login and the recovery link."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
#, php-format
msgid ""
"Hello,\n"
@@ -3339,31 +3358,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
msgid "Second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
msgid "Subject of the second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
msgid "[FusionDirectory] Password recovery successful"
msgstr "[FusionDirectory] Recuperación de clave realizada con exito"
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
#, php-format
msgid "Body (%s is login)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
#, 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
+#: plugins/config/class_recoveryConfig.inc:118
#, php-format
msgid ""
"Hello,\n"
@@ -3530,10 +3549,6 @@ msgstr ""
msgid "Login and session"
msgstr "Inicio y sesión"
-#: plugins/config/class_configInLdap.inc:189
-msgid "Login attribute"
-msgstr "Atributo de inicio de sesión"
-
#: plugins/config/class_configInLdap.inc:190
msgid "Which LDAP attribute should be used as the login name during login."
msgstr ""
@@ -4396,7 +4411,7 @@ msgstr ""
msgid "Only allow this group to connect to this list of hosts"
msgstr ""
-#: plugins/admin/groups/class_ogroup.inc:321
+#: plugins/admin/groups/class_ogroup.inc:322
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
diff --git a/locale/fa_IR/fusiondirectory.po b/locale/fa_IR/fusiondirectory.po
index f02c1cebe15b62525ed58cd85992898112c96fed..d780663c60df7f8c9b3954aa2cfc3232d8bdf095 100644
--- a/locale/fa_IR/fusiondirectory.po
+++ b/locale/fa_IR/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-11 19:09+0100\n"
-"PO-Revision-Date: 2017-01-10 14:53+0000\n"
+"POT-Creation-Date: 2017-03-29 21:46+0200\n"
+"PO-Revision-Date: 2017-03-26 15:51+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
"MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:382
+#: plugins/personal/generic/class_user.inc:385
msgid "Preferred language"
msgstr ""
@@ -316,30 +316,30 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
+#: setup/class_setupStep_Migrate.inc:981
+#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1180
+#: setup/class_setupStep_Migrate.inc:1273
+#: setup/class_setupStep_Migrate.inc:1352
+#: setup/class_setupStep_Migrate.inc:1396
+msgid "LDAP query failed"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
+#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
#: setup/class_setupStep_Migrate.inc:982
#: setup/class_setupStep_Migrate.inc:1058
#: setup/class_setupStep_Migrate.inc:1181
#: setup/class_setupStep_Migrate.inc:1274
#: setup/class_setupStep_Migrate.inc:1353
#: setup/class_setupStep_Migrate.inc:1397
-msgid "LDAP query failed"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:983
-#: setup/class_setupStep_Migrate.inc:1059
-#: setup/class_setupStep_Migrate.inc:1182
-#: setup/class_setupStep_Migrate.inc:1275
-#: setup/class_setupStep_Migrate.inc:1354
-#: setup/class_setupStep_Migrate.inc:1398
msgid "Possibly the \"root object\" is missing."
msgstr ""
#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:866
-#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
+#: setup/class_setupStep_Migrate.inc:880
msgid "Failed"
msgstr "خطا"
@@ -360,11 +360,11 @@ msgid ""
msgstr ""
#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:677
-#: include/functions.inc:724 include/functions.inc:822
-#: include/functions.inc:2988 include/functions.inc:3165
+#: include/functions.inc:522 include/functions.inc:679
+#: include/functions.inc:726 include/functions.inc:834
+#: include/functions.inc:3001 include/functions.inc:3178
#: include/class_config.inc:322 include/class_ldap.inc:924
#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
#: include/simpleplugin/attributes/class_SetAttribute.inc:726
@@ -386,13 +386,13 @@ msgid "The specified user \"%s\" does not have full access to your ldap database
msgstr ""
#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1085
-#: setup/class_setupStep_Migrate.inc:1204
-#: setup/class_setupStep_Migrate.inc:1315
-#: setup/class_setupStep_Migrate.inc:1379
-#: setup/class_setupStep_Migrate.inc:1423 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:838
-#: include/functions.inc:2523 include/simpleplugin/class_simpleTabs.inc:322
+#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1203
+#: setup/class_setupStep_Migrate.inc:1314
+#: setup/class_setupStep_Migrate.inc:1378
+#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
+#: include/class_xml.inc:55 include/functions.inc:850
+#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
#: html/index.php:597 html/main.php:158
#: plugins/personal/posix/class_posixAccount.inc:482
#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
@@ -413,7 +413,7 @@ msgid "User migration"
msgstr ""
#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1029
+#: setup/class_setupStep_Migrate.inc:1028
msgid "Migration error"
msgstr ""
@@ -422,64 +422,64 @@ msgstr ""
msgid "Cannot migrate entry \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:859
+#: setup/class_setupStep_Migrate.inc:858
#, php-format
msgid "FD 1.0.7 administrative accounts found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:862
+#: setup/class_setupStep_Migrate.inc:861
#, php-format
msgid "FD 1.0.7 administrative groups found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:864
+#: setup/class_setupStep_Migrate.inc:863
msgid ""
"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
"file at the end of the setup to migrate it.<br/>"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:867
+#: setup/class_setupStep_Migrate.inc:866
msgid ""
"There is no valid FusionDirectory 1.0.8 administrator account inside your "
"LDAP."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:868 setup/class_setupStep_Migrate.inc:883
+#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
#: include/simpleplugin/simple-list.xml:59
#: plugins/admin/departments/dep-list.xml:48
#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
msgid "Create"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:873
+#: setup/class_setupStep_Migrate.inc:872
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: plugins/admin/users/class_userManagement.inc:42
msgid "Users"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:876
+#: setup/class_setupStep_Migrate.inc:875
msgid "Groups"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStep_Migrate.inc:881
msgid "There is no FusionDirectory administrator account inside your LDAP."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:920
+#: setup/class_setupStep_Migrate.inc:919
msgid "Gives all rights on all objects"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:937 include/class_management.inc:697
+#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
#: include/class_listing.inc:551 include/class_xml.inc:58
#: include/password-methods/class_password-methods-sasl.inc:60
#: include/password-methods/class_password-methods-sasl.inc:86
#: include/password-methods/class_password-methods.inc:393
#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3112
-#: include/functions.inc:3133 include/functions.inc:3173
-#: include/functions.inc:3185 include/functions.inc:3189
-#: include/functions.inc:3196 include/functions.inc:3205
-#: include/functions.inc:3267 include/class_msg_dialog.inc:128
+#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
+#: include/functions.inc:3146 include/functions.inc:3186
+#: include/functions.inc:3198 include/functions.inc:3202
+#: include/functions.inc:3209 include/functions.inc:3218
+#: include/functions.inc:3280 include/class_msg_dialog.inc:128
#: include/class_msg_dialog.inc:164 include/class_config.inc:357
#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
@@ -492,82 +492,82 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:34
#: include/simpleplugin/attributes/class_FileAttribute.inc:37
#: include/simpleplugin/attributes/class_FileAttribute.inc:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:801
-#: include/class_plugin.inc:1534 html/index.php:453 html/index.php:474
+#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
+#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
#: html/index.php:484 html/index.php:546 html/index.php:556
#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
msgid "Error"
msgstr "خطا"
-#: setup/class_setupStep_Migrate.inc:997
+#: setup/class_setupStep_Migrate.inc:996
msgid "Default ACL roles have not been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:999
+#: setup/class_setupStep_Migrate.inc:998
msgid "Some default ACL roles are missing"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1001
+#: setup/class_setupStep_Migrate.inc:1000
msgid "Default ACL roles have been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1031
+#: setup/class_setupStep_Migrate.inc:1030
#, php-format
msgid "Cannot add ACL role \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1086
+#: setup/class_setupStep_Migrate.inc:1085
#, php-format
msgid "Found %s user(s) outside the configured tree \"%s\"."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1100
-#: setup/class_setupStep_Migrate.inc:1114
+#: setup/class_setupStep_Migrate.inc:1099
+#: setup/class_setupStep_Migrate.inc:1113
msgid "Move users into configured user tree"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
msgid "Cannot move entries to the requested department!"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "Entry will be moved from"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "to"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1154
+#: setup/class_setupStep_Migrate.inc:1153
msgid "The following references will be updated"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1205
+#: setup/class_setupStep_Migrate.inc:1204
#, php-format
msgid "Found %s groups outside the configured tree '%s'."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1219
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1218
+#: setup/class_setupStep_Migrate.inc:1232
msgid "Move groups into configured groups tree"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1316
+#: setup/class_setupStep_Migrate.inc:1315
#, php-format
msgid "Found %s department(s) that will not be visible in FusionDirectory."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1325
-#: setup/class_setupStep_Migrate.inc:1330
+#: setup/class_setupStep_Migrate.inc:1324
+#: setup/class_setupStep_Migrate.inc:1329
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1380
+#: setup/class_setupStep_Migrate.inc:1379
#, php-format
msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1424
+#: setup/class_setupStep_Migrate.inc:1423
#, php-format
msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
@@ -743,10 +743,10 @@ msgstr ""
#: include/class_logging.inc:80 include/class_session.inc:50
#: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:649
-#: include/functions.inc:770 include/functions.inc:1189
-#: include/functions.inc:2243 include/functions.inc:2285
-#: include/functions.inc:2314 include/class_ldap.inc:873
+#: include/functions.inc:564 include/functions.inc:651
+#: include/functions.inc:772 include/functions.inc:1201
+#: include/functions.inc:2255 include/functions.inc:2297
+#: include/functions.inc:2326 include/class_ldap.inc:873
#: include/class_ldap.inc:911 include/class_acl.inc:118
msgid "Internal error"
msgstr "خطای داخلی"
@@ -813,12 +813,12 @@ msgid ""
"plugin instance!"
msgstr ""
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1188
+#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
#: include/class_listing.inc:1190
msgid "Root"
msgstr ""
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
msgid "Submit"
msgstr ""
@@ -919,7 +919,7 @@ msgid "Create a new snapshot from this object"
msgstr ""
#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3302 include/simpleplugin/class_simplePlugin.inc:272
+#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
#: include/simpleplugin/class_simplePlugin.inc:277
#: include/simpleplugin/class_simplePlugin.inc:289
#: html/class_passwordRecovery.inc:116
@@ -952,7 +952,7 @@ msgstr ""
#: include/password-methods/class_password-methods-sha.inc:69
#: include/password-methods/class_password-methods-ssha.inc:73
#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:659 include/class_timezone.inc:51
+#: include/functions.inc:661 include/class_timezone.inc:51
#: include/class_config.inc:159 include/class_config.inc:284
#: include/class_config.inc:843 include/class_config.inc:856
#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
@@ -990,7 +990,7 @@ msgid "Cannot paste"
msgstr ""
#: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
#: plugins/personal/generic/paste_generic.tpl.c:11
msgid "Login"
@@ -1034,245 +1034,245 @@ msgid ""
"administrator."
msgstr ""
-#: include/functions.inc:597
+#: include/functions.inc:599
msgid "Authentication error"
msgstr ""
-#: include/functions.inc:598
+#: include/functions.inc:600
msgid ""
"It seems your user password has expired. Please use <a "
"href=\"recovery.php\">password recovery</a> to change it."
msgstr ""
-#: include/functions.inc:649 include/functions.inc:770
+#: include/functions.inc:651 include/functions.inc:772
msgid "Error while adding a lock. Contact the developers!"
msgstr ""
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid ""
"Cannot create locking information in LDAP tree. Please contact your "
"administrator!"
msgstr ""
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid "LDAP server returned: %s"
msgstr ""
-#: include/functions.inc:838
+#: include/functions.inc:850
msgid ""
"Found multiple locks for object to be locked. This should not happen - "
"cleaning up multiple references."
msgstr ""
-#: include/functions.inc:1109
+#: include/functions.inc:1121
#, php-format
msgid "The size limit of %d entries is exceed!"
msgstr ""
-#: include/functions.inc:1111
+#: include/functions.inc:1123
#, php-format
msgid ""
"Set the new size limit to %s and show me this message if the limit still "
"exceeds"
msgstr ""
-#: include/functions.inc:1128
+#: include/functions.inc:1140
msgid "Configure"
msgstr ""
-#: include/functions.inc:1133
+#: include/functions.inc:1145
msgid "incomplete"
msgstr ""
-#: include/functions.inc:1534
+#: include/functions.inc:1546
msgid "Continue anyway"
msgstr ""
-#: include/functions.inc:1536
+#: include/functions.inc:1548
msgid "Edit anyway"
msgstr ""
-#: include/functions.inc:1538
+#: include/functions.inc:1550
#, php-format
msgid "You're going to edit the LDAP entry/entries %s"
msgstr ""
-#: include/functions.inc:1766
+#: include/functions.inc:1778
msgid "Entries per page"
msgstr ""
-#: include/functions.inc:1797 include/class_filter.inc:353
+#: include/functions.inc:1809 include/class_filter.inc:353
msgid "Apply filter"
msgstr ""
-#: include/functions.inc:2065
+#: include/functions.inc:2077
#, php-format
msgid "%sB"
msgstr ""
-#: include/functions.inc:2066
+#: include/functions.inc:2078
#, php-format
msgid "%sKiB"
msgstr ""
-#: include/functions.inc:2067
+#: include/functions.inc:2079
#, php-format
msgid "%sMiB"
msgstr ""
-#: include/functions.inc:2068
+#: include/functions.inc:2080
#, php-format
msgid "%sGiB"
msgstr ""
-#: include/functions.inc:2069
+#: include/functions.inc:2081
#, php-format
msgid "%sTiB"
msgstr ""
-#: include/functions.inc:2070
+#: include/functions.inc:2082
#, php-format
msgid "%sPiB"
msgstr ""
-#: include/functions.inc:2071
+#: include/functions.inc:2083
#, php-format
msgid "%sEiB"
msgstr ""
-#: include/functions.inc:2072
+#: include/functions.inc:2084
#, php-format
msgid "%sZiB"
msgstr ""
-#: include/functions.inc:2073
+#: include/functions.inc:2085
#, php-format
msgid "%sYiB"
msgstr ""
-#: include/functions.inc:2105 include/class_filter.inc:315
+#: include/functions.inc:2117 include/class_filter.inc:315
msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
msgstr ""
-#: include/functions.inc:2243
+#: include/functions.inc:2255
#, php-format
msgid ""
"File '%s' could not be deleted. Try fusiondirectory-setup --check-"
"directories to fix permissions."
msgstr ""
-#: include/functions.inc:2285
+#: include/functions.inc:2297
msgid "Cannot write to revision file!"
msgstr ""
-#: include/functions.inc:2314
+#: include/functions.inc:2326
msgid "Cannot read to revision file!"
msgstr ""
-#: include/functions.inc:2523
+#: include/functions.inc:2535
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "LDAP warning"
msgstr ""
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "Cannot get schema information from server. No schema check possible!"
msgstr ""
-#: include/functions.inc:2564
+#: include/functions.inc:2577
msgid "Main FusionDirectory schema"
msgstr ""
-#: include/functions.inc:2571
+#: include/functions.inc:2584
msgid "Schema used to store FusionDirectory configuration"
msgstr ""
-#: include/functions.inc:2578
+#: include/functions.inc:2591
msgid "Used to store trust mode information in users or groups."
msgstr ""
-#: include/functions.inc:2585
+#: include/functions.inc:2598
msgid "Used to store templates."
msgstr ""
-#: include/functions.inc:2592
+#: include/functions.inc:2605
msgid "Used to store POSIX information."
msgstr ""
-#: include/functions.inc:2599
+#: include/functions.inc:2612
#, php-format
msgid "Missing required object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2601
+#: include/functions.inc:2614
#, php-format
msgid "Missing optional object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2605
+#: include/functions.inc:2618
#, php-format
msgid "Class(es) available"
msgstr ""
-#: include/functions.inc:2623
+#: include/functions.inc:2636
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2637
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2640
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2641
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3112 include/functions.inc:3133
-#: include/functions.inc:3173 include/functions.inc:3185
-#: include/functions.inc:3189 include/functions.inc:3196
-#: include/functions.inc:3205
+#: include/functions.inc:3125 include/functions.inc:3146
+#: include/functions.inc:3186 include/functions.inc:3198
+#: include/functions.inc:3202 include/functions.inc:3209
+#: include/functions.inc:3218
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3112
+#: include/functions.inc:3125
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3133
+#: include/functions.inc:3146
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3173
+#: include/functions.inc:3186
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3185 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3202
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3205
+#: include/functions.inc:3218
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3267
+#: include/functions.inc:3280
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3303
+#: include/functions.inc:3316
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr "Ùایل '%s' را نمی توانم پیدا کنم برای رÙع مشکل دستور '%s' را بزنید."
@@ -2102,7 +2102,7 @@ msgstr ""
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
#: plugins/admin/departments/class_department.inc:72
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/groups/class_roleGeneric.inc:91
@@ -2282,7 +2282,7 @@ msgid "The entry %s is not existing"
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:548
+#: include/class_plugin.inc:554
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!"
@@ -2398,14 +2398,19 @@ msgstr ""
msgid "There was a problem uncompressing snapshot data"
msgstr ""
-#: include/class_plugin.inc:803
+#: include/class_plugin.inc:809
#, php-format
msgid ""
"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
msgstr ""
-#: include/class_plugin.inc:1332
+#: include/class_plugin.inc:1350
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/class_plugin.inc:1352
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -2553,44 +2558,44 @@ msgstr ""
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr ""
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
msgid "Email address"
msgstr ""
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
#, php-format
msgid "Did not find an account with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
#, php-format
msgid "Found multiple accounts with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
#, php-format
msgid "There is no account using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There are several accounts using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
#, php-format
msgid "The user using email \"%s\" is locked. Please contact your administrator."
msgstr ""
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
msgid "Contact your administrator, there was a problem with mail server"
msgstr ""
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
msgid "This token is invalid"
msgstr ""
-#: html/class_passwordRecovery.inc:647
+#: html/class_passwordRecovery.inc:651
msgid "There was a problem with mail server, confirmation email not sent"
msgstr ""
@@ -2902,7 +2907,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
#: setup/setup_migrate_adminAccount.tpl.c:14
#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2939,258 +2944,262 @@ msgstr ""
msgid "User account"
msgstr ""
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:296
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:307
msgid "Personal information"
msgstr "اطلاعات شخصی"
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "Ùامیل"
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
msgid "Last name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "نام"
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
msgid "First name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
msgid "Short description of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "Picture"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "The avatar for this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:330
+#: plugins/personal/generic/class_user.inc:333
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:334
+#: plugins/personal/generic/class_user.inc:337
#: plugins/admin/departments/class_department.inc:90
#: plugins/admin/departments/class_department.inc:96
msgid "Location"
msgstr ""
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:341
#: plugins/admin/departments/class_department.inc:93
msgid "State"
msgstr ""
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
#: plugins/admin/departments/class_department.inc:102
msgid "Address"
msgstr "آدرس"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
msgid "Business postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room No."
msgstr "شماره اتاق."
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room number"
msgstr "شماره اتاق"
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
#: plugins/admin/departments/class_department.inc:106
msgid "Phone"
msgstr "تلÙÙ†"
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
msgid "Business phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Mobile"
msgstr "تلÙÙ† همراه"
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Business mobile number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Pager"
msgstr "پیجر"
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
#: plugins/admin/departments/class_department.inc:110
msgid "Fax"
msgstr ""
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:373
+#: plugins/personal/generic/class_user.inc:376
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:393
+#: plugins/personal/generic/class_user.inc:396
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Display name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home postal address"
msgstr "آدرس پستی منزل"
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Private phone"
msgstr "شماره تماس خصوصی"
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Home phone number"
msgstr "شماره تلÙÙ† منزل"
-#: plugins/personal/generic/class_user.inc:411
+#: plugins/personal/generic/class_user.inc:414
msgid "Organizational information"
msgstr "اطلاعات سازمان"
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
msgid "Title"
msgstr ""
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
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:421
+#: plugins/personal/generic/class_user.inc:424
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
msgid "Organization"
msgstr ""
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
#: plugins/admin/departments/class_department.inc:33
#: plugins/admin/departments/class_department.inc:39
#: plugins/admin/departments/dep-list.xml:21
msgid "Department"
msgstr "دپارتمان"
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
msgid "Department to which the user belongs"
msgstr ""
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department No."
msgstr "شماره دپارتمان."
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department number"
msgstr "شماره دپارتمان"
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee No."
msgstr "شماره کارمندی."
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee number"
msgstr "شماره کارمندی"
-#: plugins/personal/generic/class_user.inc:437
+#: plugins/personal/generic/class_user.inc:440
msgid "Employee type"
msgstr ""
-#: plugins/personal/generic/class_user.inc:441
+#: plugins/personal/generic/class_user.inc:444
#: plugins/admin/departments/class_department.inc:84
msgid "Manager"
msgstr ""
-#: plugins/personal/generic/class_user.inc:608
+#: plugins/personal/generic/class_user.inc:611
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:614
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:622
+#: plugins/personal/generic/class_user.inc:625
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:636
+#: plugins/personal/generic/class_user.inc:639
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:641
-#: plugins/personal/generic/class_user.inc:645
+#: plugins/personal/generic/class_user.inc:644
+#: plugins/personal/generic/class_user.inc:648
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:652
+#: plugins/personal/generic/class_user.inc:655
msgid "You need to specify your current password in order to proceed."
msgstr ""
-#: plugins/personal/generic/class_user.inc:654
+#: plugins/personal/generic/class_user.inc:657
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:656
+#: plugins/personal/generic/class_user.inc:659
#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
msgid "New password"
msgstr "کلمه عبور جدید"
-#: plugins/personal/generic/class_user.inc:658
+#: plugins/personal/generic/class_user.inc:661
msgid "The password used as new and current are too similar."
msgstr ""
-#: plugins/personal/generic/class_user.inc:660
+#: plugins/personal/generic/class_user.inc:663
msgid "The password used as new is to short."
msgstr ""
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:665
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
@@ -3298,36 +3307,46 @@ msgid ""
"recover their password"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:189
+msgid "Login attribute"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
msgid "First email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
msgid "Subject"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
msgid "Subject of the first email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
msgid "[FusionDirectory] Password recovery link"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
#, php-format
msgid ""
"Body of the first email, sent when the user ask for a new password. Use %s "
"for the login and the recovery link."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
#, php-format
msgid ""
"Hello,\n"
@@ -3339,31 +3358,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
msgid "Second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
msgid "Subject of the second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
msgid "[FusionDirectory] Password recovery successful"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
#, php-format
msgid "Body (%s is login)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
#, 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
+#: plugins/config/class_recoveryConfig.inc:118
#, php-format
msgid ""
"Hello,\n"
@@ -3530,10 +3549,6 @@ msgstr ""
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 ""
@@ -4396,7 +4411,7 @@ msgstr ""
msgid "Only allow this group to connect to this list of hosts"
msgstr ""
-#: plugins/admin/groups/class_ogroup.inc:321
+#: plugins/admin/groups/class_ogroup.inc:322
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
diff --git a/locale/fi_FI/fusiondirectory.po b/locale/fi_FI/fusiondirectory.po
index 57556e5cbfd98f5d92f5dc05114c6618784734aa..4fca40e242ba34cd33c95b97b0d6d692112fc3ee 100644
--- a/locale/fi_FI/fusiondirectory.po
+++ b/locale/fi_FI/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-11 19:09+0100\n"
-"PO-Revision-Date: 2017-01-10 14:53+0000\n"
+"POT-Creation-Date: 2017-03-29 21:46+0200\n"
+"PO-Revision-Date: 2017-03-26 15:51+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:382
+#: plugins/personal/generic/class_user.inc:385
msgid "Preferred language"
msgstr ""
@@ -316,30 +316,30 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
+#: setup/class_setupStep_Migrate.inc:981
+#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1180
+#: setup/class_setupStep_Migrate.inc:1273
+#: setup/class_setupStep_Migrate.inc:1352
+#: setup/class_setupStep_Migrate.inc:1396
+msgid "LDAP query failed"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
+#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
#: setup/class_setupStep_Migrate.inc:982
#: setup/class_setupStep_Migrate.inc:1058
#: setup/class_setupStep_Migrate.inc:1181
#: setup/class_setupStep_Migrate.inc:1274
#: setup/class_setupStep_Migrate.inc:1353
#: setup/class_setupStep_Migrate.inc:1397
-msgid "LDAP query failed"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:983
-#: setup/class_setupStep_Migrate.inc:1059
-#: setup/class_setupStep_Migrate.inc:1182
-#: setup/class_setupStep_Migrate.inc:1275
-#: setup/class_setupStep_Migrate.inc:1354
-#: setup/class_setupStep_Migrate.inc:1398
msgid "Possibly the \"root object\" is missing."
msgstr ""
#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:866
-#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
+#: setup/class_setupStep_Migrate.inc:880
msgid "Failed"
msgstr ""
@@ -360,11 +360,11 @@ msgid ""
msgstr ""
#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:677
-#: include/functions.inc:724 include/functions.inc:822
-#: include/functions.inc:2988 include/functions.inc:3165
+#: include/functions.inc:522 include/functions.inc:679
+#: include/functions.inc:726 include/functions.inc:834
+#: include/functions.inc:3001 include/functions.inc:3178
#: include/class_config.inc:322 include/class_ldap.inc:924
#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
#: include/simpleplugin/attributes/class_SetAttribute.inc:726
@@ -386,13 +386,13 @@ msgid "The specified user \"%s\" does not have full access to your ldap database
msgstr ""
#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1085
-#: setup/class_setupStep_Migrate.inc:1204
-#: setup/class_setupStep_Migrate.inc:1315
-#: setup/class_setupStep_Migrate.inc:1379
-#: setup/class_setupStep_Migrate.inc:1423 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:838
-#: include/functions.inc:2523 include/simpleplugin/class_simpleTabs.inc:322
+#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1203
+#: setup/class_setupStep_Migrate.inc:1314
+#: setup/class_setupStep_Migrate.inc:1378
+#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
+#: include/class_xml.inc:55 include/functions.inc:850
+#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
#: html/index.php:597 html/main.php:158
#: plugins/personal/posix/class_posixAccount.inc:482
#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
@@ -413,7 +413,7 @@ msgid "User migration"
msgstr ""
#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1029
+#: setup/class_setupStep_Migrate.inc:1028
msgid "Migration error"
msgstr ""
@@ -422,64 +422,64 @@ msgstr ""
msgid "Cannot migrate entry \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:859
+#: setup/class_setupStep_Migrate.inc:858
#, php-format
msgid "FD 1.0.7 administrative accounts found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:862
+#: setup/class_setupStep_Migrate.inc:861
#, php-format
msgid "FD 1.0.7 administrative groups found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:864
+#: setup/class_setupStep_Migrate.inc:863
msgid ""
"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
"file at the end of the setup to migrate it.<br/>"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:867
+#: setup/class_setupStep_Migrate.inc:866
msgid ""
"There is no valid FusionDirectory 1.0.8 administrator account inside your "
"LDAP."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:868 setup/class_setupStep_Migrate.inc:883
+#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
#: include/simpleplugin/simple-list.xml:59
#: plugins/admin/departments/dep-list.xml:48
#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
msgid "Create"
msgstr "Luo"
-#: setup/class_setupStep_Migrate.inc:873
+#: setup/class_setupStep_Migrate.inc:872
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: plugins/admin/users/class_userManagement.inc:42
msgid "Users"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:876
+#: setup/class_setupStep_Migrate.inc:875
msgid "Groups"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStep_Migrate.inc:881
msgid "There is no FusionDirectory administrator account inside your LDAP."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:920
+#: setup/class_setupStep_Migrate.inc:919
msgid "Gives all rights on all objects"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:937 include/class_management.inc:697
+#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
#: include/class_listing.inc:551 include/class_xml.inc:58
#: include/password-methods/class_password-methods-sasl.inc:60
#: include/password-methods/class_password-methods-sasl.inc:86
#: include/password-methods/class_password-methods.inc:393
#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3112
-#: include/functions.inc:3133 include/functions.inc:3173
-#: include/functions.inc:3185 include/functions.inc:3189
-#: include/functions.inc:3196 include/functions.inc:3205
-#: include/functions.inc:3267 include/class_msg_dialog.inc:128
+#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
+#: include/functions.inc:3146 include/functions.inc:3186
+#: include/functions.inc:3198 include/functions.inc:3202
+#: include/functions.inc:3209 include/functions.inc:3218
+#: include/functions.inc:3280 include/class_msg_dialog.inc:128
#: include/class_msg_dialog.inc:164 include/class_config.inc:357
#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
@@ -492,82 +492,82 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:34
#: include/simpleplugin/attributes/class_FileAttribute.inc:37
#: include/simpleplugin/attributes/class_FileAttribute.inc:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:801
-#: include/class_plugin.inc:1534 html/index.php:453 html/index.php:474
+#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
+#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
#: html/index.php:484 html/index.php:546 html/index.php:556
#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
msgid "Error"
msgstr "Virhe"
-#: setup/class_setupStep_Migrate.inc:997
+#: setup/class_setupStep_Migrate.inc:996
msgid "Default ACL roles have not been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:999
+#: setup/class_setupStep_Migrate.inc:998
msgid "Some default ACL roles are missing"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1001
+#: setup/class_setupStep_Migrate.inc:1000
msgid "Default ACL roles have been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1031
+#: setup/class_setupStep_Migrate.inc:1030
#, php-format
msgid "Cannot add ACL role \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1086
+#: setup/class_setupStep_Migrate.inc:1085
#, php-format
msgid "Found %s user(s) outside the configured tree \"%s\"."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1100
-#: setup/class_setupStep_Migrate.inc:1114
+#: setup/class_setupStep_Migrate.inc:1099
+#: setup/class_setupStep_Migrate.inc:1113
msgid "Move users into configured user tree"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
msgid "Cannot move entries to the requested department!"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "Entry will be moved from"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "to"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1154
+#: setup/class_setupStep_Migrate.inc:1153
msgid "The following references will be updated"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1205
+#: setup/class_setupStep_Migrate.inc:1204
#, php-format
msgid "Found %s groups outside the configured tree '%s'."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1219
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1218
+#: setup/class_setupStep_Migrate.inc:1232
msgid "Move groups into configured groups tree"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1316
+#: setup/class_setupStep_Migrate.inc:1315
#, php-format
msgid "Found %s department(s) that will not be visible in FusionDirectory."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1325
-#: setup/class_setupStep_Migrate.inc:1330
+#: setup/class_setupStep_Migrate.inc:1324
+#: setup/class_setupStep_Migrate.inc:1329
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1380
+#: setup/class_setupStep_Migrate.inc:1379
#, php-format
msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1424
+#: setup/class_setupStep_Migrate.inc:1423
#, php-format
msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
@@ -743,10 +743,10 @@ msgstr ""
#: include/class_logging.inc:80 include/class_session.inc:50
#: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:649
-#: include/functions.inc:770 include/functions.inc:1189
-#: include/functions.inc:2243 include/functions.inc:2285
-#: include/functions.inc:2314 include/class_ldap.inc:873
+#: include/functions.inc:564 include/functions.inc:651
+#: include/functions.inc:772 include/functions.inc:1201
+#: include/functions.inc:2255 include/functions.inc:2297
+#: include/functions.inc:2326 include/class_ldap.inc:873
#: include/class_ldap.inc:911 include/class_acl.inc:118
msgid "Internal error"
msgstr "Virhe"
@@ -813,12 +813,12 @@ msgid ""
"plugin instance!"
msgstr ""
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1188
+#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
#: include/class_listing.inc:1190
msgid "Root"
msgstr ""
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
msgid "Submit"
msgstr ""
@@ -919,7 +919,7 @@ msgid "Create a new snapshot from this object"
msgstr ""
#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3302 include/simpleplugin/class_simplePlugin.inc:272
+#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
#: include/simpleplugin/class_simplePlugin.inc:277
#: include/simpleplugin/class_simplePlugin.inc:289
#: html/class_passwordRecovery.inc:116
@@ -952,7 +952,7 @@ msgstr ""
#: include/password-methods/class_password-methods-sha.inc:69
#: include/password-methods/class_password-methods-ssha.inc:73
#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:659 include/class_timezone.inc:51
+#: include/functions.inc:661 include/class_timezone.inc:51
#: include/class_config.inc:159 include/class_config.inc:284
#: include/class_config.inc:843 include/class_config.inc:856
#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
@@ -990,7 +990,7 @@ msgid "Cannot paste"
msgstr ""
#: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
#: plugins/personal/generic/paste_generic.tpl.c:11
msgid "Login"
@@ -1034,245 +1034,245 @@ msgid ""
"administrator."
msgstr ""
-#: include/functions.inc:597
+#: include/functions.inc:599
msgid "Authentication error"
msgstr ""
-#: include/functions.inc:598
+#: include/functions.inc:600
msgid ""
"It seems your user password has expired. Please use <a "
"href=\"recovery.php\">password recovery</a> to change it."
msgstr ""
-#: include/functions.inc:649 include/functions.inc:770
+#: include/functions.inc:651 include/functions.inc:772
msgid "Error while adding a lock. Contact the developers!"
msgstr ""
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid ""
"Cannot create locking information in LDAP tree. Please contact your "
"administrator!"
msgstr ""
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid "LDAP server returned: %s"
msgstr ""
-#: include/functions.inc:838
+#: include/functions.inc:850
msgid ""
"Found multiple locks for object to be locked. This should not happen - "
"cleaning up multiple references."
msgstr ""
-#: include/functions.inc:1109
+#: include/functions.inc:1121
#, php-format
msgid "The size limit of %d entries is exceed!"
msgstr ""
-#: include/functions.inc:1111
+#: include/functions.inc:1123
#, php-format
msgid ""
"Set the new size limit to %s and show me this message if the limit still "
"exceeds"
msgstr ""
-#: include/functions.inc:1128
+#: include/functions.inc:1140
msgid "Configure"
msgstr ""
-#: include/functions.inc:1133
+#: include/functions.inc:1145
msgid "incomplete"
msgstr ""
-#: include/functions.inc:1534
+#: include/functions.inc:1546
msgid "Continue anyway"
msgstr ""
-#: include/functions.inc:1536
+#: include/functions.inc:1548
msgid "Edit anyway"
msgstr ""
-#: include/functions.inc:1538
+#: include/functions.inc:1550
#, php-format
msgid "You're going to edit the LDAP entry/entries %s"
msgstr ""
-#: include/functions.inc:1766
+#: include/functions.inc:1778
msgid "Entries per page"
msgstr ""
-#: include/functions.inc:1797 include/class_filter.inc:353
+#: include/functions.inc:1809 include/class_filter.inc:353
msgid "Apply filter"
msgstr ""
-#: include/functions.inc:2065
+#: include/functions.inc:2077
#, php-format
msgid "%sB"
msgstr ""
-#: include/functions.inc:2066
+#: include/functions.inc:2078
#, php-format
msgid "%sKiB"
msgstr ""
-#: include/functions.inc:2067
+#: include/functions.inc:2079
#, php-format
msgid "%sMiB"
msgstr ""
-#: include/functions.inc:2068
+#: include/functions.inc:2080
#, php-format
msgid "%sGiB"
msgstr ""
-#: include/functions.inc:2069
+#: include/functions.inc:2081
#, php-format
msgid "%sTiB"
msgstr ""
-#: include/functions.inc:2070
+#: include/functions.inc:2082
#, php-format
msgid "%sPiB"
msgstr ""
-#: include/functions.inc:2071
+#: include/functions.inc:2083
#, php-format
msgid "%sEiB"
msgstr ""
-#: include/functions.inc:2072
+#: include/functions.inc:2084
#, php-format
msgid "%sZiB"
msgstr ""
-#: include/functions.inc:2073
+#: include/functions.inc:2085
#, php-format
msgid "%sYiB"
msgstr ""
-#: include/functions.inc:2105 include/class_filter.inc:315
+#: include/functions.inc:2117 include/class_filter.inc:315
msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
msgstr ""
-#: include/functions.inc:2243
+#: include/functions.inc:2255
#, php-format
msgid ""
"File '%s' could not be deleted. Try fusiondirectory-setup --check-"
"directories to fix permissions."
msgstr ""
-#: include/functions.inc:2285
+#: include/functions.inc:2297
msgid "Cannot write to revision file!"
msgstr ""
-#: include/functions.inc:2314
+#: include/functions.inc:2326
msgid "Cannot read to revision file!"
msgstr ""
-#: include/functions.inc:2523
+#: include/functions.inc:2535
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "LDAP warning"
msgstr ""
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "Cannot get schema information from server. No schema check possible!"
msgstr ""
-#: include/functions.inc:2564
+#: include/functions.inc:2577
msgid "Main FusionDirectory schema"
msgstr ""
-#: include/functions.inc:2571
+#: include/functions.inc:2584
msgid "Schema used to store FusionDirectory configuration"
msgstr ""
-#: include/functions.inc:2578
+#: include/functions.inc:2591
msgid "Used to store trust mode information in users or groups."
msgstr ""
-#: include/functions.inc:2585
+#: include/functions.inc:2598
msgid "Used to store templates."
msgstr ""
-#: include/functions.inc:2592
+#: include/functions.inc:2605
msgid "Used to store POSIX information."
msgstr ""
-#: include/functions.inc:2599
+#: include/functions.inc:2612
#, php-format
msgid "Missing required object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2601
+#: include/functions.inc:2614
#, php-format
msgid "Missing optional object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2605
+#: include/functions.inc:2618
#, php-format
msgid "Class(es) available"
msgstr ""
-#: include/functions.inc:2623
+#: include/functions.inc:2636
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2637
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2640
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2641
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3112 include/functions.inc:3133
-#: include/functions.inc:3173 include/functions.inc:3185
-#: include/functions.inc:3189 include/functions.inc:3196
-#: include/functions.inc:3205
+#: include/functions.inc:3125 include/functions.inc:3146
+#: include/functions.inc:3186 include/functions.inc:3198
+#: include/functions.inc:3202 include/functions.inc:3209
+#: include/functions.inc:3218
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3112
+#: include/functions.inc:3125
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3133
+#: include/functions.inc:3146
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3173
+#: include/functions.inc:3186
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3185 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3202
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3205
+#: include/functions.inc:3218
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3267
+#: include/functions.inc:3280
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3303
+#: include/functions.inc:3316
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
@@ -2102,7 +2102,7 @@ msgstr "Nimi"
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
#: plugins/admin/departments/class_department.inc:72
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/groups/class_roleGeneric.inc:91
@@ -2282,7 +2282,7 @@ msgid "The entry %s is not existing"
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:548
+#: include/class_plugin.inc:554
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!"
@@ -2398,14 +2398,19 @@ msgstr ""
msgid "There was a problem uncompressing snapshot data"
msgstr ""
-#: include/class_plugin.inc:803
+#: include/class_plugin.inc:809
#, php-format
msgid ""
"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
msgstr ""
-#: include/class_plugin.inc:1332
+#: include/class_plugin.inc:1350
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/class_plugin.inc:1352
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -2553,44 +2558,44 @@ msgstr ""
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr ""
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
msgid "Email address"
msgstr "Sähköpostiosoite"
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
#, php-format
msgid "Did not find an account with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
#, php-format
msgid "Found multiple accounts with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
#, php-format
msgid "There is no account using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There are several accounts using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
#, php-format
msgid "The user using email \"%s\" is locked. Please contact your administrator."
msgstr ""
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
msgid "Contact your administrator, there was a problem with mail server"
msgstr ""
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
msgid "This token is invalid"
msgstr ""
-#: html/class_passwordRecovery.inc:647
+#: html/class_passwordRecovery.inc:651
msgid "There was a problem with mail server, confirmation email not sent"
msgstr ""
@@ -2902,7 +2907,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
#: setup/setup_migrate_adminAccount.tpl.c:14
#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2939,258 +2944,262 @@ msgstr ""
msgid "User account"
msgstr ""
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:296
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:307
msgid "Personal information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "Sukunimi"
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
msgid "Last name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "Etunimi"
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
msgid "First name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
msgid "Short description of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "Picture"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "The avatar for this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:330
+#: plugins/personal/generic/class_user.inc:333
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:334
+#: plugins/personal/generic/class_user.inc:337
#: plugins/admin/departments/class_department.inc:90
#: plugins/admin/departments/class_department.inc:96
msgid "Location"
msgstr ""
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:341
#: plugins/admin/departments/class_department.inc:93
msgid "State"
msgstr "Valtio"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
#: plugins/admin/departments/class_department.inc:102
msgid "Address"
msgstr "Osoite"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
msgid "Business postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
#: plugins/admin/departments/class_department.inc:106
msgid "Phone"
msgstr "Puhelin"
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
msgid "Business phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Mobile"
msgstr "Mobiili"
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Business mobile number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Pager"
msgstr ""
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
#: plugins/admin/departments/class_department.inc:110
msgid "Fax"
msgstr "Faksi"
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:373
+#: plugins/personal/generic/class_user.inc:376
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:393
+#: plugins/personal/generic/class_user.inc:396
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Display name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Private phone"
msgstr ""
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Home phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:411
+#: plugins/personal/generic/class_user.inc:414
msgid "Organizational information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
msgid "Title"
msgstr ""
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
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:421
+#: plugins/personal/generic/class_user.inc:424
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
msgid "Organization"
msgstr ""
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
#: plugins/admin/departments/class_department.inc:33
#: plugins/admin/departments/class_department.inc:39
#: plugins/admin/departments/dep-list.xml:21
msgid "Department"
msgstr ""
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
msgid "Department to which the user belongs"
msgstr ""
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:437
+#: plugins/personal/generic/class_user.inc:440
msgid "Employee type"
msgstr ""
-#: plugins/personal/generic/class_user.inc:441
+#: plugins/personal/generic/class_user.inc:444
#: plugins/admin/departments/class_department.inc:84
msgid "Manager"
msgstr ""
-#: plugins/personal/generic/class_user.inc:608
+#: plugins/personal/generic/class_user.inc:611
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:614
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:622
+#: plugins/personal/generic/class_user.inc:625
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:636
+#: plugins/personal/generic/class_user.inc:639
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:641
-#: plugins/personal/generic/class_user.inc:645
+#: plugins/personal/generic/class_user.inc:644
+#: plugins/personal/generic/class_user.inc:648
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:652
+#: plugins/personal/generic/class_user.inc:655
msgid "You need to specify your current password in order to proceed."
msgstr ""
-#: plugins/personal/generic/class_user.inc:654
+#: plugins/personal/generic/class_user.inc:657
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:656
+#: plugins/personal/generic/class_user.inc:659
#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
msgid "New password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:658
+#: plugins/personal/generic/class_user.inc:661
msgid "The password used as new and current are too similar."
msgstr ""
-#: plugins/personal/generic/class_user.inc:660
+#: plugins/personal/generic/class_user.inc:663
msgid "The password used as new is to short."
msgstr ""
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:665
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
@@ -3298,36 +3307,46 @@ msgid ""
"recover their password"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:189
+msgid "Login attribute"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
msgid "First email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
msgid "Subject"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
msgid "Subject of the first email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
msgid "[FusionDirectory] Password recovery link"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
#, php-format
msgid ""
"Body of the first email, sent when the user ask for a new password. Use %s "
"for the login and the recovery link."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
#, php-format
msgid ""
"Hello,\n"
@@ -3339,31 +3358,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
msgid "Second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
msgid "Subject of the second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
msgid "[FusionDirectory] Password recovery successful"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
#, php-format
msgid "Body (%s is login)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
#, 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
+#: plugins/config/class_recoveryConfig.inc:118
#, php-format
msgid ""
"Hello,\n"
@@ -3530,10 +3549,6 @@ msgstr ""
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 ""
@@ -4396,7 +4411,7 @@ msgstr ""
msgid "Only allow this group to connect to this list of hosts"
msgstr ""
-#: plugins/admin/groups/class_ogroup.inc:321
+#: plugins/admin/groups/class_ogroup.inc:322
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
diff --git a/locale/fr/fusiondirectory.po b/locale/fr/fusiondirectory.po
index 6b994bdc332f06172c1108d43eaf44eaf901530f..6595db70c305311d7ca59f05dbffd1501bdeada6 100644
--- a/locale/fr/fusiondirectory.po
+++ b/locale/fr/fusiondirectory.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-11 19:09+0100\n"
-"PO-Revision-Date: 2017-01-11 18:07+0000\n"
+"POT-Creation-Date: 2017-03-29 21:46+0200\n"
+"PO-Revision-Date: 2017-03-26 20:13+0000\n"
"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
"Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:382
+#: plugins/personal/generic/class_user.inc:385
msgid "Preferred language"
msgstr "Langue préférée"
@@ -320,30 +320,30 @@ msgstr "Recherche de GID en double"
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
+#: setup/class_setupStep_Migrate.inc:981
+#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1180
+#: setup/class_setupStep_Migrate.inc:1273
+#: setup/class_setupStep_Migrate.inc:1352
+#: setup/class_setupStep_Migrate.inc:1396
+msgid "LDAP query failed"
+msgstr "La requête LDAP a échoué"
+
+#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
+#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
#: setup/class_setupStep_Migrate.inc:982
#: setup/class_setupStep_Migrate.inc:1058
#: setup/class_setupStep_Migrate.inc:1181
#: setup/class_setupStep_Migrate.inc:1274
#: setup/class_setupStep_Migrate.inc:1353
#: setup/class_setupStep_Migrate.inc:1397
-msgid "LDAP query failed"
-msgstr "La requête LDAP a échoué"
-
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:983
-#: setup/class_setupStep_Migrate.inc:1059
-#: setup/class_setupStep_Migrate.inc:1182
-#: setup/class_setupStep_Migrate.inc:1275
-#: setup/class_setupStep_Migrate.inc:1354
-#: setup/class_setupStep_Migrate.inc:1398
msgid "Possibly the \"root object\" is missing."
msgstr "L'objet racine est probablement manquant."
#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:866
-#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
+#: setup/class_setupStep_Migrate.inc:880
msgid "Failed"
msgstr "Échec"
@@ -364,11 +364,11 @@ msgid ""
msgstr "Impossible de gérer le type structural de votre objet racine. S'il vous plaît essayez d’ajouter la classe d'objet '%s' à la main."
#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:677
-#: include/functions.inc:724 include/functions.inc:822
-#: include/functions.inc:2988 include/functions.inc:3165
+#: include/functions.inc:522 include/functions.inc:679
+#: include/functions.inc:726 include/functions.inc:834
+#: include/functions.inc:3001 include/functions.inc:3178
#: include/class_config.inc:322 include/class_ldap.inc:924
#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
#: include/simpleplugin/attributes/class_SetAttribute.inc:726
@@ -390,13 +390,13 @@ msgid "The specified user \"%s\" does not have full access to your ldap database
msgstr "L'utilisateur \"%s\" n'a pas un accès complet à votre annuaire LDAP."
#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1085
-#: setup/class_setupStep_Migrate.inc:1204
-#: setup/class_setupStep_Migrate.inc:1315
-#: setup/class_setupStep_Migrate.inc:1379
-#: setup/class_setupStep_Migrate.inc:1423 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:838
-#: include/functions.inc:2523 include/simpleplugin/class_simpleTabs.inc:322
+#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1203
+#: setup/class_setupStep_Migrate.inc:1314
+#: setup/class_setupStep_Migrate.inc:1378
+#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
+#: include/class_xml.inc:55 include/functions.inc:850
+#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
#: html/index.php:597 html/main.php:158
#: plugins/personal/posix/class_posixAccount.inc:482
#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
@@ -417,7 +417,7 @@ msgid "User migration"
msgstr "Migration des utilisateurs"
#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1029
+#: setup/class_setupStep_Migrate.inc:1028
msgid "Migration error"
msgstr "Erreur de migration"
@@ -426,64 +426,64 @@ msgstr "Erreur de migration"
msgid "Cannot migrate entry \"%s\":"
msgstr "Impossible de migrer l'entrée '%s' :"
-#: setup/class_setupStep_Migrate.inc:859
+#: setup/class_setupStep_Migrate.inc:858
#, php-format
msgid "FD 1.0.7 administrative accounts found: %s"
msgstr "Comptes administratifs de FusionDirectory 1.0.7 trouvés : %s"
-#: setup/class_setupStep_Migrate.inc:862
+#: setup/class_setupStep_Migrate.inc:861
#, php-format
msgid "FD 1.0.7 administrative groups found: %s"
msgstr "Comptes administratifs de FusionDirectory 1.0.7 trouvés : %s"
-#: setup/class_setupStep_Migrate.inc:864
+#: setup/class_setupStep_Migrate.inc:863
msgid ""
"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
"file at the end of the setup to migrate it.<br/>"
msgstr "Vous pouvez exécuter <i>fusiondirectory-setup --migrate-acls</i> après avoir sauvegardé le fichier de configuration à la fin de l'installation pour migrer les acls. <br/>"
-#: setup/class_setupStep_Migrate.inc:867
+#: setup/class_setupStep_Migrate.inc:866
msgid ""
"There is no valid FusionDirectory 1.0.8 administrator account inside your "
"LDAP."
msgstr "Il n’y a pas d'administrateur FusionDirectory 1.0.8 valide dans votre annuaire LDAP."
-#: setup/class_setupStep_Migrate.inc:868 setup/class_setupStep_Migrate.inc:883
+#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
#: include/simpleplugin/simple-list.xml:59
#: plugins/admin/departments/dep-list.xml:48
#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
msgid "Create"
msgstr "Créer"
-#: setup/class_setupStep_Migrate.inc:873
+#: setup/class_setupStep_Migrate.inc:872
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: plugins/admin/users/class_userManagement.inc:42
msgid "Users"
msgstr "Utilisateurs"
-#: setup/class_setupStep_Migrate.inc:876
+#: setup/class_setupStep_Migrate.inc:875
msgid "Groups"
msgstr "Groupes"
-#: setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStep_Migrate.inc:881
msgid "There is no FusionDirectory administrator account inside your LDAP."
msgstr "Il n'y a pas d'administrateur FusionDirectory dans votre annuaire LDAP."
-#: setup/class_setupStep_Migrate.inc:920
+#: setup/class_setupStep_Migrate.inc:919
msgid "Gives all rights on all objects"
msgstr "Donner tous les droits sur tous les objets"
-#: setup/class_setupStep_Migrate.inc:937 include/class_management.inc:697
+#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
#: include/class_listing.inc:551 include/class_xml.inc:58
#: include/password-methods/class_password-methods-sasl.inc:60
#: include/password-methods/class_password-methods-sasl.inc:86
#: include/password-methods/class_password-methods.inc:393
#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3112
-#: include/functions.inc:3133 include/functions.inc:3173
-#: include/functions.inc:3185 include/functions.inc:3189
-#: include/functions.inc:3196 include/functions.inc:3205
-#: include/functions.inc:3267 include/class_msg_dialog.inc:128
+#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
+#: include/functions.inc:3146 include/functions.inc:3186
+#: include/functions.inc:3198 include/functions.inc:3202
+#: include/functions.inc:3209 include/functions.inc:3218
+#: include/functions.inc:3280 include/class_msg_dialog.inc:128
#: include/class_msg_dialog.inc:164 include/class_config.inc:357
#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
@@ -496,82 +496,82 @@ msgstr "Donner tous les droits sur tous les objets"
#: include/simpleplugin/attributes/class_FileAttribute.inc:34
#: include/simpleplugin/attributes/class_FileAttribute.inc:37
#: include/simpleplugin/attributes/class_FileAttribute.inc:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:801
-#: include/class_plugin.inc:1534 html/index.php:453 html/index.php:474
+#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
+#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
#: html/index.php:484 html/index.php:546 html/index.php:556
#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
msgid "Error"
msgstr "Erreur"
-#: setup/class_setupStep_Migrate.inc:997
+#: setup/class_setupStep_Migrate.inc:996
msgid "Default ACL roles have not been inserted"
msgstr "Les rôles ACL par défaut n'ont pas été insérés"
-#: setup/class_setupStep_Migrate.inc:999
+#: setup/class_setupStep_Migrate.inc:998
msgid "Some default ACL roles are missing"
msgstr "Certains rôles ACL par défaut sont absents"
-#: setup/class_setupStep_Migrate.inc:1001
+#: setup/class_setupStep_Migrate.inc:1000
msgid "Default ACL roles have been inserted"
msgstr "Les rôles ACL par défaut on été insérés"
-#: setup/class_setupStep_Migrate.inc:1031
+#: setup/class_setupStep_Migrate.inc:1030
#, php-format
msgid "Cannot add ACL role \"%s\":"
msgstr "Impossible d’ajouter un rôle ACL pour '%s' :"
-#: setup/class_setupStep_Migrate.inc:1086
+#: setup/class_setupStep_Migrate.inc:1085
#, php-format
msgid "Found %s user(s) outside the configured tree \"%s\"."
msgstr "%s utilsateur(s) trouvé(s) en dehors de la branche configurée \"%s\"."
-#: setup/class_setupStep_Migrate.inc:1100
-#: setup/class_setupStep_Migrate.inc:1114
+#: setup/class_setupStep_Migrate.inc:1099
+#: setup/class_setupStep_Migrate.inc:1113
msgid "Move users into configured user tree"
msgstr "Déplacer les utilisateurs dans la branche utilisateur configurée"
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
msgid "Cannot move entries to the requested department!"
msgstr "Impossible de déplacer les utilisateurs vers le département spécifié !"
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "Entry will be moved from"
msgstr "Les entrées seront déplacées depuis"
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "to"
msgstr "vers"
-#: setup/class_setupStep_Migrate.inc:1154
+#: setup/class_setupStep_Migrate.inc:1153
msgid "The following references will be updated"
msgstr "Les références suivantes seront mises à jour"
-#: setup/class_setupStep_Migrate.inc:1205
+#: setup/class_setupStep_Migrate.inc:1204
#, php-format
msgid "Found %s groups outside the configured tree '%s'."
msgstr "%s groupes trouvés en dehors de la branche configurée '%s'."
-#: setup/class_setupStep_Migrate.inc:1219
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1218
+#: setup/class_setupStep_Migrate.inc:1232
msgid "Move groups into configured groups tree"
msgstr "Déplacer les groupes dans la branche configurée"
-#: setup/class_setupStep_Migrate.inc:1316
+#: setup/class_setupStep_Migrate.inc:1315
#, php-format
msgid "Found %s department(s) that will not be visible in FusionDirectory."
msgstr "%s département(s) trouvé(s) qui ne seront pas visible dans FusionDirectory."
-#: setup/class_setupStep_Migrate.inc:1325
-#: setup/class_setupStep_Migrate.inc:1330
+#: setup/class_setupStep_Migrate.inc:1324
+#: setup/class_setupStep_Migrate.inc:1329
msgid "Department migration"
msgstr "Migration des départements"
-#: setup/class_setupStep_Migrate.inc:1380
+#: setup/class_setupStep_Migrate.inc:1379
#, php-format
msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr "%s valeurs dupliquées trouvées pour l'attribut \"uidNumber\" : %s"
-#: setup/class_setupStep_Migrate.inc:1424
+#: setup/class_setupStep_Migrate.inc:1423
#, php-format
msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr "%s valeurs dupliquées trouvées pour l'attribut \"gidNumber\" : %s"
@@ -747,10 +747,10 @@ msgstr "Suivant"
#: include/class_logging.inc:80 include/class_session.inc:50
#: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:649
-#: include/functions.inc:770 include/functions.inc:1189
-#: include/functions.inc:2243 include/functions.inc:2285
-#: include/functions.inc:2314 include/class_ldap.inc:873
+#: include/functions.inc:564 include/functions.inc:651
+#: include/functions.inc:772 include/functions.inc:1201
+#: include/functions.inc:2255 include/functions.inc:2297
+#: include/functions.inc:2326 include/class_ldap.inc:873
#: include/class_ldap.inc:911 include/class_acl.inc:118
msgid "Internal error"
msgstr "Erreur interne"
@@ -817,12 +817,12 @@ msgid ""
"plugin instance!"
msgstr "Pas de déclaration d’onglets pour '%s' dans votre fichier de configuration. Impossible d'initialiser le plugin !"
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1188
+#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
#: include/class_listing.inc:1190
msgid "Root"
msgstr "Racine"
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
msgid "Submit"
msgstr "Soumettre"
@@ -923,7 +923,7 @@ msgid "Create a new snapshot from this object"
msgstr "Créer un nouvel instantané depuis cet objet"
#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3302 include/simpleplugin/class_simplePlugin.inc:272
+#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
#: include/simpleplugin/class_simplePlugin.inc:277
#: include/simpleplugin/class_simplePlugin.inc:289
#: html/class_passwordRecovery.inc:116
@@ -956,7 +956,7 @@ msgstr "Vous devez remplir saslRealm ou saslExop dans l’écran de configuratio
#: include/password-methods/class_password-methods-sha.inc:69
#: include/password-methods/class_password-methods-ssha.inc:73
#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:659 include/class_timezone.inc:51
+#: include/functions.inc:661 include/class_timezone.inc:51
#: include/class_config.inc:159 include/class_config.inc:284
#: include/class_config.inc:843 include/class_config.inc:856
#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
@@ -994,7 +994,7 @@ msgid "Cannot paste"
msgstr "Impossible de coller"
#: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
#: plugins/personal/generic/paste_generic.tpl.c:11
msgid "Login"
@@ -1038,245 +1038,245 @@ msgid ""
"administrator."
msgstr "Ce login (uid) n'est pas unique au sein de l’annuaire LDAP. Veuillez contacter votre administrateur système."
-#: include/functions.inc:597
+#: include/functions.inc:599
msgid "Authentication error"
msgstr "Erreur d'authentification"
-#: include/functions.inc:598
+#: include/functions.inc:600
msgid ""
"It seems your user password has expired. Please use <a "
"href=\"recovery.php\">password recovery</a> to change it."
msgstr "Il semble que votre mot de passe soit expiré. Veuillez utilisez <a href=\"recovery.php\">la récupération de mot de passe</a> pour le changer."
-#: include/functions.inc:649 include/functions.inc:770
+#: include/functions.inc:651 include/functions.inc:772
msgid "Error while adding a lock. Contact the developers!"
msgstr "Erreur lors de l'ajout d'un verrou. Contactez les développeurs !"
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid ""
"Cannot create locking information in LDAP tree. Please contact your "
"administrator!"
msgstr "Impossible d'obtenir les informations de verrouillage dans l'annuaire LDAP. Veuillez contacter votre administrateur !"
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid "LDAP server returned: %s"
msgstr "Le serveur LDAP a retourné : %s"
-#: include/functions.inc:838
+#: include/functions.inc:850
msgid ""
"Found multiple locks for object to be locked. This should not happen - "
"cleaning up multiple references."
msgstr "Verrou multiple pour un même objet détecté. Ceci ne devrait pas arriver. Effacement des références multiples."
-#: include/functions.inc:1109
+#: include/functions.inc:1121
#, php-format
msgid "The size limit of %d entries is exceed!"
msgstr "La taille limite de %d entrées est dépassée !"
-#: include/functions.inc:1111
+#: include/functions.inc:1123
#, php-format
msgid ""
"Set the new size limit to %s and show me this message if the limit still "
"exceeds"
msgstr "Mettre la nouvelle limite à %s et m’afficher ce message si la limite est toujours dépassée"
-#: include/functions.inc:1128
+#: include/functions.inc:1140
msgid "Configure"
msgstr "Configurer"
-#: include/functions.inc:1133
+#: include/functions.inc:1145
msgid "incomplete"
msgstr "incomplet"
-#: include/functions.inc:1534
+#: include/functions.inc:1546
msgid "Continue anyway"
msgstr "Continuer malgré tout"
-#: include/functions.inc:1536
+#: include/functions.inc:1548
msgid "Edit anyway"
msgstr "Éditer malgré tout"
-#: include/functions.inc:1538
+#: include/functions.inc:1550
#, php-format
msgid "You're going to edit the LDAP entry/entries %s"
msgstr "Vous êtes sur le point d'éditer l'entrée(s) %s"
-#: include/functions.inc:1766
+#: include/functions.inc:1778
msgid "Entries per page"
msgstr "Entrées par page"
-#: include/functions.inc:1797 include/class_filter.inc:353
+#: include/functions.inc:1809 include/class_filter.inc:353
msgid "Apply filter"
msgstr "Appliquer le filtre"
-#: include/functions.inc:2065
+#: include/functions.inc:2077
#, php-format
msgid "%sB"
msgstr "%sO"
-#: include/functions.inc:2066
+#: include/functions.inc:2078
#, php-format
msgid "%sKiB"
msgstr "%sKiO"
-#: include/functions.inc:2067
+#: include/functions.inc:2079
#, php-format
msgid "%sMiB"
msgstr "%sMiO"
-#: include/functions.inc:2068
+#: include/functions.inc:2080
#, php-format
msgid "%sGiB"
msgstr "%sGiO"
-#: include/functions.inc:2069
+#: include/functions.inc:2081
#, php-format
msgid "%sTiB"
msgstr "%sTiO"
-#: include/functions.inc:2070
+#: include/functions.inc:2082
#, php-format
msgid "%sPiB"
msgstr "%sPiO"
-#: include/functions.inc:2071
+#: include/functions.inc:2083
#, php-format
msgid "%sEiB"
msgstr "%sEiO"
-#: include/functions.inc:2072
+#: include/functions.inc:2084
#, php-format
msgid "%sZiB"
msgstr "%sZiO"
-#: include/functions.inc:2073
+#: include/functions.inc:2085
#, php-format
msgid "%sYiB"
msgstr "%sYiO"
-#: include/functions.inc:2105 include/class_filter.inc:315
+#: include/functions.inc:2117 include/class_filter.inc:315
msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
-#: include/functions.inc:2243
+#: include/functions.inc:2255
#, php-format
msgid ""
"File '%s' could not be deleted. Try fusiondirectory-setup --check-"
"directories to fix permissions."
msgstr "Le fichier '%s' ne peut être supprimé. Essayer de lancer la commande «fusiondirectory-setup --check-directories» sur le serveur FusionDirectory pour corriger les permissions de fichiers."
-#: include/functions.inc:2285
+#: include/functions.inc:2297
msgid "Cannot write to revision file!"
msgstr "Impossible d'écrire dans le fichier de révision !"
-#: include/functions.inc:2314
+#: include/functions.inc:2326
msgid "Cannot read to revision file!"
msgstr "Impossible de lire le fichier de révision !"
-#: include/functions.inc:2523
+#: include/functions.inc:2535
msgid "'nextIdHook' is not available. Using default base!"
msgstr "'nextIdHook' n'est pas disponible. Utilisation de la base par défaut !"
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "LDAP warning"
msgstr "Avertissement LDAP"
-#: include/functions.inc:2541
+#: include/functions.inc:2554
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:2564
+#: include/functions.inc:2577
msgid "Main FusionDirectory schema"
msgstr "schéma principal de FusionDirectory"
-#: include/functions.inc:2571
+#: include/functions.inc:2584
msgid "Schema used to store FusionDirectory configuration"
msgstr "Schéma utilisé pour stocker la configuration de FusionDirectory"
-#: include/functions.inc:2578
+#: include/functions.inc:2591
msgid "Used to store trust mode information in users or groups."
msgstr "Utilisé pour stocker l'autorisation de connexion chez les utilisateurs ou les groupes."
-#: include/functions.inc:2585
+#: include/functions.inc:2598
msgid "Used to store templates."
msgstr "Utilisé pour stocker les modèles"
-#: include/functions.inc:2592
+#: include/functions.inc:2605
msgid "Used to store POSIX information."
msgstr "Utilisé pour stocker des informations POSIX."
-#: include/functions.inc:2599
+#: include/functions.inc:2612
#, php-format
msgid "Missing required object class \"%s\"!"
msgstr "Object class obligatoire \"%s\" manquante !"
-#: include/functions.inc:2601
+#: include/functions.inc:2614
#, php-format
msgid "Missing optional object class \"%s\"!"
msgstr "Object class facultative \"%s\" manquante !"
-#: include/functions.inc:2605
+#: include/functions.inc:2618
#, php-format
msgid "Class(es) available"
msgstr "Classe(s) disponible(s)"
-#: include/functions.inc:2623
+#: include/functions.inc:2636
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:2637
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:2640
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:2641
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr "L’objectClass «posixGroup» doit être structurelle («STRUCTURAL»)"
-#: include/functions.inc:3112 include/functions.inc:3133
-#: include/functions.inc:3173 include/functions.inc:3185
-#: include/functions.inc:3189 include/functions.inc:3196
-#: include/functions.inc:3205
+#: include/functions.inc:3125 include/functions.inc:3146
+#: include/functions.inc:3186 include/functions.inc:3198
+#: include/functions.inc:3202 include/functions.inc:3209
+#: include/functions.inc:3218
msgid "Cannot allocate a free ID:"
msgstr "Impossible d'allouer un ID libre :"
-#: include/functions.inc:3112
+#: include/functions.inc:3125
msgid "unknown idAllocation method!"
msgstr "Méthode d'allocation des id inconnue !"
-#: include/functions.inc:3133
+#: include/functions.inc:3146
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr "%sPoolMin >= %sPoolMax !"
-#: include/functions.inc:3173
+#: include/functions.inc:3186
msgid "sambaUnixIdPool is not unique!"
msgstr "sambaUnixIdPool n'est pas unique !"
-#: include/functions.inc:3185 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3202
msgid "no ID available!"
msgstr "Pas d’ID disponibles !"
-#: include/functions.inc:3205
+#: include/functions.inc:3218
msgid "maximum tries exceeded!"
msgstr "Nombre maximum d'essais dépassé !"
-#: include/functions.inc:3267
+#: include/functions.inc:3280
msgid "Cannot allocate a free ID!"
msgstr "Impossible d'assigner un ID !"
-#: include/functions.inc:3303
+#: include/functions.inc:3316
#, 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"
@@ -2106,7 +2106,7 @@ msgstr "Nom"
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
#: plugins/admin/departments/class_department.inc:72
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/groups/class_roleGeneric.inc:91
@@ -2286,7 +2286,7 @@ msgid "The entry %s is not existing"
msgstr "L'entrée %s n'existe pas"
#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:548
+#: include/class_plugin.inc:554
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!"
@@ -2402,14 +2402,19 @@ msgstr "Un nombre à virgule inférieur à %f"
msgid "There was a problem uncompressing snapshot data"
msgstr "Il y a eu un problème lors de la décompression de l’instantané"
-#: include/class_plugin.inc:803
+#: include/class_plugin.inc:809
#, php-format
msgid ""
"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
msgstr "Dépendance récursive dans les champs de modèle: \"%1$s\" ne peut pas dépendre de \"%2$s\" vu que \"%2$s\" dépend déjà \"%1$s\""
-#: include/class_plugin.inc:1332
+#: include/class_plugin.inc:1350
+#, php-format
+msgid "Service \"%s\""
+msgstr "Service \"%s\""
+
+#: include/class_plugin.inc:1352
#, php-format
msgid "Tab \"%s\""
msgstr "Onglet \"%s\""
@@ -2557,44 +2562,44 @@ msgstr "Votre navigateur a les cookies désactivés. Veuillez activer les cookie
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr "Le fichier de configuration de FusionDirectory %s/%s ne peut être lu. Abandon."
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
msgid "Email address"
msgstr "Adresse de courriel"
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
#, php-format
msgid "Did not find an account with login \"%s\""
msgstr "Aucun compte utilisateur trouvé avec l'identifiant \"%s\""
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
#, php-format
msgid "Found multiple accounts with login \"%s\""
msgstr "Plusieurs comptes trouvés avec l’identifiant \"%s\""
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
#, php-format
msgid "There is no account using email \"%s\""
msgstr "Il n'y a pas de compte qui utilise le courriel \"%s\""
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There are several accounts using email \"%s\""
msgstr "Il y a plusieurs comptes qui utilisent le courriel \"%s\""
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
#, php-format
msgid "The user using email \"%s\" is locked. Please contact your administrator."
msgstr "L'utilisateur correspondant au courriel \"%s\" est verrouillé. Veuillez contacter votre administrateur système !"
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
msgid "Contact your administrator, there was a problem with mail server"
msgstr "Contactez votre administrateur système, il y a eu un problème avec le serveur de courriel"
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
msgid "This token is invalid"
msgstr "Le jeton n'est pas valide"
-#: html/class_passwordRecovery.inc:647
+#: html/class_passwordRecovery.inc:651
msgid "There was a problem with mail server, confirmation email not sent"
msgstr "Un problème est survenu avec le serveur, le courriel de confirmation n'a pas été envoyé"
@@ -2906,7 +2911,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:387
+#: plugins/personal/generic/class_user.inc:390
#: setup/setup_migrate_adminAccount.tpl.c:14
#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2943,258 +2948,262 @@ msgstr "Information du compte utilisateur"
msgid "User account"
msgstr "Compte utilisateur"
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:296
+msgid "User lock status"
+msgstr "Statut de verrouillage de l'utilisateur"
+
+#: plugins/personal/generic/class_user.inc:307
msgid "Personal information"
msgstr "Informations personnelles"
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "Nom de famille"
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
msgid "Last name of this user"
msgstr "Nom de famille de cet utilisateur"
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "Prénom"
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
msgid "First name of this user"
msgstr "Prénom de cet utilisateur"
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
msgid "Short description of the user"
msgstr "Courte description de l'utilisateur"
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "Picture"
msgstr "Photo"
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "The avatar for this user"
msgstr "L'avatar pour cet utilisateur"
-#: plugins/personal/generic/class_user.inc:330
+#: plugins/personal/generic/class_user.inc:333
msgid "Organizational contact information"
msgstr "Information de contact organisationnelles"
-#: plugins/personal/generic/class_user.inc:334
+#: plugins/personal/generic/class_user.inc:337
#: plugins/admin/departments/class_department.inc:90
#: plugins/admin/departments/class_department.inc:96
msgid "Location"
msgstr "Lieu"
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:341
#: plugins/admin/departments/class_department.inc:93
msgid "State"
msgstr "État"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
#: plugins/admin/departments/class_department.inc:102
msgid "Address"
msgstr "Adresse"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
msgid "Business postal address"
msgstr "Adresse postale professionnelle"
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room No."
msgstr "No. de bureau"
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room number"
msgstr "Numéro du bureau"
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
#: plugins/admin/departments/class_department.inc:106
msgid "Phone"
msgstr "Téléphone"
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
msgid "Business phone number"
msgstr "Numéro de téléphone professionnel"
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Mobile"
msgstr "Mobile"
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Business mobile number"
msgstr "Numéro de mobile professionnel "
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Pager"
msgstr "Bip"
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Business pager number"
msgstr "Numéro de bip professionnel"
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
#: plugins/admin/departments/class_department.inc:110
msgid "Fax"
msgstr "Fax"
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
msgid "Business fax number"
msgstr "Numéro de fax professionnel"
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Homepage"
msgstr "Site web"
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Personal homepage"
msgstr "Site web personnel"
-#: plugins/personal/generic/class_user.inc:373
+#: plugins/personal/generic/class_user.inc:376
msgid "Account information"
msgstr "Compte utilisateur"
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
msgid "Login of this user"
msgstr "Identifiant de l'utilisateur"
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
msgid "Password of the user"
msgstr "Mot de passe de l'utilisateur"
-#: plugins/personal/generic/class_user.inc:393
+#: plugins/personal/generic/class_user.inc:396
msgid "Personal contact information"
msgstr "Informations de contact personnelles"
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Display name"
msgstr "Nom à afficher"
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
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:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home address"
msgstr "Adresse postale"
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home postal address"
msgstr "Adresse postale personnelle"
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Private phone"
msgstr "Numéro de téléphone privé"
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Home phone number"
msgstr "Numéro de téléphone privé"
-#: plugins/personal/generic/class_user.inc:411
+#: plugins/personal/generic/class_user.inc:414
msgid "Organizational information"
msgstr "Informations organisationnelles"
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
msgid "Title"
msgstr "Titre"
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
msgid ""
"Title of a person in their organizational context. Each title is one value "
"of this multi-valued attribute"
msgstr "Titre d'une personne dans leur contexte organisationnel. Chaque titre est une valeur de cet attribut multivalué"
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:424
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
msgid "Organization"
msgstr "Organisme"
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
#: plugins/admin/departments/class_department.inc:33
#: plugins/admin/departments/class_department.inc:39
#: plugins/admin/departments/dep-list.xml:21
msgid "Department"
msgstr "Département"
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
msgid "Department to which the user belongs"
msgstr "Département auquel l'utilisateur appartient"
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department No."
msgstr "Numéro du département"
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department number"
msgstr "Numéro du département"
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee No."
msgstr "No. de l'employé"
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee number"
msgstr "Numéro de l'employé"
-#: plugins/personal/generic/class_user.inc:437
+#: plugins/personal/generic/class_user.inc:440
msgid "Employee type"
msgstr "Type d'employé"
-#: plugins/personal/generic/class_user.inc:441
+#: plugins/personal/generic/class_user.inc:444
#: plugins/admin/departments/class_department.inc:84
msgid "Manager"
msgstr "Responsable"
-#: plugins/personal/generic/class_user.inc:608
+#: plugins/personal/generic/class_user.inc:611
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr "La ppolicy \"%s\" n’a pas été trouvée dans le LDAP !"
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:614
msgid "You are not allowed to change your own password"
msgstr "Vous n’êtes pas autorisé à changer votre mot de passe"
-#: plugins/personal/generic/class_user.inc:622
+#: plugins/personal/generic/class_user.inc:625
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr "Vous devez attendre %d secondes avant de changer votre mot de passe à nouveau"
-#: plugins/personal/generic/class_user.inc:636
+#: plugins/personal/generic/class_user.inc:639
msgid "Password is in history of old passwords"
msgstr "Le mot de passe est dans l'historique des mots de passe récents"
-#: plugins/personal/generic/class_user.inc:641
-#: plugins/personal/generic/class_user.inc:645
+#: plugins/personal/generic/class_user.inc:644
+#: plugins/personal/generic/class_user.inc:648
msgid "Password is not being changed from existing value"
msgstr "Le nouveau mot de passe est le même que l’ancien"
-#: plugins/personal/generic/class_user.inc:652
+#: plugins/personal/generic/class_user.inc:655
msgid "You need to specify your current password in order to proceed."
msgstr "Vous devez spécifier votre mode de passe actuel pour continuer."
-#: plugins/personal/generic/class_user.inc:654
+#: plugins/personal/generic/class_user.inc:657
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr "Les mots de passe entrés dans les champs 'Nouveau mot de passe' et celui dans le champ 'Répéter le nouveau mot de passe' ne concordent pas."
-#: plugins/personal/generic/class_user.inc:656
+#: plugins/personal/generic/class_user.inc:659
#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
msgid "New password"
msgstr "Nouveau mot de passe"
-#: plugins/personal/generic/class_user.inc:658
+#: plugins/personal/generic/class_user.inc:661
msgid "The password used as new and current are too similar."
msgstr "Le nouveau et l'ancien mot de passe sont trop similaires."
-#: plugins/personal/generic/class_user.inc:660
+#: plugins/personal/generic/class_user.inc:663
msgid "The password used as new is to short."
msgstr "Le nouveau mot de passe est trop court."
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:665
msgid "The password contains possibly problematic Unicode characters!"
msgstr "Le mot de passe contient probablement des caractères Unicode qui sont problématique"
@@ -3302,36 +3311,46 @@ msgid ""
"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:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:189
+msgid "Login attribute"
+msgstr "Attribut de connexion"
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr "Habituellement uid, mais vous pouvez utiliser quelque chose d'autre par exemple dans le cas d'utilisation d'un SSO"
+
+#: plugins/config/class_recoveryConfig.inc:85
msgid "First email"
msgstr "Premier message"
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
msgid "Subject"
msgstr "Sujet"
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
msgid "Subject of the first email"
msgstr "Sujet du premier message"
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
msgid "[FusionDirectory] Password recovery link"
msgstr "[FusionDirectory] Lien de réinitialisation du mot de passe"
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr "Corps du message (le premier %s est l'identifiant, le second est le lien)"
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
#, php-format
msgid ""
"Body of the first email, sent when the user ask for a new password. Use %s "
"for the login and the recovery link."
msgstr "Corps du premier message, envoyé lorsque l'utilisateur demande un nouveau mot de passe. Utilisez %s pour l'identifiant et le lien de récupération."
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
#, php-format
msgid ""
"Hello,\n"
@@ -3343,31 +3362,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:99
+#: plugins/config/class_recoveryConfig.inc:104
msgid "Second email"
msgstr "Second message"
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
msgid "Subject of the second email"
msgstr "Sujet du second message"
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
msgid "[FusionDirectory] Password recovery successful"
msgstr "[FusionDirectory] Réinitialisation du mot de passe réussie !"
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
#, php-format
msgid "Body (%s is login)"
msgstr "Corps du message (%s est l'identifiant)"
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
#, 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:113
+#: plugins/config/class_recoveryConfig.inc:118
#, php-format
msgid ""
"Hello,\n"
@@ -3534,10 +3553,6 @@ msgstr "Définit le nombre maximal d'objets LDAP retournés par défaut."
msgid "Login and session"
msgstr "Connexion et session"
-#: plugins/config/class_configInLdap.inc:189
-msgid "Login attribute"
-msgstr "Attribut de connexion"
-
#: 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"
@@ -4400,7 +4415,7 @@ msgstr "Objets membres de ce groupe"
msgid "Only allow this group to connect to this list of hosts"
msgstr "Autoriser ce groupe à se connecter uniquement sur cette liste d'hôtes"
-#: plugins/admin/groups/class_ogroup.inc:321
+#: plugins/admin/groups/class_ogroup.inc:322
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr "Mettre les stations de travail et les terminaux dans le même groupe est interdit"
diff --git a/locale/hu_HU/fusiondirectory.po b/locale/hu_HU/fusiondirectory.po
index 8cb70d1bdd4b5c22b55c8cc87638d4a98d1859ae..af6159c7f97d0b73d9530b1ddfa43e0fffa16857 100644
--- a/locale/hu_HU/fusiondirectory.po
+++ b/locale/hu_HU/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-11 19:09+0100\n"
-"PO-Revision-Date: 2017-01-10 14:53+0000\n"
+"POT-Creation-Date: 2017-03-29 21:46+0200\n"
+"PO-Revision-Date: 2017-03-26 15:51+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:382
+#: plugins/personal/generic/class_user.inc:385
msgid "Preferred language"
msgstr ""
@@ -317,30 +317,30 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
+#: setup/class_setupStep_Migrate.inc:981
+#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1180
+#: setup/class_setupStep_Migrate.inc:1273
+#: setup/class_setupStep_Migrate.inc:1352
+#: setup/class_setupStep_Migrate.inc:1396
+msgid "LDAP query failed"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
+#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
#: setup/class_setupStep_Migrate.inc:982
#: setup/class_setupStep_Migrate.inc:1058
#: setup/class_setupStep_Migrate.inc:1181
#: setup/class_setupStep_Migrate.inc:1274
#: setup/class_setupStep_Migrate.inc:1353
#: setup/class_setupStep_Migrate.inc:1397
-msgid "LDAP query failed"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:983
-#: setup/class_setupStep_Migrate.inc:1059
-#: setup/class_setupStep_Migrate.inc:1182
-#: setup/class_setupStep_Migrate.inc:1275
-#: setup/class_setupStep_Migrate.inc:1354
-#: setup/class_setupStep_Migrate.inc:1398
msgid "Possibly the \"root object\" is missing."
msgstr ""
#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:866
-#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
+#: setup/class_setupStep_Migrate.inc:880
msgid "Failed"
msgstr ""
@@ -361,11 +361,11 @@ msgid ""
msgstr ""
#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:677
-#: include/functions.inc:724 include/functions.inc:822
-#: include/functions.inc:2988 include/functions.inc:3165
+#: include/functions.inc:522 include/functions.inc:679
+#: include/functions.inc:726 include/functions.inc:834
+#: include/functions.inc:3001 include/functions.inc:3178
#: include/class_config.inc:322 include/class_ldap.inc:924
#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
#: include/simpleplugin/attributes/class_SetAttribute.inc:726
@@ -387,13 +387,13 @@ msgid "The specified user \"%s\" does not have full access to your ldap database
msgstr ""
#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1085
-#: setup/class_setupStep_Migrate.inc:1204
-#: setup/class_setupStep_Migrate.inc:1315
-#: setup/class_setupStep_Migrate.inc:1379
-#: setup/class_setupStep_Migrate.inc:1423 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:838
-#: include/functions.inc:2523 include/simpleplugin/class_simpleTabs.inc:322
+#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1203
+#: setup/class_setupStep_Migrate.inc:1314
+#: setup/class_setupStep_Migrate.inc:1378
+#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
+#: include/class_xml.inc:55 include/functions.inc:850
+#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
#: html/index.php:597 html/main.php:158
#: plugins/personal/posix/class_posixAccount.inc:482
#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
@@ -414,7 +414,7 @@ msgid "User migration"
msgstr ""
#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1029
+#: setup/class_setupStep_Migrate.inc:1028
msgid "Migration error"
msgstr ""
@@ -423,64 +423,64 @@ msgstr ""
msgid "Cannot migrate entry \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:859
+#: setup/class_setupStep_Migrate.inc:858
#, php-format
msgid "FD 1.0.7 administrative accounts found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:862
+#: setup/class_setupStep_Migrate.inc:861
#, php-format
msgid "FD 1.0.7 administrative groups found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:864
+#: setup/class_setupStep_Migrate.inc:863
msgid ""
"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
"file at the end of the setup to migrate it.<br/>"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:867
+#: setup/class_setupStep_Migrate.inc:866
msgid ""
"There is no valid FusionDirectory 1.0.8 administrator account inside your "
"LDAP."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:868 setup/class_setupStep_Migrate.inc:883
+#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
#: include/simpleplugin/simple-list.xml:59
#: plugins/admin/departments/dep-list.xml:48
#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
msgid "Create"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:873
+#: setup/class_setupStep_Migrate.inc:872
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: plugins/admin/users/class_userManagement.inc:42
msgid "Users"
msgstr "Felhasználók"
-#: setup/class_setupStep_Migrate.inc:876
+#: setup/class_setupStep_Migrate.inc:875
msgid "Groups"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStep_Migrate.inc:881
msgid "There is no FusionDirectory administrator account inside your LDAP."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:920
+#: setup/class_setupStep_Migrate.inc:919
msgid "Gives all rights on all objects"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:937 include/class_management.inc:697
+#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
#: include/class_listing.inc:551 include/class_xml.inc:58
#: include/password-methods/class_password-methods-sasl.inc:60
#: include/password-methods/class_password-methods-sasl.inc:86
#: include/password-methods/class_password-methods.inc:393
#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3112
-#: include/functions.inc:3133 include/functions.inc:3173
-#: include/functions.inc:3185 include/functions.inc:3189
-#: include/functions.inc:3196 include/functions.inc:3205
-#: include/functions.inc:3267 include/class_msg_dialog.inc:128
+#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
+#: include/functions.inc:3146 include/functions.inc:3186
+#: include/functions.inc:3198 include/functions.inc:3202
+#: include/functions.inc:3209 include/functions.inc:3218
+#: include/functions.inc:3280 include/class_msg_dialog.inc:128
#: include/class_msg_dialog.inc:164 include/class_config.inc:357
#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
@@ -493,82 +493,82 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:34
#: include/simpleplugin/attributes/class_FileAttribute.inc:37
#: include/simpleplugin/attributes/class_FileAttribute.inc:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:801
-#: include/class_plugin.inc:1534 html/index.php:453 html/index.php:474
+#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
+#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
#: html/index.php:484 html/index.php:546 html/index.php:556
#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
msgid "Error"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:997
+#: setup/class_setupStep_Migrate.inc:996
msgid "Default ACL roles have not been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:999
+#: setup/class_setupStep_Migrate.inc:998
msgid "Some default ACL roles are missing"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1001
+#: setup/class_setupStep_Migrate.inc:1000
msgid "Default ACL roles have been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1031
+#: setup/class_setupStep_Migrate.inc:1030
#, php-format
msgid "Cannot add ACL role \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1086
+#: setup/class_setupStep_Migrate.inc:1085
#, php-format
msgid "Found %s user(s) outside the configured tree \"%s\"."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1100
-#: setup/class_setupStep_Migrate.inc:1114
+#: setup/class_setupStep_Migrate.inc:1099
+#: setup/class_setupStep_Migrate.inc:1113
msgid "Move users into configured user tree"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
msgid "Cannot move entries to the requested department!"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "Entry will be moved from"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "to"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1154
+#: setup/class_setupStep_Migrate.inc:1153
msgid "The following references will be updated"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1205
+#: setup/class_setupStep_Migrate.inc:1204
#, php-format
msgid "Found %s groups outside the configured tree '%s'."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1219
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1218
+#: setup/class_setupStep_Migrate.inc:1232
msgid "Move groups into configured groups tree"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1316
+#: setup/class_setupStep_Migrate.inc:1315
#, php-format
msgid "Found %s department(s) that will not be visible in FusionDirectory."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1325
-#: setup/class_setupStep_Migrate.inc:1330
+#: setup/class_setupStep_Migrate.inc:1324
+#: setup/class_setupStep_Migrate.inc:1329
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1380
+#: setup/class_setupStep_Migrate.inc:1379
#, php-format
msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1424
+#: setup/class_setupStep_Migrate.inc:1423
#, php-format
msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
@@ -744,10 +744,10 @@ msgstr ""
#: include/class_logging.inc:80 include/class_session.inc:50
#: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:649
-#: include/functions.inc:770 include/functions.inc:1189
-#: include/functions.inc:2243 include/functions.inc:2285
-#: include/functions.inc:2314 include/class_ldap.inc:873
+#: include/functions.inc:564 include/functions.inc:651
+#: include/functions.inc:772 include/functions.inc:1201
+#: include/functions.inc:2255 include/functions.inc:2297
+#: include/functions.inc:2326 include/class_ldap.inc:873
#: include/class_ldap.inc:911 include/class_acl.inc:118
msgid "Internal error"
msgstr ""
@@ -814,12 +814,12 @@ msgid ""
"plugin instance!"
msgstr ""
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1188
+#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
#: include/class_listing.inc:1190
msgid "Root"
msgstr ""
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
msgid "Submit"
msgstr ""
@@ -920,7 +920,7 @@ msgid "Create a new snapshot from this object"
msgstr ""
#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3302 include/simpleplugin/class_simplePlugin.inc:272
+#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
#: include/simpleplugin/class_simplePlugin.inc:277
#: include/simpleplugin/class_simplePlugin.inc:289
#: html/class_passwordRecovery.inc:116
@@ -953,7 +953,7 @@ msgstr ""
#: include/password-methods/class_password-methods-sha.inc:69
#: include/password-methods/class_password-methods-ssha.inc:73
#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:659 include/class_timezone.inc:51
+#: include/functions.inc:661 include/class_timezone.inc:51
#: include/class_config.inc:159 include/class_config.inc:284
#: include/class_config.inc:843 include/class_config.inc:856
#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
@@ -991,7 +991,7 @@ msgid "Cannot paste"
msgstr ""
#: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
#: plugins/personal/generic/paste_generic.tpl.c:11
msgid "Login"
@@ -1035,245 +1035,245 @@ msgid ""
"administrator."
msgstr ""
-#: include/functions.inc:597
+#: include/functions.inc:599
msgid "Authentication error"
msgstr ""
-#: include/functions.inc:598
+#: include/functions.inc:600
msgid ""
"It seems your user password has expired. Please use <a "
"href=\"recovery.php\">password recovery</a> to change it."
msgstr ""
-#: include/functions.inc:649 include/functions.inc:770
+#: include/functions.inc:651 include/functions.inc:772
msgid "Error while adding a lock. Contact the developers!"
msgstr ""
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid ""
"Cannot create locking information in LDAP tree. Please contact your "
"administrator!"
msgstr ""
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid "LDAP server returned: %s"
msgstr ""
-#: include/functions.inc:838
+#: include/functions.inc:850
msgid ""
"Found multiple locks for object to be locked. This should not happen - "
"cleaning up multiple references."
msgstr ""
-#: include/functions.inc:1109
+#: include/functions.inc:1121
#, php-format
msgid "The size limit of %d entries is exceed!"
msgstr ""
-#: include/functions.inc:1111
+#: include/functions.inc:1123
#, php-format
msgid ""
"Set the new size limit to %s and show me this message if the limit still "
"exceeds"
msgstr ""
-#: include/functions.inc:1128
+#: include/functions.inc:1140
msgid "Configure"
msgstr ""
-#: include/functions.inc:1133
+#: include/functions.inc:1145
msgid "incomplete"
msgstr ""
-#: include/functions.inc:1534
+#: include/functions.inc:1546
msgid "Continue anyway"
msgstr ""
-#: include/functions.inc:1536
+#: include/functions.inc:1548
msgid "Edit anyway"
msgstr ""
-#: include/functions.inc:1538
+#: include/functions.inc:1550
#, php-format
msgid "You're going to edit the LDAP entry/entries %s"
msgstr ""
-#: include/functions.inc:1766
+#: include/functions.inc:1778
msgid "Entries per page"
msgstr ""
-#: include/functions.inc:1797 include/class_filter.inc:353
+#: include/functions.inc:1809 include/class_filter.inc:353
msgid "Apply filter"
msgstr ""
-#: include/functions.inc:2065
+#: include/functions.inc:2077
#, php-format
msgid "%sB"
msgstr ""
-#: include/functions.inc:2066
+#: include/functions.inc:2078
#, php-format
msgid "%sKiB"
msgstr ""
-#: include/functions.inc:2067
+#: include/functions.inc:2079
#, php-format
msgid "%sMiB"
msgstr ""
-#: include/functions.inc:2068
+#: include/functions.inc:2080
#, php-format
msgid "%sGiB"
msgstr ""
-#: include/functions.inc:2069
+#: include/functions.inc:2081
#, php-format
msgid "%sTiB"
msgstr ""
-#: include/functions.inc:2070
+#: include/functions.inc:2082
#, php-format
msgid "%sPiB"
msgstr ""
-#: include/functions.inc:2071
+#: include/functions.inc:2083
#, php-format
msgid "%sEiB"
msgstr ""
-#: include/functions.inc:2072
+#: include/functions.inc:2084
#, php-format
msgid "%sZiB"
msgstr ""
-#: include/functions.inc:2073
+#: include/functions.inc:2085
#, php-format
msgid "%sYiB"
msgstr ""
-#: include/functions.inc:2105 include/class_filter.inc:315
+#: include/functions.inc:2117 include/class_filter.inc:315
msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
msgstr ""
-#: include/functions.inc:2243
+#: include/functions.inc:2255
#, php-format
msgid ""
"File '%s' could not be deleted. Try fusiondirectory-setup --check-"
"directories to fix permissions."
msgstr ""
-#: include/functions.inc:2285
+#: include/functions.inc:2297
msgid "Cannot write to revision file!"
msgstr ""
-#: include/functions.inc:2314
+#: include/functions.inc:2326
msgid "Cannot read to revision file!"
msgstr ""
-#: include/functions.inc:2523
+#: include/functions.inc:2535
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "LDAP warning"
msgstr ""
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "Cannot get schema information from server. No schema check possible!"
msgstr ""
-#: include/functions.inc:2564
+#: include/functions.inc:2577
msgid "Main FusionDirectory schema"
msgstr ""
-#: include/functions.inc:2571
+#: include/functions.inc:2584
msgid "Schema used to store FusionDirectory configuration"
msgstr ""
-#: include/functions.inc:2578
+#: include/functions.inc:2591
msgid "Used to store trust mode information in users or groups."
msgstr ""
-#: include/functions.inc:2585
+#: include/functions.inc:2598
msgid "Used to store templates."
msgstr ""
-#: include/functions.inc:2592
+#: include/functions.inc:2605
msgid "Used to store POSIX information."
msgstr ""
-#: include/functions.inc:2599
+#: include/functions.inc:2612
#, php-format
msgid "Missing required object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2601
+#: include/functions.inc:2614
#, php-format
msgid "Missing optional object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2605
+#: include/functions.inc:2618
#, php-format
msgid "Class(es) available"
msgstr ""
-#: include/functions.inc:2623
+#: include/functions.inc:2636
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2637
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2640
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2641
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3112 include/functions.inc:3133
-#: include/functions.inc:3173 include/functions.inc:3185
-#: include/functions.inc:3189 include/functions.inc:3196
-#: include/functions.inc:3205
+#: include/functions.inc:3125 include/functions.inc:3146
+#: include/functions.inc:3186 include/functions.inc:3198
+#: include/functions.inc:3202 include/functions.inc:3209
+#: include/functions.inc:3218
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3112
+#: include/functions.inc:3125
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3133
+#: include/functions.inc:3146
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3173
+#: include/functions.inc:3186
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3185 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3202
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3205
+#: include/functions.inc:3218
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3267
+#: include/functions.inc:3280
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3303
+#: include/functions.inc:3316
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
@@ -2103,7 +2103,7 @@ msgstr "Név"
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
#: plugins/admin/departments/class_department.inc:72
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/groups/class_roleGeneric.inc:91
@@ -2283,7 +2283,7 @@ msgid "The entry %s is not existing"
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:548
+#: include/class_plugin.inc:554
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!"
@@ -2399,14 +2399,19 @@ msgstr ""
msgid "There was a problem uncompressing snapshot data"
msgstr ""
-#: include/class_plugin.inc:803
+#: include/class_plugin.inc:809
#, php-format
msgid ""
"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
msgstr ""
-#: include/class_plugin.inc:1332
+#: include/class_plugin.inc:1350
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/class_plugin.inc:1352
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -2554,44 +2559,44 @@ msgstr ""
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr ""
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
msgid "Email address"
msgstr ""
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
#, php-format
msgid "Did not find an account with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
#, php-format
msgid "Found multiple accounts with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
#, php-format
msgid "There is no account using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There are several accounts using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
#, php-format
msgid "The user using email \"%s\" is locked. Please contact your administrator."
msgstr ""
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
msgid "Contact your administrator, there was a problem with mail server"
msgstr ""
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
msgid "This token is invalid"
msgstr ""
-#: html/class_passwordRecovery.inc:647
+#: html/class_passwordRecovery.inc:651
msgid "There was a problem with mail server, confirmation email not sent"
msgstr ""
@@ -2903,7 +2908,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
#: setup/setup_migrate_adminAccount.tpl.c:14
#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2940,258 +2945,262 @@ msgstr ""
msgid "User account"
msgstr ""
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:296
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:307
msgid "Personal information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
msgid "Last name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
msgid "First name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
msgid "Short description of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "Picture"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "The avatar for this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:330
+#: plugins/personal/generic/class_user.inc:333
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:334
+#: plugins/personal/generic/class_user.inc:337
#: plugins/admin/departments/class_department.inc:90
#: plugins/admin/departments/class_department.inc:96
msgid "Location"
msgstr ""
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:341
#: plugins/admin/departments/class_department.inc:93
msgid "State"
msgstr ""
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
#: plugins/admin/departments/class_department.inc:102
msgid "Address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
msgid "Business postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
#: plugins/admin/departments/class_department.inc:106
msgid "Phone"
msgstr ""
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
msgid "Business phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Mobile"
msgstr ""
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Business mobile number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Pager"
msgstr ""
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
#: plugins/admin/departments/class_department.inc:110
msgid "Fax"
msgstr ""
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:373
+#: plugins/personal/generic/class_user.inc:376
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:393
+#: plugins/personal/generic/class_user.inc:396
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Display name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Private phone"
msgstr ""
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Home phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:411
+#: plugins/personal/generic/class_user.inc:414
msgid "Organizational information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
msgid "Title"
msgstr ""
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
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:421
+#: plugins/personal/generic/class_user.inc:424
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
msgid "Organization"
msgstr ""
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
#: plugins/admin/departments/class_department.inc:33
#: plugins/admin/departments/class_department.inc:39
#: plugins/admin/departments/dep-list.xml:21
msgid "Department"
msgstr ""
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
msgid "Department to which the user belongs"
msgstr ""
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:437
+#: plugins/personal/generic/class_user.inc:440
msgid "Employee type"
msgstr ""
-#: plugins/personal/generic/class_user.inc:441
+#: plugins/personal/generic/class_user.inc:444
#: plugins/admin/departments/class_department.inc:84
msgid "Manager"
msgstr ""
-#: plugins/personal/generic/class_user.inc:608
+#: plugins/personal/generic/class_user.inc:611
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:614
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:622
+#: plugins/personal/generic/class_user.inc:625
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:636
+#: plugins/personal/generic/class_user.inc:639
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:641
-#: plugins/personal/generic/class_user.inc:645
+#: plugins/personal/generic/class_user.inc:644
+#: plugins/personal/generic/class_user.inc:648
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:652
+#: plugins/personal/generic/class_user.inc:655
msgid "You need to specify your current password in order to proceed."
msgstr ""
-#: plugins/personal/generic/class_user.inc:654
+#: plugins/personal/generic/class_user.inc:657
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:656
+#: plugins/personal/generic/class_user.inc:659
#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
msgid "New password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:658
+#: plugins/personal/generic/class_user.inc:661
msgid "The password used as new and current are too similar."
msgstr ""
-#: plugins/personal/generic/class_user.inc:660
+#: plugins/personal/generic/class_user.inc:663
msgid "The password used as new is to short."
msgstr ""
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:665
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
@@ -3299,36 +3308,46 @@ msgid ""
"recover their password"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:189
+msgid "Login attribute"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
msgid "First email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
msgid "Subject"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
msgid "Subject of the first email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
msgid "[FusionDirectory] Password recovery link"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
#, php-format
msgid ""
"Body of the first email, sent when the user ask for a new password. Use %s "
"for the login and the recovery link."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
#, php-format
msgid ""
"Hello,\n"
@@ -3340,31 +3359,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
msgid "Second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
msgid "Subject of the second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
msgid "[FusionDirectory] Password recovery successful"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
#, php-format
msgid "Body (%s is login)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
#, 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
+#: plugins/config/class_recoveryConfig.inc:118
#, php-format
msgid ""
"Hello,\n"
@@ -3531,10 +3550,6 @@ msgstr ""
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 ""
@@ -4397,7 +4412,7 @@ msgstr ""
msgid "Only allow this group to connect to this list of hosts"
msgstr ""
-#: plugins/admin/groups/class_ogroup.inc:321
+#: plugins/admin/groups/class_ogroup.inc:322
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
diff --git a/locale/id/fusiondirectory.po b/locale/id/fusiondirectory.po
index 8e28773b08ff7270b9a047cdee8560d6561b0b54..9e8c664fb365b6ea48f6ebde105527386e386d6b 100644
--- a/locale/id/fusiondirectory.po
+++ b/locale/id/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-11 19:09+0100\n"
-"PO-Revision-Date: 2017-01-10 14:53+0000\n"
+"POT-Creation-Date: 2017-03-29 21:46+0200\n"
+"PO-Revision-Date: 2017-03-26 15:51+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:382
+#: plugins/personal/generic/class_user.inc:385
msgid "Preferred language"
msgstr ""
@@ -316,30 +316,30 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
+#: setup/class_setupStep_Migrate.inc:981
+#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1180
+#: setup/class_setupStep_Migrate.inc:1273
+#: setup/class_setupStep_Migrate.inc:1352
+#: setup/class_setupStep_Migrate.inc:1396
+msgid "LDAP query failed"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
+#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
#: setup/class_setupStep_Migrate.inc:982
#: setup/class_setupStep_Migrate.inc:1058
#: setup/class_setupStep_Migrate.inc:1181
#: setup/class_setupStep_Migrate.inc:1274
#: setup/class_setupStep_Migrate.inc:1353
#: setup/class_setupStep_Migrate.inc:1397
-msgid "LDAP query failed"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:983
-#: setup/class_setupStep_Migrate.inc:1059
-#: setup/class_setupStep_Migrate.inc:1182
-#: setup/class_setupStep_Migrate.inc:1275
-#: setup/class_setupStep_Migrate.inc:1354
-#: setup/class_setupStep_Migrate.inc:1398
msgid "Possibly the \"root object\" is missing."
msgstr ""
#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:866
-#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
+#: setup/class_setupStep_Migrate.inc:880
msgid "Failed"
msgstr ""
@@ -360,11 +360,11 @@ msgid ""
msgstr ""
#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:677
-#: include/functions.inc:724 include/functions.inc:822
-#: include/functions.inc:2988 include/functions.inc:3165
+#: include/functions.inc:522 include/functions.inc:679
+#: include/functions.inc:726 include/functions.inc:834
+#: include/functions.inc:3001 include/functions.inc:3178
#: include/class_config.inc:322 include/class_ldap.inc:924
#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
#: include/simpleplugin/attributes/class_SetAttribute.inc:726
@@ -386,13 +386,13 @@ msgid "The specified user \"%s\" does not have full access to your ldap database
msgstr ""
#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1085
-#: setup/class_setupStep_Migrate.inc:1204
-#: setup/class_setupStep_Migrate.inc:1315
-#: setup/class_setupStep_Migrate.inc:1379
-#: setup/class_setupStep_Migrate.inc:1423 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:838
-#: include/functions.inc:2523 include/simpleplugin/class_simpleTabs.inc:322
+#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1203
+#: setup/class_setupStep_Migrate.inc:1314
+#: setup/class_setupStep_Migrate.inc:1378
+#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
+#: include/class_xml.inc:55 include/functions.inc:850
+#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
#: html/index.php:597 html/main.php:158
#: plugins/personal/posix/class_posixAccount.inc:482
#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
@@ -413,7 +413,7 @@ msgid "User migration"
msgstr ""
#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1029
+#: setup/class_setupStep_Migrate.inc:1028
msgid "Migration error"
msgstr ""
@@ -422,64 +422,64 @@ msgstr ""
msgid "Cannot migrate entry \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:859
+#: setup/class_setupStep_Migrate.inc:858
#, php-format
msgid "FD 1.0.7 administrative accounts found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:862
+#: setup/class_setupStep_Migrate.inc:861
#, php-format
msgid "FD 1.0.7 administrative groups found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:864
+#: setup/class_setupStep_Migrate.inc:863
msgid ""
"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
"file at the end of the setup to migrate it.<br/>"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:867
+#: setup/class_setupStep_Migrate.inc:866
msgid ""
"There is no valid FusionDirectory 1.0.8 administrator account inside your "
"LDAP."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:868 setup/class_setupStep_Migrate.inc:883
+#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
#: include/simpleplugin/simple-list.xml:59
#: plugins/admin/departments/dep-list.xml:48
#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
msgid "Create"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:873
+#: setup/class_setupStep_Migrate.inc:872
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: plugins/admin/users/class_userManagement.inc:42
msgid "Users"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:876
+#: setup/class_setupStep_Migrate.inc:875
msgid "Groups"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStep_Migrate.inc:881
msgid "There is no FusionDirectory administrator account inside your LDAP."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:920
+#: setup/class_setupStep_Migrate.inc:919
msgid "Gives all rights on all objects"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:937 include/class_management.inc:697
+#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
#: include/class_listing.inc:551 include/class_xml.inc:58
#: include/password-methods/class_password-methods-sasl.inc:60
#: include/password-methods/class_password-methods-sasl.inc:86
#: include/password-methods/class_password-methods.inc:393
#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3112
-#: include/functions.inc:3133 include/functions.inc:3173
-#: include/functions.inc:3185 include/functions.inc:3189
-#: include/functions.inc:3196 include/functions.inc:3205
-#: include/functions.inc:3267 include/class_msg_dialog.inc:128
+#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
+#: include/functions.inc:3146 include/functions.inc:3186
+#: include/functions.inc:3198 include/functions.inc:3202
+#: include/functions.inc:3209 include/functions.inc:3218
+#: include/functions.inc:3280 include/class_msg_dialog.inc:128
#: include/class_msg_dialog.inc:164 include/class_config.inc:357
#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
@@ -492,82 +492,82 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:34
#: include/simpleplugin/attributes/class_FileAttribute.inc:37
#: include/simpleplugin/attributes/class_FileAttribute.inc:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:801
-#: include/class_plugin.inc:1534 html/index.php:453 html/index.php:474
+#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
+#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
#: html/index.php:484 html/index.php:546 html/index.php:556
#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
msgid "Error"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:997
+#: setup/class_setupStep_Migrate.inc:996
msgid "Default ACL roles have not been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:999
+#: setup/class_setupStep_Migrate.inc:998
msgid "Some default ACL roles are missing"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1001
+#: setup/class_setupStep_Migrate.inc:1000
msgid "Default ACL roles have been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1031
+#: setup/class_setupStep_Migrate.inc:1030
#, php-format
msgid "Cannot add ACL role \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1086
+#: setup/class_setupStep_Migrate.inc:1085
#, php-format
msgid "Found %s user(s) outside the configured tree \"%s\"."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1100
-#: setup/class_setupStep_Migrate.inc:1114
+#: setup/class_setupStep_Migrate.inc:1099
+#: setup/class_setupStep_Migrate.inc:1113
msgid "Move users into configured user tree"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
msgid "Cannot move entries to the requested department!"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "Entry will be moved from"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "to"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1154
+#: setup/class_setupStep_Migrate.inc:1153
msgid "The following references will be updated"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1205
+#: setup/class_setupStep_Migrate.inc:1204
#, php-format
msgid "Found %s groups outside the configured tree '%s'."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1219
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1218
+#: setup/class_setupStep_Migrate.inc:1232
msgid "Move groups into configured groups tree"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1316
+#: setup/class_setupStep_Migrate.inc:1315
#, php-format
msgid "Found %s department(s) that will not be visible in FusionDirectory."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1325
-#: setup/class_setupStep_Migrate.inc:1330
+#: setup/class_setupStep_Migrate.inc:1324
+#: setup/class_setupStep_Migrate.inc:1329
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1380
+#: setup/class_setupStep_Migrate.inc:1379
#, php-format
msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1424
+#: setup/class_setupStep_Migrate.inc:1423
#, php-format
msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
@@ -743,10 +743,10 @@ msgstr ""
#: include/class_logging.inc:80 include/class_session.inc:50
#: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:649
-#: include/functions.inc:770 include/functions.inc:1189
-#: include/functions.inc:2243 include/functions.inc:2285
-#: include/functions.inc:2314 include/class_ldap.inc:873
+#: include/functions.inc:564 include/functions.inc:651
+#: include/functions.inc:772 include/functions.inc:1201
+#: include/functions.inc:2255 include/functions.inc:2297
+#: include/functions.inc:2326 include/class_ldap.inc:873
#: include/class_ldap.inc:911 include/class_acl.inc:118
msgid "Internal error"
msgstr ""
@@ -813,12 +813,12 @@ msgid ""
"plugin instance!"
msgstr ""
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1188
+#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
#: include/class_listing.inc:1190
msgid "Root"
msgstr ""
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
msgid "Submit"
msgstr ""
@@ -919,7 +919,7 @@ msgid "Create a new snapshot from this object"
msgstr ""
#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3302 include/simpleplugin/class_simplePlugin.inc:272
+#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
#: include/simpleplugin/class_simplePlugin.inc:277
#: include/simpleplugin/class_simplePlugin.inc:289
#: html/class_passwordRecovery.inc:116
@@ -952,7 +952,7 @@ msgstr ""
#: include/password-methods/class_password-methods-sha.inc:69
#: include/password-methods/class_password-methods-ssha.inc:73
#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:659 include/class_timezone.inc:51
+#: include/functions.inc:661 include/class_timezone.inc:51
#: include/class_config.inc:159 include/class_config.inc:284
#: include/class_config.inc:843 include/class_config.inc:856
#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
@@ -990,7 +990,7 @@ msgid "Cannot paste"
msgstr ""
#: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
#: plugins/personal/generic/paste_generic.tpl.c:11
msgid "Login"
@@ -1034,245 +1034,245 @@ msgid ""
"administrator."
msgstr ""
-#: include/functions.inc:597
+#: include/functions.inc:599
msgid "Authentication error"
msgstr ""
-#: include/functions.inc:598
+#: include/functions.inc:600
msgid ""
"It seems your user password has expired. Please use <a "
"href=\"recovery.php\">password recovery</a> to change it."
msgstr ""
-#: include/functions.inc:649 include/functions.inc:770
+#: include/functions.inc:651 include/functions.inc:772
msgid "Error while adding a lock. Contact the developers!"
msgstr ""
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid ""
"Cannot create locking information in LDAP tree. Please contact your "
"administrator!"
msgstr ""
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid "LDAP server returned: %s"
msgstr ""
-#: include/functions.inc:838
+#: include/functions.inc:850
msgid ""
"Found multiple locks for object to be locked. This should not happen - "
"cleaning up multiple references."
msgstr ""
-#: include/functions.inc:1109
+#: include/functions.inc:1121
#, php-format
msgid "The size limit of %d entries is exceed!"
msgstr ""
-#: include/functions.inc:1111
+#: include/functions.inc:1123
#, php-format
msgid ""
"Set the new size limit to %s and show me this message if the limit still "
"exceeds"
msgstr ""
-#: include/functions.inc:1128
+#: include/functions.inc:1140
msgid "Configure"
msgstr ""
-#: include/functions.inc:1133
+#: include/functions.inc:1145
msgid "incomplete"
msgstr ""
-#: include/functions.inc:1534
+#: include/functions.inc:1546
msgid "Continue anyway"
msgstr ""
-#: include/functions.inc:1536
+#: include/functions.inc:1548
msgid "Edit anyway"
msgstr ""
-#: include/functions.inc:1538
+#: include/functions.inc:1550
#, php-format
msgid "You're going to edit the LDAP entry/entries %s"
msgstr ""
-#: include/functions.inc:1766
+#: include/functions.inc:1778
msgid "Entries per page"
msgstr ""
-#: include/functions.inc:1797 include/class_filter.inc:353
+#: include/functions.inc:1809 include/class_filter.inc:353
msgid "Apply filter"
msgstr ""
-#: include/functions.inc:2065
+#: include/functions.inc:2077
#, php-format
msgid "%sB"
msgstr ""
-#: include/functions.inc:2066
+#: include/functions.inc:2078
#, php-format
msgid "%sKiB"
msgstr ""
-#: include/functions.inc:2067
+#: include/functions.inc:2079
#, php-format
msgid "%sMiB"
msgstr ""
-#: include/functions.inc:2068
+#: include/functions.inc:2080
#, php-format
msgid "%sGiB"
msgstr ""
-#: include/functions.inc:2069
+#: include/functions.inc:2081
#, php-format
msgid "%sTiB"
msgstr ""
-#: include/functions.inc:2070
+#: include/functions.inc:2082
#, php-format
msgid "%sPiB"
msgstr ""
-#: include/functions.inc:2071
+#: include/functions.inc:2083
#, php-format
msgid "%sEiB"
msgstr ""
-#: include/functions.inc:2072
+#: include/functions.inc:2084
#, php-format
msgid "%sZiB"
msgstr ""
-#: include/functions.inc:2073
+#: include/functions.inc:2085
#, php-format
msgid "%sYiB"
msgstr ""
-#: include/functions.inc:2105 include/class_filter.inc:315
+#: include/functions.inc:2117 include/class_filter.inc:315
msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
msgstr ""
-#: include/functions.inc:2243
+#: include/functions.inc:2255
#, php-format
msgid ""
"File '%s' could not be deleted. Try fusiondirectory-setup --check-"
"directories to fix permissions."
msgstr ""
-#: include/functions.inc:2285
+#: include/functions.inc:2297
msgid "Cannot write to revision file!"
msgstr ""
-#: include/functions.inc:2314
+#: include/functions.inc:2326
msgid "Cannot read to revision file!"
msgstr ""
-#: include/functions.inc:2523
+#: include/functions.inc:2535
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "LDAP warning"
msgstr ""
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "Cannot get schema information from server. No schema check possible!"
msgstr ""
-#: include/functions.inc:2564
+#: include/functions.inc:2577
msgid "Main FusionDirectory schema"
msgstr ""
-#: include/functions.inc:2571
+#: include/functions.inc:2584
msgid "Schema used to store FusionDirectory configuration"
msgstr ""
-#: include/functions.inc:2578
+#: include/functions.inc:2591
msgid "Used to store trust mode information in users or groups."
msgstr ""
-#: include/functions.inc:2585
+#: include/functions.inc:2598
msgid "Used to store templates."
msgstr ""
-#: include/functions.inc:2592
+#: include/functions.inc:2605
msgid "Used to store POSIX information."
msgstr ""
-#: include/functions.inc:2599
+#: include/functions.inc:2612
#, php-format
msgid "Missing required object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2601
+#: include/functions.inc:2614
#, php-format
msgid "Missing optional object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2605
+#: include/functions.inc:2618
#, php-format
msgid "Class(es) available"
msgstr ""
-#: include/functions.inc:2623
+#: include/functions.inc:2636
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2637
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2640
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2641
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3112 include/functions.inc:3133
-#: include/functions.inc:3173 include/functions.inc:3185
-#: include/functions.inc:3189 include/functions.inc:3196
-#: include/functions.inc:3205
+#: include/functions.inc:3125 include/functions.inc:3146
+#: include/functions.inc:3186 include/functions.inc:3198
+#: include/functions.inc:3202 include/functions.inc:3209
+#: include/functions.inc:3218
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3112
+#: include/functions.inc:3125
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3133
+#: include/functions.inc:3146
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3173
+#: include/functions.inc:3186
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3185 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3202
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3205
+#: include/functions.inc:3218
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3267
+#: include/functions.inc:3280
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3303
+#: include/functions.inc:3316
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
@@ -2102,7 +2102,7 @@ msgstr ""
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
#: plugins/admin/departments/class_department.inc:72
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/groups/class_roleGeneric.inc:91
@@ -2282,7 +2282,7 @@ msgid "The entry %s is not existing"
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:548
+#: include/class_plugin.inc:554
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!"
@@ -2398,14 +2398,19 @@ msgstr ""
msgid "There was a problem uncompressing snapshot data"
msgstr ""
-#: include/class_plugin.inc:803
+#: include/class_plugin.inc:809
#, php-format
msgid ""
"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
msgstr ""
-#: include/class_plugin.inc:1332
+#: include/class_plugin.inc:1350
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/class_plugin.inc:1352
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -2553,44 +2558,44 @@ msgstr ""
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr ""
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
msgid "Email address"
msgstr ""
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
#, php-format
msgid "Did not find an account with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
#, php-format
msgid "Found multiple accounts with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
#, php-format
msgid "There is no account using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There are several accounts using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
#, php-format
msgid "The user using email \"%s\" is locked. Please contact your administrator."
msgstr ""
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
msgid "Contact your administrator, there was a problem with mail server"
msgstr ""
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
msgid "This token is invalid"
msgstr ""
-#: html/class_passwordRecovery.inc:647
+#: html/class_passwordRecovery.inc:651
msgid "There was a problem with mail server, confirmation email not sent"
msgstr ""
@@ -2902,7 +2907,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
#: setup/setup_migrate_adminAccount.tpl.c:14
#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2939,258 +2944,262 @@ msgstr ""
msgid "User account"
msgstr ""
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:296
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:307
msgid "Personal information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
msgid "Last name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
msgid "First name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
msgid "Short description of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "Picture"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "The avatar for this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:330
+#: plugins/personal/generic/class_user.inc:333
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:334
+#: plugins/personal/generic/class_user.inc:337
#: plugins/admin/departments/class_department.inc:90
#: plugins/admin/departments/class_department.inc:96
msgid "Location"
msgstr ""
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:341
#: plugins/admin/departments/class_department.inc:93
msgid "State"
msgstr ""
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
#: plugins/admin/departments/class_department.inc:102
msgid "Address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
msgid "Business postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
#: plugins/admin/departments/class_department.inc:106
msgid "Phone"
msgstr ""
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
msgid "Business phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Mobile"
msgstr ""
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Business mobile number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Pager"
msgstr ""
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
#: plugins/admin/departments/class_department.inc:110
msgid "Fax"
msgstr ""
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:373
+#: plugins/personal/generic/class_user.inc:376
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:393
+#: plugins/personal/generic/class_user.inc:396
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Display name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Private phone"
msgstr ""
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Home phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:411
+#: plugins/personal/generic/class_user.inc:414
msgid "Organizational information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
msgid "Title"
msgstr ""
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
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:421
+#: plugins/personal/generic/class_user.inc:424
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
msgid "Organization"
msgstr ""
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
#: plugins/admin/departments/class_department.inc:33
#: plugins/admin/departments/class_department.inc:39
#: plugins/admin/departments/dep-list.xml:21
msgid "Department"
msgstr ""
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
msgid "Department to which the user belongs"
msgstr ""
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:437
+#: plugins/personal/generic/class_user.inc:440
msgid "Employee type"
msgstr ""
-#: plugins/personal/generic/class_user.inc:441
+#: plugins/personal/generic/class_user.inc:444
#: plugins/admin/departments/class_department.inc:84
msgid "Manager"
msgstr ""
-#: plugins/personal/generic/class_user.inc:608
+#: plugins/personal/generic/class_user.inc:611
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:614
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:622
+#: plugins/personal/generic/class_user.inc:625
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:636
+#: plugins/personal/generic/class_user.inc:639
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:641
-#: plugins/personal/generic/class_user.inc:645
+#: plugins/personal/generic/class_user.inc:644
+#: plugins/personal/generic/class_user.inc:648
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:652
+#: plugins/personal/generic/class_user.inc:655
msgid "You need to specify your current password in order to proceed."
msgstr ""
-#: plugins/personal/generic/class_user.inc:654
+#: plugins/personal/generic/class_user.inc:657
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:656
+#: plugins/personal/generic/class_user.inc:659
#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
msgid "New password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:658
+#: plugins/personal/generic/class_user.inc:661
msgid "The password used as new and current are too similar."
msgstr ""
-#: plugins/personal/generic/class_user.inc:660
+#: plugins/personal/generic/class_user.inc:663
msgid "The password used as new is to short."
msgstr ""
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:665
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
@@ -3298,36 +3307,46 @@ msgid ""
"recover their password"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:189
+msgid "Login attribute"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
msgid "First email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
msgid "Subject"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
msgid "Subject of the first email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
msgid "[FusionDirectory] Password recovery link"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
#, php-format
msgid ""
"Body of the first email, sent when the user ask for a new password. Use %s "
"for the login and the recovery link."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
#, php-format
msgid ""
"Hello,\n"
@@ -3339,31 +3358,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
msgid "Second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
msgid "Subject of the second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
msgid "[FusionDirectory] Password recovery successful"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
#, php-format
msgid "Body (%s is login)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
#, 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
+#: plugins/config/class_recoveryConfig.inc:118
#, php-format
msgid ""
"Hello,\n"
@@ -3530,10 +3549,6 @@ msgstr ""
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 ""
@@ -4396,7 +4411,7 @@ msgstr ""
msgid "Only allow this group to connect to this list of hosts"
msgstr ""
-#: plugins/admin/groups/class_ogroup.inc:321
+#: plugins/admin/groups/class_ogroup.inc:322
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
diff --git a/locale/it_IT/fusiondirectory.po b/locale/it_IT/fusiondirectory.po
index 3a9e29b412a34c738ef59b7fec6d0b2e1fc55d7d..ae4d2a0a831209266f00e6cba13b0ac769582a91 100644
--- a/locale/it_IT/fusiondirectory.po
+++ b/locale/it_IT/fusiondirectory.po
@@ -4,15 +4,16 @@
#
# Translators:
# Ilaria Montaruli <Ilaria.Montaruli@gmail.com>, 2015
-# Paola Penati <penati@avaya.com>, 2016-2017
-# Paola Penati <penati@avaya.com>, 2016
+# Paola Penati <paola.penati@opensides.be>, 2016-2017
+# Paola Penati <paola.penati@opensides.be>, 2016-2017
+# Paola Penati <paola.penati@opensides.be>, 2016
msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-11 19:09+0100\n"
-"PO-Revision-Date: 2017-01-13 17:11+0000\n"
-"Last-Translator: Paola Penati <penati@avaya.com>\n"
+"POT-Creation-Date: 2017-03-29 21:46+0200\n"
+"PO-Revision-Date: 2017-03-30 14:35+0000\n"
+"Last-Translator: Paola Penati <paola.penati@opensides.be>\n"
"Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +22,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:382
+#: plugins/personal/generic/class_user.inc:385
msgid "Preferred language"
msgstr "Lingua preferita"
@@ -319,30 +320,30 @@ msgstr "Verifica dei possibili doppioni GID"
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
+#: setup/class_setupStep_Migrate.inc:981
+#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1180
+#: setup/class_setupStep_Migrate.inc:1273
+#: setup/class_setupStep_Migrate.inc:1352
+#: setup/class_setupStep_Migrate.inc:1396
+msgid "LDAP query failed"
+msgstr "La richiesta al database LDAP è fallita!"
+
+#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
+#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
#: setup/class_setupStep_Migrate.inc:982
#: setup/class_setupStep_Migrate.inc:1058
#: setup/class_setupStep_Migrate.inc:1181
#: setup/class_setupStep_Migrate.inc:1274
#: setup/class_setupStep_Migrate.inc:1353
#: setup/class_setupStep_Migrate.inc:1397
-msgid "LDAP query failed"
-msgstr "La richiesta al database LDAP è fallita!"
-
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:983
-#: setup/class_setupStep_Migrate.inc:1059
-#: setup/class_setupStep_Migrate.inc:1182
-#: setup/class_setupStep_Migrate.inc:1275
-#: setup/class_setupStep_Migrate.inc:1354
-#: setup/class_setupStep_Migrate.inc:1398
msgid "Possibly the \"root object\" is missing."
msgstr "Forse l'\"oggetto radice\" é mancante"
#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:866
-#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
+#: setup/class_setupStep_Migrate.inc:880
msgid "Failed"
msgstr "Fallito"
@@ -363,11 +364,11 @@ msgid ""
msgstr "Impossibile gestire il tipo di oggetto strutturale del tuo oggetto radice. Prova ad aggiungere manualmente la classe d'oggetto '%s'. "
#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:677
-#: include/functions.inc:724 include/functions.inc:822
-#: include/functions.inc:2988 include/functions.inc:3165
+#: include/functions.inc:522 include/functions.inc:679
+#: include/functions.inc:726 include/functions.inc:834
+#: include/functions.inc:3001 include/functions.inc:3178
#: include/class_config.inc:322 include/class_ldap.inc:924
#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
#: include/simpleplugin/attributes/class_SetAttribute.inc:726
@@ -389,13 +390,13 @@ msgid "The specified user \"%s\" does not have full access to your ldap database
msgstr "L'utente \"%s\" non ha pieno accesso al database LDAP."
#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1085
-#: setup/class_setupStep_Migrate.inc:1204
-#: setup/class_setupStep_Migrate.inc:1315
-#: setup/class_setupStep_Migrate.inc:1379
-#: setup/class_setupStep_Migrate.inc:1423 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:838
-#: include/functions.inc:2523 include/simpleplugin/class_simpleTabs.inc:322
+#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1203
+#: setup/class_setupStep_Migrate.inc:1314
+#: setup/class_setupStep_Migrate.inc:1378
+#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
+#: include/class_xml.inc:55 include/functions.inc:850
+#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
#: html/index.php:597 html/main.php:158
#: plugins/personal/posix/class_posixAccount.inc:482
#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
@@ -416,7 +417,7 @@ msgid "User migration"
msgstr "Migrazione utente"
#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1029
+#: setup/class_setupStep_Migrate.inc:1028
msgid "Migration error"
msgstr "Errore durante la migrazione"
@@ -425,64 +426,64 @@ msgstr "Errore durante la migrazione"
msgid "Cannot migrate entry \"%s\":"
msgstr "Impossibile eseguire la migrazione di voce \"%s\":"
-#: setup/class_setupStep_Migrate.inc:859
+#: setup/class_setupStep_Migrate.inc:858
#, php-format
msgid "FD 1.0.7 administrative accounts found: %s"
msgstr "FD 1.0.7 account amministrativi trovati: %s"
-#: setup/class_setupStep_Migrate.inc:862
+#: setup/class_setupStep_Migrate.inc:861
#, php-format
msgid "FD 1.0.7 administrative groups found: %s"
msgstr "FD 1.0.7 gruppi amministrativi trovati: %s"
-#: setup/class_setupStep_Migrate.inc:864
+#: setup/class_setupStep_Migrate.inc:863
msgid ""
"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
"file at the end of the setup to migrate it.<br/>"
msgstr "é possibile eseguire <i>fusiondirectory-setup --migrate-acls</i> dopo aver salvato il file do configurazione al termine della messa a punto per la migrazione."
-#: setup/class_setupStep_Migrate.inc:867
+#: setup/class_setupStep_Migrate.inc:866
msgid ""
"There is no valid FusionDirectory 1.0.8 administrator account inside your "
"LDAP."
msgstr "Non vi è alcun account amministratore FusionDirectory 1.0.8 valido all'interno del vostro LDAP ."
-#: setup/class_setupStep_Migrate.inc:868 setup/class_setupStep_Migrate.inc:883
+#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
#: include/simpleplugin/simple-list.xml:59
#: plugins/admin/departments/dep-list.xml:48
#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
msgid "Create"
msgstr "Crea"
-#: setup/class_setupStep_Migrate.inc:873
+#: setup/class_setupStep_Migrate.inc:872
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: plugins/admin/users/class_userManagement.inc:42
msgid "Users"
msgstr "Utenti"
-#: setup/class_setupStep_Migrate.inc:876
+#: setup/class_setupStep_Migrate.inc:875
msgid "Groups"
msgstr "Gruppi"
-#: setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStep_Migrate.inc:881
msgid "There is no FusionDirectory administrator account inside your LDAP."
msgstr "Non ho trovato alcun amministratore di FusionDirectory nel tuo annuario LDAP."
-#: setup/class_setupStep_Migrate.inc:920
+#: setup/class_setupStep_Migrate.inc:919
msgid "Gives all rights on all objects"
msgstr "DÃ tutti i diritti su ogni oggetto"
-#: setup/class_setupStep_Migrate.inc:937 include/class_management.inc:697
+#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
#: include/class_listing.inc:551 include/class_xml.inc:58
#: include/password-methods/class_password-methods-sasl.inc:60
#: include/password-methods/class_password-methods-sasl.inc:86
#: include/password-methods/class_password-methods.inc:393
#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3112
-#: include/functions.inc:3133 include/functions.inc:3173
-#: include/functions.inc:3185 include/functions.inc:3189
-#: include/functions.inc:3196 include/functions.inc:3205
-#: include/functions.inc:3267 include/class_msg_dialog.inc:128
+#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
+#: include/functions.inc:3146 include/functions.inc:3186
+#: include/functions.inc:3198 include/functions.inc:3202
+#: include/functions.inc:3209 include/functions.inc:3218
+#: include/functions.inc:3280 include/class_msg_dialog.inc:128
#: include/class_msg_dialog.inc:164 include/class_config.inc:357
#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
@@ -495,82 +496,82 @@ msgstr "DÃ tutti i diritti su ogni oggetto"
#: include/simpleplugin/attributes/class_FileAttribute.inc:34
#: include/simpleplugin/attributes/class_FileAttribute.inc:37
#: include/simpleplugin/attributes/class_FileAttribute.inc:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:801
-#: include/class_plugin.inc:1534 html/index.php:453 html/index.php:474
+#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
+#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
#: html/index.php:484 html/index.php:546 html/index.php:556
#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
msgid "Error"
msgstr "Errore"
-#: setup/class_setupStep_Migrate.inc:997
+#: setup/class_setupStep_Migrate.inc:996
msgid "Default ACL roles have not been inserted"
msgstr "I ruoli ACL di default non sono stati inseriti"
-#: setup/class_setupStep_Migrate.inc:999
+#: setup/class_setupStep_Migrate.inc:998
msgid "Some default ACL roles are missing"
msgstr "Mancano alcuni ruoli ACL di default"
-#: setup/class_setupStep_Migrate.inc:1001
+#: setup/class_setupStep_Migrate.inc:1000
msgid "Default ACL roles have been inserted"
msgstr "Ruoli ACL di default sono stati inseriti"
-#: setup/class_setupStep_Migrate.inc:1031
+#: setup/class_setupStep_Migrate.inc:1030
#, php-format
msgid "Cannot add ACL role \"%s\":"
msgstr "Impossibile aggiungere ruolo \"%s\" ACL "
-#: setup/class_setupStep_Migrate.inc:1086
+#: setup/class_setupStep_Migrate.inc:1085
#, php-format
msgid "Found %s user(s) outside the configured tree \"%s\"."
msgstr "Ho trovato %s utente(i) al di fuori del ramo \"%s\" configurato."
-#: setup/class_setupStep_Migrate.inc:1100
-#: setup/class_setupStep_Migrate.inc:1114
+#: setup/class_setupStep_Migrate.inc:1099
+#: setup/class_setupStep_Migrate.inc:1113
msgid "Move users into configured user tree"
msgstr "Sposta gli utenti nel ramo utenti configurato nell'annuario"
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
msgid "Cannot move entries to the requested department!"
msgstr "Impossibile spostare le entrate nel dipartimento richiesto!"
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "Entry will be moved from"
msgstr "L'entrata verrà spostata"
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "to"
msgstr "verso"
-#: setup/class_setupStep_Migrate.inc:1154
+#: setup/class_setupStep_Migrate.inc:1153
msgid "The following references will be updated"
msgstr "Le seguenti reference saranno aggiornate"
-#: setup/class_setupStep_Migrate.inc:1205
+#: setup/class_setupStep_Migrate.inc:1204
#, php-format
msgid "Found %s groups outside the configured tree '%s'."
msgstr "Ho trovato %s gruppi al di fuori del ramo '%s' configurato."
-#: setup/class_setupStep_Migrate.inc:1219
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1218
+#: setup/class_setupStep_Migrate.inc:1232
msgid "Move groups into configured groups tree"
msgstr "Sposta i gruppi nel ramo di gruppi configurato"
-#: setup/class_setupStep_Migrate.inc:1316
+#: setup/class_setupStep_Migrate.inc:1315
#, php-format
msgid "Found %s department(s) that will not be visible in FusionDirectory."
msgstr "Ho trovato %s departimenti(o) che non saranno visibili in FusionDirectory."
-#: setup/class_setupStep_Migrate.inc:1325
-#: setup/class_setupStep_Migrate.inc:1330
+#: setup/class_setupStep_Migrate.inc:1324
+#: setup/class_setupStep_Migrate.inc:1329
msgid "Department migration"
msgstr "Migrazione Dipartilento"
-#: setup/class_setupStep_Migrate.inc:1380
+#: setup/class_setupStep_Migrate.inc:1379
#, php-format
msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr "Trovati %s valori duplicati per l'attributo \"uidNumber\":%s"
-#: setup/class_setupStep_Migrate.inc:1424
+#: setup/class_setupStep_Migrate.inc:1423
#, php-format
msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr "Trovati %s valori duplicati per l'attributo \"gidNumber\":%s"
@@ -746,10 +747,10 @@ msgstr "Successivo"
#: include/class_logging.inc:80 include/class_session.inc:50
#: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:649
-#: include/functions.inc:770 include/functions.inc:1189
-#: include/functions.inc:2243 include/functions.inc:2285
-#: include/functions.inc:2314 include/class_ldap.inc:873
+#: include/functions.inc:564 include/functions.inc:651
+#: include/functions.inc:772 include/functions.inc:1201
+#: include/functions.inc:2255 include/functions.inc:2297
+#: include/functions.inc:2326 include/class_ldap.inc:873
#: include/class_ldap.inc:911 include/class_acl.inc:118
msgid "Internal error"
msgstr "Errore interno"
@@ -816,12 +817,12 @@ msgid ""
"plugin instance!"
msgstr "Nessuna dichiarazione per '% s' nel file di configurazione. Impossibile inizializzare il plugin !"
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1188
+#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
#: include/class_listing.inc:1190
msgid "Root"
msgstr "Root"
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
msgid "Submit"
msgstr "Invia"
@@ -922,7 +923,7 @@ msgid "Create a new snapshot from this object"
msgstr "Crea una nuova 'copia istantanea a partire da questi oggetti"
#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3302 include/simpleplugin/class_simplePlugin.inc:272
+#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
#: include/simpleplugin/class_simplePlugin.inc:277
#: include/simpleplugin/class_simplePlugin.inc:289
#: html/class_passwordRecovery.inc:116
@@ -955,7 +956,7 @@ msgstr "é necessario compilare saslRealm o saslExop nello schermo di configuraz
#: include/password-methods/class_password-methods-sha.inc:69
#: include/password-methods/class_password-methods-ssha.inc:73
#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:659 include/class_timezone.inc:51
+#: include/functions.inc:661 include/class_timezone.inc:51
#: include/class_config.inc:159 include/class_config.inc:284
#: include/class_config.inc:843 include/class_config.inc:856
#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
@@ -993,7 +994,7 @@ msgid "Cannot paste"
msgstr "Impossibile incollare"
#: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
#: plugins/personal/generic/paste_generic.tpl.c:11
msgid "Login"
@@ -1037,245 +1038,245 @@ msgid ""
"administrator."
msgstr "Il login (uid) non é unico all'interno della struttura LDAP. Per favore contattare il vostro amministratore di sistema."
-#: include/functions.inc:597
+#: include/functions.inc:599
msgid "Authentication error"
msgstr "Errore di autentificazione"
-#: include/functions.inc:598
+#: include/functions.inc:600
msgid ""
"It seems your user password has expired. Please use <a "
"href=\"recovery.php\">password recovery</a> to change it."
msgstr "Sembrerebbe che la password sia scaduta. Per favore utilizzare <a href=\"recovery.php\"> recupero password </a> per cambiarla"
-#: include/functions.inc:649 include/functions.inc:770
+#: include/functions.inc:651 include/functions.inc:772
msgid "Error while adding a lock. Contact the developers!"
msgstr "Errore all'aggiunta di un bloccaggio. Contatta i programmatori !"
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid ""
"Cannot create locking information in LDAP tree. Please contact your "
"administrator!"
msgstr "Impossibile creare i dati per il bloccaggio nell'annuario LDAP. Contatta l'amministratore del sistema !"
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid "LDAP server returned: %s"
msgstr "Il server LDAP ha risposto: %s"
-#: include/functions.inc:838
+#: include/functions.inc:850
msgid ""
"Found multiple locks for object to be locked. This should not happen - "
"cleaning up multiple references."
msgstr "Sono stati trovati molteplici bloccaggi per lo stesso oggetto da bloccare. Questo non dovrebbe mai succedere. Ripulire le referenze multiple."
-#: include/functions.inc:1109
+#: include/functions.inc:1121
#, php-format
msgid "The size limit of %d entries is exceed!"
msgstr "Il valore limite dell'entries %d è stato superato !"
-#: include/functions.inc:1111
+#: include/functions.inc:1123
#, php-format
msgid ""
"Set the new size limit to %s and show me this message if the limit still "
"exceeds"
msgstr "Impostare il nuovo valore limite a %s et mostrare questo messaggio se lo stesso valore è superato"
-#: include/functions.inc:1128
+#: include/functions.inc:1140
msgid "Configure"
msgstr "Configura"
-#: include/functions.inc:1133
+#: include/functions.inc:1145
msgid "incomplete"
msgstr "incompleto"
-#: include/functions.inc:1534
+#: include/functions.inc:1546
msgid "Continue anyway"
msgstr "Prosegui comunque"
-#: include/functions.inc:1536
+#: include/functions.inc:1548
msgid "Edit anyway"
msgstr "Modifica malgrado l'avvertimento"
-#: include/functions.inc:1538
+#: include/functions.inc:1550
#, php-format
msgid "You're going to edit the LDAP entry/entries %s"
msgstr "Sei sul punto di modificare la/le voce/voci %s"
-#: include/functions.inc:1766
+#: include/functions.inc:1778
msgid "Entries per page"
msgstr "Voci per pagina"
-#: include/functions.inc:1797 include/class_filter.inc:353
+#: include/functions.inc:1809 include/class_filter.inc:353
msgid "Apply filter"
msgstr "Applica filtro"
-#: include/functions.inc:2065
+#: include/functions.inc:2077
#, php-format
msgid "%sB"
msgstr "%sB"
-#: include/functions.inc:2066
+#: include/functions.inc:2078
#, php-format
msgid "%sKiB"
msgstr "%sKiB"
-#: include/functions.inc:2067
+#: include/functions.inc:2079
#, php-format
msgid "%sMiB"
msgstr "%sMiB"
-#: include/functions.inc:2068
+#: include/functions.inc:2080
#, php-format
msgid "%sGiB"
msgstr "%sGiB"
-#: include/functions.inc:2069
+#: include/functions.inc:2081
#, php-format
msgid "%sTiB"
msgstr "%sTiB"
-#: include/functions.inc:2070
+#: include/functions.inc:2082
#, php-format
msgid "%sPiB"
msgstr "%sPiB"
-#: include/functions.inc:2071
+#: include/functions.inc:2083
#, php-format
msgid "%sEiB"
msgstr "%sPiB"
-#: include/functions.inc:2072
+#: include/functions.inc:2084
#, php-format
msgid "%sZiB"
msgstr "%sZiB"
-#: include/functions.inc:2073
+#: include/functions.inc:2085
#, php-format
msgid "%sYiB"
msgstr "%sYiB"
-#: include/functions.inc:2105 include/class_filter.inc:315
+#: include/functions.inc:2117 include/class_filter.inc:315
msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
-#: include/functions.inc:2243
+#: include/functions.inc:2255
#, php-format
msgid ""
"File '%s' could not be deleted. Try fusiondirectory-setup --check-"
"directories to fix permissions."
msgstr "Il file '%s' non puó essere rimosso. Prova ad usare fusiondirectory-setup --check-directories per correggerne i privilegi di accesso."
-#: include/functions.inc:2285
+#: include/functions.inc:2297
msgid "Cannot write to revision file!"
msgstr "Impossibile scrivere il file di revisione !"
-#: include/functions.inc:2314
+#: include/functions.inc:2326
msgid "Cannot read to revision file!"
msgstr "Impossibile leggere il file di revisione !"
-#: include/functions.inc:2523
+#: include/functions.inc:2535
msgid "'nextIdHook' is not available. Using default base!"
msgstr "'prossimo Hook ID\" non é disponibile. Usa una base predefinita!"
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "LDAP warning"
msgstr "Avvertimento LDAP"
-#: include/functions.inc:2541
+#: include/functions.inc:2554
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:2564
+#: include/functions.inc:2577
msgid "Main FusionDirectory schema"
msgstr "Schema principale di FusionDirectory"
-#: include/functions.inc:2571
+#: include/functions.inc:2584
msgid "Schema used to store FusionDirectory configuration"
msgstr "Schema utilizzato per memorizzare la configurazione di FusionDirectory"
-#: include/functions.inc:2578
+#: include/functions.inc:2591
msgid "Used to store trust mode information in users or groups."
msgstr "Utilizzato per memorizzare le informazioni in modalità fiducia in utenti o gruppi."
-#: include/functions.inc:2585
+#: include/functions.inc:2598
msgid "Used to store templates."
msgstr "Usato per memorizzare i modelli."
-#: include/functions.inc:2592
+#: include/functions.inc:2605
msgid "Used to store POSIX information."
msgstr "Usato per memorizzare le informazioni POSIX."
-#: include/functions.inc:2599
+#: include/functions.inc:2612
#, php-format
msgid "Missing required object class \"%s\"!"
msgstr "Manca la classe di oggetti necessaria \"%s\"!"
-#: include/functions.inc:2601
+#: include/functions.inc:2614
#, php-format
msgid "Missing optional object class \"%s\"!"
msgstr "Manca classe di oggetti optional \"%s\"!"
-#: include/functions.inc:2605
+#: include/functions.inc:2618
#, php-format
msgid "Class(es) available"
msgstr "Classe(i) disponibile(i)"
-#: include/functions.inc:2623
+#: include/functions.inc:2636
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:2637
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:2640
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:2641
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr "L'objectClass \"posixGroup\" deve essere STRUTTURALE"
-#: include/functions.inc:3112 include/functions.inc:3133
-#: include/functions.inc:3173 include/functions.inc:3185
-#: include/functions.inc:3189 include/functions.inc:3196
-#: include/functions.inc:3205
+#: include/functions.inc:3125 include/functions.inc:3146
+#: include/functions.inc:3186 include/functions.inc:3198
+#: include/functions.inc:3202 include/functions.inc:3209
+#: include/functions.inc:3218
msgid "Cannot allocate a free ID:"
msgstr "Impossibile assegnare un ID libero:"
-#: include/functions.inc:3112
+#: include/functions.inc:3125
msgid "unknown idAllocation method!"
msgstr "Metodo idAllocation sconosciuto !"
-#: include/functions.inc:3133
+#: include/functions.inc:3146
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr "%sPoolMin >= %sPoolMax!"
-#: include/functions.inc:3173
+#: include/functions.inc:3186
msgid "sambaUnixIdPool is not unique!"
msgstr "sambaUnixIdPool non è univoco !"
-#: include/functions.inc:3185 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3202
msgid "no ID available!"
msgstr "nessun ID disponibile !"
-#: include/functions.inc:3205
+#: include/functions.inc:3218
msgid "maximum tries exceeded!"
msgstr "Il numero massimo di tentativi è stato superato"
-#: include/functions.inc:3267
+#: include/functions.inc:3280
msgid "Cannot allocate a free ID!"
msgstr "Impossibile assegnare un ID libero!"
-#: include/functions.inc:3303
+#: include/functions.inc:3316
#, 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"
@@ -2105,7 +2106,7 @@ msgstr "Nome"
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
#: plugins/admin/departments/class_department.inc:72
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/groups/class_roleGeneric.inc:91
@@ -2285,7 +2286,7 @@ msgid "The entry %s is not existing"
msgstr "La voce %s non esiste"
#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:548
+#: include/class_plugin.inc:554
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!"
@@ -2401,14 +2402,19 @@ msgstr "Un numero con la virgola più piccolo di %f"
msgid "There was a problem uncompressing snapshot data"
msgstr "C'é stato un problema nella decompressione dei dati di snapshot"
-#: include/class_plugin.inc:803
+#: include/class_plugin.inc:809
#, php-format
msgid ""
"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
msgstr "La dipendenza riccorsiva nei campi di modello: \"%1$s\" non puo' dipendere da \"%2$s\" dato che \"%2$s\" dipende già da \"%1$s\""
-#: include/class_plugin.inc:1332
+#: include/class_plugin.inc:1350
+#, php-format
+msgid "Service \"%s\""
+msgstr "Servizio \"%s\""
+
+#: include/class_plugin.inc:1352
#, php-format
msgid "Tab \"%s\""
msgstr "Tab \"%s\""
@@ -2556,44 +2562,44 @@ msgstr "Il tuo navigatore web ha i cookies disattivati. Attiva i cookies e ricar
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr "Il file di configurazione %s/%s non è leggibile. Operazione Annullata."
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
msgid "Email address"
msgstr "Indirizzo di posta elettronica"
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
#, php-format
msgid "Did not find an account with login \"%s\""
msgstr "Alcun account trovato con login \"%s\" "
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
#, php-format
msgid "Found multiple accounts with login \"%s\""
msgstr "Trovati più accounts con login \"%s\""
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
#, php-format
msgid "There is no account using email \"%s\""
msgstr "Non c'è nessun account che usa l'indirizzo mail %s"
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There are several accounts using email \"%s\""
msgstr "Ci sono più account che usano l'indirizzo mail %s"
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
#, php-format
msgid "The user using email \"%s\" is locked. Please contact your administrator."
msgstr "L'utente che usa la mail \"%s\" é bloccato. Si prega di contattare l'amministratore di sistema."
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
msgid "Contact your administrator, there was a problem with mail server"
msgstr "Contattare l'amministratore, c'è stato un problema con il server di posta elettronica"
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
msgid "This token is invalid"
msgstr "Questo token non è valido"
-#: html/class_passwordRecovery.inc:647
+#: html/class_passwordRecovery.inc:651
msgid "There was a problem with mail server, confirmation email not sent"
msgstr "Si è verificato un problema con il server mail, la email di conferma non è stata inviata"
@@ -2905,7 +2911,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:387
+#: plugins/personal/generic/class_user.inc:390
#: setup/setup_migrate_adminAccount.tpl.c:14
#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2942,258 +2948,262 @@ msgstr "Informazioni account utente"
msgid "User account"
msgstr "Account utente"
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:296
+msgid "User lock status"
+msgstr "Stato di blocco utente"
+
+#: plugins/personal/generic/class_user.inc:307
msgid "Personal information"
msgstr "Informazioni personali"
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "Cognome"
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
msgid "Last name of this user"
msgstr "Cognome utente"
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "Nome"
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
msgid "First name of this user"
msgstr "Nme utente"
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
msgid "Short description of the user"
msgstr "Breve descrizione dell'utente"
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "Picture"
msgstr "Foto"
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "The avatar for this user"
msgstr "Avatar di questo utente"
-#: plugins/personal/generic/class_user.inc:330
+#: plugins/personal/generic/class_user.inc:333
msgid "Organizational contact information"
msgstr "Informazioni di contatto organizzativo"
-#: plugins/personal/generic/class_user.inc:334
+#: plugins/personal/generic/class_user.inc:337
#: plugins/admin/departments/class_department.inc:90
#: plugins/admin/departments/class_department.inc:96
msgid "Location"
msgstr "Località "
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:341
#: plugins/admin/departments/class_department.inc:93
msgid "State"
msgstr "Regione"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
#: plugins/admin/departments/class_department.inc:102
msgid "Address"
msgstr "Indirizzo"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
msgid "Business postal address"
msgstr "Indirizzo postale ufficio"
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room No."
msgstr "Stanza No."
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room number"
msgstr "Numero dell'ufficio"
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
#: plugins/admin/departments/class_department.inc:106
msgid "Phone"
msgstr "Telefono"
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
msgid "Business phone number"
msgstr "Telefono ufficio"
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Mobile"
msgstr "Cellulare"
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Business mobile number"
msgstr "Telefono cellulare professionale"
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Pager"
msgstr "Cercapersone"
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Business pager number"
msgstr "Numero pager ufficio"
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
#: plugins/admin/departments/class_department.inc:110
msgid "Fax"
msgstr "Fax"
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
msgid "Business fax number"
msgstr "Numero fax ufficio"
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Homepage"
msgstr "Home Page"
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Personal homepage"
msgstr "Pagina Web personale"
-#: plugins/personal/generic/class_user.inc:373
+#: plugins/personal/generic/class_user.inc:376
msgid "Account information"
msgstr "Informazioni account utente"
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
msgid "Login of this user"
msgstr "Login utente"
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
msgid "Password of the user"
msgstr "Password dell'utente"
-#: plugins/personal/generic/class_user.inc:393
+#: plugins/personal/generic/class_user.inc:396
msgid "Personal contact information"
msgstr "Informazioni personali utente"
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Display name"
msgstr "Mostra il nome"
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
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:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home address"
msgstr "Indirizzo di casa"
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home postal address"
msgstr "Indirizzo postale di casa"
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Private phone"
msgstr "Numero di telefono privato"
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Home phone number"
msgstr "Numero di telefono di casa"
-#: plugins/personal/generic/class_user.inc:411
+#: plugins/personal/generic/class_user.inc:414
msgid "Organizational information"
msgstr "Informazioni organizzazione"
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
msgid "Title"
msgstr "Titolo"
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
msgid ""
"Title of a person in their organizational context. Each title is one value "
"of this multi-valued attribute"
msgstr "Titolo di una persona nel proprio contesto organizzativo. Ogni titolo è una valore di questo attributo multivalore"
-#: plugins/personal/generic/class_user.inc:421
+#: plugins/personal/generic/class_user.inc:424
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
msgid "Organization"
msgstr "Organizzazione"
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
#: plugins/admin/departments/class_department.inc:33
#: plugins/admin/departments/class_department.inc:39
#: plugins/admin/departments/dep-list.xml:21
msgid "Department"
msgstr "Dipartimento"
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
msgid "Department to which the user belongs"
msgstr "Dipartimento al quale appartiene l'utente"
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department No."
msgstr "Dipartimento No."
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department number"
msgstr "Numero del dipartimento"
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee No."
msgstr "Matricola No."
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee number"
msgstr "Matricola dell'impiegato"
-#: plugins/personal/generic/class_user.inc:437
+#: plugins/personal/generic/class_user.inc:440
msgid "Employee type"
msgstr "Qualifica"
-#: plugins/personal/generic/class_user.inc:441
+#: plugins/personal/generic/class_user.inc:444
#: plugins/admin/departments/class_department.inc:84
msgid "Manager"
msgstr "Manager"
-#: plugins/personal/generic/class_user.inc:608
+#: plugins/personal/generic/class_user.inc:611
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr "Impossibile trovare %s nell'annuario LDAP"
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:614
msgid "You are not allowed to change your own password"
msgstr "Non le é permesso cambiare la propria password"
-#: plugins/personal/generic/class_user.inc:622
+#: plugins/personal/generic/class_user.inc:625
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr "Devi attendere %d secondi prima di cambiare di nuovo la password"
-#: plugins/personal/generic/class_user.inc:636
+#: plugins/personal/generic/class_user.inc:639
msgid "Password is in history of old passwords"
msgstr "La password si trova nella cronologia delle vecchie password"
-#: plugins/personal/generic/class_user.inc:641
-#: plugins/personal/generic/class_user.inc:645
+#: plugins/personal/generic/class_user.inc:644
+#: plugins/personal/generic/class_user.inc:648
msgid "Password is not being changed from existing value"
msgstr "La password non è stata cambiata dal valore esistente"
-#: plugins/personal/generic/class_user.inc:652
+#: plugins/personal/generic/class_user.inc:655
msgid "You need to specify your current password in order to proceed."
msgstr "Devi specificare la tua 'Password attuale' per procedere."
-#: plugins/personal/generic/class_user.inc:654
+#: plugins/personal/generic/class_user.inc:657
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr "Le password che hai inserito come \" Nuova password \" e \"Ripeti nuova password\" non corrispondono."
-#: plugins/personal/generic/class_user.inc:656
+#: plugins/personal/generic/class_user.inc:659
#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
msgid "New password"
msgstr "Imposta la nuova password"
-#: plugins/personal/generic/class_user.inc:658
+#: plugins/personal/generic/class_user.inc:661
msgid "The password used as new and current are too similar."
msgstr "La password che hai definito come 'Nuova password' è troppo simile a quella attuale."
-#: plugins/personal/generic/class_user.inc:660
+#: plugins/personal/generic/class_user.inc:663
msgid "The password used as new is to short."
msgstr "La 'Nuova password' immessa è troppo corta."
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:665
msgid "The password contains possibly problematic Unicode characters!"
msgstr "La password contiene caratteri Unicode eventualmente problematici!"
@@ -3301,36 +3311,46 @@ msgid ""
"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:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:189
+msgid "Login attribute"
+msgstr "Attributo di connessione"
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr "Di solito UID, ma è possibile utilizzare qualcos'altro per esempio in caso di SSO"
+
+#: plugins/config/class_recoveryConfig.inc:85
msgid "First email"
msgstr "Prima email"
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
msgid "Subject"
msgstr "Oggetto"
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
msgid "Subject of the first email"
msgstr "Soggetto della prima email"
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
msgid "[FusionDirectory] Password recovery link"
msgstr "[FusionDirectory] link verso il recupero della password"
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
#, 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:91
+#: plugins/config/class_recoveryConfig.inc:96
#, php-format
msgid ""
"Body of the first email, sent when the user ask for a new password. Use %s "
"for the login and the recovery link."
msgstr "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:94
+#: plugins/config/class_recoveryConfig.inc:99
#, php-format
msgid ""
"Hello,\n"
@@ -3342,31 +3362,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr "Buongiorno,\n\necco le votre informazioni:\n- Login : %s\n\n- Link : %s\n\n\nQuesto link é valido solo per 10 minuti."
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
msgid "Second email"
msgstr "Seconda email"
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
msgid "Subject of the second email"
msgstr "Soggetto della seconda email"
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
msgid "[FusionDirectory] Password recovery successful"
msgstr "[FusionDirectory] Il recupero della password è stato eseguito con successo"
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
#, php-format
msgid "Body (%s is login)"
msgstr "Corpo del messaggio (%s è il login utente)"
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
#, 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:113
+#: plugins/config/class_recoveryConfig.inc:118
#, php-format
msgid ""
"Hello,\n"
@@ -3533,10 +3553,6 @@ msgstr "Definisce il numero di voci ottenibili da LDAP come impostazione predefi
msgid "Login and session"
msgstr "Connessione e sessione"
-#: plugins/config/class_configInLdap.inc:189
-msgid "Login attribute"
-msgstr "Attributo di connessione"
-
#: 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."
@@ -4399,7 +4415,7 @@ msgstr "Oggetti membro di questo gruppo"
msgid "Only allow this group to connect to this list of hosts"
msgstr "Consenti all'utente di connettersi solo a questo elenco di host "
-#: plugins/admin/groups/class_ogroup.inc:321
+#: plugins/admin/groups/class_ogroup.inc:322
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr "Non é consentito mettre workstations e terminali nello stesso gruppo"
diff --git a/locale/lv/fusiondirectory.po b/locale/lv/fusiondirectory.po
index 3d9b3b4adc2f4c9b737d484f0aef0362818dcfc7..7450982e529c73ed84f0a90bc4b0dcce7def624e 100644
--- a/locale/lv/fusiondirectory.po
+++ b/locale/lv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-11 19:09+0100\n"
-"PO-Revision-Date: 2017-01-10 14:53+0000\n"
+"POT-Creation-Date: 2017-03-29 21:46+0200\n"
+"PO-Revision-Date: 2017-03-26 15:51+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:382
+#: plugins/personal/generic/class_user.inc:385
msgid "Preferred language"
msgstr ""
@@ -316,30 +316,30 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
+#: setup/class_setupStep_Migrate.inc:981
+#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1180
+#: setup/class_setupStep_Migrate.inc:1273
+#: setup/class_setupStep_Migrate.inc:1352
+#: setup/class_setupStep_Migrate.inc:1396
+msgid "LDAP query failed"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
+#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
#: setup/class_setupStep_Migrate.inc:982
#: setup/class_setupStep_Migrate.inc:1058
#: setup/class_setupStep_Migrate.inc:1181
#: setup/class_setupStep_Migrate.inc:1274
#: setup/class_setupStep_Migrate.inc:1353
#: setup/class_setupStep_Migrate.inc:1397
-msgid "LDAP query failed"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:983
-#: setup/class_setupStep_Migrate.inc:1059
-#: setup/class_setupStep_Migrate.inc:1182
-#: setup/class_setupStep_Migrate.inc:1275
-#: setup/class_setupStep_Migrate.inc:1354
-#: setup/class_setupStep_Migrate.inc:1398
msgid "Possibly the \"root object\" is missing."
msgstr ""
#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:866
-#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
+#: setup/class_setupStep_Migrate.inc:880
msgid "Failed"
msgstr ""
@@ -360,11 +360,11 @@ msgid ""
msgstr ""
#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:677
-#: include/functions.inc:724 include/functions.inc:822
-#: include/functions.inc:2988 include/functions.inc:3165
+#: include/functions.inc:522 include/functions.inc:679
+#: include/functions.inc:726 include/functions.inc:834
+#: include/functions.inc:3001 include/functions.inc:3178
#: include/class_config.inc:322 include/class_ldap.inc:924
#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
#: include/simpleplugin/attributes/class_SetAttribute.inc:726
@@ -386,13 +386,13 @@ msgid "The specified user \"%s\" does not have full access to your ldap database
msgstr ""
#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1085
-#: setup/class_setupStep_Migrate.inc:1204
-#: setup/class_setupStep_Migrate.inc:1315
-#: setup/class_setupStep_Migrate.inc:1379
-#: setup/class_setupStep_Migrate.inc:1423 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:838
-#: include/functions.inc:2523 include/simpleplugin/class_simpleTabs.inc:322
+#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1203
+#: setup/class_setupStep_Migrate.inc:1314
+#: setup/class_setupStep_Migrate.inc:1378
+#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
+#: include/class_xml.inc:55 include/functions.inc:850
+#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
#: html/index.php:597 html/main.php:158
#: plugins/personal/posix/class_posixAccount.inc:482
#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
@@ -413,7 +413,7 @@ msgid "User migration"
msgstr ""
#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1029
+#: setup/class_setupStep_Migrate.inc:1028
msgid "Migration error"
msgstr ""
@@ -422,64 +422,64 @@ msgstr ""
msgid "Cannot migrate entry \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:859
+#: setup/class_setupStep_Migrate.inc:858
#, php-format
msgid "FD 1.0.7 administrative accounts found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:862
+#: setup/class_setupStep_Migrate.inc:861
#, php-format
msgid "FD 1.0.7 administrative groups found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:864
+#: setup/class_setupStep_Migrate.inc:863
msgid ""
"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
"file at the end of the setup to migrate it.<br/>"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:867
+#: setup/class_setupStep_Migrate.inc:866
msgid ""
"There is no valid FusionDirectory 1.0.8 administrator account inside your "
"LDAP."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:868 setup/class_setupStep_Migrate.inc:883
+#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
#: include/simpleplugin/simple-list.xml:59
#: plugins/admin/departments/dep-list.xml:48
#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
msgid "Create"
msgstr "Izveidot"
-#: setup/class_setupStep_Migrate.inc:873
+#: setup/class_setupStep_Migrate.inc:872
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: plugins/admin/users/class_userManagement.inc:42
msgid "Users"
msgstr "LietotÄji"
-#: setup/class_setupStep_Migrate.inc:876
+#: setup/class_setupStep_Migrate.inc:875
msgid "Groups"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStep_Migrate.inc:881
msgid "There is no FusionDirectory administrator account inside your LDAP."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:920
+#: setup/class_setupStep_Migrate.inc:919
msgid "Gives all rights on all objects"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:937 include/class_management.inc:697
+#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
#: include/class_listing.inc:551 include/class_xml.inc:58
#: include/password-methods/class_password-methods-sasl.inc:60
#: include/password-methods/class_password-methods-sasl.inc:86
#: include/password-methods/class_password-methods.inc:393
#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3112
-#: include/functions.inc:3133 include/functions.inc:3173
-#: include/functions.inc:3185 include/functions.inc:3189
-#: include/functions.inc:3196 include/functions.inc:3205
-#: include/functions.inc:3267 include/class_msg_dialog.inc:128
+#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
+#: include/functions.inc:3146 include/functions.inc:3186
+#: include/functions.inc:3198 include/functions.inc:3202
+#: include/functions.inc:3209 include/functions.inc:3218
+#: include/functions.inc:3280 include/class_msg_dialog.inc:128
#: include/class_msg_dialog.inc:164 include/class_config.inc:357
#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
@@ -492,82 +492,82 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:34
#: include/simpleplugin/attributes/class_FileAttribute.inc:37
#: include/simpleplugin/attributes/class_FileAttribute.inc:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:801
-#: include/class_plugin.inc:1534 html/index.php:453 html/index.php:474
+#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
+#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
#: html/index.php:484 html/index.php:546 html/index.php:556
#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
msgid "Error"
msgstr "Kļūda"
-#: setup/class_setupStep_Migrate.inc:997
+#: setup/class_setupStep_Migrate.inc:996
msgid "Default ACL roles have not been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:999
+#: setup/class_setupStep_Migrate.inc:998
msgid "Some default ACL roles are missing"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1001
+#: setup/class_setupStep_Migrate.inc:1000
msgid "Default ACL roles have been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1031
+#: setup/class_setupStep_Migrate.inc:1030
#, php-format
msgid "Cannot add ACL role \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1086
+#: setup/class_setupStep_Migrate.inc:1085
#, php-format
msgid "Found %s user(s) outside the configured tree \"%s\"."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1100
-#: setup/class_setupStep_Migrate.inc:1114
+#: setup/class_setupStep_Migrate.inc:1099
+#: setup/class_setupStep_Migrate.inc:1113
msgid "Move users into configured user tree"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
msgid "Cannot move entries to the requested department!"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "Entry will be moved from"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "to"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1154
+#: setup/class_setupStep_Migrate.inc:1153
msgid "The following references will be updated"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1205
+#: setup/class_setupStep_Migrate.inc:1204
#, php-format
msgid "Found %s groups outside the configured tree '%s'."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1219
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1218
+#: setup/class_setupStep_Migrate.inc:1232
msgid "Move groups into configured groups tree"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1316
+#: setup/class_setupStep_Migrate.inc:1315
#, php-format
msgid "Found %s department(s) that will not be visible in FusionDirectory."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1325
-#: setup/class_setupStep_Migrate.inc:1330
+#: setup/class_setupStep_Migrate.inc:1324
+#: setup/class_setupStep_Migrate.inc:1329
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1380
+#: setup/class_setupStep_Migrate.inc:1379
#, php-format
msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1424
+#: setup/class_setupStep_Migrate.inc:1423
#, php-format
msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
@@ -743,10 +743,10 @@ msgstr ""
#: include/class_logging.inc:80 include/class_session.inc:50
#: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:649
-#: include/functions.inc:770 include/functions.inc:1189
-#: include/functions.inc:2243 include/functions.inc:2285
-#: include/functions.inc:2314 include/class_ldap.inc:873
+#: include/functions.inc:564 include/functions.inc:651
+#: include/functions.inc:772 include/functions.inc:1201
+#: include/functions.inc:2255 include/functions.inc:2297
+#: include/functions.inc:2326 include/class_ldap.inc:873
#: include/class_ldap.inc:911 include/class_acl.inc:118
msgid "Internal error"
msgstr "IekÅ¡Ä“jÄ kļūda"
@@ -813,12 +813,12 @@ msgid ""
"plugin instance!"
msgstr ""
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1188
+#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
#: include/class_listing.inc:1190
msgid "Root"
msgstr ""
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
msgid "Submit"
msgstr ""
@@ -919,7 +919,7 @@ msgid "Create a new snapshot from this object"
msgstr ""
#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3302 include/simpleplugin/class_simplePlugin.inc:272
+#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
#: include/simpleplugin/class_simplePlugin.inc:277
#: include/simpleplugin/class_simplePlugin.inc:289
#: html/class_passwordRecovery.inc:116
@@ -952,7 +952,7 @@ msgstr ""
#: include/password-methods/class_password-methods-sha.inc:69
#: include/password-methods/class_password-methods-ssha.inc:73
#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:659 include/class_timezone.inc:51
+#: include/functions.inc:661 include/class_timezone.inc:51
#: include/class_config.inc:159 include/class_config.inc:284
#: include/class_config.inc:843 include/class_config.inc:856
#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
@@ -990,7 +990,7 @@ msgid "Cannot paste"
msgstr ""
#: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
#: plugins/personal/generic/paste_generic.tpl.c:11
msgid "Login"
@@ -1034,245 +1034,245 @@ msgid ""
"administrator."
msgstr ""
-#: include/functions.inc:597
+#: include/functions.inc:599
msgid "Authentication error"
msgstr ""
-#: include/functions.inc:598
+#: include/functions.inc:600
msgid ""
"It seems your user password has expired. Please use <a "
"href=\"recovery.php\">password recovery</a> to change it."
msgstr ""
-#: include/functions.inc:649 include/functions.inc:770
+#: include/functions.inc:651 include/functions.inc:772
msgid "Error while adding a lock. Contact the developers!"
msgstr ""
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid ""
"Cannot create locking information in LDAP tree. Please contact your "
"administrator!"
msgstr ""
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid "LDAP server returned: %s"
msgstr ""
-#: include/functions.inc:838
+#: include/functions.inc:850
msgid ""
"Found multiple locks for object to be locked. This should not happen - "
"cleaning up multiple references."
msgstr ""
-#: include/functions.inc:1109
+#: include/functions.inc:1121
#, php-format
msgid "The size limit of %d entries is exceed!"
msgstr ""
-#: include/functions.inc:1111
+#: include/functions.inc:1123
#, php-format
msgid ""
"Set the new size limit to %s and show me this message if the limit still "
"exceeds"
msgstr ""
-#: include/functions.inc:1128
+#: include/functions.inc:1140
msgid "Configure"
msgstr ""
-#: include/functions.inc:1133
+#: include/functions.inc:1145
msgid "incomplete"
msgstr ""
-#: include/functions.inc:1534
+#: include/functions.inc:1546
msgid "Continue anyway"
msgstr ""
-#: include/functions.inc:1536
+#: include/functions.inc:1548
msgid "Edit anyway"
msgstr ""
-#: include/functions.inc:1538
+#: include/functions.inc:1550
#, php-format
msgid "You're going to edit the LDAP entry/entries %s"
msgstr ""
-#: include/functions.inc:1766
+#: include/functions.inc:1778
msgid "Entries per page"
msgstr ""
-#: include/functions.inc:1797 include/class_filter.inc:353
+#: include/functions.inc:1809 include/class_filter.inc:353
msgid "Apply filter"
msgstr ""
-#: include/functions.inc:2065
+#: include/functions.inc:2077
#, php-format
msgid "%sB"
msgstr ""
-#: include/functions.inc:2066
+#: include/functions.inc:2078
#, php-format
msgid "%sKiB"
msgstr ""
-#: include/functions.inc:2067
+#: include/functions.inc:2079
#, php-format
msgid "%sMiB"
msgstr ""
-#: include/functions.inc:2068
+#: include/functions.inc:2080
#, php-format
msgid "%sGiB"
msgstr ""
-#: include/functions.inc:2069
+#: include/functions.inc:2081
#, php-format
msgid "%sTiB"
msgstr ""
-#: include/functions.inc:2070
+#: include/functions.inc:2082
#, php-format
msgid "%sPiB"
msgstr ""
-#: include/functions.inc:2071
+#: include/functions.inc:2083
#, php-format
msgid "%sEiB"
msgstr ""
-#: include/functions.inc:2072
+#: include/functions.inc:2084
#, php-format
msgid "%sZiB"
msgstr ""
-#: include/functions.inc:2073
+#: include/functions.inc:2085
#, php-format
msgid "%sYiB"
msgstr ""
-#: include/functions.inc:2105 include/class_filter.inc:315
+#: include/functions.inc:2117 include/class_filter.inc:315
msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
msgstr ""
-#: include/functions.inc:2243
+#: include/functions.inc:2255
#, php-format
msgid ""
"File '%s' could not be deleted. Try fusiondirectory-setup --check-"
"directories to fix permissions."
msgstr ""
-#: include/functions.inc:2285
+#: include/functions.inc:2297
msgid "Cannot write to revision file!"
msgstr ""
-#: include/functions.inc:2314
+#: include/functions.inc:2326
msgid "Cannot read to revision file!"
msgstr ""
-#: include/functions.inc:2523
+#: include/functions.inc:2535
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "LDAP warning"
msgstr ""
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "Cannot get schema information from server. No schema check possible!"
msgstr ""
-#: include/functions.inc:2564
+#: include/functions.inc:2577
msgid "Main FusionDirectory schema"
msgstr ""
-#: include/functions.inc:2571
+#: include/functions.inc:2584
msgid "Schema used to store FusionDirectory configuration"
msgstr ""
-#: include/functions.inc:2578
+#: include/functions.inc:2591
msgid "Used to store trust mode information in users or groups."
msgstr ""
-#: include/functions.inc:2585
+#: include/functions.inc:2598
msgid "Used to store templates."
msgstr ""
-#: include/functions.inc:2592
+#: include/functions.inc:2605
msgid "Used to store POSIX information."
msgstr ""
-#: include/functions.inc:2599
+#: include/functions.inc:2612
#, php-format
msgid "Missing required object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2601
+#: include/functions.inc:2614
#, php-format
msgid "Missing optional object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2605
+#: include/functions.inc:2618
#, php-format
msgid "Class(es) available"
msgstr ""
-#: include/functions.inc:2623
+#: include/functions.inc:2636
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2637
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2640
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2641
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3112 include/functions.inc:3133
-#: include/functions.inc:3173 include/functions.inc:3185
-#: include/functions.inc:3189 include/functions.inc:3196
-#: include/functions.inc:3205
+#: include/functions.inc:3125 include/functions.inc:3146
+#: include/functions.inc:3186 include/functions.inc:3198
+#: include/functions.inc:3202 include/functions.inc:3209
+#: include/functions.inc:3218
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3112
+#: include/functions.inc:3125
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3133
+#: include/functions.inc:3146
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3173
+#: include/functions.inc:3186
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3185 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3202
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3205
+#: include/functions.inc:3218
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3267
+#: include/functions.inc:3280
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3303
+#: include/functions.inc:3316
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
@@ -2102,7 +2102,7 @@ msgstr "VÄrds "
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
#: plugins/admin/departments/class_department.inc:72
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/groups/class_roleGeneric.inc:91
@@ -2282,7 +2282,7 @@ msgid "The entry %s is not existing"
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:548
+#: include/class_plugin.inc:554
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!"
@@ -2398,14 +2398,19 @@ msgstr ""
msgid "There was a problem uncompressing snapshot data"
msgstr ""
-#: include/class_plugin.inc:803
+#: include/class_plugin.inc:809
#, php-format
msgid ""
"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
msgstr ""
-#: include/class_plugin.inc:1332
+#: include/class_plugin.inc:1350
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/class_plugin.inc:1352
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -2553,44 +2558,44 @@ msgstr ""
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr ""
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
msgid "Email address"
msgstr "E-pasta adrese"
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
#, php-format
msgid "Did not find an account with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
#, php-format
msgid "Found multiple accounts with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
#, php-format
msgid "There is no account using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There are several accounts using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
#, php-format
msgid "The user using email \"%s\" is locked. Please contact your administrator."
msgstr ""
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
msgid "Contact your administrator, there was a problem with mail server"
msgstr ""
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
msgid "This token is invalid"
msgstr ""
-#: html/class_passwordRecovery.inc:647
+#: html/class_passwordRecovery.inc:651
msgid "There was a problem with mail server, confirmation email not sent"
msgstr ""
@@ -2902,7 +2907,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
#: setup/setup_migrate_adminAccount.tpl.c:14
#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2939,258 +2944,262 @@ msgstr ""
msgid "User account"
msgstr ""
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:296
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:307
msgid "Personal information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "UzvÄrds"
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
msgid "Last name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "VÄrds"
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
msgid "First name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
msgid "Short description of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "Picture"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "The avatar for this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:330
+#: plugins/personal/generic/class_user.inc:333
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:334
+#: plugins/personal/generic/class_user.inc:337
#: plugins/admin/departments/class_department.inc:90
#: plugins/admin/departments/class_department.inc:96
msgid "Location"
msgstr "AtraÅ¡anÄs vieta"
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:341
#: plugins/admin/departments/class_department.inc:93
msgid "State"
msgstr "Valsts"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
#: plugins/admin/departments/class_department.inc:102
msgid "Address"
msgstr "Adrese"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
msgid "Business postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
#: plugins/admin/departments/class_department.inc:106
msgid "Phone"
msgstr "TÄlrunis"
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
msgid "Business phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Mobile"
msgstr "Mobilais"
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Business mobile number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Pager"
msgstr "Peidžeris"
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
#: plugins/admin/departments/class_department.inc:110
msgid "Fax"
msgstr "Fakss"
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:373
+#: plugins/personal/generic/class_user.inc:376
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:393
+#: plugins/personal/generic/class_user.inc:396
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Display name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home postal address"
msgstr "MÄjas pasta adrese"
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Private phone"
msgstr ""
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Home phone number"
msgstr "MÄjas tÄlruņa numurs"
-#: plugins/personal/generic/class_user.inc:411
+#: plugins/personal/generic/class_user.inc:414
msgid "Organizational information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
msgid "Title"
msgstr "Nosaukums"
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
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:421
+#: plugins/personal/generic/class_user.inc:424
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
msgid "Organization"
msgstr "OrganizÄcija"
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
#: plugins/admin/departments/class_department.inc:33
#: plugins/admin/departments/class_department.inc:39
#: plugins/admin/departments/dep-list.xml:21
msgid "Department"
msgstr "Nodaļa"
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
msgid "Department to which the user belongs"
msgstr ""
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:437
+#: plugins/personal/generic/class_user.inc:440
msgid "Employee type"
msgstr ""
-#: plugins/personal/generic/class_user.inc:441
+#: plugins/personal/generic/class_user.inc:444
#: plugins/admin/departments/class_department.inc:84
msgid "Manager"
msgstr ""
-#: plugins/personal/generic/class_user.inc:608
+#: plugins/personal/generic/class_user.inc:611
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:614
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:622
+#: plugins/personal/generic/class_user.inc:625
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:636
+#: plugins/personal/generic/class_user.inc:639
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:641
-#: plugins/personal/generic/class_user.inc:645
+#: plugins/personal/generic/class_user.inc:644
+#: plugins/personal/generic/class_user.inc:648
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:652
+#: plugins/personal/generic/class_user.inc:655
msgid "You need to specify your current password in order to proceed."
msgstr ""
-#: plugins/personal/generic/class_user.inc:654
+#: plugins/personal/generic/class_user.inc:657
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:656
+#: plugins/personal/generic/class_user.inc:659
#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
msgid "New password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:658
+#: plugins/personal/generic/class_user.inc:661
msgid "The password used as new and current are too similar."
msgstr ""
-#: plugins/personal/generic/class_user.inc:660
+#: plugins/personal/generic/class_user.inc:663
msgid "The password used as new is to short."
msgstr ""
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:665
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
@@ -3298,36 +3307,46 @@ msgid ""
"recover their password"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:189
+msgid "Login attribute"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
msgid "First email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
msgid "Subject"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
msgid "Subject of the first email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
msgid "[FusionDirectory] Password recovery link"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
#, php-format
msgid ""
"Body of the first email, sent when the user ask for a new password. Use %s "
"for the login and the recovery link."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
#, php-format
msgid ""
"Hello,\n"
@@ -3339,31 +3358,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
msgid "Second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
msgid "Subject of the second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
msgid "[FusionDirectory] Password recovery successful"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
#, php-format
msgid "Body (%s is login)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
#, 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
+#: plugins/config/class_recoveryConfig.inc:118
#, php-format
msgid ""
"Hello,\n"
@@ -3530,10 +3549,6 @@ msgstr ""
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 ""
@@ -4396,7 +4411,7 @@ msgstr ""
msgid "Only allow this group to connect to this list of hosts"
msgstr ""
-#: plugins/admin/groups/class_ogroup.inc:321
+#: plugins/admin/groups/class_ogroup.inc:322
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
diff --git a/locale/nb/fusiondirectory.po b/locale/nb/fusiondirectory.po
index 1c620e043a89a5edb235d29b9a92aa138ddd347f..a8a4f2088968394da5df2e2195c4d73943fb3097 100644
--- a/locale/nb/fusiondirectory.po
+++ b/locale/nb/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-11 19:09+0100\n"
-"PO-Revision-Date: 2017-01-10 14:53+0000\n"
+"POT-Creation-Date: 2017-03-29 21:46+0200\n"
+"PO-Revision-Date: 2017-03-26 15:51+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
"MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:382
+#: plugins/personal/generic/class_user.inc:385
msgid "Preferred language"
msgstr ""
@@ -316,30 +316,30 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
+#: setup/class_setupStep_Migrate.inc:981
+#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1180
+#: setup/class_setupStep_Migrate.inc:1273
+#: setup/class_setupStep_Migrate.inc:1352
+#: setup/class_setupStep_Migrate.inc:1396
+msgid "LDAP query failed"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
+#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
#: setup/class_setupStep_Migrate.inc:982
#: setup/class_setupStep_Migrate.inc:1058
#: setup/class_setupStep_Migrate.inc:1181
#: setup/class_setupStep_Migrate.inc:1274
#: setup/class_setupStep_Migrate.inc:1353
#: setup/class_setupStep_Migrate.inc:1397
-msgid "LDAP query failed"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:983
-#: setup/class_setupStep_Migrate.inc:1059
-#: setup/class_setupStep_Migrate.inc:1182
-#: setup/class_setupStep_Migrate.inc:1275
-#: setup/class_setupStep_Migrate.inc:1354
-#: setup/class_setupStep_Migrate.inc:1398
msgid "Possibly the \"root object\" is missing."
msgstr ""
#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:866
-#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
+#: setup/class_setupStep_Migrate.inc:880
msgid "Failed"
msgstr "Feil"
@@ -360,11 +360,11 @@ msgid ""
msgstr ""
#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:677
-#: include/functions.inc:724 include/functions.inc:822
-#: include/functions.inc:2988 include/functions.inc:3165
+#: include/functions.inc:522 include/functions.inc:679
+#: include/functions.inc:726 include/functions.inc:834
+#: include/functions.inc:3001 include/functions.inc:3178
#: include/class_config.inc:322 include/class_ldap.inc:924
#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
#: include/simpleplugin/attributes/class_SetAttribute.inc:726
@@ -386,13 +386,13 @@ msgid "The specified user \"%s\" does not have full access to your ldap database
msgstr ""
#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1085
-#: setup/class_setupStep_Migrate.inc:1204
-#: setup/class_setupStep_Migrate.inc:1315
-#: setup/class_setupStep_Migrate.inc:1379
-#: setup/class_setupStep_Migrate.inc:1423 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:838
-#: include/functions.inc:2523 include/simpleplugin/class_simpleTabs.inc:322
+#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1203
+#: setup/class_setupStep_Migrate.inc:1314
+#: setup/class_setupStep_Migrate.inc:1378
+#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
+#: include/class_xml.inc:55 include/functions.inc:850
+#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
#: html/index.php:597 html/main.php:158
#: plugins/personal/posix/class_posixAccount.inc:482
#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
@@ -413,7 +413,7 @@ msgid "User migration"
msgstr ""
#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1029
+#: setup/class_setupStep_Migrate.inc:1028
msgid "Migration error"
msgstr ""
@@ -422,64 +422,64 @@ msgstr ""
msgid "Cannot migrate entry \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:859
+#: setup/class_setupStep_Migrate.inc:858
#, php-format
msgid "FD 1.0.7 administrative accounts found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:862
+#: setup/class_setupStep_Migrate.inc:861
#, php-format
msgid "FD 1.0.7 administrative groups found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:864
+#: setup/class_setupStep_Migrate.inc:863
msgid ""
"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
"file at the end of the setup to migrate it.<br/>"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:867
+#: setup/class_setupStep_Migrate.inc:866
msgid ""
"There is no valid FusionDirectory 1.0.8 administrator account inside your "
"LDAP."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:868 setup/class_setupStep_Migrate.inc:883
+#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
#: include/simpleplugin/simple-list.xml:59
#: plugins/admin/departments/dep-list.xml:48
#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
msgid "Create"
msgstr "Opprett"
-#: setup/class_setupStep_Migrate.inc:873
+#: setup/class_setupStep_Migrate.inc:872
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: plugins/admin/users/class_userManagement.inc:42
msgid "Users"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:876
+#: setup/class_setupStep_Migrate.inc:875
msgid "Groups"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStep_Migrate.inc:881
msgid "There is no FusionDirectory administrator account inside your LDAP."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:920
+#: setup/class_setupStep_Migrate.inc:919
msgid "Gives all rights on all objects"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:937 include/class_management.inc:697
+#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
#: include/class_listing.inc:551 include/class_xml.inc:58
#: include/password-methods/class_password-methods-sasl.inc:60
#: include/password-methods/class_password-methods-sasl.inc:86
#: include/password-methods/class_password-methods.inc:393
#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3112
-#: include/functions.inc:3133 include/functions.inc:3173
-#: include/functions.inc:3185 include/functions.inc:3189
-#: include/functions.inc:3196 include/functions.inc:3205
-#: include/functions.inc:3267 include/class_msg_dialog.inc:128
+#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
+#: include/functions.inc:3146 include/functions.inc:3186
+#: include/functions.inc:3198 include/functions.inc:3202
+#: include/functions.inc:3209 include/functions.inc:3218
+#: include/functions.inc:3280 include/class_msg_dialog.inc:128
#: include/class_msg_dialog.inc:164 include/class_config.inc:357
#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
@@ -492,82 +492,82 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:34
#: include/simpleplugin/attributes/class_FileAttribute.inc:37
#: include/simpleplugin/attributes/class_FileAttribute.inc:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:801
-#: include/class_plugin.inc:1534 html/index.php:453 html/index.php:474
+#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
+#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
#: html/index.php:484 html/index.php:546 html/index.php:556
#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
msgid "Error"
msgstr "Feil"
-#: setup/class_setupStep_Migrate.inc:997
+#: setup/class_setupStep_Migrate.inc:996
msgid "Default ACL roles have not been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:999
+#: setup/class_setupStep_Migrate.inc:998
msgid "Some default ACL roles are missing"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1001
+#: setup/class_setupStep_Migrate.inc:1000
msgid "Default ACL roles have been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1031
+#: setup/class_setupStep_Migrate.inc:1030
#, php-format
msgid "Cannot add ACL role \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1086
+#: setup/class_setupStep_Migrate.inc:1085
#, php-format
msgid "Found %s user(s) outside the configured tree \"%s\"."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1100
-#: setup/class_setupStep_Migrate.inc:1114
+#: setup/class_setupStep_Migrate.inc:1099
+#: setup/class_setupStep_Migrate.inc:1113
msgid "Move users into configured user tree"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
msgid "Cannot move entries to the requested department!"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "Entry will be moved from"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "to"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1154
+#: setup/class_setupStep_Migrate.inc:1153
msgid "The following references will be updated"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1205
+#: setup/class_setupStep_Migrate.inc:1204
#, php-format
msgid "Found %s groups outside the configured tree '%s'."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1219
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1218
+#: setup/class_setupStep_Migrate.inc:1232
msgid "Move groups into configured groups tree"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1316
+#: setup/class_setupStep_Migrate.inc:1315
#, php-format
msgid "Found %s department(s) that will not be visible in FusionDirectory."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1325
-#: setup/class_setupStep_Migrate.inc:1330
+#: setup/class_setupStep_Migrate.inc:1324
+#: setup/class_setupStep_Migrate.inc:1329
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1380
+#: setup/class_setupStep_Migrate.inc:1379
#, php-format
msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1424
+#: setup/class_setupStep_Migrate.inc:1423
#, php-format
msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
@@ -743,10 +743,10 @@ msgstr ""
#: include/class_logging.inc:80 include/class_session.inc:50
#: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:649
-#: include/functions.inc:770 include/functions.inc:1189
-#: include/functions.inc:2243 include/functions.inc:2285
-#: include/functions.inc:2314 include/class_ldap.inc:873
+#: include/functions.inc:564 include/functions.inc:651
+#: include/functions.inc:772 include/functions.inc:1201
+#: include/functions.inc:2255 include/functions.inc:2297
+#: include/functions.inc:2326 include/class_ldap.inc:873
#: include/class_ldap.inc:911 include/class_acl.inc:118
msgid "Internal error"
msgstr ""
@@ -813,12 +813,12 @@ msgid ""
"plugin instance!"
msgstr ""
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1188
+#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
#: include/class_listing.inc:1190
msgid "Root"
msgstr ""
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
msgid "Submit"
msgstr ""
@@ -919,7 +919,7 @@ msgid "Create a new snapshot from this object"
msgstr ""
#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3302 include/simpleplugin/class_simplePlugin.inc:272
+#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
#: include/simpleplugin/class_simplePlugin.inc:277
#: include/simpleplugin/class_simplePlugin.inc:289
#: html/class_passwordRecovery.inc:116
@@ -952,7 +952,7 @@ msgstr ""
#: include/password-methods/class_password-methods-sha.inc:69
#: include/password-methods/class_password-methods-ssha.inc:73
#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:659 include/class_timezone.inc:51
+#: include/functions.inc:661 include/class_timezone.inc:51
#: include/class_config.inc:159 include/class_config.inc:284
#: include/class_config.inc:843 include/class_config.inc:856
#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
@@ -990,7 +990,7 @@ msgid "Cannot paste"
msgstr ""
#: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
#: plugins/personal/generic/paste_generic.tpl.c:11
msgid "Login"
@@ -1034,245 +1034,245 @@ msgid ""
"administrator."
msgstr ""
-#: include/functions.inc:597
+#: include/functions.inc:599
msgid "Authentication error"
msgstr ""
-#: include/functions.inc:598
+#: include/functions.inc:600
msgid ""
"It seems your user password has expired. Please use <a "
"href=\"recovery.php\">password recovery</a> to change it."
msgstr ""
-#: include/functions.inc:649 include/functions.inc:770
+#: include/functions.inc:651 include/functions.inc:772
msgid "Error while adding a lock. Contact the developers!"
msgstr ""
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid ""
"Cannot create locking information in LDAP tree. Please contact your "
"administrator!"
msgstr ""
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid "LDAP server returned: %s"
msgstr ""
-#: include/functions.inc:838
+#: include/functions.inc:850
msgid ""
"Found multiple locks for object to be locked. This should not happen - "
"cleaning up multiple references."
msgstr ""
-#: include/functions.inc:1109
+#: include/functions.inc:1121
#, php-format
msgid "The size limit of %d entries is exceed!"
msgstr ""
-#: include/functions.inc:1111
+#: include/functions.inc:1123
#, php-format
msgid ""
"Set the new size limit to %s and show me this message if the limit still "
"exceeds"
msgstr ""
-#: include/functions.inc:1128
+#: include/functions.inc:1140
msgid "Configure"
msgstr ""
-#: include/functions.inc:1133
+#: include/functions.inc:1145
msgid "incomplete"
msgstr ""
-#: include/functions.inc:1534
+#: include/functions.inc:1546
msgid "Continue anyway"
msgstr ""
-#: include/functions.inc:1536
+#: include/functions.inc:1548
msgid "Edit anyway"
msgstr ""
-#: include/functions.inc:1538
+#: include/functions.inc:1550
#, php-format
msgid "You're going to edit the LDAP entry/entries %s"
msgstr ""
-#: include/functions.inc:1766
+#: include/functions.inc:1778
msgid "Entries per page"
msgstr ""
-#: include/functions.inc:1797 include/class_filter.inc:353
+#: include/functions.inc:1809 include/class_filter.inc:353
msgid "Apply filter"
msgstr ""
-#: include/functions.inc:2065
+#: include/functions.inc:2077
#, php-format
msgid "%sB"
msgstr ""
-#: include/functions.inc:2066
+#: include/functions.inc:2078
#, php-format
msgid "%sKiB"
msgstr ""
-#: include/functions.inc:2067
+#: include/functions.inc:2079
#, php-format
msgid "%sMiB"
msgstr ""
-#: include/functions.inc:2068
+#: include/functions.inc:2080
#, php-format
msgid "%sGiB"
msgstr ""
-#: include/functions.inc:2069
+#: include/functions.inc:2081
#, php-format
msgid "%sTiB"
msgstr ""
-#: include/functions.inc:2070
+#: include/functions.inc:2082
#, php-format
msgid "%sPiB"
msgstr ""
-#: include/functions.inc:2071
+#: include/functions.inc:2083
#, php-format
msgid "%sEiB"
msgstr ""
-#: include/functions.inc:2072
+#: include/functions.inc:2084
#, php-format
msgid "%sZiB"
msgstr ""
-#: include/functions.inc:2073
+#: include/functions.inc:2085
#, php-format
msgid "%sYiB"
msgstr ""
-#: include/functions.inc:2105 include/class_filter.inc:315
+#: include/functions.inc:2117 include/class_filter.inc:315
msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
msgstr ""
-#: include/functions.inc:2243
+#: include/functions.inc:2255
#, php-format
msgid ""
"File '%s' could not be deleted. Try fusiondirectory-setup --check-"
"directories to fix permissions."
msgstr ""
-#: include/functions.inc:2285
+#: include/functions.inc:2297
msgid "Cannot write to revision file!"
msgstr ""
-#: include/functions.inc:2314
+#: include/functions.inc:2326
msgid "Cannot read to revision file!"
msgstr ""
-#: include/functions.inc:2523
+#: include/functions.inc:2535
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "LDAP warning"
msgstr ""
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "Cannot get schema information from server. No schema check possible!"
msgstr ""
-#: include/functions.inc:2564
+#: include/functions.inc:2577
msgid "Main FusionDirectory schema"
msgstr ""
-#: include/functions.inc:2571
+#: include/functions.inc:2584
msgid "Schema used to store FusionDirectory configuration"
msgstr ""
-#: include/functions.inc:2578
+#: include/functions.inc:2591
msgid "Used to store trust mode information in users or groups."
msgstr ""
-#: include/functions.inc:2585
+#: include/functions.inc:2598
msgid "Used to store templates."
msgstr ""
-#: include/functions.inc:2592
+#: include/functions.inc:2605
msgid "Used to store POSIX information."
msgstr ""
-#: include/functions.inc:2599
+#: include/functions.inc:2612
#, php-format
msgid "Missing required object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2601
+#: include/functions.inc:2614
#, php-format
msgid "Missing optional object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2605
+#: include/functions.inc:2618
#, php-format
msgid "Class(es) available"
msgstr ""
-#: include/functions.inc:2623
+#: include/functions.inc:2636
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2637
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2640
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2641
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3112 include/functions.inc:3133
-#: include/functions.inc:3173 include/functions.inc:3185
-#: include/functions.inc:3189 include/functions.inc:3196
-#: include/functions.inc:3205
+#: include/functions.inc:3125 include/functions.inc:3146
+#: include/functions.inc:3186 include/functions.inc:3198
+#: include/functions.inc:3202 include/functions.inc:3209
+#: include/functions.inc:3218
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3112
+#: include/functions.inc:3125
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3133
+#: include/functions.inc:3146
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3173
+#: include/functions.inc:3186
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3185 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3202
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3205
+#: include/functions.inc:3218
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3267
+#: include/functions.inc:3280
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3303
+#: include/functions.inc:3316
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
@@ -2102,7 +2102,7 @@ msgstr "Navn"
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
#: plugins/admin/departments/class_department.inc:72
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/groups/class_roleGeneric.inc:91
@@ -2282,7 +2282,7 @@ msgid "The entry %s is not existing"
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:548
+#: include/class_plugin.inc:554
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!"
@@ -2398,14 +2398,19 @@ msgstr ""
msgid "There was a problem uncompressing snapshot data"
msgstr ""
-#: include/class_plugin.inc:803
+#: include/class_plugin.inc:809
#, php-format
msgid ""
"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
msgstr ""
-#: include/class_plugin.inc:1332
+#: include/class_plugin.inc:1350
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/class_plugin.inc:1352
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -2553,44 +2558,44 @@ msgstr ""
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr ""
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
msgid "Email address"
msgstr ""
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
#, php-format
msgid "Did not find an account with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
#, php-format
msgid "Found multiple accounts with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
#, php-format
msgid "There is no account using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There are several accounts using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
#, php-format
msgid "The user using email \"%s\" is locked. Please contact your administrator."
msgstr ""
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
msgid "Contact your administrator, there was a problem with mail server"
msgstr ""
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
msgid "This token is invalid"
msgstr ""
-#: html/class_passwordRecovery.inc:647
+#: html/class_passwordRecovery.inc:651
msgid "There was a problem with mail server, confirmation email not sent"
msgstr ""
@@ -2902,7 +2907,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
#: setup/setup_migrate_adminAccount.tpl.c:14
#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2939,258 +2944,262 @@ msgstr ""
msgid "User account"
msgstr ""
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:296
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:307
msgid "Personal information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
msgid "Last name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
msgid "First name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
msgid "Short description of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "Picture"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "The avatar for this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:330
+#: plugins/personal/generic/class_user.inc:333
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:334
+#: plugins/personal/generic/class_user.inc:337
#: plugins/admin/departments/class_department.inc:90
#: plugins/admin/departments/class_department.inc:96
msgid "Location"
msgstr ""
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:341
#: plugins/admin/departments/class_department.inc:93
msgid "State"
msgstr ""
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
#: plugins/admin/departments/class_department.inc:102
msgid "Address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
msgid "Business postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
#: plugins/admin/departments/class_department.inc:106
msgid "Phone"
msgstr ""
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
msgid "Business phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Mobile"
msgstr ""
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Business mobile number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Pager"
msgstr ""
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
#: plugins/admin/departments/class_department.inc:110
msgid "Fax"
msgstr ""
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:373
+#: plugins/personal/generic/class_user.inc:376
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:393
+#: plugins/personal/generic/class_user.inc:396
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Display name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Private phone"
msgstr ""
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Home phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:411
+#: plugins/personal/generic/class_user.inc:414
msgid "Organizational information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
msgid "Title"
msgstr ""
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
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:421
+#: plugins/personal/generic/class_user.inc:424
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
msgid "Organization"
msgstr ""
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
#: plugins/admin/departments/class_department.inc:33
#: plugins/admin/departments/class_department.inc:39
#: plugins/admin/departments/dep-list.xml:21
msgid "Department"
msgstr ""
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
msgid "Department to which the user belongs"
msgstr ""
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:437
+#: plugins/personal/generic/class_user.inc:440
msgid "Employee type"
msgstr ""
-#: plugins/personal/generic/class_user.inc:441
+#: plugins/personal/generic/class_user.inc:444
#: plugins/admin/departments/class_department.inc:84
msgid "Manager"
msgstr ""
-#: plugins/personal/generic/class_user.inc:608
+#: plugins/personal/generic/class_user.inc:611
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:614
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:622
+#: plugins/personal/generic/class_user.inc:625
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:636
+#: plugins/personal/generic/class_user.inc:639
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:641
-#: plugins/personal/generic/class_user.inc:645
+#: plugins/personal/generic/class_user.inc:644
+#: plugins/personal/generic/class_user.inc:648
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:652
+#: plugins/personal/generic/class_user.inc:655
msgid "You need to specify your current password in order to proceed."
msgstr ""
-#: plugins/personal/generic/class_user.inc:654
+#: plugins/personal/generic/class_user.inc:657
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:656
+#: plugins/personal/generic/class_user.inc:659
#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
msgid "New password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:658
+#: plugins/personal/generic/class_user.inc:661
msgid "The password used as new and current are too similar."
msgstr ""
-#: plugins/personal/generic/class_user.inc:660
+#: plugins/personal/generic/class_user.inc:663
msgid "The password used as new is to short."
msgstr ""
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:665
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
@@ -3298,36 +3307,46 @@ msgid ""
"recover their password"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:189
+msgid "Login attribute"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
msgid "First email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
msgid "Subject"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
msgid "Subject of the first email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
msgid "[FusionDirectory] Password recovery link"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
#, php-format
msgid ""
"Body of the first email, sent when the user ask for a new password. Use %s "
"for the login and the recovery link."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
#, php-format
msgid ""
"Hello,\n"
@@ -3339,31 +3358,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
msgid "Second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
msgid "Subject of the second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
msgid "[FusionDirectory] Password recovery successful"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
#, php-format
msgid "Body (%s is login)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
#, 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
+#: plugins/config/class_recoveryConfig.inc:118
#, php-format
msgid ""
"Hello,\n"
@@ -3530,10 +3549,6 @@ msgstr ""
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 ""
@@ -4396,7 +4411,7 @@ msgstr ""
msgid "Only allow this group to connect to this list of hosts"
msgstr ""
-#: plugins/admin/groups/class_ogroup.inc:321
+#: plugins/admin/groups/class_ogroup.inc:322
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
diff --git a/locale/nl/fusiondirectory.po b/locale/nl/fusiondirectory.po
index 4a9b8e4b391f15b921eb2a1fdbef3153b9d9262e..39df2925ee63eccbdcb56ba1dd23d3a3d1c7c340 100644
--- a/locale/nl/fusiondirectory.po
+++ b/locale/nl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-11 19:09+0100\n"
-"PO-Revision-Date: 2017-01-10 14:53+0000\n"
+"POT-Creation-Date: 2017-03-29 21:46+0200\n"
+"PO-Revision-Date: 2017-03-26 15:51+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:382
+#: plugins/personal/generic/class_user.inc:385
msgid "Preferred language"
msgstr "Gewenste taal"
@@ -316,30 +316,30 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
+#: setup/class_setupStep_Migrate.inc:981
+#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1180
+#: setup/class_setupStep_Migrate.inc:1273
+#: setup/class_setupStep_Migrate.inc:1352
+#: setup/class_setupStep_Migrate.inc:1396
+msgid "LDAP query failed"
+msgstr "LDAP query faalde"
+
+#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
+#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
#: setup/class_setupStep_Migrate.inc:982
#: setup/class_setupStep_Migrate.inc:1058
#: setup/class_setupStep_Migrate.inc:1181
#: setup/class_setupStep_Migrate.inc:1274
#: setup/class_setupStep_Migrate.inc:1353
#: setup/class_setupStep_Migrate.inc:1397
-msgid "LDAP query failed"
-msgstr "LDAP query faalde"
-
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:983
-#: setup/class_setupStep_Migrate.inc:1059
-#: setup/class_setupStep_Migrate.inc:1182
-#: setup/class_setupStep_Migrate.inc:1275
-#: setup/class_setupStep_Migrate.inc:1354
-#: setup/class_setupStep_Migrate.inc:1398
msgid "Possibly the \"root object\" is missing."
msgstr ""
#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:866
-#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
+#: setup/class_setupStep_Migrate.inc:880
msgid "Failed"
msgstr "Mislukt"
@@ -360,11 +360,11 @@ msgid ""
msgstr "Kan het structurele object type van je root object niet gebruiken. Probeer de object class '%s' manueel toe te voegen."
#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:677
-#: include/functions.inc:724 include/functions.inc:822
-#: include/functions.inc:2988 include/functions.inc:3165
+#: include/functions.inc:522 include/functions.inc:679
+#: include/functions.inc:726 include/functions.inc:834
+#: include/functions.inc:3001 include/functions.inc:3178
#: include/class_config.inc:322 include/class_ldap.inc:924
#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
#: include/simpleplugin/attributes/class_SetAttribute.inc:726
@@ -386,13 +386,13 @@ msgid "The specified user \"%s\" does not have full access to your ldap database
msgstr ""
#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1085
-#: setup/class_setupStep_Migrate.inc:1204
-#: setup/class_setupStep_Migrate.inc:1315
-#: setup/class_setupStep_Migrate.inc:1379
-#: setup/class_setupStep_Migrate.inc:1423 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:838
-#: include/functions.inc:2523 include/simpleplugin/class_simpleTabs.inc:322
+#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1203
+#: setup/class_setupStep_Migrate.inc:1314
+#: setup/class_setupStep_Migrate.inc:1378
+#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
+#: include/class_xml.inc:55 include/functions.inc:850
+#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
#: html/index.php:597 html/main.php:158
#: plugins/personal/posix/class_posixAccount.inc:482
#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
@@ -413,7 +413,7 @@ msgid "User migration"
msgstr ""
#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1029
+#: setup/class_setupStep_Migrate.inc:1028
msgid "Migration error"
msgstr "Migratie error"
@@ -422,64 +422,64 @@ msgstr "Migratie error"
msgid "Cannot migrate entry \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:859
+#: setup/class_setupStep_Migrate.inc:858
#, php-format
msgid "FD 1.0.7 administrative accounts found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:862
+#: setup/class_setupStep_Migrate.inc:861
#, php-format
msgid "FD 1.0.7 administrative groups found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:864
+#: setup/class_setupStep_Migrate.inc:863
msgid ""
"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
"file at the end of the setup to migrate it.<br/>"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:867
+#: setup/class_setupStep_Migrate.inc:866
msgid ""
"There is no valid FusionDirectory 1.0.8 administrator account inside your "
"LDAP."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:868 setup/class_setupStep_Migrate.inc:883
+#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
#: include/simpleplugin/simple-list.xml:59
#: plugins/admin/departments/dep-list.xml:48
#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
msgid "Create"
msgstr "Aanmaken"
-#: setup/class_setupStep_Migrate.inc:873
+#: setup/class_setupStep_Migrate.inc:872
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: plugins/admin/users/class_userManagement.inc:42
msgid "Users"
msgstr "Gebruikers"
-#: setup/class_setupStep_Migrate.inc:876
+#: setup/class_setupStep_Migrate.inc:875
msgid "Groups"
msgstr "Groepen"
-#: setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStep_Migrate.inc:881
msgid "There is no FusionDirectory administrator account inside your LDAP."
msgstr "Er is geen FusionDirectory administrator account in je LDAP."
-#: setup/class_setupStep_Migrate.inc:920
+#: setup/class_setupStep_Migrate.inc:919
msgid "Gives all rights on all objects"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:937 include/class_management.inc:697
+#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
#: include/class_listing.inc:551 include/class_xml.inc:58
#: include/password-methods/class_password-methods-sasl.inc:60
#: include/password-methods/class_password-methods-sasl.inc:86
#: include/password-methods/class_password-methods.inc:393
#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3112
-#: include/functions.inc:3133 include/functions.inc:3173
-#: include/functions.inc:3185 include/functions.inc:3189
-#: include/functions.inc:3196 include/functions.inc:3205
-#: include/functions.inc:3267 include/class_msg_dialog.inc:128
+#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
+#: include/functions.inc:3146 include/functions.inc:3186
+#: include/functions.inc:3198 include/functions.inc:3202
+#: include/functions.inc:3209 include/functions.inc:3218
+#: include/functions.inc:3280 include/class_msg_dialog.inc:128
#: include/class_msg_dialog.inc:164 include/class_config.inc:357
#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
@@ -492,82 +492,82 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:34
#: include/simpleplugin/attributes/class_FileAttribute.inc:37
#: include/simpleplugin/attributes/class_FileAttribute.inc:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:801
-#: include/class_plugin.inc:1534 html/index.php:453 html/index.php:474
+#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
+#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
#: html/index.php:484 html/index.php:546 html/index.php:556
#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
msgid "Error"
msgstr "Fout"
-#: setup/class_setupStep_Migrate.inc:997
+#: setup/class_setupStep_Migrate.inc:996
msgid "Default ACL roles have not been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:999
+#: setup/class_setupStep_Migrate.inc:998
msgid "Some default ACL roles are missing"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1001
+#: setup/class_setupStep_Migrate.inc:1000
msgid "Default ACL roles have been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1031
+#: setup/class_setupStep_Migrate.inc:1030
#, php-format
msgid "Cannot add ACL role \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1086
+#: setup/class_setupStep_Migrate.inc:1085
#, php-format
msgid "Found %s user(s) outside the configured tree \"%s\"."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1100
-#: setup/class_setupStep_Migrate.inc:1114
+#: setup/class_setupStep_Migrate.inc:1099
+#: setup/class_setupStep_Migrate.inc:1113
msgid "Move users into configured user tree"
msgstr "Verplaats gebruikers in deze geconfigureerde user tree"
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
msgid "Cannot move entries to the requested department!"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "Entry will be moved from"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "to"
msgstr "naar"
-#: setup/class_setupStep_Migrate.inc:1154
+#: setup/class_setupStep_Migrate.inc:1153
msgid "The following references will be updated"
msgstr "De volgende referenties zullen upgedate worden"
-#: setup/class_setupStep_Migrate.inc:1205
+#: setup/class_setupStep_Migrate.inc:1204
#, php-format
msgid "Found %s groups outside the configured tree '%s'."
msgstr "Vond %s groepen buiten de geconfigureerde tree '%s'."
-#: setup/class_setupStep_Migrate.inc:1219
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1218
+#: setup/class_setupStep_Migrate.inc:1232
msgid "Move groups into configured groups tree"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1316
+#: setup/class_setupStep_Migrate.inc:1315
#, php-format
msgid "Found %s department(s) that will not be visible in FusionDirectory."
msgstr "Vond %s departement(en) die niet zichtbaar zullen zijn in FusionDirectory."
-#: setup/class_setupStep_Migrate.inc:1325
-#: setup/class_setupStep_Migrate.inc:1330
+#: setup/class_setupStep_Migrate.inc:1324
+#: setup/class_setupStep_Migrate.inc:1329
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1380
+#: setup/class_setupStep_Migrate.inc:1379
#, php-format
msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1424
+#: setup/class_setupStep_Migrate.inc:1423
#, php-format
msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
@@ -743,10 +743,10 @@ msgstr "Volgende"
#: include/class_logging.inc:80 include/class_session.inc:50
#: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:649
-#: include/functions.inc:770 include/functions.inc:1189
-#: include/functions.inc:2243 include/functions.inc:2285
-#: include/functions.inc:2314 include/class_ldap.inc:873
+#: include/functions.inc:564 include/functions.inc:651
+#: include/functions.inc:772 include/functions.inc:1201
+#: include/functions.inc:2255 include/functions.inc:2297
+#: include/functions.inc:2326 include/class_ldap.inc:873
#: include/class_ldap.inc:911 include/class_acl.inc:118
msgid "Internal error"
msgstr "Interne fout"
@@ -813,12 +813,12 @@ msgid ""
"plugin instance!"
msgstr "Geen tab declaratie voor '%s' gevonden in je configuratie bestand. Kan plugin instantie niet aanmaken!"
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1188
+#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
#: include/class_listing.inc:1190
msgid "Root"
msgstr "Basis"
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
msgid "Submit"
msgstr "Verwerk"
@@ -919,7 +919,7 @@ msgid "Create a new snapshot from this object"
msgstr "Maak een nieuw snapshot van dit object"
#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3302 include/simpleplugin/class_simplePlugin.inc:272
+#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
#: include/simpleplugin/class_simplePlugin.inc:277
#: include/simpleplugin/class_simplePlugin.inc:289
#: html/class_passwordRecovery.inc:116
@@ -952,7 +952,7 @@ msgstr ""
#: include/password-methods/class_password-methods-sha.inc:69
#: include/password-methods/class_password-methods-ssha.inc:73
#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:659 include/class_timezone.inc:51
+#: include/functions.inc:661 include/class_timezone.inc:51
#: include/class_config.inc:159 include/class_config.inc:284
#: include/class_config.inc:843 include/class_config.inc:856
#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
@@ -990,7 +990,7 @@ msgid "Cannot paste"
msgstr "Kan niet plakken"
#: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
#: plugins/personal/generic/paste_generic.tpl.c:11
msgid "Login"
@@ -1034,245 +1034,245 @@ msgid ""
"administrator."
msgstr ""
-#: include/functions.inc:597
+#: include/functions.inc:599
msgid "Authentication error"
msgstr "Authentificatie error"
-#: include/functions.inc:598
+#: include/functions.inc:600
msgid ""
"It seems your user password has expired. Please use <a "
"href=\"recovery.php\">password recovery</a> to change it."
msgstr ""
-#: include/functions.inc:649 include/functions.inc:770
+#: include/functions.inc:651 include/functions.inc:772
msgid "Error while adding a lock. Contact the developers!"
msgstr "Error tijdens het toevoegen van de lock. Contacteer de programmeurs!"
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid ""
"Cannot create locking information in LDAP tree. Please contact your "
"administrator!"
msgstr "Kan de locking informatie voor de LDAP tree niet aanmaken. Gelieve je systeembeheerder te contacteren!"
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid "LDAP server returned: %s"
msgstr "LDAP server returned: %s"
-#: include/functions.inc:838
+#: include/functions.inc:850
msgid ""
"Found multiple locks for object to be locked. This should not happen - "
"cleaning up multiple references."
msgstr "Verschillende locks zijn teruggevonden voor het object dat je wilt in lock plaatsen. Dit zou niet mogen gebeuren - Opschonen van meerdere referenties."
-#: include/functions.inc:1109
+#: include/functions.inc:1121
#, php-format
msgid "The size limit of %d entries is exceed!"
msgstr "De hoeveelheidslimiet van %d invoeren is overschreden!"
-#: include/functions.inc:1111
+#: include/functions.inc:1123
#, php-format
msgid ""
"Set the new size limit to %s and show me this message if the limit still "
"exceeds"
msgstr "Stel de nieuwe hoeveelheidslimiet in op %s en toon me dit bericht indien de limiet nog steeds overschreden wordt."
-#: include/functions.inc:1128
+#: include/functions.inc:1140
msgid "Configure"
msgstr "Instellen"
-#: include/functions.inc:1133
+#: include/functions.inc:1145
msgid "incomplete"
msgstr "onvolledig"
-#: include/functions.inc:1534
+#: include/functions.inc:1546
msgid "Continue anyway"
msgstr "Toch doorgaan"
-#: include/functions.inc:1536
+#: include/functions.inc:1548
msgid "Edit anyway"
msgstr "Alsnog bewerken"
-#: include/functions.inc:1538
+#: include/functions.inc:1550
#, php-format
msgid "You're going to edit the LDAP entry/entries %s"
msgstr "Je staat op het punt de LDAP inzending/inzendingen te wijzigen %s"
-#: include/functions.inc:1766
+#: include/functions.inc:1778
msgid "Entries per page"
msgstr "Regels per pagina"
-#: include/functions.inc:1797 include/class_filter.inc:353
+#: include/functions.inc:1809 include/class_filter.inc:353
msgid "Apply filter"
msgstr "Filter toepassen"
-#: include/functions.inc:2065
+#: include/functions.inc:2077
#, php-format
msgid "%sB"
msgstr ""
-#: include/functions.inc:2066
+#: include/functions.inc:2078
#, php-format
msgid "%sKiB"
msgstr ""
-#: include/functions.inc:2067
+#: include/functions.inc:2079
#, php-format
msgid "%sMiB"
msgstr ""
-#: include/functions.inc:2068
+#: include/functions.inc:2080
#, php-format
msgid "%sGiB"
msgstr ""
-#: include/functions.inc:2069
+#: include/functions.inc:2081
#, php-format
msgid "%sTiB"
msgstr ""
-#: include/functions.inc:2070
+#: include/functions.inc:2082
#, php-format
msgid "%sPiB"
msgstr ""
-#: include/functions.inc:2071
+#: include/functions.inc:2083
#, php-format
msgid "%sEiB"
msgstr ""
-#: include/functions.inc:2072
+#: include/functions.inc:2084
#, php-format
msgid "%sZiB"
msgstr ""
-#: include/functions.inc:2073
+#: include/functions.inc:2085
#, php-format
msgid "%sYiB"
msgstr ""
-#: include/functions.inc:2105 include/class_filter.inc:315
+#: include/functions.inc:2117 include/class_filter.inc:315
msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
-#: include/functions.inc:2243
+#: include/functions.inc:2255
#, php-format
msgid ""
"File '%s' could not be deleted. Try fusiondirectory-setup --check-"
"directories to fix permissions."
msgstr "Bestand '%s' kon niet verwijderd worden. Probeer fusiondirectory-setup --check-directories om de rechten correct te plaatsen."
-#: include/functions.inc:2285
+#: include/functions.inc:2297
msgid "Cannot write to revision file!"
msgstr "Kan niet wegschrijven naar revisie bestand!"
-#: include/functions.inc:2314
+#: include/functions.inc:2326
msgid "Cannot read to revision file!"
msgstr "Kan revisie bestand niet lezen!"
-#: include/functions.inc:2523
+#: include/functions.inc:2535
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "LDAP warning"
msgstr "LDAP waarschuwing"
-#: include/functions.inc:2541
+#: include/functions.inc:2554
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:2564
+#: include/functions.inc:2577
msgid "Main FusionDirectory schema"
msgstr ""
-#: include/functions.inc:2571
+#: include/functions.inc:2584
msgid "Schema used to store FusionDirectory configuration"
msgstr ""
-#: include/functions.inc:2578
+#: include/functions.inc:2591
msgid "Used to store trust mode information in users or groups."
msgstr ""
-#: include/functions.inc:2585
+#: include/functions.inc:2598
msgid "Used to store templates."
msgstr ""
-#: include/functions.inc:2592
+#: include/functions.inc:2605
msgid "Used to store POSIX information."
msgstr ""
-#: include/functions.inc:2599
+#: include/functions.inc:2612
#, php-format
msgid "Missing required object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2601
+#: include/functions.inc:2614
#, php-format
msgid "Missing optional object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2605
+#: include/functions.inc:2618
#, php-format
msgid "Class(es) available"
msgstr "Class(es) beschikbaar"
-#: include/functions.inc:2623
+#: include/functions.inc:2636
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2637
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2640
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2641
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3112 include/functions.inc:3133
-#: include/functions.inc:3173 include/functions.inc:3185
-#: include/functions.inc:3189 include/functions.inc:3196
-#: include/functions.inc:3205
+#: include/functions.inc:3125 include/functions.inc:3146
+#: include/functions.inc:3186 include/functions.inc:3198
+#: include/functions.inc:3202 include/functions.inc:3209
+#: include/functions.inc:3218
msgid "Cannot allocate a free ID:"
msgstr "Kan geen vrij ID toekennen:"
-#: include/functions.inc:3112
+#: include/functions.inc:3125
msgid "unknown idAllocation method!"
msgstr "onbekende idAllocation methode!"
-#: include/functions.inc:3133
+#: include/functions.inc:3146
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr "%sPoolMin >=%sPoolMax!"
-#: include/functions.inc:3173
+#: include/functions.inc:3186
msgid "sambaUnixIdPool is not unique!"
msgstr "sambaUnixIdPool is niet uniek!"
-#: include/functions.inc:3185 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3202
msgid "no ID available!"
msgstr "Geen ID beschikbaar!"
-#: include/functions.inc:3205
+#: include/functions.inc:3218
msgid "maximum tries exceeded!"
msgstr "maximum pogingen overschreden!"
-#: include/functions.inc:3267
+#: include/functions.inc:3280
msgid "Cannot allocate a free ID!"
msgstr "Kan geen vrij ID toekennen!"
-#: include/functions.inc:3303
+#: include/functions.inc:3316
#, 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"
@@ -2102,7 +2102,7 @@ msgstr "Naam"
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
#: plugins/admin/departments/class_department.inc:72
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/groups/class_roleGeneric.inc:91
@@ -2282,7 +2282,7 @@ msgid "The entry %s is not existing"
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:548
+#: include/class_plugin.inc:554
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!"
@@ -2398,14 +2398,19 @@ msgstr ""
msgid "There was a problem uncompressing snapshot data"
msgstr ""
-#: include/class_plugin.inc:803
+#: include/class_plugin.inc:809
#, php-format
msgid ""
"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
msgstr ""
-#: include/class_plugin.inc:1332
+#: include/class_plugin.inc:1350
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/class_plugin.inc:1352
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -2553,44 +2558,44 @@ msgstr "Cookies zijn uitgeschakeld in uw browser. Schakel cookies a.u.b. in en h
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr "FusionDirectory configuratie %s/%s is niet leesbaar. Geannuleerd."
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
msgid "Email address"
msgstr "E-mail adres"
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
#, php-format
msgid "Did not find an account with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
#, php-format
msgid "Found multiple accounts with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
#, php-format
msgid "There is no account using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There are several accounts using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
#, php-format
msgid "The user using email \"%s\" is locked. Please contact your administrator."
msgstr ""
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
msgid "Contact your administrator, there was a problem with mail server"
msgstr "Contacteer je systeembeheerder, er was een probleem met de mailserver"
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
msgid "This token is invalid"
msgstr "Deze token is niet geldig"
-#: html/class_passwordRecovery.inc:647
+#: html/class_passwordRecovery.inc:651
msgid "There was a problem with mail server, confirmation email not sent"
msgstr "Er was een probleem met de mail server, de bevestiging werd niet verstuurd"
@@ -2902,7 +2907,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
#: setup/setup_migrate_adminAccount.tpl.c:14
#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2939,258 +2944,262 @@ msgstr ""
msgid "User account"
msgstr ""
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:296
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:307
msgid "Personal information"
msgstr "Persoonlijke informatie"
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "Achternaam"
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
msgid "Last name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "Voornaam"
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
msgid "First name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
msgid "Short description of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "Picture"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "The avatar for this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:330
+#: plugins/personal/generic/class_user.inc:333
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:334
+#: plugins/personal/generic/class_user.inc:337
#: plugins/admin/departments/class_department.inc:90
#: plugins/admin/departments/class_department.inc:96
msgid "Location"
msgstr "Plaats"
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:341
#: plugins/admin/departments/class_department.inc:93
msgid "State"
msgstr "Provincie"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
#: plugins/admin/departments/class_department.inc:102
msgid "Address"
msgstr "Adres"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
msgid "Business postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room No."
msgstr "Kamer nr."
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room number"
msgstr "Kamernummer"
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
#: plugins/admin/departments/class_department.inc:106
msgid "Phone"
msgstr "Telefoon"
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
msgid "Business phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Mobile"
msgstr "GSM"
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Business mobile number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Pager"
msgstr "Pieper"
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
#: plugins/admin/departments/class_department.inc:110
msgid "Fax"
msgstr "Fax"
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Homepage"
msgstr "Homepage"
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:373
+#: plugins/personal/generic/class_user.inc:376
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:393
+#: plugins/personal/generic/class_user.inc:396
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Display name"
msgstr "Getoonde naam"
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home postal address"
msgstr "Postadres thuis"
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Private phone"
msgstr "Telefoon privé"
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Home phone number"
msgstr "Prive nummer"
-#: plugins/personal/generic/class_user.inc:411
+#: plugins/personal/generic/class_user.inc:414
msgid "Organizational information"
msgstr "Organisatie informatie"
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
msgid "Title"
msgstr "Titel"
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
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:421
+#: plugins/personal/generic/class_user.inc:424
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
msgid "Organization"
msgstr "Organisatie"
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
#: plugins/admin/departments/class_department.inc:33
#: plugins/admin/departments/class_department.inc:39
#: plugins/admin/departments/dep-list.xml:21
msgid "Department"
msgstr "Afdeling"
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
msgid "Department to which the user belongs"
msgstr ""
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department No."
msgstr "Afdeling nr."
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department number"
msgstr "Departement nummer"
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee No."
msgstr "Personeel nr."
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee number"
msgstr "Werknemer nummer"
-#: plugins/personal/generic/class_user.inc:437
+#: plugins/personal/generic/class_user.inc:440
msgid "Employee type"
msgstr "Functie"
-#: plugins/personal/generic/class_user.inc:441
+#: plugins/personal/generic/class_user.inc:444
#: plugins/admin/departments/class_department.inc:84
msgid "Manager"
msgstr "Beheerder"
-#: plugins/personal/generic/class_user.inc:608
+#: plugins/personal/generic/class_user.inc:611
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:614
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:622
+#: plugins/personal/generic/class_user.inc:625
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:636
+#: plugins/personal/generic/class_user.inc:639
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:641
-#: plugins/personal/generic/class_user.inc:645
+#: plugins/personal/generic/class_user.inc:644
+#: plugins/personal/generic/class_user.inc:648
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:652
+#: plugins/personal/generic/class_user.inc:655
msgid "You need to specify your current password in order to proceed."
msgstr "U moet uw huidige wachtwoord opgeven om door te kunnen gaan."
-#: plugins/personal/generic/class_user.inc:654
+#: plugins/personal/generic/class_user.inc:657
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:656
+#: plugins/personal/generic/class_user.inc:659
#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
msgid "New password"
msgstr "Nieuw wachtwoord"
-#: plugins/personal/generic/class_user.inc:658
+#: plugins/personal/generic/class_user.inc:661
msgid "The password used as new and current are too similar."
msgstr "Het huidige wachtwoord en het nieuwe wachtwoord lijken te veel op elkaar."
-#: plugins/personal/generic/class_user.inc:660
+#: plugins/personal/generic/class_user.inc:663
msgid "The password used as new is to short."
msgstr "Het nieuw opgegeven wachtwoord is te kort."
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:665
msgid "The password contains possibly problematic Unicode characters!"
msgstr "Het paswoord bevat mogelijke probleemgevende Unicode karakters!"
@@ -3298,36 +3307,46 @@ msgid ""
"recover their password"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:189
+msgid "Login attribute"
+msgstr "Login attribuut"
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
msgid "First email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
msgid "Subject"
msgstr "Onderwerp"
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
msgid "Subject of the first email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
msgid "[FusionDirectory] Password recovery link"
msgstr "[FusionDirectory] Paswoord herstel link"
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
#, php-format
msgid ""
"Body of the first email, sent when the user ask for a new password. Use %s "
"for the login and the recovery link."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
#, php-format
msgid ""
"Hello,\n"
@@ -3339,31 +3358,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
msgid "Second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
msgid "Subject of the second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
msgid "[FusionDirectory] Password recovery successful"
msgstr "[FusionDirectory] Paswoord herstel succesvol"
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
#, php-format
msgid "Body (%s is login)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
#, 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
+#: plugins/config/class_recoveryConfig.inc:118
#, php-format
msgid ""
"Hello,\n"
@@ -3530,10 +3549,6 @@ msgstr ""
msgid "Login and session"
msgstr "Login en sessie"
-#: plugins/config/class_configInLdap.inc:189
-msgid "Login attribute"
-msgstr "Login attribuut"
-
#: plugins/config/class_configInLdap.inc:190
msgid "Which LDAP attribute should be used as the login name during login."
msgstr ""
@@ -4396,7 +4411,7 @@ msgstr ""
msgid "Only allow this group to connect to this list of hosts"
msgstr ""
-#: plugins/admin/groups/class_ogroup.inc:321
+#: plugins/admin/groups/class_ogroup.inc:322
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
diff --git a/locale/pl/fusiondirectory.po b/locale/pl/fusiondirectory.po
index 3214e096004a98d1ac9b3d87e56c3322b135f6bd..3c0a3a2c0ef46f1a07919ad52ab7fa86b7868f44 100644
--- a/locale/pl/fusiondirectory.po
+++ b/locale/pl/fusiondirectory.po
@@ -7,18 +7,18 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-11 19:09+0100\n"
-"PO-Revision-Date: 2017-01-10 14:53+0000\n"
+"POT-Creation-Date: 2017-03-29 21:46+0200\n"
+"PO-Revision-Date: 2017-03-26 15:51+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:382
+#: plugins/personal/generic/class_user.inc:385
msgid "Preferred language"
msgstr "Preferowany język"
@@ -316,30 +316,30 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
+#: setup/class_setupStep_Migrate.inc:981
+#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1180
+#: setup/class_setupStep_Migrate.inc:1273
+#: setup/class_setupStep_Migrate.inc:1352
+#: setup/class_setupStep_Migrate.inc:1396
+msgid "LDAP query failed"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
+#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
#: setup/class_setupStep_Migrate.inc:982
#: setup/class_setupStep_Migrate.inc:1058
#: setup/class_setupStep_Migrate.inc:1181
#: setup/class_setupStep_Migrate.inc:1274
#: setup/class_setupStep_Migrate.inc:1353
#: setup/class_setupStep_Migrate.inc:1397
-msgid "LDAP query failed"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:983
-#: setup/class_setupStep_Migrate.inc:1059
-#: setup/class_setupStep_Migrate.inc:1182
-#: setup/class_setupStep_Migrate.inc:1275
-#: setup/class_setupStep_Migrate.inc:1354
-#: setup/class_setupStep_Migrate.inc:1398
msgid "Possibly the \"root object\" is missing."
msgstr ""
#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:866
-#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
+#: setup/class_setupStep_Migrate.inc:880
msgid "Failed"
msgstr "Niepowodzenie"
@@ -360,11 +360,11 @@ msgid ""
msgstr ""
#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:677
-#: include/functions.inc:724 include/functions.inc:822
-#: include/functions.inc:2988 include/functions.inc:3165
+#: include/functions.inc:522 include/functions.inc:679
+#: include/functions.inc:726 include/functions.inc:834
+#: include/functions.inc:3001 include/functions.inc:3178
#: include/class_config.inc:322 include/class_ldap.inc:924
#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
#: include/simpleplugin/attributes/class_SetAttribute.inc:726
@@ -386,13 +386,13 @@ msgid "The specified user \"%s\" does not have full access to your ldap database
msgstr ""
#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1085
-#: setup/class_setupStep_Migrate.inc:1204
-#: setup/class_setupStep_Migrate.inc:1315
-#: setup/class_setupStep_Migrate.inc:1379
-#: setup/class_setupStep_Migrate.inc:1423 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:838
-#: include/functions.inc:2523 include/simpleplugin/class_simpleTabs.inc:322
+#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1203
+#: setup/class_setupStep_Migrate.inc:1314
+#: setup/class_setupStep_Migrate.inc:1378
+#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
+#: include/class_xml.inc:55 include/functions.inc:850
+#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
#: html/index.php:597 html/main.php:158
#: plugins/personal/posix/class_posixAccount.inc:482
#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
@@ -413,7 +413,7 @@ msgid "User migration"
msgstr ""
#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1029
+#: setup/class_setupStep_Migrate.inc:1028
msgid "Migration error"
msgstr "BÅ‚Ä…d migracji"
@@ -422,64 +422,64 @@ msgstr "BÅ‚Ä…d migracji"
msgid "Cannot migrate entry \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:859
+#: setup/class_setupStep_Migrate.inc:858
#, php-format
msgid "FD 1.0.7 administrative accounts found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:862
+#: setup/class_setupStep_Migrate.inc:861
#, php-format
msgid "FD 1.0.7 administrative groups found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:864
+#: setup/class_setupStep_Migrate.inc:863
msgid ""
"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
"file at the end of the setup to migrate it.<br/>"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:867
+#: setup/class_setupStep_Migrate.inc:866
msgid ""
"There is no valid FusionDirectory 1.0.8 administrator account inside your "
"LDAP."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:868 setup/class_setupStep_Migrate.inc:883
+#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
#: include/simpleplugin/simple-list.xml:59
#: plugins/admin/departments/dep-list.xml:48
#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
msgid "Create"
msgstr "Utwórz"
-#: setup/class_setupStep_Migrate.inc:873
+#: setup/class_setupStep_Migrate.inc:872
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: plugins/admin/users/class_userManagement.inc:42
msgid "Users"
msgstr "Użytkownicy"
-#: setup/class_setupStep_Migrate.inc:876
+#: setup/class_setupStep_Migrate.inc:875
msgid "Groups"
msgstr "Grupy"
-#: setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStep_Migrate.inc:881
msgid "There is no FusionDirectory administrator account inside your LDAP."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:920
+#: setup/class_setupStep_Migrate.inc:919
msgid "Gives all rights on all objects"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:937 include/class_management.inc:697
+#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
#: include/class_listing.inc:551 include/class_xml.inc:58
#: include/password-methods/class_password-methods-sasl.inc:60
#: include/password-methods/class_password-methods-sasl.inc:86
#: include/password-methods/class_password-methods.inc:393
#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3112
-#: include/functions.inc:3133 include/functions.inc:3173
-#: include/functions.inc:3185 include/functions.inc:3189
-#: include/functions.inc:3196 include/functions.inc:3205
-#: include/functions.inc:3267 include/class_msg_dialog.inc:128
+#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
+#: include/functions.inc:3146 include/functions.inc:3186
+#: include/functions.inc:3198 include/functions.inc:3202
+#: include/functions.inc:3209 include/functions.inc:3218
+#: include/functions.inc:3280 include/class_msg_dialog.inc:128
#: include/class_msg_dialog.inc:164 include/class_config.inc:357
#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
@@ -492,82 +492,82 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:34
#: include/simpleplugin/attributes/class_FileAttribute.inc:37
#: include/simpleplugin/attributes/class_FileAttribute.inc:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:801
-#: include/class_plugin.inc:1534 html/index.php:453 html/index.php:474
+#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
+#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
#: html/index.php:484 html/index.php:546 html/index.php:556
#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
msgid "Error"
msgstr "BÅ‚Ä…d"
-#: setup/class_setupStep_Migrate.inc:997
+#: setup/class_setupStep_Migrate.inc:996
msgid "Default ACL roles have not been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:999
+#: setup/class_setupStep_Migrate.inc:998
msgid "Some default ACL roles are missing"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1001
+#: setup/class_setupStep_Migrate.inc:1000
msgid "Default ACL roles have been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1031
+#: setup/class_setupStep_Migrate.inc:1030
#, php-format
msgid "Cannot add ACL role \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1086
+#: setup/class_setupStep_Migrate.inc:1085
#, php-format
msgid "Found %s user(s) outside the configured tree \"%s\"."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1100
-#: setup/class_setupStep_Migrate.inc:1114
+#: setup/class_setupStep_Migrate.inc:1099
+#: setup/class_setupStep_Migrate.inc:1113
msgid "Move users into configured user tree"
msgstr "Przenieś użytkowników do skonfigurowanego drzewa"
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
msgid "Cannot move entries to the requested department!"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "Entry will be moved from"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "to"
msgstr "do"
-#: setup/class_setupStep_Migrate.inc:1154
+#: setup/class_setupStep_Migrate.inc:1153
msgid "The following references will be updated"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1205
+#: setup/class_setupStep_Migrate.inc:1204
#, php-format
msgid "Found %s groups outside the configured tree '%s'."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1219
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1218
+#: setup/class_setupStep_Migrate.inc:1232
msgid "Move groups into configured groups tree"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1316
+#: setup/class_setupStep_Migrate.inc:1315
#, php-format
msgid "Found %s department(s) that will not be visible in FusionDirectory."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1325
-#: setup/class_setupStep_Migrate.inc:1330
+#: setup/class_setupStep_Migrate.inc:1324
+#: setup/class_setupStep_Migrate.inc:1329
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1380
+#: setup/class_setupStep_Migrate.inc:1379
#, php-format
msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1424
+#: setup/class_setupStep_Migrate.inc:1423
#, php-format
msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
@@ -743,10 +743,10 @@ msgstr "Następne"
#: include/class_logging.inc:80 include/class_session.inc:50
#: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:649
-#: include/functions.inc:770 include/functions.inc:1189
-#: include/functions.inc:2243 include/functions.inc:2285
-#: include/functions.inc:2314 include/class_ldap.inc:873
+#: include/functions.inc:564 include/functions.inc:651
+#: include/functions.inc:772 include/functions.inc:1201
+#: include/functions.inc:2255 include/functions.inc:2297
+#: include/functions.inc:2326 include/class_ldap.inc:873
#: include/class_ldap.inc:911 include/class_acl.inc:118
msgid "Internal error"
msgstr "Błąd wewnętrzny"
@@ -813,12 +813,12 @@ msgid ""
"plugin instance!"
msgstr ""
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1188
+#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
#: include/class_listing.inc:1190
msgid "Root"
msgstr "Główny"
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
msgid "Submit"
msgstr "Wyślij"
@@ -919,7 +919,7 @@ msgid "Create a new snapshot from this object"
msgstr "Utwórz nowy snapshot z tego obiektu"
#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3302 include/simpleplugin/class_simplePlugin.inc:272
+#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
#: include/simpleplugin/class_simplePlugin.inc:277
#: include/simpleplugin/class_simplePlugin.inc:289
#: html/class_passwordRecovery.inc:116
@@ -952,7 +952,7 @@ msgstr ""
#: include/password-methods/class_password-methods-sha.inc:69
#: include/password-methods/class_password-methods-ssha.inc:73
#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:659 include/class_timezone.inc:51
+#: include/functions.inc:661 include/class_timezone.inc:51
#: include/class_config.inc:159 include/class_config.inc:284
#: include/class_config.inc:843 include/class_config.inc:856
#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
@@ -990,7 +990,7 @@ msgid "Cannot paste"
msgstr "Nie można wkleić"
#: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
#: plugins/personal/generic/paste_generic.tpl.c:11
msgid "Login"
@@ -1034,245 +1034,245 @@ msgid ""
"administrator."
msgstr ""
-#: include/functions.inc:597
+#: include/functions.inc:599
msgid "Authentication error"
msgstr "BÅ‚Ä…d autentykacji"
-#: include/functions.inc:598
+#: include/functions.inc:600
msgid ""
"It seems your user password has expired. Please use <a "
"href=\"recovery.php\">password recovery</a> to change it."
msgstr ""
-#: include/functions.inc:649 include/functions.inc:770
+#: include/functions.inc:651 include/functions.inc:772
msgid "Error while adding a lock. Contact the developers!"
msgstr ""
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid ""
"Cannot create locking information in LDAP tree. Please contact your "
"administrator!"
msgstr ""
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid "LDAP server returned: %s"
msgstr ""
-#: include/functions.inc:838
+#: include/functions.inc:850
msgid ""
"Found multiple locks for object to be locked. This should not happen - "
"cleaning up multiple references."
msgstr ""
-#: include/functions.inc:1109
+#: include/functions.inc:1121
#, php-format
msgid "The size limit of %d entries is exceed!"
msgstr "Limit wielkości %d elementów został przekroczony!"
-#: include/functions.inc:1111
+#: include/functions.inc:1123
#, php-format
msgid ""
"Set the new size limit to %s and show me this message if the limit still "
"exceeds"
msgstr "Ustaw nowy limit rozmiaru na %s i pokaż ten komunikat jeśli limit wciąż jest przekroczony"
-#: include/functions.inc:1128
+#: include/functions.inc:1140
msgid "Configure"
msgstr "Konfiguruj"
-#: include/functions.inc:1133
+#: include/functions.inc:1145
msgid "incomplete"
msgstr "niepełne"
-#: include/functions.inc:1534
+#: include/functions.inc:1546
msgid "Continue anyway"
msgstr "Kontynuuj mimo wszystko"
-#: include/functions.inc:1536
+#: include/functions.inc:1548
msgid "Edit anyway"
msgstr "Edytuj mimo wszystko"
-#: include/functions.inc:1538
+#: include/functions.inc:1550
#, php-format
msgid "You're going to edit the LDAP entry/entries %s"
msgstr ""
-#: include/functions.inc:1766
+#: include/functions.inc:1778
msgid "Entries per page"
msgstr "Wpisów na stronie"
-#: include/functions.inc:1797 include/class_filter.inc:353
+#: include/functions.inc:1809 include/class_filter.inc:353
msgid "Apply filter"
msgstr "Zastosuj filtr"
-#: include/functions.inc:2065
+#: include/functions.inc:2077
#, php-format
msgid "%sB"
msgstr ""
-#: include/functions.inc:2066
+#: include/functions.inc:2078
#, php-format
msgid "%sKiB"
msgstr ""
-#: include/functions.inc:2067
+#: include/functions.inc:2079
#, php-format
msgid "%sMiB"
msgstr ""
-#: include/functions.inc:2068
+#: include/functions.inc:2080
#, php-format
msgid "%sGiB"
msgstr ""
-#: include/functions.inc:2069
+#: include/functions.inc:2081
#, php-format
msgid "%sTiB"
msgstr ""
-#: include/functions.inc:2070
+#: include/functions.inc:2082
#, php-format
msgid "%sPiB"
msgstr ""
-#: include/functions.inc:2071
+#: include/functions.inc:2083
#, php-format
msgid "%sEiB"
msgstr ""
-#: include/functions.inc:2072
+#: include/functions.inc:2084
#, php-format
msgid "%sZiB"
msgstr ""
-#: include/functions.inc:2073
+#: include/functions.inc:2085
#, php-format
msgid "%sYiB"
msgstr ""
-#: include/functions.inc:2105 include/class_filter.inc:315
+#: include/functions.inc:2117 include/class_filter.inc:315
msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
-#: include/functions.inc:2243
+#: include/functions.inc:2255
#, php-format
msgid ""
"File '%s' could not be deleted. Try fusiondirectory-setup --check-"
"directories to fix permissions."
msgstr ""
-#: include/functions.inc:2285
+#: include/functions.inc:2297
msgid "Cannot write to revision file!"
msgstr ""
-#: include/functions.inc:2314
+#: include/functions.inc:2326
msgid "Cannot read to revision file!"
msgstr ""
-#: include/functions.inc:2523
+#: include/functions.inc:2535
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "LDAP warning"
msgstr "Ostrzeżenie LDAP"
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "Cannot get schema information from server. No schema check possible!"
msgstr ""
-#: include/functions.inc:2564
+#: include/functions.inc:2577
msgid "Main FusionDirectory schema"
msgstr ""
-#: include/functions.inc:2571
+#: include/functions.inc:2584
msgid "Schema used to store FusionDirectory configuration"
msgstr ""
-#: include/functions.inc:2578
+#: include/functions.inc:2591
msgid "Used to store trust mode information in users or groups."
msgstr ""
-#: include/functions.inc:2585
+#: include/functions.inc:2598
msgid "Used to store templates."
msgstr ""
-#: include/functions.inc:2592
+#: include/functions.inc:2605
msgid "Used to store POSIX information."
msgstr ""
-#: include/functions.inc:2599
+#: include/functions.inc:2612
#, php-format
msgid "Missing required object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2601
+#: include/functions.inc:2614
#, php-format
msgid "Missing optional object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2605
+#: include/functions.inc:2618
#, php-format
msgid "Class(es) available"
msgstr ""
-#: include/functions.inc:2623
+#: include/functions.inc:2636
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2637
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2640
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2641
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3112 include/functions.inc:3133
-#: include/functions.inc:3173 include/functions.inc:3185
-#: include/functions.inc:3189 include/functions.inc:3196
-#: include/functions.inc:3205
+#: include/functions.inc:3125 include/functions.inc:3146
+#: include/functions.inc:3186 include/functions.inc:3198
+#: include/functions.inc:3202 include/functions.inc:3209
+#: include/functions.inc:3218
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3112
+#: include/functions.inc:3125
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3133
+#: include/functions.inc:3146
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3173
+#: include/functions.inc:3186
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3185 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3202
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3205
+#: include/functions.inc:3218
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3267
+#: include/functions.inc:3280
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3303
+#: include/functions.inc:3316
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
@@ -2102,7 +2102,7 @@ msgstr "ImiÄ™"
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
#: plugins/admin/departments/class_department.inc:72
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/groups/class_roleGeneric.inc:91
@@ -2282,7 +2282,7 @@ msgid "The entry %s is not existing"
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:548
+#: include/class_plugin.inc:554
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!"
@@ -2398,14 +2398,19 @@ msgstr ""
msgid "There was a problem uncompressing snapshot data"
msgstr ""
-#: include/class_plugin.inc:803
+#: include/class_plugin.inc:809
#, php-format
msgid ""
"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
msgstr ""
-#: include/class_plugin.inc:1332
+#: include/class_plugin.inc:1350
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/class_plugin.inc:1352
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -2553,44 +2558,44 @@ msgstr "Twoja przeglądarka ma wyłączone cookies. Proszę włączyć cookies i
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr ""
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
msgid "Email address"
msgstr "Adres email"
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
#, php-format
msgid "Did not find an account with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
#, php-format
msgid "Found multiple accounts with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
#, php-format
msgid "There is no account using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There are several accounts using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
#, php-format
msgid "The user using email \"%s\" is locked. Please contact your administrator."
msgstr ""
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
msgid "Contact your administrator, there was a problem with mail server"
msgstr ""
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
msgid "This token is invalid"
msgstr ""
-#: html/class_passwordRecovery.inc:647
+#: html/class_passwordRecovery.inc:651
msgid "There was a problem with mail server, confirmation email not sent"
msgstr ""
@@ -2902,7 +2907,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
#: setup/setup_migrate_adminAccount.tpl.c:14
#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2939,258 +2944,262 @@ msgstr ""
msgid "User account"
msgstr ""
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:296
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:307
msgid "Personal information"
msgstr "Informacje osobiste"
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "Nazwisko"
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
msgid "Last name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "ImiÄ™"
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
msgid "First name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
msgid "Short description of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "Picture"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "The avatar for this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:330
+#: plugins/personal/generic/class_user.inc:333
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:334
+#: plugins/personal/generic/class_user.inc:337
#: plugins/admin/departments/class_department.inc:90
#: plugins/admin/departments/class_department.inc:96
msgid "Location"
msgstr "Lokalizacja"
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:341
#: plugins/admin/departments/class_department.inc:93
msgid "State"
msgstr "Stan"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
#: plugins/admin/departments/class_department.inc:102
msgid "Address"
msgstr "Adres"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
msgid "Business postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room No."
msgstr "Numer pokoju"
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room number"
msgstr "Numer pokoju"
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
#: plugins/admin/departments/class_department.inc:106
msgid "Phone"
msgstr "Telefon"
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
msgid "Business phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Mobile"
msgstr "Komórka"
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Business mobile number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Pager"
msgstr "Pager"
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
#: plugins/admin/departments/class_department.inc:110
msgid "Fax"
msgstr "Fax"
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Homepage"
msgstr "Strona domowa"
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:373
+#: plugins/personal/generic/class_user.inc:376
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:393
+#: plugins/personal/generic/class_user.inc:396
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Display name"
msgstr "Wyświetl nazwę"
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home postal address"
msgstr "Adres domowy"
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Private phone"
msgstr "Telefon prywatny"
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Home phone number"
msgstr "Numer telefonu domowego"
-#: plugins/personal/generic/class_user.inc:411
+#: plugins/personal/generic/class_user.inc:414
msgid "Organizational information"
msgstr "Informacje organizacyjne"
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
msgid "Title"
msgstr "Tytuł"
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
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:421
+#: plugins/personal/generic/class_user.inc:424
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
msgid "Organization"
msgstr "Organizacja"
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
#: plugins/admin/departments/class_department.inc:33
#: plugins/admin/departments/class_department.inc:39
#: plugins/admin/departments/dep-list.xml:21
msgid "Department"
msgstr "Departament"
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
msgid "Department to which the user belongs"
msgstr ""
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department No."
msgstr "Numer departamentu"
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department number"
msgstr "Numer departamentu"
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee No."
msgstr "Numer pracownika"
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee number"
msgstr "Numer pracownika"
-#: plugins/personal/generic/class_user.inc:437
+#: plugins/personal/generic/class_user.inc:440
msgid "Employee type"
msgstr "Typ pracownika"
-#: plugins/personal/generic/class_user.inc:441
+#: plugins/personal/generic/class_user.inc:444
#: plugins/admin/departments/class_department.inc:84
msgid "Manager"
msgstr ""
-#: plugins/personal/generic/class_user.inc:608
+#: plugins/personal/generic/class_user.inc:611
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:614
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:622
+#: plugins/personal/generic/class_user.inc:625
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:636
+#: plugins/personal/generic/class_user.inc:639
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:641
-#: plugins/personal/generic/class_user.inc:645
+#: plugins/personal/generic/class_user.inc:644
+#: plugins/personal/generic/class_user.inc:648
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:652
+#: plugins/personal/generic/class_user.inc:655
msgid "You need to specify your current password in order to proceed."
msgstr "Proszę podać obecne hasło aby kontynuować."
-#: plugins/personal/generic/class_user.inc:654
+#: plugins/personal/generic/class_user.inc:657
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:656
+#: plugins/personal/generic/class_user.inc:659
#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
msgid "New password"
msgstr "Nowe hasło"
-#: plugins/personal/generic/class_user.inc:658
+#: plugins/personal/generic/class_user.inc:661
msgid "The password used as new and current are too similar."
msgstr "Hasło podane jako nowe jest zbyt podobne do obecnego."
-#: plugins/personal/generic/class_user.inc:660
+#: plugins/personal/generic/class_user.inc:663
msgid "The password used as new is to short."
msgstr "Hasło podane jako nowe jest za krótkie."
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:665
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
@@ -3298,36 +3307,46 @@ msgid ""
"recover their password"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:189
+msgid "Login attribute"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
msgid "First email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
msgid "Subject"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
msgid "Subject of the first email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
msgid "[FusionDirectory] Password recovery link"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
#, php-format
msgid ""
"Body of the first email, sent when the user ask for a new password. Use %s "
"for the login and the recovery link."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
#, php-format
msgid ""
"Hello,\n"
@@ -3339,31 +3358,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
msgid "Second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
msgid "Subject of the second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
msgid "[FusionDirectory] Password recovery successful"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
#, php-format
msgid "Body (%s is login)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
#, 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
+#: plugins/config/class_recoveryConfig.inc:118
#, php-format
msgid ""
"Hello,\n"
@@ -3530,10 +3549,6 @@ msgstr ""
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 ""
@@ -4396,7 +4411,7 @@ msgstr ""
msgid "Only allow this group to connect to this list of hosts"
msgstr ""
-#: plugins/admin/groups/class_ogroup.inc:321
+#: plugins/admin/groups/class_ogroup.inc:322
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
@@ -5146,6 +5161,7 @@ msgid_plural "There are %1 groups:"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
+msgstr[3] ""
#: plugins/addons/dashboard/groups_stats.tpl.c:5
msgid "One of them is a %1 group"
@@ -5153,6 +5169,7 @@ msgid_plural "%2 are %1 groups"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
+msgstr[3] ""
#: plugins/addons/dashboard/groups_stats.tpl.c:8
msgid "There is no %1 group"
@@ -5165,6 +5182,7 @@ msgid_plural "There are %1 users:"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
+msgstr[3] ""
#: plugins/addons/dashboard/users_stats.tpl.c:5
msgid "One of them have a %1 account"
@@ -5172,6 +5190,7 @@ msgid_plural "%2 of them have a %1 account"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
+msgstr[3] ""
#: plugins/addons/dashboard/users_stats.tpl.c:8
msgid "None of them have a %1 account"
@@ -5183,6 +5202,7 @@ msgid_plural "%2 of them use %1 method"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
+msgstr[3] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:8
msgid "One of them is locked"
@@ -5190,6 +5210,7 @@ msgid_plural "%1 of them are locked"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
+msgstr[3] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:11
msgid "None of them is locked"
@@ -5201,6 +5222,7 @@ msgid_plural "There are %1 expired accounts"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
+msgstr[3] ""
#: plugins/addons/dashboard/users_accounts.tpl.c:5
msgid "There is no expired account"
@@ -5249,6 +5271,7 @@ msgid_plural "There are %2 accounts expiring in the next %1 days"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
+msgstr[3] ""
#: plugins/addons/dashboard/users_accounts.tpl.c:38
msgid "There is no account expiring in the next %1 days"
diff --git a/locale/pt/fusiondirectory.po b/locale/pt/fusiondirectory.po
index 305862eddaeaa011f3f2d0538198ecc2197d8d41..3392d0cd9fd7de468b853051c0977db5b23f0b53 100644
--- a/locale/pt/fusiondirectory.po
+++ b/locale/pt/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-11 19:09+0100\n"
-"PO-Revision-Date: 2017-01-10 14:53+0000\n"
+"POT-Creation-Date: 2017-03-29 21:46+0200\n"
+"PO-Revision-Date: 2017-03-26 15:51+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
"MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:382
+#: plugins/personal/generic/class_user.inc:385
msgid "Preferred language"
msgstr ""
@@ -316,30 +316,30 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
+#: setup/class_setupStep_Migrate.inc:981
+#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1180
+#: setup/class_setupStep_Migrate.inc:1273
+#: setup/class_setupStep_Migrate.inc:1352
+#: setup/class_setupStep_Migrate.inc:1396
+msgid "LDAP query failed"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
+#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
#: setup/class_setupStep_Migrate.inc:982
#: setup/class_setupStep_Migrate.inc:1058
#: setup/class_setupStep_Migrate.inc:1181
#: setup/class_setupStep_Migrate.inc:1274
#: setup/class_setupStep_Migrate.inc:1353
#: setup/class_setupStep_Migrate.inc:1397
-msgid "LDAP query failed"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:983
-#: setup/class_setupStep_Migrate.inc:1059
-#: setup/class_setupStep_Migrate.inc:1182
-#: setup/class_setupStep_Migrate.inc:1275
-#: setup/class_setupStep_Migrate.inc:1354
-#: setup/class_setupStep_Migrate.inc:1398
msgid "Possibly the \"root object\" is missing."
msgstr ""
#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:866
-#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
+#: setup/class_setupStep_Migrate.inc:880
msgid "Failed"
msgstr "Erro"
@@ -360,11 +360,11 @@ msgid ""
msgstr ""
#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:677
-#: include/functions.inc:724 include/functions.inc:822
-#: include/functions.inc:2988 include/functions.inc:3165
+#: include/functions.inc:522 include/functions.inc:679
+#: include/functions.inc:726 include/functions.inc:834
+#: include/functions.inc:3001 include/functions.inc:3178
#: include/class_config.inc:322 include/class_ldap.inc:924
#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
#: include/simpleplugin/attributes/class_SetAttribute.inc:726
@@ -386,13 +386,13 @@ msgid "The specified user \"%s\" does not have full access to your ldap database
msgstr ""
#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1085
-#: setup/class_setupStep_Migrate.inc:1204
-#: setup/class_setupStep_Migrate.inc:1315
-#: setup/class_setupStep_Migrate.inc:1379
-#: setup/class_setupStep_Migrate.inc:1423 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:838
-#: include/functions.inc:2523 include/simpleplugin/class_simpleTabs.inc:322
+#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1203
+#: setup/class_setupStep_Migrate.inc:1314
+#: setup/class_setupStep_Migrate.inc:1378
+#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
+#: include/class_xml.inc:55 include/functions.inc:850
+#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
#: html/index.php:597 html/main.php:158
#: plugins/personal/posix/class_posixAccount.inc:482
#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
@@ -413,7 +413,7 @@ msgid "User migration"
msgstr ""
#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1029
+#: setup/class_setupStep_Migrate.inc:1028
msgid "Migration error"
msgstr ""
@@ -422,64 +422,64 @@ msgstr ""
msgid "Cannot migrate entry \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:859
+#: setup/class_setupStep_Migrate.inc:858
#, php-format
msgid "FD 1.0.7 administrative accounts found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:862
+#: setup/class_setupStep_Migrate.inc:861
#, php-format
msgid "FD 1.0.7 administrative groups found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:864
+#: setup/class_setupStep_Migrate.inc:863
msgid ""
"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
"file at the end of the setup to migrate it.<br/>"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:867
+#: setup/class_setupStep_Migrate.inc:866
msgid ""
"There is no valid FusionDirectory 1.0.8 administrator account inside your "
"LDAP."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:868 setup/class_setupStep_Migrate.inc:883
+#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
#: include/simpleplugin/simple-list.xml:59
#: plugins/admin/departments/dep-list.xml:48
#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
msgid "Create"
msgstr "Criar"
-#: setup/class_setupStep_Migrate.inc:873
+#: setup/class_setupStep_Migrate.inc:872
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: plugins/admin/users/class_userManagement.inc:42
msgid "Users"
msgstr "Usuários"
-#: setup/class_setupStep_Migrate.inc:876
+#: setup/class_setupStep_Migrate.inc:875
msgid "Groups"
msgstr "Grupos"
-#: setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStep_Migrate.inc:881
msgid "There is no FusionDirectory administrator account inside your LDAP."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:920
+#: setup/class_setupStep_Migrate.inc:919
msgid "Gives all rights on all objects"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:937 include/class_management.inc:697
+#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
#: include/class_listing.inc:551 include/class_xml.inc:58
#: include/password-methods/class_password-methods-sasl.inc:60
#: include/password-methods/class_password-methods-sasl.inc:86
#: include/password-methods/class_password-methods.inc:393
#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3112
-#: include/functions.inc:3133 include/functions.inc:3173
-#: include/functions.inc:3185 include/functions.inc:3189
-#: include/functions.inc:3196 include/functions.inc:3205
-#: include/functions.inc:3267 include/class_msg_dialog.inc:128
+#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
+#: include/functions.inc:3146 include/functions.inc:3186
+#: include/functions.inc:3198 include/functions.inc:3202
+#: include/functions.inc:3209 include/functions.inc:3218
+#: include/functions.inc:3280 include/class_msg_dialog.inc:128
#: include/class_msg_dialog.inc:164 include/class_config.inc:357
#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
@@ -492,82 +492,82 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:34
#: include/simpleplugin/attributes/class_FileAttribute.inc:37
#: include/simpleplugin/attributes/class_FileAttribute.inc:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:801
-#: include/class_plugin.inc:1534 html/index.php:453 html/index.php:474
+#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
+#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
#: html/index.php:484 html/index.php:546 html/index.php:556
#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
msgid "Error"
msgstr "Erro"
-#: setup/class_setupStep_Migrate.inc:997
+#: setup/class_setupStep_Migrate.inc:996
msgid "Default ACL roles have not been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:999
+#: setup/class_setupStep_Migrate.inc:998
msgid "Some default ACL roles are missing"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1001
+#: setup/class_setupStep_Migrate.inc:1000
msgid "Default ACL roles have been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1031
+#: setup/class_setupStep_Migrate.inc:1030
#, php-format
msgid "Cannot add ACL role \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1086
+#: setup/class_setupStep_Migrate.inc:1085
#, php-format
msgid "Found %s user(s) outside the configured tree \"%s\"."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1100
-#: setup/class_setupStep_Migrate.inc:1114
+#: setup/class_setupStep_Migrate.inc:1099
+#: setup/class_setupStep_Migrate.inc:1113
msgid "Move users into configured user tree"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
msgid "Cannot move entries to the requested department!"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "Entry will be moved from"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "to"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1154
+#: setup/class_setupStep_Migrate.inc:1153
msgid "The following references will be updated"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1205
+#: setup/class_setupStep_Migrate.inc:1204
#, php-format
msgid "Found %s groups outside the configured tree '%s'."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1219
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1218
+#: setup/class_setupStep_Migrate.inc:1232
msgid "Move groups into configured groups tree"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1316
+#: setup/class_setupStep_Migrate.inc:1315
#, php-format
msgid "Found %s department(s) that will not be visible in FusionDirectory."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1325
-#: setup/class_setupStep_Migrate.inc:1330
+#: setup/class_setupStep_Migrate.inc:1324
+#: setup/class_setupStep_Migrate.inc:1329
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1380
+#: setup/class_setupStep_Migrate.inc:1379
#, php-format
msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1424
+#: setup/class_setupStep_Migrate.inc:1423
#, php-format
msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
@@ -743,10 +743,10 @@ msgstr ""
#: include/class_logging.inc:80 include/class_session.inc:50
#: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:649
-#: include/functions.inc:770 include/functions.inc:1189
-#: include/functions.inc:2243 include/functions.inc:2285
-#: include/functions.inc:2314 include/class_ldap.inc:873
+#: include/functions.inc:564 include/functions.inc:651
+#: include/functions.inc:772 include/functions.inc:1201
+#: include/functions.inc:2255 include/functions.inc:2297
+#: include/functions.inc:2326 include/class_ldap.inc:873
#: include/class_ldap.inc:911 include/class_acl.inc:118
msgid "Internal error"
msgstr "Erro interno"
@@ -813,12 +813,12 @@ msgid ""
"plugin instance!"
msgstr ""
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1188
+#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
#: include/class_listing.inc:1190
msgid "Root"
msgstr "Raiz"
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
msgid "Submit"
msgstr "Submeter"
@@ -919,7 +919,7 @@ msgid "Create a new snapshot from this object"
msgstr ""
#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3302 include/simpleplugin/class_simplePlugin.inc:272
+#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
#: include/simpleplugin/class_simplePlugin.inc:277
#: include/simpleplugin/class_simplePlugin.inc:289
#: html/class_passwordRecovery.inc:116
@@ -952,7 +952,7 @@ msgstr ""
#: include/password-methods/class_password-methods-sha.inc:69
#: include/password-methods/class_password-methods-ssha.inc:73
#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:659 include/class_timezone.inc:51
+#: include/functions.inc:661 include/class_timezone.inc:51
#: include/class_config.inc:159 include/class_config.inc:284
#: include/class_config.inc:843 include/class_config.inc:856
#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
@@ -990,7 +990,7 @@ msgid "Cannot paste"
msgstr "ImpossÃvel colar"
#: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
#: plugins/personal/generic/paste_generic.tpl.c:11
msgid "Login"
@@ -1034,245 +1034,245 @@ msgid ""
"administrator."
msgstr ""
-#: include/functions.inc:597
+#: include/functions.inc:599
msgid "Authentication error"
msgstr ""
-#: include/functions.inc:598
+#: include/functions.inc:600
msgid ""
"It seems your user password has expired. Please use <a "
"href=\"recovery.php\">password recovery</a> to change it."
msgstr ""
-#: include/functions.inc:649 include/functions.inc:770
+#: include/functions.inc:651 include/functions.inc:772
msgid "Error while adding a lock. Contact the developers!"
msgstr ""
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid ""
"Cannot create locking information in LDAP tree. Please contact your "
"administrator!"
msgstr ""
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid "LDAP server returned: %s"
msgstr ""
-#: include/functions.inc:838
+#: include/functions.inc:850
msgid ""
"Found multiple locks for object to be locked. This should not happen - "
"cleaning up multiple references."
msgstr ""
-#: include/functions.inc:1109
+#: include/functions.inc:1121
#, php-format
msgid "The size limit of %d entries is exceed!"
msgstr ""
-#: include/functions.inc:1111
+#: include/functions.inc:1123
#, php-format
msgid ""
"Set the new size limit to %s and show me this message if the limit still "
"exceeds"
msgstr ""
-#: include/functions.inc:1128
+#: include/functions.inc:1140
msgid "Configure"
msgstr "Configurar"
-#: include/functions.inc:1133
+#: include/functions.inc:1145
msgid "incomplete"
msgstr ""
-#: include/functions.inc:1534
+#: include/functions.inc:1546
msgid "Continue anyway"
msgstr ""
-#: include/functions.inc:1536
+#: include/functions.inc:1548
msgid "Edit anyway"
msgstr "Editar mesmo assim"
-#: include/functions.inc:1538
+#: include/functions.inc:1550
#, php-format
msgid "You're going to edit the LDAP entry/entries %s"
msgstr ""
-#: include/functions.inc:1766
+#: include/functions.inc:1778
msgid "Entries per page"
msgstr ""
-#: include/functions.inc:1797 include/class_filter.inc:353
+#: include/functions.inc:1809 include/class_filter.inc:353
msgid "Apply filter"
msgstr "Aplicar filtro"
-#: include/functions.inc:2065
+#: include/functions.inc:2077
#, php-format
msgid "%sB"
msgstr ""
-#: include/functions.inc:2066
+#: include/functions.inc:2078
#, php-format
msgid "%sKiB"
msgstr ""
-#: include/functions.inc:2067
+#: include/functions.inc:2079
#, php-format
msgid "%sMiB"
msgstr ""
-#: include/functions.inc:2068
+#: include/functions.inc:2080
#, php-format
msgid "%sGiB"
msgstr ""
-#: include/functions.inc:2069
+#: include/functions.inc:2081
#, php-format
msgid "%sTiB"
msgstr ""
-#: include/functions.inc:2070
+#: include/functions.inc:2082
#, php-format
msgid "%sPiB"
msgstr ""
-#: include/functions.inc:2071
+#: include/functions.inc:2083
#, php-format
msgid "%sEiB"
msgstr ""
-#: include/functions.inc:2072
+#: include/functions.inc:2084
#, php-format
msgid "%sZiB"
msgstr ""
-#: include/functions.inc:2073
+#: include/functions.inc:2085
#, php-format
msgid "%sYiB"
msgstr ""
-#: include/functions.inc:2105 include/class_filter.inc:315
+#: include/functions.inc:2117 include/class_filter.inc:315
msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
msgstr ""
-#: include/functions.inc:2243
+#: include/functions.inc:2255
#, php-format
msgid ""
"File '%s' could not be deleted. Try fusiondirectory-setup --check-"
"directories to fix permissions."
msgstr ""
-#: include/functions.inc:2285
+#: include/functions.inc:2297
msgid "Cannot write to revision file!"
msgstr ""
-#: include/functions.inc:2314
+#: include/functions.inc:2326
msgid "Cannot read to revision file!"
msgstr ""
-#: include/functions.inc:2523
+#: include/functions.inc:2535
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "LDAP warning"
msgstr ""
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "Cannot get schema information from server. No schema check possible!"
msgstr ""
-#: include/functions.inc:2564
+#: include/functions.inc:2577
msgid "Main FusionDirectory schema"
msgstr ""
-#: include/functions.inc:2571
+#: include/functions.inc:2584
msgid "Schema used to store FusionDirectory configuration"
msgstr ""
-#: include/functions.inc:2578
+#: include/functions.inc:2591
msgid "Used to store trust mode information in users or groups."
msgstr ""
-#: include/functions.inc:2585
+#: include/functions.inc:2598
msgid "Used to store templates."
msgstr ""
-#: include/functions.inc:2592
+#: include/functions.inc:2605
msgid "Used to store POSIX information."
msgstr ""
-#: include/functions.inc:2599
+#: include/functions.inc:2612
#, php-format
msgid "Missing required object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2601
+#: include/functions.inc:2614
#, php-format
msgid "Missing optional object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2605
+#: include/functions.inc:2618
#, php-format
msgid "Class(es) available"
msgstr ""
-#: include/functions.inc:2623
+#: include/functions.inc:2636
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2637
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2640
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2641
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3112 include/functions.inc:3133
-#: include/functions.inc:3173 include/functions.inc:3185
-#: include/functions.inc:3189 include/functions.inc:3196
-#: include/functions.inc:3205
+#: include/functions.inc:3125 include/functions.inc:3146
+#: include/functions.inc:3186 include/functions.inc:3198
+#: include/functions.inc:3202 include/functions.inc:3209
+#: include/functions.inc:3218
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3112
+#: include/functions.inc:3125
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3133
+#: include/functions.inc:3146
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3173
+#: include/functions.inc:3186
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3185 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3202
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3205
+#: include/functions.inc:3218
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3267
+#: include/functions.inc:3280
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3303
+#: include/functions.inc:3316
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
@@ -2102,7 +2102,7 @@ msgstr "Nome"
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
#: plugins/admin/departments/class_department.inc:72
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/groups/class_roleGeneric.inc:91
@@ -2282,7 +2282,7 @@ msgid "The entry %s is not existing"
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:548
+#: include/class_plugin.inc:554
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!"
@@ -2398,14 +2398,19 @@ msgstr ""
msgid "There was a problem uncompressing snapshot data"
msgstr ""
-#: include/class_plugin.inc:803
+#: include/class_plugin.inc:809
#, php-format
msgid ""
"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
msgstr ""
-#: include/class_plugin.inc:1332
+#: include/class_plugin.inc:1350
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/class_plugin.inc:1352
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -2553,44 +2558,44 @@ msgstr "Seu navegador está com suporte a cookies desabilitado. Por favor, habil
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr ""
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
msgid "Email address"
msgstr ""
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
#, php-format
msgid "Did not find an account with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
#, php-format
msgid "Found multiple accounts with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
#, php-format
msgid "There is no account using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There are several accounts using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
#, php-format
msgid "The user using email \"%s\" is locked. Please contact your administrator."
msgstr ""
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
msgid "Contact your administrator, there was a problem with mail server"
msgstr ""
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
msgid "This token is invalid"
msgstr ""
-#: html/class_passwordRecovery.inc:647
+#: html/class_passwordRecovery.inc:651
msgid "There was a problem with mail server, confirmation email not sent"
msgstr ""
@@ -2902,7 +2907,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
#: setup/setup_migrate_adminAccount.tpl.c:14
#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2939,258 +2944,262 @@ msgstr ""
msgid "User account"
msgstr ""
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:296
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:307
msgid "Personal information"
msgstr "Informação pessoal"
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "Último nome"
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
msgid "Last name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "Primeiro nome"
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
msgid "First name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
msgid "Short description of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "Picture"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "The avatar for this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:330
+#: plugins/personal/generic/class_user.inc:333
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:334
+#: plugins/personal/generic/class_user.inc:337
#: plugins/admin/departments/class_department.inc:90
#: plugins/admin/departments/class_department.inc:96
msgid "Location"
msgstr "Localização"
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:341
#: plugins/admin/departments/class_department.inc:93
msgid "State"
msgstr "Estado"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
#: plugins/admin/departments/class_department.inc:102
msgid "Address"
msgstr "Endereço"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
msgid "Business postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room No."
msgstr "Nº da sala"
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
#: plugins/admin/departments/class_department.inc:106
msgid "Phone"
msgstr "Fone"
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
msgid "Business phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Mobile"
msgstr "Celular"
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Business mobile number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Pager"
msgstr "Pager"
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
#: plugins/admin/departments/class_department.inc:110
msgid "Fax"
msgstr "Fax"
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Homepage"
msgstr "Página pessoal"
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:373
+#: plugins/personal/generic/class_user.inc:376
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:393
+#: plugins/personal/generic/class_user.inc:396
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Display name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home postal address"
msgstr "Caixa postal residencial"
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Private phone"
msgstr "Telefone privativo"
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Home phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:411
+#: plugins/personal/generic/class_user.inc:414
msgid "Organizational information"
msgstr "Informação organizacional"
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
msgid "Title"
msgstr ""
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
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:421
+#: plugins/personal/generic/class_user.inc:424
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
msgid "Organization"
msgstr "Organização"
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
#: plugins/admin/departments/class_department.inc:33
#: plugins/admin/departments/class_department.inc:39
#: plugins/admin/departments/dep-list.xml:21
msgid "Department"
msgstr "Departamento"
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
msgid "Department to which the user belongs"
msgstr ""
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department No."
msgstr "Nº do departamento"
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee No."
msgstr "Nº do empregado"
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:437
+#: plugins/personal/generic/class_user.inc:440
msgid "Employee type"
msgstr "Tipo de empregado"
-#: plugins/personal/generic/class_user.inc:441
+#: plugins/personal/generic/class_user.inc:444
#: plugins/admin/departments/class_department.inc:84
msgid "Manager"
msgstr ""
-#: plugins/personal/generic/class_user.inc:608
+#: plugins/personal/generic/class_user.inc:611
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:614
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:622
+#: plugins/personal/generic/class_user.inc:625
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:636
+#: plugins/personal/generic/class_user.inc:639
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:641
-#: plugins/personal/generic/class_user.inc:645
+#: plugins/personal/generic/class_user.inc:644
+#: plugins/personal/generic/class_user.inc:648
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:652
+#: plugins/personal/generic/class_user.inc:655
msgid "You need to specify your current password in order to proceed."
msgstr "Você precisa especificar sua senha atual para continuar."
-#: plugins/personal/generic/class_user.inc:654
+#: plugins/personal/generic/class_user.inc:657
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:656
+#: plugins/personal/generic/class_user.inc:659
#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
msgid "New password"
msgstr "Nova senha"
-#: plugins/personal/generic/class_user.inc:658
+#: plugins/personal/generic/class_user.inc:661
msgid "The password used as new and current are too similar."
msgstr "A senha utilizada como nova e atual são muito similares."
-#: plugins/personal/generic/class_user.inc:660
+#: plugins/personal/generic/class_user.inc:663
msgid "The password used as new is to short."
msgstr "A senha utilizada como nova é curta."
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:665
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
@@ -3298,36 +3307,46 @@ msgid ""
"recover their password"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:189
+msgid "Login attribute"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
msgid "First email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
msgid "Subject"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
msgid "Subject of the first email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
msgid "[FusionDirectory] Password recovery link"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
#, php-format
msgid ""
"Body of the first email, sent when the user ask for a new password. Use %s "
"for the login and the recovery link."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
#, php-format
msgid ""
"Hello,\n"
@@ -3339,31 +3358,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
msgid "Second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
msgid "Subject of the second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
msgid "[FusionDirectory] Password recovery successful"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
#, php-format
msgid "Body (%s is login)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
#, 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
+#: plugins/config/class_recoveryConfig.inc:118
#, php-format
msgid ""
"Hello,\n"
@@ -3530,10 +3549,6 @@ msgstr ""
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 ""
@@ -4396,7 +4411,7 @@ msgstr ""
msgid "Only allow this group to connect to this list of hosts"
msgstr ""
-#: plugins/admin/groups/class_ogroup.inc:321
+#: plugins/admin/groups/class_ogroup.inc:322
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
diff --git a/locale/pt_BR/fusiondirectory.po b/locale/pt_BR/fusiondirectory.po
index 3a4435d17fd702422fae4805848bd5ed59746a2a..97b60592f0ff589aed601b95ff4a71ecce23aab1 100644
--- a/locale/pt_BR/fusiondirectory.po
+++ b/locale/pt_BR/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-11 19:09+0100\n"
-"PO-Revision-Date: 2017-01-10 14:53+0000\n"
+"POT-Creation-Date: 2017-03-29 21:46+0200\n"
+"PO-Revision-Date: 2017-03-26 15:51+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:382
+#: plugins/personal/generic/class_user.inc:385
msgid "Preferred language"
msgstr "Idioma desejado"
@@ -317,30 +317,30 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
+#: setup/class_setupStep_Migrate.inc:981
+#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1180
+#: setup/class_setupStep_Migrate.inc:1273
+#: setup/class_setupStep_Migrate.inc:1352
+#: setup/class_setupStep_Migrate.inc:1396
+msgid "LDAP query failed"
+msgstr "Consulta em LDAP falhou"
+
+#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
+#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
#: setup/class_setupStep_Migrate.inc:982
#: setup/class_setupStep_Migrate.inc:1058
#: setup/class_setupStep_Migrate.inc:1181
#: setup/class_setupStep_Migrate.inc:1274
#: setup/class_setupStep_Migrate.inc:1353
#: setup/class_setupStep_Migrate.inc:1397
-msgid "LDAP query failed"
-msgstr "Consulta em LDAP falhou"
-
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:983
-#: setup/class_setupStep_Migrate.inc:1059
-#: setup/class_setupStep_Migrate.inc:1182
-#: setup/class_setupStep_Migrate.inc:1275
-#: setup/class_setupStep_Migrate.inc:1354
-#: setup/class_setupStep_Migrate.inc:1398
msgid "Possibly the \"root object\" is missing."
msgstr ""
#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:866
-#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
+#: setup/class_setupStep_Migrate.inc:880
msgid "Failed"
msgstr "Falhou"
@@ -361,11 +361,11 @@ msgid ""
msgstr ""
#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:677
-#: include/functions.inc:724 include/functions.inc:822
-#: include/functions.inc:2988 include/functions.inc:3165
+#: include/functions.inc:522 include/functions.inc:679
+#: include/functions.inc:726 include/functions.inc:834
+#: include/functions.inc:3001 include/functions.inc:3178
#: include/class_config.inc:322 include/class_ldap.inc:924
#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
#: include/simpleplugin/attributes/class_SetAttribute.inc:726
@@ -387,13 +387,13 @@ msgid "The specified user \"%s\" does not have full access to your ldap database
msgstr ""
#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1085
-#: setup/class_setupStep_Migrate.inc:1204
-#: setup/class_setupStep_Migrate.inc:1315
-#: setup/class_setupStep_Migrate.inc:1379
-#: setup/class_setupStep_Migrate.inc:1423 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:838
-#: include/functions.inc:2523 include/simpleplugin/class_simpleTabs.inc:322
+#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1203
+#: setup/class_setupStep_Migrate.inc:1314
+#: setup/class_setupStep_Migrate.inc:1378
+#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
+#: include/class_xml.inc:55 include/functions.inc:850
+#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
#: html/index.php:597 html/main.php:158
#: plugins/personal/posix/class_posixAccount.inc:482
#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
@@ -414,7 +414,7 @@ msgid "User migration"
msgstr ""
#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1029
+#: setup/class_setupStep_Migrate.inc:1028
msgid "Migration error"
msgstr ""
@@ -423,64 +423,64 @@ msgstr ""
msgid "Cannot migrate entry \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:859
+#: setup/class_setupStep_Migrate.inc:858
#, php-format
msgid "FD 1.0.7 administrative accounts found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:862
+#: setup/class_setupStep_Migrate.inc:861
#, php-format
msgid "FD 1.0.7 administrative groups found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:864
+#: setup/class_setupStep_Migrate.inc:863
msgid ""
"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
"file at the end of the setup to migrate it.<br/>"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:867
+#: setup/class_setupStep_Migrate.inc:866
msgid ""
"There is no valid FusionDirectory 1.0.8 administrator account inside your "
"LDAP."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:868 setup/class_setupStep_Migrate.inc:883
+#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
#: include/simpleplugin/simple-list.xml:59
#: plugins/admin/departments/dep-list.xml:48
#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
msgid "Create"
msgstr "Criar"
-#: setup/class_setupStep_Migrate.inc:873
+#: setup/class_setupStep_Migrate.inc:872
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: plugins/admin/users/class_userManagement.inc:42
msgid "Users"
msgstr "Usuários"
-#: setup/class_setupStep_Migrate.inc:876
+#: setup/class_setupStep_Migrate.inc:875
msgid "Groups"
msgstr "Grupos"
-#: setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStep_Migrate.inc:881
msgid "There is no FusionDirectory administrator account inside your LDAP."
msgstr "Não existe uma conta de administrador do FusioDirectory no seu LDAP."
-#: setup/class_setupStep_Migrate.inc:920
+#: setup/class_setupStep_Migrate.inc:919
msgid "Gives all rights on all objects"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:937 include/class_management.inc:697
+#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
#: include/class_listing.inc:551 include/class_xml.inc:58
#: include/password-methods/class_password-methods-sasl.inc:60
#: include/password-methods/class_password-methods-sasl.inc:86
#: include/password-methods/class_password-methods.inc:393
#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3112
-#: include/functions.inc:3133 include/functions.inc:3173
-#: include/functions.inc:3185 include/functions.inc:3189
-#: include/functions.inc:3196 include/functions.inc:3205
-#: include/functions.inc:3267 include/class_msg_dialog.inc:128
+#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
+#: include/functions.inc:3146 include/functions.inc:3186
+#: include/functions.inc:3198 include/functions.inc:3202
+#: include/functions.inc:3209 include/functions.inc:3218
+#: include/functions.inc:3280 include/class_msg_dialog.inc:128
#: include/class_msg_dialog.inc:164 include/class_config.inc:357
#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
@@ -493,82 +493,82 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:34
#: include/simpleplugin/attributes/class_FileAttribute.inc:37
#: include/simpleplugin/attributes/class_FileAttribute.inc:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:801
-#: include/class_plugin.inc:1534 html/index.php:453 html/index.php:474
+#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
+#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
#: html/index.php:484 html/index.php:546 html/index.php:556
#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
msgid "Error"
msgstr "Erro"
-#: setup/class_setupStep_Migrate.inc:997
+#: setup/class_setupStep_Migrate.inc:996
msgid "Default ACL roles have not been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:999
+#: setup/class_setupStep_Migrate.inc:998
msgid "Some default ACL roles are missing"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1001
+#: setup/class_setupStep_Migrate.inc:1000
msgid "Default ACL roles have been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1031
+#: setup/class_setupStep_Migrate.inc:1030
#, php-format
msgid "Cannot add ACL role \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1086
+#: setup/class_setupStep_Migrate.inc:1085
#, php-format
msgid "Found %s user(s) outside the configured tree \"%s\"."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1100
-#: setup/class_setupStep_Migrate.inc:1114
+#: setup/class_setupStep_Migrate.inc:1099
+#: setup/class_setupStep_Migrate.inc:1113
msgid "Move users into configured user tree"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
msgid "Cannot move entries to the requested department!"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "Entry will be moved from"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "to"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1154
+#: setup/class_setupStep_Migrate.inc:1153
msgid "The following references will be updated"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1205
+#: setup/class_setupStep_Migrate.inc:1204
#, php-format
msgid "Found %s groups outside the configured tree '%s'."
msgstr "Encontrado %s grupos fora da árvore configurada '%s'."
-#: setup/class_setupStep_Migrate.inc:1219
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1218
+#: setup/class_setupStep_Migrate.inc:1232
msgid "Move groups into configured groups tree"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1316
+#: setup/class_setupStep_Migrate.inc:1315
#, php-format
msgid "Found %s department(s) that will not be visible in FusionDirectory."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1325
-#: setup/class_setupStep_Migrate.inc:1330
+#: setup/class_setupStep_Migrate.inc:1324
+#: setup/class_setupStep_Migrate.inc:1329
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1380
+#: setup/class_setupStep_Migrate.inc:1379
#, php-format
msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1424
+#: setup/class_setupStep_Migrate.inc:1423
#, php-format
msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
@@ -744,10 +744,10 @@ msgstr "Próximo"
#: include/class_logging.inc:80 include/class_session.inc:50
#: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:649
-#: include/functions.inc:770 include/functions.inc:1189
-#: include/functions.inc:2243 include/functions.inc:2285
-#: include/functions.inc:2314 include/class_ldap.inc:873
+#: include/functions.inc:564 include/functions.inc:651
+#: include/functions.inc:772 include/functions.inc:1201
+#: include/functions.inc:2255 include/functions.inc:2297
+#: include/functions.inc:2326 include/class_ldap.inc:873
#: include/class_ldap.inc:911 include/class_acl.inc:118
msgid "Internal error"
msgstr "Erro interno"
@@ -814,12 +814,12 @@ msgid ""
"plugin instance!"
msgstr ""
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1188
+#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
#: include/class_listing.inc:1190
msgid "Root"
msgstr ""
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
msgid "Submit"
msgstr ""
@@ -920,7 +920,7 @@ msgid "Create a new snapshot from this object"
msgstr "Criar um novo snapshots deste objeto"
#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3302 include/simpleplugin/class_simplePlugin.inc:272
+#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
#: include/simpleplugin/class_simplePlugin.inc:277
#: include/simpleplugin/class_simplePlugin.inc:289
#: html/class_passwordRecovery.inc:116
@@ -953,7 +953,7 @@ msgstr ""
#: include/password-methods/class_password-methods-sha.inc:69
#: include/password-methods/class_password-methods-ssha.inc:73
#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:659 include/class_timezone.inc:51
+#: include/functions.inc:661 include/class_timezone.inc:51
#: include/class_config.inc:159 include/class_config.inc:284
#: include/class_config.inc:843 include/class_config.inc:856
#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
@@ -991,7 +991,7 @@ msgid "Cannot paste"
msgstr ""
#: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
#: plugins/personal/generic/paste_generic.tpl.c:11
msgid "Login"
@@ -1035,245 +1035,245 @@ msgid ""
"administrator."
msgstr ""
-#: include/functions.inc:597
+#: include/functions.inc:599
msgid "Authentication error"
msgstr "Erro de autenticação"
-#: include/functions.inc:598
+#: include/functions.inc:600
msgid ""
"It seems your user password has expired. Please use <a "
"href=\"recovery.php\">password recovery</a> to change it."
msgstr ""
-#: include/functions.inc:649 include/functions.inc:770
+#: include/functions.inc:651 include/functions.inc:772
msgid "Error while adding a lock. Contact the developers!"
msgstr ""
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid ""
"Cannot create locking information in LDAP tree. Please contact your "
"administrator!"
msgstr ""
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid "LDAP server returned: %s"
msgstr ""
-#: include/functions.inc:838
+#: include/functions.inc:850
msgid ""
"Found multiple locks for object to be locked. This should not happen - "
"cleaning up multiple references."
msgstr ""
-#: include/functions.inc:1109
+#: include/functions.inc:1121
#, php-format
msgid "The size limit of %d entries is exceed!"
msgstr ""
-#: include/functions.inc:1111
+#: include/functions.inc:1123
#, php-format
msgid ""
"Set the new size limit to %s and show me this message if the limit still "
"exceeds"
msgstr ""
-#: include/functions.inc:1128
+#: include/functions.inc:1140
msgid "Configure"
msgstr "Configurar"
-#: include/functions.inc:1133
+#: include/functions.inc:1145
msgid "incomplete"
msgstr ""
-#: include/functions.inc:1534
+#: include/functions.inc:1546
msgid "Continue anyway"
msgstr ""
-#: include/functions.inc:1536
+#: include/functions.inc:1548
msgid "Edit anyway"
msgstr ""
-#: include/functions.inc:1538
+#: include/functions.inc:1550
#, php-format
msgid "You're going to edit the LDAP entry/entries %s"
msgstr ""
-#: include/functions.inc:1766
+#: include/functions.inc:1778
msgid "Entries per page"
msgstr ""
-#: include/functions.inc:1797 include/class_filter.inc:353
+#: include/functions.inc:1809 include/class_filter.inc:353
msgid "Apply filter"
msgstr ""
-#: include/functions.inc:2065
+#: include/functions.inc:2077
#, php-format
msgid "%sB"
msgstr ""
-#: include/functions.inc:2066
+#: include/functions.inc:2078
#, php-format
msgid "%sKiB"
msgstr ""
-#: include/functions.inc:2067
+#: include/functions.inc:2079
#, php-format
msgid "%sMiB"
msgstr ""
-#: include/functions.inc:2068
+#: include/functions.inc:2080
#, php-format
msgid "%sGiB"
msgstr ""
-#: include/functions.inc:2069
+#: include/functions.inc:2081
#, php-format
msgid "%sTiB"
msgstr ""
-#: include/functions.inc:2070
+#: include/functions.inc:2082
#, php-format
msgid "%sPiB"
msgstr ""
-#: include/functions.inc:2071
+#: include/functions.inc:2083
#, php-format
msgid "%sEiB"
msgstr ""
-#: include/functions.inc:2072
+#: include/functions.inc:2084
#, php-format
msgid "%sZiB"
msgstr ""
-#: include/functions.inc:2073
+#: include/functions.inc:2085
#, php-format
msgid "%sYiB"
msgstr ""
-#: include/functions.inc:2105 include/class_filter.inc:315
+#: include/functions.inc:2117 include/class_filter.inc:315
msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
msgstr ""
-#: include/functions.inc:2243
+#: include/functions.inc:2255
#, php-format
msgid ""
"File '%s' could not be deleted. Try fusiondirectory-setup --check-"
"directories to fix permissions."
msgstr "Arquivo '%s' não pode ser deletado. Tente fusiondirectory-setup --check-directories para ajustas as permissões."
-#: include/functions.inc:2285
+#: include/functions.inc:2297
msgid "Cannot write to revision file!"
msgstr ""
-#: include/functions.inc:2314
+#: include/functions.inc:2326
msgid "Cannot read to revision file!"
msgstr ""
-#: include/functions.inc:2523
+#: include/functions.inc:2535
msgid "'nextIdHook' is not available. Using default base!"
msgstr "'nextIdHook' não está disponÃvel. Utilizando base padrão."
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "LDAP warning"
msgstr ""
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "Cannot get schema information from server. No schema check possible!"
msgstr ""
-#: include/functions.inc:2564
+#: include/functions.inc:2577
msgid "Main FusionDirectory schema"
msgstr ""
-#: include/functions.inc:2571
+#: include/functions.inc:2584
msgid "Schema used to store FusionDirectory configuration"
msgstr ""
-#: include/functions.inc:2578
+#: include/functions.inc:2591
msgid "Used to store trust mode information in users or groups."
msgstr ""
-#: include/functions.inc:2585
+#: include/functions.inc:2598
msgid "Used to store templates."
msgstr ""
-#: include/functions.inc:2592
+#: include/functions.inc:2605
msgid "Used to store POSIX information."
msgstr ""
-#: include/functions.inc:2599
+#: include/functions.inc:2612
#, php-format
msgid "Missing required object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2601
+#: include/functions.inc:2614
#, php-format
msgid "Missing optional object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2605
+#: include/functions.inc:2618
#, php-format
msgid "Class(es) available"
msgstr ""
-#: include/functions.inc:2623
+#: include/functions.inc:2636
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2637
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2640
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2641
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3112 include/functions.inc:3133
-#: include/functions.inc:3173 include/functions.inc:3185
-#: include/functions.inc:3189 include/functions.inc:3196
-#: include/functions.inc:3205
+#: include/functions.inc:3125 include/functions.inc:3146
+#: include/functions.inc:3186 include/functions.inc:3198
+#: include/functions.inc:3202 include/functions.inc:3209
+#: include/functions.inc:3218
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3112
+#: include/functions.inc:3125
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3133
+#: include/functions.inc:3146
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3173
+#: include/functions.inc:3186
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3185 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3202
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3205
+#: include/functions.inc:3218
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3267
+#: include/functions.inc:3280
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3303
+#: include/functions.inc:3316
#, 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"
@@ -2103,7 +2103,7 @@ msgstr "Nome"
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
#: plugins/admin/departments/class_department.inc:72
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/groups/class_roleGeneric.inc:91
@@ -2283,7 +2283,7 @@ msgid "The entry %s is not existing"
msgstr "A entrada %s não é existente"
#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:548
+#: include/class_plugin.inc:554
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!"
@@ -2399,14 +2399,19 @@ msgstr "Um float menor que %f"
msgid "There was a problem uncompressing snapshot data"
msgstr ""
-#: include/class_plugin.inc:803
+#: include/class_plugin.inc:809
#, php-format
msgid ""
"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
msgstr ""
-#: include/class_plugin.inc:1332
+#: include/class_plugin.inc:1350
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/class_plugin.inc:1352
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -2554,44 +2559,44 @@ msgstr "Cookies estão desabilitados. Por favor, habilite os cookies em seu nave
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr "Abortado. Configuração %s/%s do FusionDirectory não pôde ser lida."
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
msgid "Email address"
msgstr "Endereço de email"
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
#, php-format
msgid "Did not find an account with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
#, php-format
msgid "Found multiple accounts with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
#, php-format
msgid "There is no account using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There are several accounts using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
#, php-format
msgid "The user using email \"%s\" is locked. Please contact your administrator."
msgstr ""
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
msgid "Contact your administrator, there was a problem with mail server"
msgstr "Entre em contato com o administrador, houve um problema com o servidor de e-mail."
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
msgid "This token is invalid"
msgstr ""
-#: html/class_passwordRecovery.inc:647
+#: html/class_passwordRecovery.inc:651
msgid "There was a problem with mail server, confirmation email not sent"
msgstr ""
@@ -2903,7 +2908,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:387
+#: plugins/personal/generic/class_user.inc:390
#: setup/setup_migrate_adminAccount.tpl.c:14
#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2940,258 +2945,262 @@ msgstr ""
msgid "User account"
msgstr ""
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:296
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:307
msgid "Personal information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "Sobrenome"
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
msgid "Last name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "Nome"
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
msgid "First name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
msgid "Short description of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "Picture"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "The avatar for this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:330
+#: plugins/personal/generic/class_user.inc:333
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:334
+#: plugins/personal/generic/class_user.inc:337
#: plugins/admin/departments/class_department.inc:90
#: plugins/admin/departments/class_department.inc:96
msgid "Location"
msgstr "Localização"
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:341
#: plugins/admin/departments/class_department.inc:93
msgid "State"
msgstr "Estado"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
#: plugins/admin/departments/class_department.inc:102
msgid "Address"
msgstr "Endereço"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
msgid "Business postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room number"
msgstr "Número da sala"
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
#: plugins/admin/departments/class_department.inc:106
msgid "Phone"
msgstr "Telefone"
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
msgid "Business phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Mobile"
msgstr "Celular"
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Business mobile number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Pager"
msgstr "Pager"
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
#: plugins/admin/departments/class_department.inc:110
msgid "Fax"
msgstr "Fax"
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Homepage"
msgstr "Página inicial"
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:373
+#: plugins/personal/generic/class_user.inc:376
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:393
+#: plugins/personal/generic/class_user.inc:396
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Display name"
msgstr "Nome de exibição"
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home postal address"
msgstr "Endereço residencial"
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Private phone"
msgstr ""
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Home phone number"
msgstr "Telefone residencial"
-#: plugins/personal/generic/class_user.inc:411
+#: plugins/personal/generic/class_user.inc:414
msgid "Organizational information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
msgid "Title"
msgstr "TÃtulo"
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
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:421
+#: plugins/personal/generic/class_user.inc:424
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
msgid "Organization"
msgstr "Organização"
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
#: plugins/admin/departments/class_department.inc:33
#: plugins/admin/departments/class_department.inc:39
#: plugins/admin/departments/dep-list.xml:21
msgid "Department"
msgstr "Departamento"
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
msgid "Department to which the user belongs"
msgstr ""
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department number"
msgstr "Número do departamento"
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee number"
msgstr "Número do funcionário"
-#: plugins/personal/generic/class_user.inc:437
+#: plugins/personal/generic/class_user.inc:440
msgid "Employee type"
msgstr "Tipo de funcionário"
-#: plugins/personal/generic/class_user.inc:441
+#: plugins/personal/generic/class_user.inc:444
#: plugins/admin/departments/class_department.inc:84
msgid "Manager"
msgstr "Gerente"
-#: plugins/personal/generic/class_user.inc:608
+#: plugins/personal/generic/class_user.inc:611
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:614
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:622
+#: plugins/personal/generic/class_user.inc:625
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:636
+#: plugins/personal/generic/class_user.inc:639
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:641
-#: plugins/personal/generic/class_user.inc:645
+#: plugins/personal/generic/class_user.inc:644
+#: plugins/personal/generic/class_user.inc:648
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:652
+#: plugins/personal/generic/class_user.inc:655
msgid "You need to specify your current password in order to proceed."
msgstr "Você precisa especificar sua atual senha para prosseguir."
-#: plugins/personal/generic/class_user.inc:654
+#: plugins/personal/generic/class_user.inc:657
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:656
+#: plugins/personal/generic/class_user.inc:659
#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
msgid "New password"
msgstr "Nova senha"
-#: plugins/personal/generic/class_user.inc:658
+#: plugins/personal/generic/class_user.inc:661
msgid "The password used as new and current are too similar."
msgstr "A nova senha é muito similar à senha atual."
-#: plugins/personal/generic/class_user.inc:660
+#: plugins/personal/generic/class_user.inc:663
msgid "The password used as new is to short."
msgstr "A nova senha é muito curta."
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:665
msgid "The password contains possibly problematic Unicode characters!"
msgstr "A senha contém caracteres Unicode problemáticos."
@@ -3299,36 +3308,46 @@ msgid ""
"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:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:189
+msgid "Login attribute"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
msgid "First email"
msgstr "Primeiro e-mail"
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
msgid "Subject"
msgstr "Assunto"
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
msgid "Subject of the first email"
msgstr "Assunto do primeiro e-mail"
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
msgid "[FusionDirectory] Password recovery link"
msgstr "[FusionDirectory] Link de recuperação de senha"
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
#, 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:91
+#: plugins/config/class_recoveryConfig.inc:96
#, php-format
msgid ""
"Body of the first email, sent when the user ask for a new password. Use %s "
"for the login and the recovery link."
msgstr "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:94
+#: plugins/config/class_recoveryConfig.inc:99
#, php-format
msgid ""
"Hello,\n"
@@ -3340,31 +3359,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
msgid "Second email"
msgstr "Segundo e-mail"
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
msgid "Subject of the second email"
msgstr "Assunto do segundo e-mail"
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
msgid "[FusionDirectory] Password recovery successful"
msgstr "[FusionDirectory] Senha recuperada com sucesso"
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
#, php-format
msgid "Body (%s is login)"
msgstr "Corpo (%s é o login)"
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
#, 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:113
+#: plugins/config/class_recoveryConfig.inc:118
#, php-format
msgid ""
"Hello,\n"
@@ -3531,10 +3550,6 @@ msgstr ""
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 ""
@@ -4397,7 +4412,7 @@ msgstr ""
msgid "Only allow this group to connect to this list of hosts"
msgstr ""
-#: plugins/admin/groups/class_ogroup.inc:321
+#: plugins/admin/groups/class_ogroup.inc:322
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
diff --git a/locale/ru/fusiondirectory.po b/locale/ru/fusiondirectory.po
index 0ac0191218e34ee7b44e9fe60b82f30d64745597..b37bee3e8c883d4fcb1cb80f2fab4ebbef88dbd1 100644
--- a/locale/ru/fusiondirectory.po
+++ b/locale/ru/fusiondirectory.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-11 19:09+0100\n"
-"PO-Revision-Date: 2017-01-10 14:53+0000\n"
+"POT-Creation-Date: 2017-03-29 21:46+0200\n"
+"PO-Revision-Date: 2017-03-26 15:51+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:382
+#: plugins/personal/generic/class_user.inc:385
msgid "Preferred language"
msgstr "Предпочитаемый Ñзык"
@@ -318,30 +318,30 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
+#: setup/class_setupStep_Migrate.inc:981
+#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1180
+#: setup/class_setupStep_Migrate.inc:1273
+#: setup/class_setupStep_Migrate.inc:1352
+#: setup/class_setupStep_Migrate.inc:1396
+msgid "LDAP query failed"
+msgstr "LDAP Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ðµ удалÑÑ"
+
+#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
+#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
#: setup/class_setupStep_Migrate.inc:982
#: setup/class_setupStep_Migrate.inc:1058
#: setup/class_setupStep_Migrate.inc:1181
#: setup/class_setupStep_Migrate.inc:1274
#: setup/class_setupStep_Migrate.inc:1353
#: setup/class_setupStep_Migrate.inc:1397
-msgid "LDAP query failed"
-msgstr "LDAP Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ðµ удалÑÑ"
-
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:983
-#: setup/class_setupStep_Migrate.inc:1059
-#: setup/class_setupStep_Migrate.inc:1182
-#: setup/class_setupStep_Migrate.inc:1275
-#: setup/class_setupStep_Migrate.inc:1354
-#: setup/class_setupStep_Migrate.inc:1398
msgid "Possibly the \"root object\" is missing."
msgstr ""
#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:866
-#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
+#: setup/class_setupStep_Migrate.inc:880
msgid "Failed"
msgstr "Ошибка"
@@ -362,11 +362,11 @@ msgid ""
msgstr ""
#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:677
-#: include/functions.inc:724 include/functions.inc:822
-#: include/functions.inc:2988 include/functions.inc:3165
+#: include/functions.inc:522 include/functions.inc:679
+#: include/functions.inc:726 include/functions.inc:834
+#: include/functions.inc:3001 include/functions.inc:3178
#: include/class_config.inc:322 include/class_ldap.inc:924
#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
#: include/simpleplugin/attributes/class_SetAttribute.inc:726
@@ -388,13 +388,13 @@ msgid "The specified user \"%s\" does not have full access to your ldap database
msgstr ""
#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1085
-#: setup/class_setupStep_Migrate.inc:1204
-#: setup/class_setupStep_Migrate.inc:1315
-#: setup/class_setupStep_Migrate.inc:1379
-#: setup/class_setupStep_Migrate.inc:1423 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:838
-#: include/functions.inc:2523 include/simpleplugin/class_simpleTabs.inc:322
+#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1203
+#: setup/class_setupStep_Migrate.inc:1314
+#: setup/class_setupStep_Migrate.inc:1378
+#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
+#: include/class_xml.inc:55 include/functions.inc:850
+#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
#: html/index.php:597 html/main.php:158
#: plugins/personal/posix/class_posixAccount.inc:482
#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
@@ -415,7 +415,7 @@ msgid "User migration"
msgstr ""
#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1029
+#: setup/class_setupStep_Migrate.inc:1028
msgid "Migration error"
msgstr "Ошибка перемещениÑ"
@@ -424,64 +424,64 @@ msgstr "Ошибка перемещениÑ"
msgid "Cannot migrate entry \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:859
+#: setup/class_setupStep_Migrate.inc:858
#, php-format
msgid "FD 1.0.7 administrative accounts found: %s"
msgstr "Ðайдена ÑƒÑ‡ÐµÑ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ админиÑтратора FD 1.0.7: %s"
-#: setup/class_setupStep_Migrate.inc:862
+#: setup/class_setupStep_Migrate.inc:861
#, php-format
msgid "FD 1.0.7 administrative groups found: %s"
msgstr "Ðайдена админиÑÑ‚Ñ€Ð°Ñ‚Ð¸Ð²Ð½Ð°Ñ Ð³Ñ€ÑƒÐ¿Ð¿Ð° FD 1.0.7: %s"
-#: setup/class_setupStep_Migrate.inc:864
+#: setup/class_setupStep_Migrate.inc:863
msgid ""
"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
"file at the end of the setup to migrate it.<br/>"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:867
+#: setup/class_setupStep_Migrate.inc:866
msgid ""
"There is no valid FusionDirectory 1.0.8 administrator account inside your "
"LDAP."
msgstr "Ðет рабочей учетной запиÑи админиÑтратора FusionDirectory 1.0.8 в вашем LDAP."
-#: setup/class_setupStep_Migrate.inc:868 setup/class_setupStep_Migrate.inc:883
+#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
#: include/simpleplugin/simple-list.xml:59
#: plugins/admin/departments/dep-list.xml:48
#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
msgid "Create"
msgstr "Создать"
-#: setup/class_setupStep_Migrate.inc:873
+#: setup/class_setupStep_Migrate.inc:872
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: plugins/admin/users/class_userManagement.inc:42
msgid "Users"
msgstr "Пользователи"
-#: setup/class_setupStep_Migrate.inc:876
+#: setup/class_setupStep_Migrate.inc:875
msgid "Groups"
msgstr "Группы"
-#: setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStep_Migrate.inc:881
msgid "There is no FusionDirectory administrator account inside your LDAP."
msgstr "Ðет учетной запиÑи админиÑтратора FusionDirectory в вашем LDAP."
-#: setup/class_setupStep_Migrate.inc:920
+#: setup/class_setupStep_Migrate.inc:919
msgid "Gives all rights on all objects"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:937 include/class_management.inc:697
+#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
#: include/class_listing.inc:551 include/class_xml.inc:58
#: include/password-methods/class_password-methods-sasl.inc:60
#: include/password-methods/class_password-methods-sasl.inc:86
#: include/password-methods/class_password-methods.inc:393
#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3112
-#: include/functions.inc:3133 include/functions.inc:3173
-#: include/functions.inc:3185 include/functions.inc:3189
-#: include/functions.inc:3196 include/functions.inc:3205
-#: include/functions.inc:3267 include/class_msg_dialog.inc:128
+#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
+#: include/functions.inc:3146 include/functions.inc:3186
+#: include/functions.inc:3198 include/functions.inc:3202
+#: include/functions.inc:3209 include/functions.inc:3218
+#: include/functions.inc:3280 include/class_msg_dialog.inc:128
#: include/class_msg_dialog.inc:164 include/class_config.inc:357
#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
@@ -494,82 +494,82 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:34
#: include/simpleplugin/attributes/class_FileAttribute.inc:37
#: include/simpleplugin/attributes/class_FileAttribute.inc:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:801
-#: include/class_plugin.inc:1534 html/index.php:453 html/index.php:474
+#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
+#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
#: html/index.php:484 html/index.php:546 html/index.php:556
#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
msgid "Error"
msgstr "Ошибка"
-#: setup/class_setupStep_Migrate.inc:997
+#: setup/class_setupStep_Migrate.inc:996
msgid "Default ACL roles have not been inserted"
msgstr "ACL ролей по умолчанию не вÑтавлены"
-#: setup/class_setupStep_Migrate.inc:999
+#: setup/class_setupStep_Migrate.inc:998
msgid "Some default ACL roles are missing"
msgstr "Ðекоторые ACL ролей по умолчанию пропущены"
-#: setup/class_setupStep_Migrate.inc:1001
+#: setup/class_setupStep_Migrate.inc:1000
msgid "Default ACL roles have been inserted"
msgstr "ACL ролей по умолчанию вÑтавлен"
-#: setup/class_setupStep_Migrate.inc:1031
+#: setup/class_setupStep_Migrate.inc:1030
#, php-format
msgid "Cannot add ACL role \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1086
+#: setup/class_setupStep_Migrate.inc:1085
#, php-format
msgid "Found %s user(s) outside the configured tree \"%s\"."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1100
-#: setup/class_setupStep_Migrate.inc:1114
+#: setup/class_setupStep_Migrate.inc:1099
+#: setup/class_setupStep_Migrate.inc:1113
msgid "Move users into configured user tree"
msgstr "ПеремеÑтить пользователей в наÑтроенное дерево пользователей"
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
msgid "Cannot move entries to the requested department!"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "Entry will be moved from"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "to"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1154
+#: setup/class_setupStep_Migrate.inc:1153
msgid "The following references will be updated"
msgstr "Следующие ÑÑылки будут обновлены"
-#: setup/class_setupStep_Migrate.inc:1205
+#: setup/class_setupStep_Migrate.inc:1204
#, php-format
msgid "Found %s groups outside the configured tree '%s'."
msgstr "Ðайдены группы %s, выходÑщие за пределы наÑтроенного дерева '%s'."
-#: setup/class_setupStep_Migrate.inc:1219
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1218
+#: setup/class_setupStep_Migrate.inc:1232
msgid "Move groups into configured groups tree"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1316
+#: setup/class_setupStep_Migrate.inc:1315
#, php-format
msgid "Found %s department(s) that will not be visible in FusionDirectory."
msgstr "Ðайдены подразделение(Ñ) %s, которые будет не видны в FusionDirectory."
-#: setup/class_setupStep_Migrate.inc:1325
-#: setup/class_setupStep_Migrate.inc:1330
+#: setup/class_setupStep_Migrate.inc:1324
+#: setup/class_setupStep_Migrate.inc:1329
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1380
+#: setup/class_setupStep_Migrate.inc:1379
#, php-format
msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1424
+#: setup/class_setupStep_Migrate.inc:1423
#, php-format
msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
@@ -745,10 +745,10 @@ msgstr "Далее"
#: include/class_logging.inc:80 include/class_session.inc:50
#: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:649
-#: include/functions.inc:770 include/functions.inc:1189
-#: include/functions.inc:2243 include/functions.inc:2285
-#: include/functions.inc:2314 include/class_ldap.inc:873
+#: include/functions.inc:564 include/functions.inc:651
+#: include/functions.inc:772 include/functions.inc:1201
+#: include/functions.inc:2255 include/functions.inc:2297
+#: include/functions.inc:2326 include/class_ldap.inc:873
#: include/class_ldap.inc:911 include/class_acl.inc:118
msgid "Internal error"
msgstr "ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°"
@@ -815,12 +815,12 @@ msgid ""
"plugin instance!"
msgstr "Ð’ конфигурационном файле не найдено объÑвление вкладки Ð´Ð»Ñ '%s'. Ðе могу Ñоздать ÑкземплÑÑ€ плагина!"
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1188
+#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
#: include/class_listing.inc:1190
msgid "Root"
msgstr ""
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
msgid "Submit"
msgstr "Отправить"
@@ -921,7 +921,7 @@ msgid "Create a new snapshot from this object"
msgstr "Создать новый Ñнапшот из объекта"
#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3302 include/simpleplugin/class_simplePlugin.inc:272
+#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
#: include/simpleplugin/class_simplePlugin.inc:277
#: include/simpleplugin/class_simplePlugin.inc:289
#: html/class_passwordRecovery.inc:116
@@ -954,7 +954,7 @@ msgstr ""
#: include/password-methods/class_password-methods-sha.inc:69
#: include/password-methods/class_password-methods-ssha.inc:73
#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:659 include/class_timezone.inc:51
+#: include/functions.inc:661 include/class_timezone.inc:51
#: include/class_config.inc:159 include/class_config.inc:284
#: include/class_config.inc:843 include/class_config.inc:856
#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
@@ -992,7 +992,7 @@ msgid "Cannot paste"
msgstr "Ðе могу вÑтавить"
#: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
#: plugins/personal/generic/paste_generic.tpl.c:11
msgid "Login"
@@ -1036,245 +1036,245 @@ msgid ""
"administrator."
msgstr "Логин (uid) не уникальный внутри LDAP дерева! ПожалуйÑта ÑвÑжитеÑÑŒ Ñ Ð²Ð°ÑˆÐ¸Ð¼ админиÑтратором."
-#: include/functions.inc:597
+#: include/functions.inc:599
msgid "Authentication error"
msgstr "Ошибка аутентификации"
-#: include/functions.inc:598
+#: include/functions.inc:600
msgid ""
"It seems your user password has expired. Please use <a "
"href=\"recovery.php\">password recovery</a> to change it."
msgstr ""
-#: include/functions.inc:649 include/functions.inc:770
+#: include/functions.inc:651 include/functions.inc:772
msgid "Error while adding a lock. Contact the developers!"
msgstr "Ошибка при добавлении блокировки. СвÑжитеÑÑŒ Ñ Ñ€Ð°Ð·Ñ€Ð°Ð±Ð¾Ñ‚Ñ‡Ð¸ÐºÐ°Ð¼Ð¸!"
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid ""
"Cannot create locking information in LDAP tree. Please contact your "
"administrator!"
msgstr "Ðевозможно Ñоздать информацию о блокировки в LDAP дереве. ПожалуйÑта ÑвÑжитеÑÑŒ Ñ Ð²Ð°ÑˆÐ¸Ð¼ админиÑтратором!"
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid "LDAP server returned: %s"
msgstr "LDAP Ñервер вернул: %s"
-#: include/functions.inc:838
+#: include/functions.inc:850
msgid ""
"Found multiple locks for object to be locked. This should not happen - "
"cleaning up multiple references."
msgstr "Ðайдены множеÑтвенные блокировки Ð´Ð»Ñ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð¾Ð³Ð¾ объекта. Ðто не должно было ÑлучитьÑÑ - очиÑтите их."
-#: include/functions.inc:1109
+#: include/functions.inc:1121
#, php-format
msgid "The size limit of %d entries is exceed!"
msgstr "Ðайдено более %d объектов."
-#: include/functions.inc:1111
+#: include/functions.inc:1123
#, php-format
msgid ""
"Set the new size limit to %s and show me this message if the limit still "
"exceeds"
msgstr "УÑтановить новое значение лимита в %s и показать мне Ñто Ñообщение еÑли лимит будет иÑчерпан."
-#: include/functions.inc:1128
+#: include/functions.inc:1140
msgid "Configure"
msgstr "ÐаÑтроить"
-#: include/functions.inc:1133
+#: include/functions.inc:1145
msgid "incomplete"
msgstr "не полный"
-#: include/functions.inc:1534
+#: include/functions.inc:1546
msgid "Continue anyway"
msgstr "Продолжить в любом Ñлучае"
-#: include/functions.inc:1536
+#: include/functions.inc:1548
msgid "Edit anyway"
msgstr "Редактировать в любом Ñлучае"
-#: include/functions.inc:1538
+#: include/functions.inc:1550
#, php-format
msgid "You're going to edit the LDAP entry/entries %s"
msgstr "Ð’Ñ‹ ÑобираетеÑÑŒ редактировать LDAP запиÑÑŒ/запиÑи %s"
-#: include/functions.inc:1766
+#: include/functions.inc:1778
msgid "Entries per page"
msgstr "ЗапиÑей на Ñтранице"
-#: include/functions.inc:1797 include/class_filter.inc:353
+#: include/functions.inc:1809 include/class_filter.inc:353
msgid "Apply filter"
msgstr "Применить фильтр"
-#: include/functions.inc:2065
+#: include/functions.inc:2077
#, php-format
msgid "%sB"
msgstr "%sB"
-#: include/functions.inc:2066
+#: include/functions.inc:2078
#, php-format
msgid "%sKiB"
msgstr "%sKiB"
-#: include/functions.inc:2067
+#: include/functions.inc:2079
#, php-format
msgid "%sMiB"
msgstr "%sMiB"
-#: include/functions.inc:2068
+#: include/functions.inc:2080
#, php-format
msgid "%sGiB"
msgstr "%sGiB"
-#: include/functions.inc:2069
+#: include/functions.inc:2081
#, php-format
msgid "%sTiB"
msgstr "%sTiB"
-#: include/functions.inc:2070
+#: include/functions.inc:2082
#, php-format
msgid "%sPiB"
msgstr "%sPiB"
-#: include/functions.inc:2071
+#: include/functions.inc:2083
#, php-format
msgid "%sEiB"
msgstr "%sEiB"
-#: include/functions.inc:2072
+#: include/functions.inc:2084
#, php-format
msgid "%sZiB"
msgstr "%sZiB"
-#: include/functions.inc:2073
+#: include/functions.inc:2085
#, php-format
msgid "%sYiB"
msgstr "%sYiB"
-#: include/functions.inc:2105 include/class_filter.inc:315
+#: include/functions.inc:2117 include/class_filter.inc:315
msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
msgstr "*ÐБВГДЕÐЖЗИЙКЛМÐОПРСТУФХЦЧШЩЫÐЮЯ0123456789"
-#: include/functions.inc:2243
+#: include/functions.inc:2255
#, php-format
msgid ""
"File '%s' could not be deleted. Try fusiondirectory-setup --check-"
"directories to fix permissions."
msgstr "Файл '%s' не может быть удален. Попробуйте fusiondirectory-setup --check-directories чтобы иÑправить права."
-#: include/functions.inc:2285
+#: include/functions.inc:2297
msgid "Cannot write to revision file!"
msgstr "Ðе могу запиÑать файл проверки!"
-#: include/functions.inc:2314
+#: include/functions.inc:2326
msgid "Cannot read to revision file!"
msgstr "Ðе могу прочитать файл проверки!"
-#: include/functions.inc:2523
+#: include/functions.inc:2535
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "LDAP warning"
msgstr "Предупреждение LDAP"
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "Cannot get schema information from server. No schema check possible!"
msgstr "Ðе могу получить информацию о Ñхемах Ñ Ñервера. Проверить Ñхемы невозможно!"
-#: include/functions.inc:2564
+#: include/functions.inc:2577
msgid "Main FusionDirectory schema"
msgstr ""
-#: include/functions.inc:2571
+#: include/functions.inc:2584
msgid "Schema used to store FusionDirectory configuration"
msgstr ""
-#: include/functions.inc:2578
+#: include/functions.inc:2591
msgid "Used to store trust mode information in users or groups."
msgstr ""
-#: include/functions.inc:2585
+#: include/functions.inc:2598
msgid "Used to store templates."
msgstr ""
-#: include/functions.inc:2592
+#: include/functions.inc:2605
msgid "Used to store POSIX information."
msgstr ""
-#: include/functions.inc:2599
+#: include/functions.inc:2612
#, php-format
msgid "Missing required object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2601
+#: include/functions.inc:2614
#, php-format
msgid "Missing optional object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2605
+#: include/functions.inc:2618
#, php-format
msgid "Class(es) available"
msgstr "ДоÑтупные клаÑÑ(Ñ‹)"
-#: include/functions.inc:2623
+#: include/functions.inc:2636
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2637
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2640
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2641
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3112 include/functions.inc:3133
-#: include/functions.inc:3173 include/functions.inc:3185
-#: include/functions.inc:3189 include/functions.inc:3196
-#: include/functions.inc:3205
+#: include/functions.inc:3125 include/functions.inc:3146
+#: include/functions.inc:3186 include/functions.inc:3198
+#: include/functions.inc:3202 include/functions.inc:3209
+#: include/functions.inc:3218
msgid "Cannot allocate a free ID:"
msgstr "Ðе могу выделить Ñвободный ID:"
-#: include/functions.inc:3112
+#: include/functions.inc:3125
msgid "unknown idAllocation method!"
msgstr " неизвеÑтный idAllocation метод!"
-#: include/functions.inc:3133
+#: include/functions.inc:3146
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr "%sPoolMin >= %sPoolMax!"
-#: include/functions.inc:3173
+#: include/functions.inc:3186
msgid "sambaUnixIdPool is not unique!"
msgstr "sambaUnixIdPool не уникальна!"
-#: include/functions.inc:3185 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3202
msgid "no ID available!"
msgstr "нет доÑтупных ID!"
-#: include/functions.inc:3205
+#: include/functions.inc:3218
msgid "maximum tries exceeded!"
msgstr "Превышено макÑимальное чиÑло попыток!"
-#: include/functions.inc:3267
+#: include/functions.inc:3280
msgid "Cannot allocate a free ID!"
msgstr "Ðе могу выделить Ñвободный ID!"
-#: include/functions.inc:3303
+#: include/functions.inc:3316
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr "Ðе могу обнаружить файл '%s' - пожалуйÑта запуÑтите '%s', чтобы иÑправить Ñто."
@@ -2104,7 +2104,7 @@ msgstr "Ðазвание"
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
#: plugins/admin/departments/class_department.inc:72
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/groups/class_roleGeneric.inc:91
@@ -2284,7 +2284,7 @@ msgid "The entry %s is not existing"
msgstr "ЗапиÑÑŒ %s не ÑущеÑтвует"
#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:548
+#: include/class_plugin.inc:554
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!"
@@ -2400,14 +2400,19 @@ msgstr "ВещеÑтвенное чиÑло меньше %f"
msgid "There was a problem uncompressing snapshot data"
msgstr "Были проблемы при раÑпаковке данных Ñнапшота"
-#: include/class_plugin.inc:803
+#: include/class_plugin.inc:809
#, php-format
msgid ""
"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
msgstr ""
-#: include/class_plugin.inc:1332
+#: include/class_plugin.inc:1350
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/class_plugin.inc:1352
#, php-format
msgid "Tab \"%s\""
msgstr "Вкладка \"%s\""
@@ -2555,44 +2560,44 @@ msgstr "В вашем браузере отключены куки. Пожалу
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ FusionDirectory %s/%s не читаема. Прервано."
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
msgid "Email address"
msgstr "ÐÐ´Ñ€ÐµÑ Ñлектронной почты"
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
#, php-format
msgid "Did not find an account with login \"%s\""
msgstr "Ðе найден аккаунт Ñ Ð»Ð¾Ð³Ð¸Ð½Ð¾Ð¼ \"%s\""
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
#, php-format
msgid "Found multiple accounts with login \"%s\""
msgstr "Ðайдено множеÑтво учетных запиÑей Ñ Ð»Ð¾Ð³Ð¸Ð½Ð¾Ð¼ \"%s\""
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
#, php-format
msgid "There is no account using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There are several accounts using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
#, php-format
msgid "The user using email \"%s\" is locked. Please contact your administrator."
msgstr ""
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
msgid "Contact your administrator, there was a problem with mail server"
msgstr "СвÑжитеÑÑŒ Ñ Ð²Ð°ÑˆÐ¸Ð¼ ÑиÑтемным админиÑтратором, были проблемы Ñ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ð¼ Ñервером"
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
msgid "This token is invalid"
msgstr ""
-#: html/class_passwordRecovery.inc:647
+#: html/class_passwordRecovery.inc:651
msgid "There was a problem with mail server, confirmation email not sent"
msgstr "Были проблемы Ñ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ð¼ Ñервером, имÑйл Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ð½Ðµ отправлены"
@@ -2904,7 +2909,7 @@ msgid "Password hash method to use"
msgstr "ПрименÑемый метод Ð´Ð»Ñ Ñ…Ñша паролÑ"
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
#: setup/setup_migrate_adminAccount.tpl.c:14
#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2941,258 +2946,262 @@ msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ð± учетной запиÑи пользоват
msgid "User account"
msgstr "Ð£Ñ‡ÐµÑ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ пользователÑ"
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:296
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:307
msgid "Personal information"
msgstr "Ð›Ð¸Ñ‡Ð½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ"
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "ФамилиÑ"
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
msgid "Last name of this user"
msgstr "Ð¤Ð°Ð¼Ð¸Ð»Ð¸Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "ИмÑ"
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
msgid "First name of this user"
msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
msgid "Short description of the user"
msgstr "Краткое опиÑание пользователÑ"
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "Picture"
msgstr "ФотографиÑ"
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "The avatar for this user"
msgstr "Ðватар пользователÑ"
-#: plugins/personal/generic/class_user.inc:330
+#: plugins/personal/generic/class_user.inc:333
msgid "Organizational contact information"
msgstr "Ð Ð°Ð±Ð¾Ñ‡Ð°Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ð½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ"
-#: plugins/personal/generic/class_user.inc:334
+#: plugins/personal/generic/class_user.inc:337
#: plugins/admin/departments/class_department.inc:90
#: plugins/admin/departments/class_department.inc:96
msgid "Location"
msgstr "МеÑтоположение"
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:341
#: plugins/admin/departments/class_department.inc:93
msgid "State"
msgstr "Ðдм. единица"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
#: plugins/admin/departments/class_department.inc:102
msgid "Address"
msgstr "ÐдреÑ"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
msgid "Business postal address"
msgstr "Рабочий почтовый адреÑ"
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room No."
msgstr "Ðомер комнаты"
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room number"
msgstr "Ðомер комнаты"
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
#: plugins/admin/departments/class_department.inc:106
msgid "Phone"
msgstr "Телефон"
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
msgid "Business phone number"
msgstr "Рабочий номер телефона"
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Mobile"
msgstr "Мобильный"
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Business mobile number"
msgstr "Рабочий номер мобильного телефона"
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Pager"
msgstr "Пейджер"
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Business pager number"
msgstr "Рабочий номер пейджера"
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
#: plugins/admin/departments/class_department.inc:110
msgid "Fax"
msgstr "ФакÑ"
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
msgid "Business fax number"
msgstr "Рабочий номер факÑа"
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Homepage"
msgstr "ДомашнÑÑ Ñтраница"
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Personal homepage"
msgstr "ПерÑÐ¾Ð½Ð°Ð»ÑŒÐ½Ð°Ñ Ð´Ð¾Ð¼Ð°ÑˆÐ½ÑÑ Ñтраница"
-#: plugins/personal/generic/class_user.inc:373
+#: plugins/personal/generic/class_user.inc:376
msgid "Account information"
msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ð± учетной запиÑи"
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
msgid "Login of this user"
msgstr "Логин Ñтого пользователÑ"
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
msgid "Password of the user"
msgstr "Пароль пользователÑ"
-#: plugins/personal/generic/class_user.inc:393
+#: plugins/personal/generic/class_user.inc:396
msgid "Personal contact information"
msgstr "Ð›Ð¸Ñ‡Ð½Ð°Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ð½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ"
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Display name"
msgstr "Отображаемое имÑ"
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home address"
msgstr "Домашний адреÑ"
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home postal address"
msgstr "Домашний почтовый адреÑ"
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Private phone"
msgstr "Личный телефон"
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Home phone number"
msgstr "Домашний телефон"
-#: plugins/personal/generic/class_user.inc:411
+#: plugins/personal/generic/class_user.inc:414
msgid "Organizational information"
msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ð± организации"
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
msgid "Title"
msgstr "Заголовок"
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
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:421
+#: plugins/personal/generic/class_user.inc:424
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
msgid "Organization"
msgstr "ОрганизациÑ"
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
#: plugins/admin/departments/class_department.inc:33
#: plugins/admin/departments/class_department.inc:39
#: plugins/admin/departments/dep-list.xml:21
msgid "Department"
msgstr "Подразделение"
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
msgid "Department to which the user belongs"
msgstr ""
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department No."
msgstr "Ðомер подразделениÑ"
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department number"
msgstr "Ðомер отдела"
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee No."
msgstr "Ðомер работника"
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee number"
msgstr "Ðомер работника"
-#: plugins/personal/generic/class_user.inc:437
+#: plugins/personal/generic/class_user.inc:440
msgid "Employee type"
msgstr "Форма трудоуÑтройÑтва"
-#: plugins/personal/generic/class_user.inc:441
+#: plugins/personal/generic/class_user.inc:444
#: plugins/admin/departments/class_department.inc:84
msgid "Manager"
msgstr "Руководитель"
-#: plugins/personal/generic/class_user.inc:608
+#: plugins/personal/generic/class_user.inc:611
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:614
msgid "You are not allowed to change your own password"
msgstr "Вам не разрешено изменÑÑ‚ÑŒ Ñвой пароль"
-#: plugins/personal/generic/class_user.inc:622
+#: plugins/personal/generic/class_user.inc:625
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr "Ð’Ñ‹ должны подождать %d Ñекунд перед повторным изменением паролÑ"
-#: plugins/personal/generic/class_user.inc:636
+#: plugins/personal/generic/class_user.inc:639
msgid "Password is in history of old passwords"
msgstr "Пароль приÑутÑтвует в иÑтории Ñтарых паролей"
-#: plugins/personal/generic/class_user.inc:641
-#: plugins/personal/generic/class_user.inc:645
+#: plugins/personal/generic/class_user.inc:644
+#: plugins/personal/generic/class_user.inc:648
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:652
+#: plugins/personal/generic/class_user.inc:655
msgid "You need to specify your current password in order to proceed."
msgstr "Ð”Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ ÑƒÐºÐ°Ð¶Ð¸Ñ‚Ðµ Ñвой текущий пароль."
-#: plugins/personal/generic/class_user.inc:654
+#: plugins/personal/generic/class_user.inc:657
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:656
+#: plugins/personal/generic/class_user.inc:659
#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
msgid "New password"
msgstr "Ðовый пароль"
-#: plugins/personal/generic/class_user.inc:658
+#: plugins/personal/generic/class_user.inc:661
msgid "The password used as new and current are too similar."
msgstr "Ðовый и текущий пароли Ñлишком похожи."
-#: plugins/personal/generic/class_user.inc:660
+#: plugins/personal/generic/class_user.inc:663
msgid "The password used as new is to short."
msgstr "Ðовый пароль Ñлишком короткий."
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:665
msgid "The password contains possibly problematic Unicode characters!"
msgstr "Пароль Ñодержит Ñимволы Unicode, которые могут проблемы!"
@@ -3300,36 +3309,46 @@ msgid ""
"recover their password"
msgstr "ПользователÑм также нужно ввеÑти один из их дополнительных адреÑов Ð´Ð»Ñ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ"
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:189
+msgid "Login attribute"
+msgstr "Ðтрибут Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ð°"
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
msgid "First email"
msgstr "Первое пиÑьмо"
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
msgid "Subject"
msgstr "Тема"
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
msgid "Subject of the first email"
msgstr "Тема первого пиÑьма"
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
msgid "[FusionDirectory] Password recovery link"
msgstr "[FusionDirectory] СÑылка Ð´Ð»Ñ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ"
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr "Тело (вначале логин %s, Ð²Ñ‚Ð¾Ñ€Ð°Ñ ÑÑылка)"
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
#, php-format
msgid ""
"Body of the first email, sent when the user ask for a new password. Use %s "
"for the login and the recovery link."
msgstr "Тело первого пиÑьма, отправлÑетÑÑ ÐºÐ¾Ð³Ð´Ð° пользователь запрашивает новый пароль. ИÑпользует %s логин и ÑÑылку Ð´Ð»Ñ Ð²Ð¾ÑÑтановлениÑ."
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
#, php-format
msgid ""
"Hello,\n"
@@ -3341,31 +3360,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
msgid "Second email"
msgstr "Второе пиÑьмо"
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
msgid "Subject of the second email"
msgstr "Тема второго пиÑьма"
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
msgid "[FusionDirectory] Password recovery successful"
msgstr "[FusionDirectory] Пароль воÑÑтановлен уÑпешно"
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
#, php-format
msgid "Body (%s is login)"
msgstr "Тело (%s логин)"
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
#, 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:113
+#: plugins/config/class_recoveryConfig.inc:118
#, php-format
msgid ""
"Hello,\n"
@@ -3532,10 +3551,6 @@ msgstr "ОпределÑет количеÑтво запиÑей, которые
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 "Какой LDAP атрибут необходимо иÑпользовать в качеÑтве логина при входе в ÑиÑтему."
@@ -4398,7 +4413,7 @@ msgstr "Объекты, члены Ñтой группы"
msgid "Only allow this group to connect to this list of hosts"
msgstr "Позволить подключатьÑÑ Ñтой группе только к хоÑтам из ÑпиÑка"
-#: plugins/admin/groups/class_ogroup.inc:321
+#: plugins/admin/groups/class_ogroup.inc:322
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
diff --git a/locale/ru@petr1708/fusiondirectory.po b/locale/ru@petr1708/fusiondirectory.po
index 1730c0722b9a81fa297f331c90f527ffb65390a3..86f7b183efdcc9b0bc897e8f66c0ecb5c34ae1c3 100644
--- a/locale/ru@petr1708/fusiondirectory.po
+++ b/locale/ru@petr1708/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-11 19:09+0100\n"
-"PO-Revision-Date: 2017-01-10 14:53+0000\n"
+"POT-Creation-Date: 2017-03-29 21:46+0200\n"
+"PO-Revision-Date: 2017-03-26 15:51+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
"MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:382
+#: plugins/personal/generic/class_user.inc:385
msgid "Preferred language"
msgstr ""
@@ -316,30 +316,30 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
+#: setup/class_setupStep_Migrate.inc:981
+#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1180
+#: setup/class_setupStep_Migrate.inc:1273
+#: setup/class_setupStep_Migrate.inc:1352
+#: setup/class_setupStep_Migrate.inc:1396
+msgid "LDAP query failed"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
+#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
#: setup/class_setupStep_Migrate.inc:982
#: setup/class_setupStep_Migrate.inc:1058
#: setup/class_setupStep_Migrate.inc:1181
#: setup/class_setupStep_Migrate.inc:1274
#: setup/class_setupStep_Migrate.inc:1353
#: setup/class_setupStep_Migrate.inc:1397
-msgid "LDAP query failed"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:983
-#: setup/class_setupStep_Migrate.inc:1059
-#: setup/class_setupStep_Migrate.inc:1182
-#: setup/class_setupStep_Migrate.inc:1275
-#: setup/class_setupStep_Migrate.inc:1354
-#: setup/class_setupStep_Migrate.inc:1398
msgid "Possibly the \"root object\" is missing."
msgstr ""
#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:866
-#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
+#: setup/class_setupStep_Migrate.inc:880
msgid "Failed"
msgstr ""
@@ -360,11 +360,11 @@ msgid ""
msgstr ""
#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:677
-#: include/functions.inc:724 include/functions.inc:822
-#: include/functions.inc:2988 include/functions.inc:3165
+#: include/functions.inc:522 include/functions.inc:679
+#: include/functions.inc:726 include/functions.inc:834
+#: include/functions.inc:3001 include/functions.inc:3178
#: include/class_config.inc:322 include/class_ldap.inc:924
#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
#: include/simpleplugin/attributes/class_SetAttribute.inc:726
@@ -386,13 +386,13 @@ msgid "The specified user \"%s\" does not have full access to your ldap database
msgstr ""
#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1085
-#: setup/class_setupStep_Migrate.inc:1204
-#: setup/class_setupStep_Migrate.inc:1315
-#: setup/class_setupStep_Migrate.inc:1379
-#: setup/class_setupStep_Migrate.inc:1423 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:838
-#: include/functions.inc:2523 include/simpleplugin/class_simpleTabs.inc:322
+#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1203
+#: setup/class_setupStep_Migrate.inc:1314
+#: setup/class_setupStep_Migrate.inc:1378
+#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
+#: include/class_xml.inc:55 include/functions.inc:850
+#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
#: html/index.php:597 html/main.php:158
#: plugins/personal/posix/class_posixAccount.inc:482
#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
@@ -413,7 +413,7 @@ msgid "User migration"
msgstr ""
#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1029
+#: setup/class_setupStep_Migrate.inc:1028
msgid "Migration error"
msgstr ""
@@ -422,64 +422,64 @@ msgstr ""
msgid "Cannot migrate entry \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:859
+#: setup/class_setupStep_Migrate.inc:858
#, php-format
msgid "FD 1.0.7 administrative accounts found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:862
+#: setup/class_setupStep_Migrate.inc:861
#, php-format
msgid "FD 1.0.7 administrative groups found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:864
+#: setup/class_setupStep_Migrate.inc:863
msgid ""
"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
"file at the end of the setup to migrate it.<br/>"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:867
+#: setup/class_setupStep_Migrate.inc:866
msgid ""
"There is no valid FusionDirectory 1.0.8 administrator account inside your "
"LDAP."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:868 setup/class_setupStep_Migrate.inc:883
+#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
#: include/simpleplugin/simple-list.xml:59
#: plugins/admin/departments/dep-list.xml:48
#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
msgid "Create"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:873
+#: setup/class_setupStep_Migrate.inc:872
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: plugins/admin/users/class_userManagement.inc:42
msgid "Users"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:876
+#: setup/class_setupStep_Migrate.inc:875
msgid "Groups"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStep_Migrate.inc:881
msgid "There is no FusionDirectory administrator account inside your LDAP."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:920
+#: setup/class_setupStep_Migrate.inc:919
msgid "Gives all rights on all objects"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:937 include/class_management.inc:697
+#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
#: include/class_listing.inc:551 include/class_xml.inc:58
#: include/password-methods/class_password-methods-sasl.inc:60
#: include/password-methods/class_password-methods-sasl.inc:86
#: include/password-methods/class_password-methods.inc:393
#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3112
-#: include/functions.inc:3133 include/functions.inc:3173
-#: include/functions.inc:3185 include/functions.inc:3189
-#: include/functions.inc:3196 include/functions.inc:3205
-#: include/functions.inc:3267 include/class_msg_dialog.inc:128
+#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
+#: include/functions.inc:3146 include/functions.inc:3186
+#: include/functions.inc:3198 include/functions.inc:3202
+#: include/functions.inc:3209 include/functions.inc:3218
+#: include/functions.inc:3280 include/class_msg_dialog.inc:128
#: include/class_msg_dialog.inc:164 include/class_config.inc:357
#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
@@ -492,82 +492,82 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:34
#: include/simpleplugin/attributes/class_FileAttribute.inc:37
#: include/simpleplugin/attributes/class_FileAttribute.inc:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:801
-#: include/class_plugin.inc:1534 html/index.php:453 html/index.php:474
+#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
+#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
#: html/index.php:484 html/index.php:546 html/index.php:556
#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
msgid "Error"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:997
+#: setup/class_setupStep_Migrate.inc:996
msgid "Default ACL roles have not been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:999
+#: setup/class_setupStep_Migrate.inc:998
msgid "Some default ACL roles are missing"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1001
+#: setup/class_setupStep_Migrate.inc:1000
msgid "Default ACL roles have been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1031
+#: setup/class_setupStep_Migrate.inc:1030
#, php-format
msgid "Cannot add ACL role \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1086
+#: setup/class_setupStep_Migrate.inc:1085
#, php-format
msgid "Found %s user(s) outside the configured tree \"%s\"."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1100
-#: setup/class_setupStep_Migrate.inc:1114
+#: setup/class_setupStep_Migrate.inc:1099
+#: setup/class_setupStep_Migrate.inc:1113
msgid "Move users into configured user tree"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
msgid "Cannot move entries to the requested department!"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "Entry will be moved from"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "to"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1154
+#: setup/class_setupStep_Migrate.inc:1153
msgid "The following references will be updated"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1205
+#: setup/class_setupStep_Migrate.inc:1204
#, php-format
msgid "Found %s groups outside the configured tree '%s'."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1219
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1218
+#: setup/class_setupStep_Migrate.inc:1232
msgid "Move groups into configured groups tree"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1316
+#: setup/class_setupStep_Migrate.inc:1315
#, php-format
msgid "Found %s department(s) that will not be visible in FusionDirectory."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1325
-#: setup/class_setupStep_Migrate.inc:1330
+#: setup/class_setupStep_Migrate.inc:1324
+#: setup/class_setupStep_Migrate.inc:1329
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1380
+#: setup/class_setupStep_Migrate.inc:1379
#, php-format
msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1424
+#: setup/class_setupStep_Migrate.inc:1423
#, php-format
msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
@@ -743,10 +743,10 @@ msgstr ""
#: include/class_logging.inc:80 include/class_session.inc:50
#: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:649
-#: include/functions.inc:770 include/functions.inc:1189
-#: include/functions.inc:2243 include/functions.inc:2285
-#: include/functions.inc:2314 include/class_ldap.inc:873
+#: include/functions.inc:564 include/functions.inc:651
+#: include/functions.inc:772 include/functions.inc:1201
+#: include/functions.inc:2255 include/functions.inc:2297
+#: include/functions.inc:2326 include/class_ldap.inc:873
#: include/class_ldap.inc:911 include/class_acl.inc:118
msgid "Internal error"
msgstr ""
@@ -813,12 +813,12 @@ msgid ""
"plugin instance!"
msgstr ""
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1188
+#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
#: include/class_listing.inc:1190
msgid "Root"
msgstr ""
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
msgid "Submit"
msgstr ""
@@ -919,7 +919,7 @@ msgid "Create a new snapshot from this object"
msgstr ""
#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3302 include/simpleplugin/class_simplePlugin.inc:272
+#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
#: include/simpleplugin/class_simplePlugin.inc:277
#: include/simpleplugin/class_simplePlugin.inc:289
#: html/class_passwordRecovery.inc:116
@@ -952,7 +952,7 @@ msgstr ""
#: include/password-methods/class_password-methods-sha.inc:69
#: include/password-methods/class_password-methods-ssha.inc:73
#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:659 include/class_timezone.inc:51
+#: include/functions.inc:661 include/class_timezone.inc:51
#: include/class_config.inc:159 include/class_config.inc:284
#: include/class_config.inc:843 include/class_config.inc:856
#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
@@ -990,7 +990,7 @@ msgid "Cannot paste"
msgstr ""
#: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
#: plugins/personal/generic/paste_generic.tpl.c:11
msgid "Login"
@@ -1034,245 +1034,245 @@ msgid ""
"administrator."
msgstr ""
-#: include/functions.inc:597
+#: include/functions.inc:599
msgid "Authentication error"
msgstr ""
-#: include/functions.inc:598
+#: include/functions.inc:600
msgid ""
"It seems your user password has expired. Please use <a "
"href=\"recovery.php\">password recovery</a> to change it."
msgstr ""
-#: include/functions.inc:649 include/functions.inc:770
+#: include/functions.inc:651 include/functions.inc:772
msgid "Error while adding a lock. Contact the developers!"
msgstr ""
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid ""
"Cannot create locking information in LDAP tree. Please contact your "
"administrator!"
msgstr ""
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid "LDAP server returned: %s"
msgstr ""
-#: include/functions.inc:838
+#: include/functions.inc:850
msgid ""
"Found multiple locks for object to be locked. This should not happen - "
"cleaning up multiple references."
msgstr ""
-#: include/functions.inc:1109
+#: include/functions.inc:1121
#, php-format
msgid "The size limit of %d entries is exceed!"
msgstr ""
-#: include/functions.inc:1111
+#: include/functions.inc:1123
#, php-format
msgid ""
"Set the new size limit to %s and show me this message if the limit still "
"exceeds"
msgstr ""
-#: include/functions.inc:1128
+#: include/functions.inc:1140
msgid "Configure"
msgstr ""
-#: include/functions.inc:1133
+#: include/functions.inc:1145
msgid "incomplete"
msgstr ""
-#: include/functions.inc:1534
+#: include/functions.inc:1546
msgid "Continue anyway"
msgstr ""
-#: include/functions.inc:1536
+#: include/functions.inc:1548
msgid "Edit anyway"
msgstr ""
-#: include/functions.inc:1538
+#: include/functions.inc:1550
#, php-format
msgid "You're going to edit the LDAP entry/entries %s"
msgstr ""
-#: include/functions.inc:1766
+#: include/functions.inc:1778
msgid "Entries per page"
msgstr ""
-#: include/functions.inc:1797 include/class_filter.inc:353
+#: include/functions.inc:1809 include/class_filter.inc:353
msgid "Apply filter"
msgstr ""
-#: include/functions.inc:2065
+#: include/functions.inc:2077
#, php-format
msgid "%sB"
msgstr ""
-#: include/functions.inc:2066
+#: include/functions.inc:2078
#, php-format
msgid "%sKiB"
msgstr ""
-#: include/functions.inc:2067
+#: include/functions.inc:2079
#, php-format
msgid "%sMiB"
msgstr ""
-#: include/functions.inc:2068
+#: include/functions.inc:2080
#, php-format
msgid "%sGiB"
msgstr ""
-#: include/functions.inc:2069
+#: include/functions.inc:2081
#, php-format
msgid "%sTiB"
msgstr ""
-#: include/functions.inc:2070
+#: include/functions.inc:2082
#, php-format
msgid "%sPiB"
msgstr ""
-#: include/functions.inc:2071
+#: include/functions.inc:2083
#, php-format
msgid "%sEiB"
msgstr ""
-#: include/functions.inc:2072
+#: include/functions.inc:2084
#, php-format
msgid "%sZiB"
msgstr ""
-#: include/functions.inc:2073
+#: include/functions.inc:2085
#, php-format
msgid "%sYiB"
msgstr ""
-#: include/functions.inc:2105 include/class_filter.inc:315
+#: include/functions.inc:2117 include/class_filter.inc:315
msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
msgstr ""
-#: include/functions.inc:2243
+#: include/functions.inc:2255
#, php-format
msgid ""
"File '%s' could not be deleted. Try fusiondirectory-setup --check-"
"directories to fix permissions."
msgstr ""
-#: include/functions.inc:2285
+#: include/functions.inc:2297
msgid "Cannot write to revision file!"
msgstr ""
-#: include/functions.inc:2314
+#: include/functions.inc:2326
msgid "Cannot read to revision file!"
msgstr ""
-#: include/functions.inc:2523
+#: include/functions.inc:2535
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "LDAP warning"
msgstr ""
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "Cannot get schema information from server. No schema check possible!"
msgstr ""
-#: include/functions.inc:2564
+#: include/functions.inc:2577
msgid "Main FusionDirectory schema"
msgstr ""
-#: include/functions.inc:2571
+#: include/functions.inc:2584
msgid "Schema used to store FusionDirectory configuration"
msgstr ""
-#: include/functions.inc:2578
+#: include/functions.inc:2591
msgid "Used to store trust mode information in users or groups."
msgstr ""
-#: include/functions.inc:2585
+#: include/functions.inc:2598
msgid "Used to store templates."
msgstr ""
-#: include/functions.inc:2592
+#: include/functions.inc:2605
msgid "Used to store POSIX information."
msgstr ""
-#: include/functions.inc:2599
+#: include/functions.inc:2612
#, php-format
msgid "Missing required object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2601
+#: include/functions.inc:2614
#, php-format
msgid "Missing optional object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2605
+#: include/functions.inc:2618
#, php-format
msgid "Class(es) available"
msgstr ""
-#: include/functions.inc:2623
+#: include/functions.inc:2636
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2637
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2640
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2641
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3112 include/functions.inc:3133
-#: include/functions.inc:3173 include/functions.inc:3185
-#: include/functions.inc:3189 include/functions.inc:3196
-#: include/functions.inc:3205
+#: include/functions.inc:3125 include/functions.inc:3146
+#: include/functions.inc:3186 include/functions.inc:3198
+#: include/functions.inc:3202 include/functions.inc:3209
+#: include/functions.inc:3218
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3112
+#: include/functions.inc:3125
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3133
+#: include/functions.inc:3146
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3173
+#: include/functions.inc:3186
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3185 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3202
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3205
+#: include/functions.inc:3218
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3267
+#: include/functions.inc:3280
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3303
+#: include/functions.inc:3316
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
@@ -2102,7 +2102,7 @@ msgstr ""
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
#: plugins/admin/departments/class_department.inc:72
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/groups/class_roleGeneric.inc:91
@@ -2282,7 +2282,7 @@ msgid "The entry %s is not existing"
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:548
+#: include/class_plugin.inc:554
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!"
@@ -2398,14 +2398,19 @@ msgstr ""
msgid "There was a problem uncompressing snapshot data"
msgstr ""
-#: include/class_plugin.inc:803
+#: include/class_plugin.inc:809
#, php-format
msgid ""
"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
msgstr ""
-#: include/class_plugin.inc:1332
+#: include/class_plugin.inc:1350
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/class_plugin.inc:1352
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -2553,44 +2558,44 @@ msgstr ""
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr ""
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
msgid "Email address"
msgstr ""
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
#, php-format
msgid "Did not find an account with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
#, php-format
msgid "Found multiple accounts with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
#, php-format
msgid "There is no account using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There are several accounts using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
#, php-format
msgid "The user using email \"%s\" is locked. Please contact your administrator."
msgstr ""
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
msgid "Contact your administrator, there was a problem with mail server"
msgstr ""
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
msgid "This token is invalid"
msgstr ""
-#: html/class_passwordRecovery.inc:647
+#: html/class_passwordRecovery.inc:651
msgid "There was a problem with mail server, confirmation email not sent"
msgstr ""
@@ -2902,7 +2907,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
#: setup/setup_migrate_adminAccount.tpl.c:14
#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2939,258 +2944,262 @@ msgstr ""
msgid "User account"
msgstr ""
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:296
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:307
msgid "Personal information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
msgid "Last name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
msgid "First name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
msgid "Short description of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "Picture"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "The avatar for this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:330
+#: plugins/personal/generic/class_user.inc:333
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:334
+#: plugins/personal/generic/class_user.inc:337
#: plugins/admin/departments/class_department.inc:90
#: plugins/admin/departments/class_department.inc:96
msgid "Location"
msgstr ""
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:341
#: plugins/admin/departments/class_department.inc:93
msgid "State"
msgstr ""
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
#: plugins/admin/departments/class_department.inc:102
msgid "Address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
msgid "Business postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
#: plugins/admin/departments/class_department.inc:106
msgid "Phone"
msgstr ""
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
msgid "Business phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Mobile"
msgstr ""
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Business mobile number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Pager"
msgstr ""
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
#: plugins/admin/departments/class_department.inc:110
msgid "Fax"
msgstr ""
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:373
+#: plugins/personal/generic/class_user.inc:376
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:393
+#: plugins/personal/generic/class_user.inc:396
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Display name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Private phone"
msgstr ""
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Home phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:411
+#: plugins/personal/generic/class_user.inc:414
msgid "Organizational information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
msgid "Title"
msgstr ""
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
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:421
+#: plugins/personal/generic/class_user.inc:424
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
msgid "Organization"
msgstr ""
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
#: plugins/admin/departments/class_department.inc:33
#: plugins/admin/departments/class_department.inc:39
#: plugins/admin/departments/dep-list.xml:21
msgid "Department"
msgstr ""
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
msgid "Department to which the user belongs"
msgstr ""
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:437
+#: plugins/personal/generic/class_user.inc:440
msgid "Employee type"
msgstr ""
-#: plugins/personal/generic/class_user.inc:441
+#: plugins/personal/generic/class_user.inc:444
#: plugins/admin/departments/class_department.inc:84
msgid "Manager"
msgstr ""
-#: plugins/personal/generic/class_user.inc:608
+#: plugins/personal/generic/class_user.inc:611
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:614
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:622
+#: plugins/personal/generic/class_user.inc:625
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:636
+#: plugins/personal/generic/class_user.inc:639
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:641
-#: plugins/personal/generic/class_user.inc:645
+#: plugins/personal/generic/class_user.inc:644
+#: plugins/personal/generic/class_user.inc:648
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:652
+#: plugins/personal/generic/class_user.inc:655
msgid "You need to specify your current password in order to proceed."
msgstr ""
-#: plugins/personal/generic/class_user.inc:654
+#: plugins/personal/generic/class_user.inc:657
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:656
+#: plugins/personal/generic/class_user.inc:659
#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
msgid "New password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:658
+#: plugins/personal/generic/class_user.inc:661
msgid "The password used as new and current are too similar."
msgstr ""
-#: plugins/personal/generic/class_user.inc:660
+#: plugins/personal/generic/class_user.inc:663
msgid "The password used as new is to short."
msgstr ""
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:665
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
@@ -3298,36 +3307,46 @@ msgid ""
"recover their password"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:189
+msgid "Login attribute"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
msgid "First email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
msgid "Subject"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
msgid "Subject of the first email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
msgid "[FusionDirectory] Password recovery link"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
#, php-format
msgid ""
"Body of the first email, sent when the user ask for a new password. Use %s "
"for the login and the recovery link."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
#, php-format
msgid ""
"Hello,\n"
@@ -3339,31 +3358,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
msgid "Second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
msgid "Subject of the second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
msgid "[FusionDirectory] Password recovery successful"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
#, php-format
msgid "Body (%s is login)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
#, 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
+#: plugins/config/class_recoveryConfig.inc:118
#, php-format
msgid ""
"Hello,\n"
@@ -3530,10 +3549,6 @@ msgstr ""
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 ""
@@ -4396,7 +4411,7 @@ msgstr ""
msgid "Only allow this group to connect to this list of hosts"
msgstr ""
-#: plugins/admin/groups/class_ogroup.inc:321
+#: plugins/admin/groups/class_ogroup.inc:322
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
diff --git a/locale/sv/fusiondirectory.po b/locale/sv/fusiondirectory.po
index ebab725beffa39ce363d99410843193cc4b67206..6b35f483d63cce8866010fadfa6409c6853de02d 100644
--- a/locale/sv/fusiondirectory.po
+++ b/locale/sv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-11 19:09+0100\n"
-"PO-Revision-Date: 2017-01-10 14:53+0000\n"
+"POT-Creation-Date: 2017-03-29 21:46+0200\n"
+"PO-Revision-Date: 2017-03-26 15:51+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:382
+#: plugins/personal/generic/class_user.inc:385
msgid "Preferred language"
msgstr "Föredraget språk"
@@ -316,30 +316,30 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
+#: setup/class_setupStep_Migrate.inc:981
+#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1180
+#: setup/class_setupStep_Migrate.inc:1273
+#: setup/class_setupStep_Migrate.inc:1352
+#: setup/class_setupStep_Migrate.inc:1396
+msgid "LDAP query failed"
+msgstr "LDAP-fråga misslyckades"
+
+#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
+#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
#: setup/class_setupStep_Migrate.inc:982
#: setup/class_setupStep_Migrate.inc:1058
#: setup/class_setupStep_Migrate.inc:1181
#: setup/class_setupStep_Migrate.inc:1274
#: setup/class_setupStep_Migrate.inc:1353
#: setup/class_setupStep_Migrate.inc:1397
-msgid "LDAP query failed"
-msgstr "LDAP-fråga misslyckades"
-
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:983
-#: setup/class_setupStep_Migrate.inc:1059
-#: setup/class_setupStep_Migrate.inc:1182
-#: setup/class_setupStep_Migrate.inc:1275
-#: setup/class_setupStep_Migrate.inc:1354
-#: setup/class_setupStep_Migrate.inc:1398
msgid "Possibly the \"root object\" is missing."
msgstr ""
#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:866
-#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
+#: setup/class_setupStep_Migrate.inc:880
msgid "Failed"
msgstr "Misslyckades"
@@ -360,11 +360,11 @@ msgid ""
msgstr "Kan inte hantera den strukturella objekttypen hos ditt root-objekt. Vänligen lägg till objektklassen '%s' manuellt."
#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:677
-#: include/functions.inc:724 include/functions.inc:822
-#: include/functions.inc:2988 include/functions.inc:3165
+#: include/functions.inc:522 include/functions.inc:679
+#: include/functions.inc:726 include/functions.inc:834
+#: include/functions.inc:3001 include/functions.inc:3178
#: include/class_config.inc:322 include/class_ldap.inc:924
#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
#: include/simpleplugin/attributes/class_SetAttribute.inc:726
@@ -386,13 +386,13 @@ msgid "The specified user \"%s\" does not have full access to your ldap database
msgstr ""
#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1085
-#: setup/class_setupStep_Migrate.inc:1204
-#: setup/class_setupStep_Migrate.inc:1315
-#: setup/class_setupStep_Migrate.inc:1379
-#: setup/class_setupStep_Migrate.inc:1423 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:838
-#: include/functions.inc:2523 include/simpleplugin/class_simpleTabs.inc:322
+#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1203
+#: setup/class_setupStep_Migrate.inc:1314
+#: setup/class_setupStep_Migrate.inc:1378
+#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
+#: include/class_xml.inc:55 include/functions.inc:850
+#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
#: html/index.php:597 html/main.php:158
#: plugins/personal/posix/class_posixAccount.inc:482
#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
@@ -413,7 +413,7 @@ msgid "User migration"
msgstr ""
#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1029
+#: setup/class_setupStep_Migrate.inc:1028
msgid "Migration error"
msgstr "Migreringsfel"
@@ -422,64 +422,64 @@ msgstr "Migreringsfel"
msgid "Cannot migrate entry \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:859
+#: setup/class_setupStep_Migrate.inc:858
#, php-format
msgid "FD 1.0.7 administrative accounts found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:862
+#: setup/class_setupStep_Migrate.inc:861
#, php-format
msgid "FD 1.0.7 administrative groups found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:864
+#: setup/class_setupStep_Migrate.inc:863
msgid ""
"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
"file at the end of the setup to migrate it.<br/>"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:867
+#: setup/class_setupStep_Migrate.inc:866
msgid ""
"There is no valid FusionDirectory 1.0.8 administrator account inside your "
"LDAP."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:868 setup/class_setupStep_Migrate.inc:883
+#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
#: include/simpleplugin/simple-list.xml:59
#: plugins/admin/departments/dep-list.xml:48
#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
msgid "Create"
msgstr "Skapa"
-#: setup/class_setupStep_Migrate.inc:873
+#: setup/class_setupStep_Migrate.inc:872
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: plugins/admin/users/class_userManagement.inc:42
msgid "Users"
msgstr "Användare"
-#: setup/class_setupStep_Migrate.inc:876
+#: setup/class_setupStep_Migrate.inc:875
msgid "Groups"
msgstr "Grupper"
-#: setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStep_Migrate.inc:881
msgid "There is no FusionDirectory administrator account inside your LDAP."
msgstr "Det finns inget FusionDirectory-adminkonto i din LDAP-katalog."
-#: setup/class_setupStep_Migrate.inc:920
+#: setup/class_setupStep_Migrate.inc:919
msgid "Gives all rights on all objects"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:937 include/class_management.inc:697
+#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
#: include/class_listing.inc:551 include/class_xml.inc:58
#: include/password-methods/class_password-methods-sasl.inc:60
#: include/password-methods/class_password-methods-sasl.inc:86
#: include/password-methods/class_password-methods.inc:393
#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3112
-#: include/functions.inc:3133 include/functions.inc:3173
-#: include/functions.inc:3185 include/functions.inc:3189
-#: include/functions.inc:3196 include/functions.inc:3205
-#: include/functions.inc:3267 include/class_msg_dialog.inc:128
+#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
+#: include/functions.inc:3146 include/functions.inc:3186
+#: include/functions.inc:3198 include/functions.inc:3202
+#: include/functions.inc:3209 include/functions.inc:3218
+#: include/functions.inc:3280 include/class_msg_dialog.inc:128
#: include/class_msg_dialog.inc:164 include/class_config.inc:357
#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
@@ -492,82 +492,82 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:34
#: include/simpleplugin/attributes/class_FileAttribute.inc:37
#: include/simpleplugin/attributes/class_FileAttribute.inc:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:801
-#: include/class_plugin.inc:1534 html/index.php:453 html/index.php:474
+#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
+#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
#: html/index.php:484 html/index.php:546 html/index.php:556
#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
msgid "Error"
msgstr "Fel"
-#: setup/class_setupStep_Migrate.inc:997
+#: setup/class_setupStep_Migrate.inc:996
msgid "Default ACL roles have not been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:999
+#: setup/class_setupStep_Migrate.inc:998
msgid "Some default ACL roles are missing"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1001
+#: setup/class_setupStep_Migrate.inc:1000
msgid "Default ACL roles have been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1031
+#: setup/class_setupStep_Migrate.inc:1030
#, php-format
msgid "Cannot add ACL role \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1086
+#: setup/class_setupStep_Migrate.inc:1085
#, php-format
msgid "Found %s user(s) outside the configured tree \"%s\"."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1100
-#: setup/class_setupStep_Migrate.inc:1114
+#: setup/class_setupStep_Migrate.inc:1099
+#: setup/class_setupStep_Migrate.inc:1113
msgid "Move users into configured user tree"
msgstr "Flytta användare in i det konfigurerade användarträdet"
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
msgid "Cannot move entries to the requested department!"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "Entry will be moved from"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "to"
msgstr "till"
-#: setup/class_setupStep_Migrate.inc:1154
+#: setup/class_setupStep_Migrate.inc:1153
msgid "The following references will be updated"
msgstr "Följande referenser kommer att uppdateras"
-#: setup/class_setupStep_Migrate.inc:1205
+#: setup/class_setupStep_Migrate.inc:1204
#, php-format
msgid "Found %s groups outside the configured tree '%s'."
msgstr "Hittade %s grupper utanför det konfigurerade trädet '%s'."
-#: setup/class_setupStep_Migrate.inc:1219
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1218
+#: setup/class_setupStep_Migrate.inc:1232
msgid "Move groups into configured groups tree"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1316
+#: setup/class_setupStep_Migrate.inc:1315
#, php-format
msgid "Found %s department(s) that will not be visible in FusionDirectory."
msgstr "Hittade %s avdelning(ar) som inte kommer att vara synliga i FusionDirectory."
-#: setup/class_setupStep_Migrate.inc:1325
-#: setup/class_setupStep_Migrate.inc:1330
+#: setup/class_setupStep_Migrate.inc:1324
+#: setup/class_setupStep_Migrate.inc:1329
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1380
+#: setup/class_setupStep_Migrate.inc:1379
#, php-format
msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1424
+#: setup/class_setupStep_Migrate.inc:1423
#, php-format
msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
@@ -743,10 +743,10 @@ msgstr "Nästa"
#: include/class_logging.inc:80 include/class_session.inc:50
#: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:649
-#: include/functions.inc:770 include/functions.inc:1189
-#: include/functions.inc:2243 include/functions.inc:2285
-#: include/functions.inc:2314 include/class_ldap.inc:873
+#: include/functions.inc:564 include/functions.inc:651
+#: include/functions.inc:772 include/functions.inc:1201
+#: include/functions.inc:2255 include/functions.inc:2297
+#: include/functions.inc:2326 include/class_ldap.inc:873
#: include/class_ldap.inc:911 include/class_acl.inc:118
msgid "Internal error"
msgstr "Internt fel"
@@ -813,12 +813,12 @@ msgid ""
"plugin instance!"
msgstr "Ingen tab-deklaration för '%s' hittades i din konfigurationsfil. Kan inte skapa plugin-instans!"
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1188
+#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
#: include/class_listing.inc:1190
msgid "Root"
msgstr "Root"
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
msgid "Submit"
msgstr "Skicka"
@@ -919,7 +919,7 @@ msgid "Create a new snapshot from this object"
msgstr "Skapa ny ögonblicksbild från det här objektet"
#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3302 include/simpleplugin/class_simplePlugin.inc:272
+#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
#: include/simpleplugin/class_simplePlugin.inc:277
#: include/simpleplugin/class_simplePlugin.inc:289
#: html/class_passwordRecovery.inc:116
@@ -952,7 +952,7 @@ msgstr ""
#: include/password-methods/class_password-methods-sha.inc:69
#: include/password-methods/class_password-methods-ssha.inc:73
#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:659 include/class_timezone.inc:51
+#: include/functions.inc:661 include/class_timezone.inc:51
#: include/class_config.inc:159 include/class_config.inc:284
#: include/class_config.inc:843 include/class_config.inc:856
#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
@@ -990,7 +990,7 @@ msgid "Cannot paste"
msgstr "Kan inte klistra in"
#: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
#: plugins/personal/generic/paste_generic.tpl.c:11
msgid "Login"
@@ -1034,245 +1034,245 @@ msgid ""
"administrator."
msgstr ""
-#: include/functions.inc:597
+#: include/functions.inc:599
msgid "Authentication error"
msgstr "Autentiseringsfel"
-#: include/functions.inc:598
+#: include/functions.inc:600
msgid ""
"It seems your user password has expired. Please use <a "
"href=\"recovery.php\">password recovery</a> to change it."
msgstr ""
-#: include/functions.inc:649 include/functions.inc:770
+#: include/functions.inc:651 include/functions.inc:772
msgid "Error while adding a lock. Contact the developers!"
msgstr "Fel uppstod när lås skulle läggas till. Kontakta utvecklarna!"
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid ""
"Cannot create locking information in LDAP tree. Please contact your "
"administrator!"
msgstr "Kan inte skapa låsinformation i LDAP-trädet. Vänligen kontakta din administratör!"
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid "LDAP server returned: %s"
msgstr "LDAP-server returnerade %s"
-#: include/functions.inc:838
+#: include/functions.inc:850
msgid ""
"Found multiple locks for object to be locked. This should not happen - "
"cleaning up multiple references."
msgstr "Hittade flera lås för objektet som ska låsas. Detta ska inte hända - rensar upp multipla referenser."
-#: include/functions.inc:1109
+#: include/functions.inc:1121
#, php-format
msgid "The size limit of %d entries is exceed!"
msgstr "Storleksgränsen på %d poster har överskridits!"
-#: include/functions.inc:1111
+#: include/functions.inc:1123
#, php-format
msgid ""
"Set the new size limit to %s and show me this message if the limit still "
"exceeds"
msgstr "Sätt ny storleksgräns till %s och visa mig meddelandet om gränsen fortfarande överskrids"
-#: include/functions.inc:1128
+#: include/functions.inc:1140
msgid "Configure"
msgstr "Konfigurera"
-#: include/functions.inc:1133
+#: include/functions.inc:1145
msgid "incomplete"
msgstr "ofullständig"
-#: include/functions.inc:1534
+#: include/functions.inc:1546
msgid "Continue anyway"
msgstr "Fortsätt ändå"
-#: include/functions.inc:1536
+#: include/functions.inc:1548
msgid "Edit anyway"
msgstr "Redigera ändå"
-#: include/functions.inc:1538
+#: include/functions.inc:1550
#, php-format
msgid "You're going to edit the LDAP entry/entries %s"
msgstr "Du kommer att redigera LDAP-posten/posterna %s"
-#: include/functions.inc:1766
+#: include/functions.inc:1778
msgid "Entries per page"
msgstr "Poster per sida"
-#: include/functions.inc:1797 include/class_filter.inc:353
+#: include/functions.inc:1809 include/class_filter.inc:353
msgid "Apply filter"
msgstr "Aktivera filter"
-#: include/functions.inc:2065
+#: include/functions.inc:2077
#, php-format
msgid "%sB"
msgstr ""
-#: include/functions.inc:2066
+#: include/functions.inc:2078
#, php-format
msgid "%sKiB"
msgstr ""
-#: include/functions.inc:2067
+#: include/functions.inc:2079
#, php-format
msgid "%sMiB"
msgstr ""
-#: include/functions.inc:2068
+#: include/functions.inc:2080
#, php-format
msgid "%sGiB"
msgstr ""
-#: include/functions.inc:2069
+#: include/functions.inc:2081
#, php-format
msgid "%sTiB"
msgstr ""
-#: include/functions.inc:2070
+#: include/functions.inc:2082
#, php-format
msgid "%sPiB"
msgstr ""
-#: include/functions.inc:2071
+#: include/functions.inc:2083
#, php-format
msgid "%sEiB"
msgstr ""
-#: include/functions.inc:2072
+#: include/functions.inc:2084
#, php-format
msgid "%sZiB"
msgstr ""
-#: include/functions.inc:2073
+#: include/functions.inc:2085
#, php-format
msgid "%sYiB"
msgstr ""
-#: include/functions.inc:2105 include/class_filter.inc:315
+#: include/functions.inc:2117 include/class_filter.inc:315
msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZÅÄÖ0123456789"
-#: include/functions.inc:2243
+#: include/functions.inc:2255
#, php-format
msgid ""
"File '%s' could not be deleted. Try fusiondirectory-setup --check-"
"directories to fix permissions."
msgstr "Filen '%s' kunde inte tas bort. Försök med fusiondirectory-setup --check-directories för att åtgärda rättighetsproblem."
-#: include/functions.inc:2285
+#: include/functions.inc:2297
msgid "Cannot write to revision file!"
msgstr "Kan inte skriva till revisionsfil!"
-#: include/functions.inc:2314
+#: include/functions.inc:2326
msgid "Cannot read to revision file!"
msgstr "Kan inte läsa revisionsfil!"
-#: include/functions.inc:2523
+#: include/functions.inc:2535
msgid "'nextIdHook' is not available. Using default base!"
msgstr "'nextIdHook' är inte tillgänglig. Använder standard-bas!"
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "LDAP warning"
msgstr "LDAP-varning"
-#: include/functions.inc:2541
+#: include/functions.inc:2554
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:2564
+#: include/functions.inc:2577
msgid "Main FusionDirectory schema"
msgstr ""
-#: include/functions.inc:2571
+#: include/functions.inc:2584
msgid "Schema used to store FusionDirectory configuration"
msgstr ""
-#: include/functions.inc:2578
+#: include/functions.inc:2591
msgid "Used to store trust mode information in users or groups."
msgstr ""
-#: include/functions.inc:2585
+#: include/functions.inc:2598
msgid "Used to store templates."
msgstr ""
-#: include/functions.inc:2592
+#: include/functions.inc:2605
msgid "Used to store POSIX information."
msgstr ""
-#: include/functions.inc:2599
+#: include/functions.inc:2612
#, php-format
msgid "Missing required object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2601
+#: include/functions.inc:2614
#, php-format
msgid "Missing optional object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2605
+#: include/functions.inc:2618
#, php-format
msgid "Class(es) available"
msgstr "Klass(er) tillgänglig(a)"
-#: include/functions.inc:2623
+#: include/functions.inc:2636
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2637
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2640
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2641
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3112 include/functions.inc:3133
-#: include/functions.inc:3173 include/functions.inc:3185
-#: include/functions.inc:3189 include/functions.inc:3196
-#: include/functions.inc:3205
+#: include/functions.inc:3125 include/functions.inc:3146
+#: include/functions.inc:3186 include/functions.inc:3198
+#: include/functions.inc:3202 include/functions.inc:3209
+#: include/functions.inc:3218
msgid "Cannot allocate a free ID:"
msgstr "Kan inte allokera ett fritt ID:"
-#: include/functions.inc:3112
+#: include/functions.inc:3125
msgid "unknown idAllocation method!"
msgstr "okänd idAllocation-metod!"
-#: include/functions.inc:3133
+#: include/functions.inc:3146
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr "%sPoolMin >= %sPoolMax!"
-#: include/functions.inc:3173
+#: include/functions.inc:3186
msgid "sambaUnixIdPool is not unique!"
msgstr "sambaUnixIdPool är inte unik!"
-#: include/functions.inc:3185 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3202
msgid "no ID available!"
msgstr "inget ID tillgängligt!"
-#: include/functions.inc:3205
+#: include/functions.inc:3218
msgid "maximum tries exceeded!"
msgstr "maximalt antal försök överskridet!"
-#: include/functions.inc:3267
+#: include/functions.inc:3280
msgid "Cannot allocate a free ID!"
msgstr "Kan inte allokera ett fritt ID!"
-#: include/functions.inc:3303
+#: include/functions.inc:3316
#, 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"
@@ -2102,7 +2102,7 @@ msgstr "Namn"
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
#: plugins/admin/departments/class_department.inc:72
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/groups/class_roleGeneric.inc:91
@@ -2282,7 +2282,7 @@ msgid "The entry %s is not existing"
msgstr "Posten %s finns inte"
#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:548
+#: include/class_plugin.inc:554
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!"
@@ -2398,14 +2398,19 @@ msgstr "Ett flyttal mindre än %f"
msgid "There was a problem uncompressing snapshot data"
msgstr ""
-#: include/class_plugin.inc:803
+#: include/class_plugin.inc:809
#, php-format
msgid ""
"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
msgstr ""
-#: include/class_plugin.inc:1332
+#: include/class_plugin.inc:1350
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/class_plugin.inc:1352
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -2553,44 +2558,44 @@ msgstr "Din webbläsare har avaktiverat cookies. Vänligen aktivera cookies och
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr "FusionDirectory-konfiguration %s/%s är inte läsbar. Avbryter."
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
msgid "Email address"
msgstr "Epostadress"
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
#, php-format
msgid "Did not find an account with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
#, php-format
msgid "Found multiple accounts with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
#, php-format
msgid "There is no account using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There are several accounts using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
#, php-format
msgid "The user using email \"%s\" is locked. Please contact your administrator."
msgstr ""
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
msgid "Contact your administrator, there was a problem with mail server"
msgstr "Kontakta din administratör, det uppstod ett problem med epostservern"
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
msgid "This token is invalid"
msgstr ""
-#: html/class_passwordRecovery.inc:647
+#: html/class_passwordRecovery.inc:651
msgid "There was a problem with mail server, confirmation email not sent"
msgstr "Det uppstod ett problem med epostservern, bekräftelsebrevet skickades inte"
@@ -2902,7 +2907,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:387
+#: plugins/personal/generic/class_user.inc:390
#: setup/setup_migrate_adminAccount.tpl.c:14
#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2939,258 +2944,262 @@ msgstr ""
msgid "User account"
msgstr ""
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:296
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:307
msgid "Personal information"
msgstr "Personlig information"
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "Efternamn"
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
msgid "Last name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "Förnamn"
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
msgid "First name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
msgid "Short description of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "Picture"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "The avatar for this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:330
+#: plugins/personal/generic/class_user.inc:333
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:334
+#: plugins/personal/generic/class_user.inc:337
#: plugins/admin/departments/class_department.inc:90
#: plugins/admin/departments/class_department.inc:96
msgid "Location"
msgstr "Plats"
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:341
#: plugins/admin/departments/class_department.inc:93
msgid "State"
msgstr "Län"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
#: plugins/admin/departments/class_department.inc:102
msgid "Address"
msgstr "Adress"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
msgid "Business postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room No."
msgstr "Rumsnummer"
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room number"
msgstr "Rumsnummer"
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
#: plugins/admin/departments/class_department.inc:106
msgid "Phone"
msgstr "Telefon"
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
msgid "Business phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Mobile"
msgstr "Mobil"
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Business mobile number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Pager"
msgstr "Pager"
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
#: plugins/admin/departments/class_department.inc:110
msgid "Fax"
msgstr "Fax"
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Homepage"
msgstr "Hemsida"
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:373
+#: plugins/personal/generic/class_user.inc:376
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:393
+#: plugins/personal/generic/class_user.inc:396
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Display name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home postal address"
msgstr "Hempostadress"
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Private phone"
msgstr "Privat telefon"
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Home phone number"
msgstr "Hemtelefonnummer"
-#: plugins/personal/generic/class_user.inc:411
+#: plugins/personal/generic/class_user.inc:414
msgid "Organizational information"
msgstr "Organisationsinformation"
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
msgid "Title"
msgstr ""
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
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:421
+#: plugins/personal/generic/class_user.inc:424
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
msgid "Organization"
msgstr "Organisation"
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
#: plugins/admin/departments/class_department.inc:33
#: plugins/admin/departments/class_department.inc:39
#: plugins/admin/departments/dep-list.xml:21
msgid "Department"
msgstr "Avdelning"
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
msgid "Department to which the user belongs"
msgstr ""
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department No."
msgstr "Avdelningsnummer"
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department number"
msgstr "Avdelningsnummer"
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee No."
msgstr "Anställningsnummer"
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee number"
msgstr "Anställningsnummer"
-#: plugins/personal/generic/class_user.inc:437
+#: plugins/personal/generic/class_user.inc:440
msgid "Employee type"
msgstr "Anställningstyp"
-#: plugins/personal/generic/class_user.inc:441
+#: plugins/personal/generic/class_user.inc:444
#: plugins/admin/departments/class_department.inc:84
msgid "Manager"
msgstr "Manager"
-#: plugins/personal/generic/class_user.inc:608
+#: plugins/personal/generic/class_user.inc:611
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:614
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:622
+#: plugins/personal/generic/class_user.inc:625
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:636
+#: plugins/personal/generic/class_user.inc:639
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:641
-#: plugins/personal/generic/class_user.inc:645
+#: plugins/personal/generic/class_user.inc:644
+#: plugins/personal/generic/class_user.inc:648
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:652
+#: plugins/personal/generic/class_user.inc:655
msgid "You need to specify your current password in order to proceed."
msgstr "Du behöver ange ditt nuvarande lösenord för att fortsätta."
-#: plugins/personal/generic/class_user.inc:654
+#: plugins/personal/generic/class_user.inc:657
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:656
+#: plugins/personal/generic/class_user.inc:659
#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
msgid "New password"
msgstr "Nytt lösenord"
-#: plugins/personal/generic/class_user.inc:658
+#: plugins/personal/generic/class_user.inc:661
msgid "The password used as new and current are too similar."
msgstr "Det nya lösenordet och det nuvarande är för lika varandra."
-#: plugins/personal/generic/class_user.inc:660
+#: plugins/personal/generic/class_user.inc:663
msgid "The password used as new is to short."
msgstr "Det nya lösenordet är för kort."
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:665
msgid "The password contains possibly problematic Unicode characters!"
msgstr "Lösenordet innehåller möjligtvis problematiska Unicode-tecken!"
@@ -3298,36 +3307,46 @@ msgid ""
"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:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:189
+msgid "Login attribute"
+msgstr "Inloggningsattribut"
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
msgid "First email"
msgstr "Första epost"
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
msgid "Subject"
msgstr "Ämne"
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
msgid "Subject of the first email"
msgstr "Ämne på första epostmeddelandet"
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
msgid "[FusionDirectory] Password recovery link"
msgstr "[FusionDirectory] Länk för återskapande av lösenord"
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
#, 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:91
+#: plugins/config/class_recoveryConfig.inc:96
#, php-format
msgid ""
"Body of the first email, sent when the user ask for a new password. Use %s "
"for the login and the recovery link."
msgstr "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:94
+#: plugins/config/class_recoveryConfig.inc:99
#, php-format
msgid ""
"Hello,\n"
@@ -3339,31 +3358,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
msgid "Second email"
msgstr "Andre epostmeddelandet"
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
msgid "Subject of the second email"
msgstr "Ämne på det andra epostmeddelandet"
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
msgid "[FusionDirectory] Password recovery successful"
msgstr "[FusionDirectory] Återställning av lösenord lyckades"
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
#, php-format
msgid "Body (%s is login)"
msgstr "Meddelandekropp (%s är login)"
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
#, 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:113
+#: plugins/config/class_recoveryConfig.inc:118
#, php-format
msgid ""
"Hello,\n"
@@ -3530,10 +3549,6 @@ msgstr "Definierar antalet poster att få från LDAP som standard."
msgid "Login and session"
msgstr "Inloggning och session"
-#: plugins/config/class_configInLdap.inc:189
-msgid "Login attribute"
-msgstr "Inloggningsattribut"
-
#: 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."
@@ -4396,7 +4411,7 @@ msgstr ""
msgid "Only allow this group to connect to this list of hosts"
msgstr ""
-#: plugins/admin/groups/class_ogroup.inc:321
+#: plugins/admin/groups/class_ogroup.inc:322
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
diff --git a/locale/ug/fusiondirectory.po b/locale/ug/fusiondirectory.po
index a9303c79f55e8e86adb1af624a260d5cfa06ade7..fc5d304998dbfdfa29d39d490fd3e61e9544d093 100644
--- a/locale/ug/fusiondirectory.po
+++ b/locale/ug/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-11 19:09+0100\n"
-"PO-Revision-Date: 2017-01-10 14:53+0000\n"
+"POT-Creation-Date: 2017-03-29 21:46+0200\n"
+"PO-Revision-Date: 2017-03-26 15:51+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
"MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:382
+#: plugins/personal/generic/class_user.inc:385
msgid "Preferred language"
msgstr ""
@@ -316,30 +316,30 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
+#: setup/class_setupStep_Migrate.inc:981
+#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1180
+#: setup/class_setupStep_Migrate.inc:1273
+#: setup/class_setupStep_Migrate.inc:1352
+#: setup/class_setupStep_Migrate.inc:1396
+msgid "LDAP query failed"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
+#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
#: setup/class_setupStep_Migrate.inc:982
#: setup/class_setupStep_Migrate.inc:1058
#: setup/class_setupStep_Migrate.inc:1181
#: setup/class_setupStep_Migrate.inc:1274
#: setup/class_setupStep_Migrate.inc:1353
#: setup/class_setupStep_Migrate.inc:1397
-msgid "LDAP query failed"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:983
-#: setup/class_setupStep_Migrate.inc:1059
-#: setup/class_setupStep_Migrate.inc:1182
-#: setup/class_setupStep_Migrate.inc:1275
-#: setup/class_setupStep_Migrate.inc:1354
-#: setup/class_setupStep_Migrate.inc:1398
msgid "Possibly the \"root object\" is missing."
msgstr ""
#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:866
-#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
+#: setup/class_setupStep_Migrate.inc:880
msgid "Failed"
msgstr ""
@@ -360,11 +360,11 @@ msgid ""
msgstr ""
#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:677
-#: include/functions.inc:724 include/functions.inc:822
-#: include/functions.inc:2988 include/functions.inc:3165
+#: include/functions.inc:522 include/functions.inc:679
+#: include/functions.inc:726 include/functions.inc:834
+#: include/functions.inc:3001 include/functions.inc:3178
#: include/class_config.inc:322 include/class_ldap.inc:924
#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
#: include/simpleplugin/attributes/class_SetAttribute.inc:726
@@ -386,13 +386,13 @@ msgid "The specified user \"%s\" does not have full access to your ldap database
msgstr ""
#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1085
-#: setup/class_setupStep_Migrate.inc:1204
-#: setup/class_setupStep_Migrate.inc:1315
-#: setup/class_setupStep_Migrate.inc:1379
-#: setup/class_setupStep_Migrate.inc:1423 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:838
-#: include/functions.inc:2523 include/simpleplugin/class_simpleTabs.inc:322
+#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1203
+#: setup/class_setupStep_Migrate.inc:1314
+#: setup/class_setupStep_Migrate.inc:1378
+#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
+#: include/class_xml.inc:55 include/functions.inc:850
+#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
#: html/index.php:597 html/main.php:158
#: plugins/personal/posix/class_posixAccount.inc:482
#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
@@ -413,7 +413,7 @@ msgid "User migration"
msgstr ""
#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1029
+#: setup/class_setupStep_Migrate.inc:1028
msgid "Migration error"
msgstr ""
@@ -422,64 +422,64 @@ msgstr ""
msgid "Cannot migrate entry \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:859
+#: setup/class_setupStep_Migrate.inc:858
#, php-format
msgid "FD 1.0.7 administrative accounts found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:862
+#: setup/class_setupStep_Migrate.inc:861
#, php-format
msgid "FD 1.0.7 administrative groups found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:864
+#: setup/class_setupStep_Migrate.inc:863
msgid ""
"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
"file at the end of the setup to migrate it.<br/>"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:867
+#: setup/class_setupStep_Migrate.inc:866
msgid ""
"There is no valid FusionDirectory 1.0.8 administrator account inside your "
"LDAP."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:868 setup/class_setupStep_Migrate.inc:883
+#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
#: include/simpleplugin/simple-list.xml:59
#: plugins/admin/departments/dep-list.xml:48
#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
msgid "Create"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:873
+#: setup/class_setupStep_Migrate.inc:872
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: plugins/admin/users/class_userManagement.inc:42
msgid "Users"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:876
+#: setup/class_setupStep_Migrate.inc:875
msgid "Groups"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStep_Migrate.inc:881
msgid "There is no FusionDirectory administrator account inside your LDAP."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:920
+#: setup/class_setupStep_Migrate.inc:919
msgid "Gives all rights on all objects"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:937 include/class_management.inc:697
+#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
#: include/class_listing.inc:551 include/class_xml.inc:58
#: include/password-methods/class_password-methods-sasl.inc:60
#: include/password-methods/class_password-methods-sasl.inc:86
#: include/password-methods/class_password-methods.inc:393
#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3112
-#: include/functions.inc:3133 include/functions.inc:3173
-#: include/functions.inc:3185 include/functions.inc:3189
-#: include/functions.inc:3196 include/functions.inc:3205
-#: include/functions.inc:3267 include/class_msg_dialog.inc:128
+#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
+#: include/functions.inc:3146 include/functions.inc:3186
+#: include/functions.inc:3198 include/functions.inc:3202
+#: include/functions.inc:3209 include/functions.inc:3218
+#: include/functions.inc:3280 include/class_msg_dialog.inc:128
#: include/class_msg_dialog.inc:164 include/class_config.inc:357
#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
@@ -492,82 +492,82 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:34
#: include/simpleplugin/attributes/class_FileAttribute.inc:37
#: include/simpleplugin/attributes/class_FileAttribute.inc:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:801
-#: include/class_plugin.inc:1534 html/index.php:453 html/index.php:474
+#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
+#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
#: html/index.php:484 html/index.php:546 html/index.php:556
#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
msgid "Error"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:997
+#: setup/class_setupStep_Migrate.inc:996
msgid "Default ACL roles have not been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:999
+#: setup/class_setupStep_Migrate.inc:998
msgid "Some default ACL roles are missing"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1001
+#: setup/class_setupStep_Migrate.inc:1000
msgid "Default ACL roles have been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1031
+#: setup/class_setupStep_Migrate.inc:1030
#, php-format
msgid "Cannot add ACL role \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1086
+#: setup/class_setupStep_Migrate.inc:1085
#, php-format
msgid "Found %s user(s) outside the configured tree \"%s\"."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1100
-#: setup/class_setupStep_Migrate.inc:1114
+#: setup/class_setupStep_Migrate.inc:1099
+#: setup/class_setupStep_Migrate.inc:1113
msgid "Move users into configured user tree"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
msgid "Cannot move entries to the requested department!"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "Entry will be moved from"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "to"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1154
+#: setup/class_setupStep_Migrate.inc:1153
msgid "The following references will be updated"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1205
+#: setup/class_setupStep_Migrate.inc:1204
#, php-format
msgid "Found %s groups outside the configured tree '%s'."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1219
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1218
+#: setup/class_setupStep_Migrate.inc:1232
msgid "Move groups into configured groups tree"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1316
+#: setup/class_setupStep_Migrate.inc:1315
#, php-format
msgid "Found %s department(s) that will not be visible in FusionDirectory."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1325
-#: setup/class_setupStep_Migrate.inc:1330
+#: setup/class_setupStep_Migrate.inc:1324
+#: setup/class_setupStep_Migrate.inc:1329
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1380
+#: setup/class_setupStep_Migrate.inc:1379
#, php-format
msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1424
+#: setup/class_setupStep_Migrate.inc:1423
#, php-format
msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
@@ -743,10 +743,10 @@ msgstr ""
#: include/class_logging.inc:80 include/class_session.inc:50
#: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:649
-#: include/functions.inc:770 include/functions.inc:1189
-#: include/functions.inc:2243 include/functions.inc:2285
-#: include/functions.inc:2314 include/class_ldap.inc:873
+#: include/functions.inc:564 include/functions.inc:651
+#: include/functions.inc:772 include/functions.inc:1201
+#: include/functions.inc:2255 include/functions.inc:2297
+#: include/functions.inc:2326 include/class_ldap.inc:873
#: include/class_ldap.inc:911 include/class_acl.inc:118
msgid "Internal error"
msgstr ""
@@ -813,12 +813,12 @@ msgid ""
"plugin instance!"
msgstr ""
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1188
+#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
#: include/class_listing.inc:1190
msgid "Root"
msgstr ""
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
msgid "Submit"
msgstr ""
@@ -919,7 +919,7 @@ msgid "Create a new snapshot from this object"
msgstr ""
#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3302 include/simpleplugin/class_simplePlugin.inc:272
+#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
#: include/simpleplugin/class_simplePlugin.inc:277
#: include/simpleplugin/class_simplePlugin.inc:289
#: html/class_passwordRecovery.inc:116
@@ -952,7 +952,7 @@ msgstr ""
#: include/password-methods/class_password-methods-sha.inc:69
#: include/password-methods/class_password-methods-ssha.inc:73
#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:659 include/class_timezone.inc:51
+#: include/functions.inc:661 include/class_timezone.inc:51
#: include/class_config.inc:159 include/class_config.inc:284
#: include/class_config.inc:843 include/class_config.inc:856
#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
@@ -990,7 +990,7 @@ msgid "Cannot paste"
msgstr ""
#: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
#: plugins/personal/generic/paste_generic.tpl.c:11
msgid "Login"
@@ -1034,245 +1034,245 @@ msgid ""
"administrator."
msgstr ""
-#: include/functions.inc:597
+#: include/functions.inc:599
msgid "Authentication error"
msgstr ""
-#: include/functions.inc:598
+#: include/functions.inc:600
msgid ""
"It seems your user password has expired. Please use <a "
"href=\"recovery.php\">password recovery</a> to change it."
msgstr ""
-#: include/functions.inc:649 include/functions.inc:770
+#: include/functions.inc:651 include/functions.inc:772
msgid "Error while adding a lock. Contact the developers!"
msgstr ""
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid ""
"Cannot create locking information in LDAP tree. Please contact your "
"administrator!"
msgstr ""
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid "LDAP server returned: %s"
msgstr ""
-#: include/functions.inc:838
+#: include/functions.inc:850
msgid ""
"Found multiple locks for object to be locked. This should not happen - "
"cleaning up multiple references."
msgstr ""
-#: include/functions.inc:1109
+#: include/functions.inc:1121
#, php-format
msgid "The size limit of %d entries is exceed!"
msgstr ""
-#: include/functions.inc:1111
+#: include/functions.inc:1123
#, php-format
msgid ""
"Set the new size limit to %s and show me this message if the limit still "
"exceeds"
msgstr ""
-#: include/functions.inc:1128
+#: include/functions.inc:1140
msgid "Configure"
msgstr ""
-#: include/functions.inc:1133
+#: include/functions.inc:1145
msgid "incomplete"
msgstr ""
-#: include/functions.inc:1534
+#: include/functions.inc:1546
msgid "Continue anyway"
msgstr ""
-#: include/functions.inc:1536
+#: include/functions.inc:1548
msgid "Edit anyway"
msgstr ""
-#: include/functions.inc:1538
+#: include/functions.inc:1550
#, php-format
msgid "You're going to edit the LDAP entry/entries %s"
msgstr ""
-#: include/functions.inc:1766
+#: include/functions.inc:1778
msgid "Entries per page"
msgstr ""
-#: include/functions.inc:1797 include/class_filter.inc:353
+#: include/functions.inc:1809 include/class_filter.inc:353
msgid "Apply filter"
msgstr ""
-#: include/functions.inc:2065
+#: include/functions.inc:2077
#, php-format
msgid "%sB"
msgstr ""
-#: include/functions.inc:2066
+#: include/functions.inc:2078
#, php-format
msgid "%sKiB"
msgstr ""
-#: include/functions.inc:2067
+#: include/functions.inc:2079
#, php-format
msgid "%sMiB"
msgstr ""
-#: include/functions.inc:2068
+#: include/functions.inc:2080
#, php-format
msgid "%sGiB"
msgstr ""
-#: include/functions.inc:2069
+#: include/functions.inc:2081
#, php-format
msgid "%sTiB"
msgstr ""
-#: include/functions.inc:2070
+#: include/functions.inc:2082
#, php-format
msgid "%sPiB"
msgstr ""
-#: include/functions.inc:2071
+#: include/functions.inc:2083
#, php-format
msgid "%sEiB"
msgstr ""
-#: include/functions.inc:2072
+#: include/functions.inc:2084
#, php-format
msgid "%sZiB"
msgstr ""
-#: include/functions.inc:2073
+#: include/functions.inc:2085
#, php-format
msgid "%sYiB"
msgstr ""
-#: include/functions.inc:2105 include/class_filter.inc:315
+#: include/functions.inc:2117 include/class_filter.inc:315
msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
msgstr ""
-#: include/functions.inc:2243
+#: include/functions.inc:2255
#, php-format
msgid ""
"File '%s' could not be deleted. Try fusiondirectory-setup --check-"
"directories to fix permissions."
msgstr ""
-#: include/functions.inc:2285
+#: include/functions.inc:2297
msgid "Cannot write to revision file!"
msgstr ""
-#: include/functions.inc:2314
+#: include/functions.inc:2326
msgid "Cannot read to revision file!"
msgstr ""
-#: include/functions.inc:2523
+#: include/functions.inc:2535
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "LDAP warning"
msgstr ""
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "Cannot get schema information from server. No schema check possible!"
msgstr ""
-#: include/functions.inc:2564
+#: include/functions.inc:2577
msgid "Main FusionDirectory schema"
msgstr ""
-#: include/functions.inc:2571
+#: include/functions.inc:2584
msgid "Schema used to store FusionDirectory configuration"
msgstr ""
-#: include/functions.inc:2578
+#: include/functions.inc:2591
msgid "Used to store trust mode information in users or groups."
msgstr ""
-#: include/functions.inc:2585
+#: include/functions.inc:2598
msgid "Used to store templates."
msgstr ""
-#: include/functions.inc:2592
+#: include/functions.inc:2605
msgid "Used to store POSIX information."
msgstr ""
-#: include/functions.inc:2599
+#: include/functions.inc:2612
#, php-format
msgid "Missing required object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2601
+#: include/functions.inc:2614
#, php-format
msgid "Missing optional object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2605
+#: include/functions.inc:2618
#, php-format
msgid "Class(es) available"
msgstr ""
-#: include/functions.inc:2623
+#: include/functions.inc:2636
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2637
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2640
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2641
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3112 include/functions.inc:3133
-#: include/functions.inc:3173 include/functions.inc:3185
-#: include/functions.inc:3189 include/functions.inc:3196
-#: include/functions.inc:3205
+#: include/functions.inc:3125 include/functions.inc:3146
+#: include/functions.inc:3186 include/functions.inc:3198
+#: include/functions.inc:3202 include/functions.inc:3209
+#: include/functions.inc:3218
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3112
+#: include/functions.inc:3125
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3133
+#: include/functions.inc:3146
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3173
+#: include/functions.inc:3186
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3185 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3202
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3205
+#: include/functions.inc:3218
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3267
+#: include/functions.inc:3280
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3303
+#: include/functions.inc:3316
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
@@ -2102,7 +2102,7 @@ msgstr ""
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
#: plugins/admin/departments/class_department.inc:72
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/groups/class_roleGeneric.inc:91
@@ -2282,7 +2282,7 @@ msgid "The entry %s is not existing"
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:548
+#: include/class_plugin.inc:554
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!"
@@ -2398,14 +2398,19 @@ msgstr ""
msgid "There was a problem uncompressing snapshot data"
msgstr ""
-#: include/class_plugin.inc:803
+#: include/class_plugin.inc:809
#, php-format
msgid ""
"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
msgstr ""
-#: include/class_plugin.inc:1332
+#: include/class_plugin.inc:1350
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/class_plugin.inc:1352
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -2553,44 +2558,44 @@ msgstr ""
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr ""
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
msgid "Email address"
msgstr ""
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
#, php-format
msgid "Did not find an account with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
#, php-format
msgid "Found multiple accounts with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
#, php-format
msgid "There is no account using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There are several accounts using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
#, php-format
msgid "The user using email \"%s\" is locked. Please contact your administrator."
msgstr ""
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
msgid "Contact your administrator, there was a problem with mail server"
msgstr ""
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
msgid "This token is invalid"
msgstr ""
-#: html/class_passwordRecovery.inc:647
+#: html/class_passwordRecovery.inc:651
msgid "There was a problem with mail server, confirmation email not sent"
msgstr ""
@@ -2902,7 +2907,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
#: setup/setup_migrate_adminAccount.tpl.c:14
#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2939,258 +2944,262 @@ msgstr ""
msgid "User account"
msgstr ""
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:296
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:307
msgid "Personal information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
msgid "Last name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
msgid "First name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
msgid "Short description of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "Picture"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "The avatar for this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:330
+#: plugins/personal/generic/class_user.inc:333
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:334
+#: plugins/personal/generic/class_user.inc:337
#: plugins/admin/departments/class_department.inc:90
#: plugins/admin/departments/class_department.inc:96
msgid "Location"
msgstr ""
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:341
#: plugins/admin/departments/class_department.inc:93
msgid "State"
msgstr ""
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
#: plugins/admin/departments/class_department.inc:102
msgid "Address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
msgid "Business postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
#: plugins/admin/departments/class_department.inc:106
msgid "Phone"
msgstr ""
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
msgid "Business phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Mobile"
msgstr ""
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Business mobile number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Pager"
msgstr ""
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
#: plugins/admin/departments/class_department.inc:110
msgid "Fax"
msgstr ""
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:373
+#: plugins/personal/generic/class_user.inc:376
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:393
+#: plugins/personal/generic/class_user.inc:396
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Display name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Private phone"
msgstr ""
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Home phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:411
+#: plugins/personal/generic/class_user.inc:414
msgid "Organizational information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
msgid "Title"
msgstr ""
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
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:421
+#: plugins/personal/generic/class_user.inc:424
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
msgid "Organization"
msgstr ""
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
#: plugins/admin/departments/class_department.inc:33
#: plugins/admin/departments/class_department.inc:39
#: plugins/admin/departments/dep-list.xml:21
msgid "Department"
msgstr ""
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
msgid "Department to which the user belongs"
msgstr ""
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:437
+#: plugins/personal/generic/class_user.inc:440
msgid "Employee type"
msgstr ""
-#: plugins/personal/generic/class_user.inc:441
+#: plugins/personal/generic/class_user.inc:444
#: plugins/admin/departments/class_department.inc:84
msgid "Manager"
msgstr ""
-#: plugins/personal/generic/class_user.inc:608
+#: plugins/personal/generic/class_user.inc:611
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:614
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:622
+#: plugins/personal/generic/class_user.inc:625
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:636
+#: plugins/personal/generic/class_user.inc:639
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:641
-#: plugins/personal/generic/class_user.inc:645
+#: plugins/personal/generic/class_user.inc:644
+#: plugins/personal/generic/class_user.inc:648
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:652
+#: plugins/personal/generic/class_user.inc:655
msgid "You need to specify your current password in order to proceed."
msgstr ""
-#: plugins/personal/generic/class_user.inc:654
+#: plugins/personal/generic/class_user.inc:657
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:656
+#: plugins/personal/generic/class_user.inc:659
#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
msgid "New password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:658
+#: plugins/personal/generic/class_user.inc:661
msgid "The password used as new and current are too similar."
msgstr ""
-#: plugins/personal/generic/class_user.inc:660
+#: plugins/personal/generic/class_user.inc:663
msgid "The password used as new is to short."
msgstr ""
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:665
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
@@ -3298,36 +3307,46 @@ msgid ""
"recover their password"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:189
+msgid "Login attribute"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
msgid "First email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
msgid "Subject"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
msgid "Subject of the first email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
msgid "[FusionDirectory] Password recovery link"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
#, php-format
msgid ""
"Body of the first email, sent when the user ask for a new password. Use %s "
"for the login and the recovery link."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
#, php-format
msgid ""
"Hello,\n"
@@ -3339,31 +3358,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
msgid "Second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
msgid "Subject of the second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
msgid "[FusionDirectory] Password recovery successful"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
#, php-format
msgid "Body (%s is login)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
#, 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
+#: plugins/config/class_recoveryConfig.inc:118
#, php-format
msgid ""
"Hello,\n"
@@ -3530,10 +3549,6 @@ msgstr ""
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 ""
@@ -4396,7 +4411,7 @@ msgstr ""
msgid "Only allow this group to connect to this list of hosts"
msgstr ""
-#: plugins/admin/groups/class_ogroup.inc:321
+#: plugins/admin/groups/class_ogroup.inc:322
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
diff --git a/locale/vi_VN/fusiondirectory.po b/locale/vi_VN/fusiondirectory.po
index 4de809c0c2959392b00149a5a174331190f85854..dddda835d0b88e0c8ce3e2288af0d8b388f2d1b7 100644
--- a/locale/vi_VN/fusiondirectory.po
+++ b/locale/vi_VN/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-11 19:09+0100\n"
-"PO-Revision-Date: 2017-01-10 14:53+0000\n"
+"POT-Creation-Date: 2017-03-29 21:46+0200\n"
+"PO-Revision-Date: 2017-03-26 15:51+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
"MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:382
+#: plugins/personal/generic/class_user.inc:385
msgid "Preferred language"
msgstr "Ngôn ngữ muốn sỠdụng"
@@ -316,30 +316,30 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
+#: setup/class_setupStep_Migrate.inc:981
+#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1180
+#: setup/class_setupStep_Migrate.inc:1273
+#: setup/class_setupStep_Migrate.inc:1352
+#: setup/class_setupStep_Migrate.inc:1396
+msgid "LDAP query failed"
+msgstr "Yêu cầu LDAP thất bại"
+
+#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
+#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
#: setup/class_setupStep_Migrate.inc:982
#: setup/class_setupStep_Migrate.inc:1058
#: setup/class_setupStep_Migrate.inc:1181
#: setup/class_setupStep_Migrate.inc:1274
#: setup/class_setupStep_Migrate.inc:1353
#: setup/class_setupStep_Migrate.inc:1397
-msgid "LDAP query failed"
-msgstr "Yêu cầu LDAP thất bại"
-
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:983
-#: setup/class_setupStep_Migrate.inc:1059
-#: setup/class_setupStep_Migrate.inc:1182
-#: setup/class_setupStep_Migrate.inc:1275
-#: setup/class_setupStep_Migrate.inc:1354
-#: setup/class_setupStep_Migrate.inc:1398
msgid "Possibly the \"root object\" is missing."
msgstr ""
#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:866
-#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
+#: setup/class_setupStep_Migrate.inc:880
msgid "Failed"
msgstr "Thất bại"
@@ -360,11 +360,11 @@ msgid ""
msgstr ""
#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:677
-#: include/functions.inc:724 include/functions.inc:822
-#: include/functions.inc:2988 include/functions.inc:3165
+#: include/functions.inc:522 include/functions.inc:679
+#: include/functions.inc:726 include/functions.inc:834
+#: include/functions.inc:3001 include/functions.inc:3178
#: include/class_config.inc:322 include/class_ldap.inc:924
#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
#: include/simpleplugin/attributes/class_SetAttribute.inc:726
@@ -386,13 +386,13 @@ msgid "The specified user \"%s\" does not have full access to your ldap database
msgstr ""
#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1085
-#: setup/class_setupStep_Migrate.inc:1204
-#: setup/class_setupStep_Migrate.inc:1315
-#: setup/class_setupStep_Migrate.inc:1379
-#: setup/class_setupStep_Migrate.inc:1423 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:838
-#: include/functions.inc:2523 include/simpleplugin/class_simpleTabs.inc:322
+#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1203
+#: setup/class_setupStep_Migrate.inc:1314
+#: setup/class_setupStep_Migrate.inc:1378
+#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
+#: include/class_xml.inc:55 include/functions.inc:850
+#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
#: html/index.php:597 html/main.php:158
#: plugins/personal/posix/class_posixAccount.inc:482
#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
@@ -413,7 +413,7 @@ msgid "User migration"
msgstr ""
#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1029
+#: setup/class_setupStep_Migrate.inc:1028
msgid "Migration error"
msgstr "Lỗi di trú"
@@ -422,64 +422,64 @@ msgstr "Lỗi di trú"
msgid "Cannot migrate entry \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:859
+#: setup/class_setupStep_Migrate.inc:858
#, php-format
msgid "FD 1.0.7 administrative accounts found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:862
+#: setup/class_setupStep_Migrate.inc:861
#, php-format
msgid "FD 1.0.7 administrative groups found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:864
+#: setup/class_setupStep_Migrate.inc:863
msgid ""
"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
"file at the end of the setup to migrate it.<br/>"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:867
+#: setup/class_setupStep_Migrate.inc:866
msgid ""
"There is no valid FusionDirectory 1.0.8 administrator account inside your "
"LDAP."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:868 setup/class_setupStep_Migrate.inc:883
+#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
#: include/simpleplugin/simple-list.xml:59
#: plugins/admin/departments/dep-list.xml:48
#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
msgid "Create"
msgstr "Tạo "
-#: setup/class_setupStep_Migrate.inc:873
+#: setup/class_setupStep_Migrate.inc:872
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: plugins/admin/users/class_userManagement.inc:42
msgid "Users"
msgstr "NgÆ°á»i dùng"
-#: setup/class_setupStep_Migrate.inc:876
+#: setup/class_setupStep_Migrate.inc:875
msgid "Groups"
msgstr "Các nhóm"
-#: setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStep_Migrate.inc:881
msgid "There is no FusionDirectory administrator account inside your LDAP."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:920
+#: setup/class_setupStep_Migrate.inc:919
msgid "Gives all rights on all objects"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:937 include/class_management.inc:697
+#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
#: include/class_listing.inc:551 include/class_xml.inc:58
#: include/password-methods/class_password-methods-sasl.inc:60
#: include/password-methods/class_password-methods-sasl.inc:86
#: include/password-methods/class_password-methods.inc:393
#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3112
-#: include/functions.inc:3133 include/functions.inc:3173
-#: include/functions.inc:3185 include/functions.inc:3189
-#: include/functions.inc:3196 include/functions.inc:3205
-#: include/functions.inc:3267 include/class_msg_dialog.inc:128
+#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
+#: include/functions.inc:3146 include/functions.inc:3186
+#: include/functions.inc:3198 include/functions.inc:3202
+#: include/functions.inc:3209 include/functions.inc:3218
+#: include/functions.inc:3280 include/class_msg_dialog.inc:128
#: include/class_msg_dialog.inc:164 include/class_config.inc:357
#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
@@ -492,82 +492,82 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:34
#: include/simpleplugin/attributes/class_FileAttribute.inc:37
#: include/simpleplugin/attributes/class_FileAttribute.inc:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:801
-#: include/class_plugin.inc:1534 html/index.php:453 html/index.php:474
+#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
+#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
#: html/index.php:484 html/index.php:546 html/index.php:556
#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
msgid "Error"
msgstr "Lá»—i"
-#: setup/class_setupStep_Migrate.inc:997
+#: setup/class_setupStep_Migrate.inc:996
msgid "Default ACL roles have not been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:999
+#: setup/class_setupStep_Migrate.inc:998
msgid "Some default ACL roles are missing"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1001
+#: setup/class_setupStep_Migrate.inc:1000
msgid "Default ACL roles have been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1031
+#: setup/class_setupStep_Migrate.inc:1030
#, php-format
msgid "Cannot add ACL role \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1086
+#: setup/class_setupStep_Migrate.inc:1085
#, php-format
msgid "Found %s user(s) outside the configured tree \"%s\"."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1100
-#: setup/class_setupStep_Migrate.inc:1114
+#: setup/class_setupStep_Migrate.inc:1099
+#: setup/class_setupStep_Migrate.inc:1113
msgid "Move users into configured user tree"
msgstr "Chuyển ngÆ°á»i dùng sang cây ngÆ°á»i dùng được cấu hình"
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
msgid "Cannot move entries to the requested department!"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "Entry will be moved from"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "to"
msgstr "đến"
-#: setup/class_setupStep_Migrate.inc:1154
+#: setup/class_setupStep_Migrate.inc:1153
msgid "The following references will be updated"
msgstr "Tham chiếu sau sẽ được cáºp nháºt"
-#: setup/class_setupStep_Migrate.inc:1205
+#: setup/class_setupStep_Migrate.inc:1204
#, php-format
msgid "Found %s groups outside the configured tree '%s'."
msgstr "Äã tìm thấy %s nhóm bên ngoà i cây được cấu hình '%s'."
-#: setup/class_setupStep_Migrate.inc:1219
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1218
+#: setup/class_setupStep_Migrate.inc:1232
msgid "Move groups into configured groups tree"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1316
+#: setup/class_setupStep_Migrate.inc:1315
#, php-format
msgid "Found %s department(s) that will not be visible in FusionDirectory."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1325
-#: setup/class_setupStep_Migrate.inc:1330
+#: setup/class_setupStep_Migrate.inc:1324
+#: setup/class_setupStep_Migrate.inc:1329
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1380
+#: setup/class_setupStep_Migrate.inc:1379
#, php-format
msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1424
+#: setup/class_setupStep_Migrate.inc:1423
#, php-format
msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
@@ -743,10 +743,10 @@ msgstr "Tiếp tục"
#: include/class_logging.inc:80 include/class_session.inc:50
#: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:649
-#: include/functions.inc:770 include/functions.inc:1189
-#: include/functions.inc:2243 include/functions.inc:2285
-#: include/functions.inc:2314 include/class_ldap.inc:873
+#: include/functions.inc:564 include/functions.inc:651
+#: include/functions.inc:772 include/functions.inc:1201
+#: include/functions.inc:2255 include/functions.inc:2297
+#: include/functions.inc:2326 include/class_ldap.inc:873
#: include/class_ldap.inc:911 include/class_acl.inc:118
msgid "Internal error"
msgstr "Lá»—i ná»™i bá»™"
@@ -813,12 +813,12 @@ msgid ""
"plugin instance!"
msgstr ""
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1188
+#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
#: include/class_listing.inc:1190
msgid "Root"
msgstr "Gốc"
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
msgid "Submit"
msgstr "Ná»™p"
@@ -919,7 +919,7 @@ msgid "Create a new snapshot from this object"
msgstr "Tạo ra một snapshot mới từ đối tượng nà y"
#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3302 include/simpleplugin/class_simplePlugin.inc:272
+#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
#: include/simpleplugin/class_simplePlugin.inc:277
#: include/simpleplugin/class_simplePlugin.inc:289
#: html/class_passwordRecovery.inc:116
@@ -952,7 +952,7 @@ msgstr ""
#: include/password-methods/class_password-methods-sha.inc:69
#: include/password-methods/class_password-methods-ssha.inc:73
#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:659 include/class_timezone.inc:51
+#: include/functions.inc:661 include/class_timezone.inc:51
#: include/class_config.inc:159 include/class_config.inc:284
#: include/class_config.inc:843 include/class_config.inc:856
#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
@@ -990,7 +990,7 @@ msgid "Cannot paste"
msgstr "Không thể paste"
#: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
#: plugins/personal/generic/paste_generic.tpl.c:11
msgid "Login"
@@ -1034,245 +1034,245 @@ msgid ""
"administrator."
msgstr ""
-#: include/functions.inc:597
+#: include/functions.inc:599
msgid "Authentication error"
msgstr "Lá»—i xác định thẩm quyá»n"
-#: include/functions.inc:598
+#: include/functions.inc:600
msgid ""
"It seems your user password has expired. Please use <a "
"href=\"recovery.php\">password recovery</a> to change it."
msgstr ""
-#: include/functions.inc:649 include/functions.inc:770
+#: include/functions.inc:651 include/functions.inc:772
msgid "Error while adding a lock. Contact the developers!"
msgstr "Lỗi khi đang thêm một khóa và o. Hãy liên lạc với các nhà phát triển!"
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid ""
"Cannot create locking information in LDAP tree. Please contact your "
"administrator!"
msgstr "Không thể tạo ra việc khóa thông tin trong cây LDAP.Xin hãy liên lạc với admin của bạn!"
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid "LDAP server returned: %s"
msgstr "LDAP server trả vá»: %s"
-#: include/functions.inc:838
+#: include/functions.inc:850
msgid ""
"Found multiple locks for object to be locked. This should not happen - "
"cleaning up multiple references."
msgstr "Tìm thấy nhiá»u khóa khác nhau để khóa đối tượng. Äiá»u nà y không nên xảy ra - hãy dá»n sạch các tham chiếu."
-#: include/functions.inc:1109
+#: include/functions.inc:1121
#, php-format
msgid "The size limit of %d entries is exceed!"
msgstr "Äã vượt quá giá»›i hạn kÃch cỡ của các entry %d!"
-#: include/functions.inc:1111
+#: include/functions.inc:1123
#, php-format
msgid ""
"Set the new size limit to %s and show me this message if the limit still "
"exceeds"
msgstr "Thiết láºp kÃch cỡ má»›i cho %s và cho tôi thấy tin nhắn nếu giá»›i hạn nà y vẫn vượt quá tiêu chuẩn"
-#: include/functions.inc:1128
+#: include/functions.inc:1140
msgid "Configure"
msgstr "Cấu hình"
-#: include/functions.inc:1133
+#: include/functions.inc:1145
msgid "incomplete"
msgstr "chưa hoà n thà nh"
-#: include/functions.inc:1534
+#: include/functions.inc:1546
msgid "Continue anyway"
msgstr "Cứ tiếp tục"
-#: include/functions.inc:1536
+#: include/functions.inc:1548
msgid "Edit anyway"
msgstr "Cứ hiệu chỉnh"
-#: include/functions.inc:1538
+#: include/functions.inc:1550
#, php-format
msgid "You're going to edit the LDAP entry/entries %s"
msgstr "Bạn sẽ hiệu chỉnh entry/các entry %s của LDAP"
-#: include/functions.inc:1766
+#: include/functions.inc:1778
msgid "Entries per page"
msgstr "các entry cho mỗi trang"
-#: include/functions.inc:1797 include/class_filter.inc:353
+#: include/functions.inc:1809 include/class_filter.inc:353
msgid "Apply filter"
msgstr "Ãp dụng bá»™ lá»c"
-#: include/functions.inc:2065
+#: include/functions.inc:2077
#, php-format
msgid "%sB"
msgstr ""
-#: include/functions.inc:2066
+#: include/functions.inc:2078
#, php-format
msgid "%sKiB"
msgstr ""
-#: include/functions.inc:2067
+#: include/functions.inc:2079
#, php-format
msgid "%sMiB"
msgstr ""
-#: include/functions.inc:2068
+#: include/functions.inc:2080
#, php-format
msgid "%sGiB"
msgstr ""
-#: include/functions.inc:2069
+#: include/functions.inc:2081
#, php-format
msgid "%sTiB"
msgstr ""
-#: include/functions.inc:2070
+#: include/functions.inc:2082
#, php-format
msgid "%sPiB"
msgstr ""
-#: include/functions.inc:2071
+#: include/functions.inc:2083
#, php-format
msgid "%sEiB"
msgstr ""
-#: include/functions.inc:2072
+#: include/functions.inc:2084
#, php-format
msgid "%sZiB"
msgstr ""
-#: include/functions.inc:2073
+#: include/functions.inc:2085
#, php-format
msgid "%sYiB"
msgstr ""
-#: include/functions.inc:2105 include/class_filter.inc:315
+#: include/functions.inc:2117 include/class_filter.inc:315
msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
-#: include/functions.inc:2243
+#: include/functions.inc:2255
#, php-format
msgid ""
"File '%s' could not be deleted. Try fusiondirectory-setup --check-"
"directories to fix permissions."
msgstr ""
-#: include/functions.inc:2285
+#: include/functions.inc:2297
msgid "Cannot write to revision file!"
msgstr "Không thể viết lên revision file!"
-#: include/functions.inc:2314
+#: include/functions.inc:2326
msgid "Cannot read to revision file!"
msgstr ""
-#: include/functions.inc:2523
+#: include/functions.inc:2535
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "LDAP warning"
msgstr "Cảnh báo LDAP"
-#: include/functions.inc:2541
+#: include/functions.inc:2554
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:2564
+#: include/functions.inc:2577
msgid "Main FusionDirectory schema"
msgstr ""
-#: include/functions.inc:2571
+#: include/functions.inc:2584
msgid "Schema used to store FusionDirectory configuration"
msgstr ""
-#: include/functions.inc:2578
+#: include/functions.inc:2591
msgid "Used to store trust mode information in users or groups."
msgstr ""
-#: include/functions.inc:2585
+#: include/functions.inc:2598
msgid "Used to store templates."
msgstr ""
-#: include/functions.inc:2592
+#: include/functions.inc:2605
msgid "Used to store POSIX information."
msgstr ""
-#: include/functions.inc:2599
+#: include/functions.inc:2612
#, php-format
msgid "Missing required object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2601
+#: include/functions.inc:2614
#, php-format
msgid "Missing optional object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2605
+#: include/functions.inc:2618
#, php-format
msgid "Class(es) available"
msgstr "Äã có lá»›p"
-#: include/functions.inc:2623
+#: include/functions.inc:2636
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2637
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2640
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2641
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3112 include/functions.inc:3133
-#: include/functions.inc:3173 include/functions.inc:3185
-#: include/functions.inc:3189 include/functions.inc:3196
-#: include/functions.inc:3205
+#: include/functions.inc:3125 include/functions.inc:3146
+#: include/functions.inc:3186 include/functions.inc:3198
+#: include/functions.inc:3202 include/functions.inc:3209
+#: include/functions.inc:3218
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3112
+#: include/functions.inc:3125
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3133
+#: include/functions.inc:3146
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3173
+#: include/functions.inc:3186
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3185 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3202
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3205
+#: include/functions.inc:3218
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3267
+#: include/functions.inc:3280
msgid "Cannot allocate a free ID!"
msgstr "Không thể phân phối má»™t ID miá»…n phÃ!"
-#: include/functions.inc:3303
+#: include/functions.inc:3316
#, 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!"
@@ -2102,7 +2102,7 @@ msgstr "Tên"
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
#: plugins/admin/departments/class_department.inc:72
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/groups/class_roleGeneric.inc:91
@@ -2282,7 +2282,7 @@ msgid "The entry %s is not existing"
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:548
+#: include/class_plugin.inc:554
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!"
@@ -2398,14 +2398,19 @@ msgstr ""
msgid "There was a problem uncompressing snapshot data"
msgstr ""
-#: include/class_plugin.inc:803
+#: include/class_plugin.inc:809
#, php-format
msgid ""
"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
msgstr ""
-#: include/class_plugin.inc:1332
+#: include/class_plugin.inc:1350
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/class_plugin.inc:1352
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -2553,44 +2558,44 @@ msgstr "Trình duyệt của bạn đã vô hiệu cookies. Xin hãy cho phép c
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr ""
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
msgid "Email address"
msgstr ""
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
#, php-format
msgid "Did not find an account with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
#, php-format
msgid "Found multiple accounts with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
#, php-format
msgid "There is no account using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There are several accounts using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
#, php-format
msgid "The user using email \"%s\" is locked. Please contact your administrator."
msgstr ""
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
msgid "Contact your administrator, there was a problem with mail server"
msgstr ""
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
msgid "This token is invalid"
msgstr ""
-#: html/class_passwordRecovery.inc:647
+#: html/class_passwordRecovery.inc:651
msgid "There was a problem with mail server, confirmation email not sent"
msgstr ""
@@ -2902,7 +2907,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
#: setup/setup_migrate_adminAccount.tpl.c:14
#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2939,258 +2944,262 @@ msgstr ""
msgid "User account"
msgstr ""
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:296
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:307
msgid "Personal information"
msgstr "Thông tin cá nhân"
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "Há»"
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
msgid "Last name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "Tên"
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
msgid "First name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
msgid "Short description of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "Picture"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "The avatar for this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:330
+#: plugins/personal/generic/class_user.inc:333
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:334
+#: plugins/personal/generic/class_user.inc:337
#: plugins/admin/departments/class_department.inc:90
#: plugins/admin/departments/class_department.inc:96
msgid "Location"
msgstr "Vị trÃ"
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:341
#: plugins/admin/departments/class_department.inc:93
msgid "State"
msgstr "Bang"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
#: plugins/admin/departments/class_department.inc:102
msgid "Address"
msgstr "Äịa chỉ"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
msgid "Business postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room No."
msgstr "Số phòng"
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room number"
msgstr "Số phòng"
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
#: plugins/admin/departments/class_department.inc:106
msgid "Phone"
msgstr "Số điện thoại"
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
msgid "Business phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Mobile"
msgstr "Äiện thoại di Ä‘á»™ng"
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Business mobile number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Pager"
msgstr "Máy nhắn tin"
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
#: plugins/admin/departments/class_department.inc:110
msgid "Fax"
msgstr "Số fax"
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Homepage"
msgstr "Trang chủ"
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:373
+#: plugins/personal/generic/class_user.inc:376
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:393
+#: plugins/personal/generic/class_user.inc:396
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Display name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home postal address"
msgstr "Äại chỉ nhà theo bÆ°u Ä‘iện"
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Private phone"
msgstr "Số điện thoại riêng"
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Home phone number"
msgstr "Số điện thoại nhà "
-#: plugins/personal/generic/class_user.inc:411
+#: plugins/personal/generic/class_user.inc:414
msgid "Organizational information"
msgstr "Thông tin vỠtổ chức"
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
msgid "Title"
msgstr ""
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
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:421
+#: plugins/personal/generic/class_user.inc:424
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
msgid "Organization"
msgstr "Tổ chức"
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
#: plugins/admin/departments/class_department.inc:33
#: plugins/admin/departments/class_department.inc:39
#: plugins/admin/departments/dep-list.xml:21
msgid "Department"
msgstr "Bá»™ pháºn"
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
msgid "Department to which the user belongs"
msgstr ""
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department No."
msgstr "Số phòng ban"
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department number"
msgstr "Số phòng là m việc"
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee No."
msgstr "Số nhân viên"
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee number"
msgstr "Số nhân viên"
-#: plugins/personal/generic/class_user.inc:437
+#: plugins/personal/generic/class_user.inc:440
msgid "Employee type"
msgstr "Loại nhân viên"
-#: plugins/personal/generic/class_user.inc:441
+#: plugins/personal/generic/class_user.inc:444
#: plugins/admin/departments/class_department.inc:84
msgid "Manager"
msgstr ""
-#: plugins/personal/generic/class_user.inc:608
+#: plugins/personal/generic/class_user.inc:611
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:614
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:622
+#: plugins/personal/generic/class_user.inc:625
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:636
+#: plugins/personal/generic/class_user.inc:639
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:641
-#: plugins/personal/generic/class_user.inc:645
+#: plugins/personal/generic/class_user.inc:644
+#: plugins/personal/generic/class_user.inc:648
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:652
+#: plugins/personal/generic/class_user.inc:655
msgid "You need to specify your current password in order to proceed."
msgstr "Bạn cần xác định máºt khẩu hiện tại để có thể tiếp tục."
-#: plugins/personal/generic/class_user.inc:654
+#: plugins/personal/generic/class_user.inc:657
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:656
+#: plugins/personal/generic/class_user.inc:659
#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
msgid "New password"
msgstr "Máºt khẩu má»›i"
-#: plugins/personal/generic/class_user.inc:658
+#: plugins/personal/generic/class_user.inc:661
msgid "The password used as new and current are too similar."
msgstr "Máºt khẩu má»›i và máºt khẩu cÅ© quá giống nhau."
-#: plugins/personal/generic/class_user.inc:660
+#: plugins/personal/generic/class_user.inc:663
msgid "The password used as new is to short."
msgstr "Máºt khẩu má»›i cần được cắt ngắn lại."
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:665
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
@@ -3298,36 +3307,46 @@ msgid ""
"recover their password"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:189
+msgid "Login attribute"
+msgstr "Thuá»™c tÃnh đăng nháºp"
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
msgid "First email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
msgid "Subject"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
msgid "Subject of the first email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
msgid "[FusionDirectory] Password recovery link"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
#, php-format
msgid ""
"Body of the first email, sent when the user ask for a new password. Use %s "
"for the login and the recovery link."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
#, php-format
msgid ""
"Hello,\n"
@@ -3339,31 +3358,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
msgid "Second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
msgid "Subject of the second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
msgid "[FusionDirectory] Password recovery successful"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
#, php-format
msgid "Body (%s is login)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
#, 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
+#: plugins/config/class_recoveryConfig.inc:118
#, php-format
msgid ""
"Hello,\n"
@@ -3530,10 +3549,6 @@ msgstr ""
msgid "Login and session"
msgstr "Äăng nháºp và phiên"
-#: plugins/config/class_configInLdap.inc:189
-msgid "Login attribute"
-msgstr "Thuá»™c tÃnh đăng nháºp"
-
#: plugins/config/class_configInLdap.inc:190
msgid "Which LDAP attribute should be used as the login name during login."
msgstr ""
@@ -4396,7 +4411,7 @@ msgstr ""
msgid "Only allow this group to connect to this list of hosts"
msgstr ""
-#: plugins/admin/groups/class_ogroup.inc:321
+#: plugins/admin/groups/class_ogroup.inc:322
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
diff --git a/locale/zh/fusiondirectory.po b/locale/zh/fusiondirectory.po
index 1f29b5de93c5aee1aacb726f7b4678dace8de671..0fa5719dd31b3feca48433ff5e1718542251db2a 100644
--- a/locale/zh/fusiondirectory.po
+++ b/locale/zh/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-11 19:09+0100\n"
-"PO-Revision-Date: 2017-01-10 14:53+0000\n"
+"POT-Creation-Date: 2017-03-29 21:46+0200\n"
+"PO-Revision-Date: 2017-03-26 15:51+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
"Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
"MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:382
+#: plugins/personal/generic/class_user.inc:385
msgid "Preferred language"
msgstr ""
@@ -316,30 +316,30 @@ msgstr ""
#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
+#: setup/class_setupStep_Migrate.inc:981
+#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1180
+#: setup/class_setupStep_Migrate.inc:1273
+#: setup/class_setupStep_Migrate.inc:1352
+#: setup/class_setupStep_Migrate.inc:1396
+msgid "LDAP query failed"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
+#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
#: setup/class_setupStep_Migrate.inc:982
#: setup/class_setupStep_Migrate.inc:1058
#: setup/class_setupStep_Migrate.inc:1181
#: setup/class_setupStep_Migrate.inc:1274
#: setup/class_setupStep_Migrate.inc:1353
#: setup/class_setupStep_Migrate.inc:1397
-msgid "LDAP query failed"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:983
-#: setup/class_setupStep_Migrate.inc:1059
-#: setup/class_setupStep_Migrate.inc:1182
-#: setup/class_setupStep_Migrate.inc:1275
-#: setup/class_setupStep_Migrate.inc:1354
-#: setup/class_setupStep_Migrate.inc:1398
msgid "Possibly the \"root object\" is missing."
msgstr ""
#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:866
-#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
+#: setup/class_setupStep_Migrate.inc:880
msgid "Failed"
msgstr "失败"
@@ -360,11 +360,11 @@ msgid ""
msgstr ""
#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:677
-#: include/functions.inc:724 include/functions.inc:822
-#: include/functions.inc:2988 include/functions.inc:3165
+#: include/functions.inc:522 include/functions.inc:679
+#: include/functions.inc:726 include/functions.inc:834
+#: include/functions.inc:3001 include/functions.inc:3178
#: include/class_config.inc:322 include/class_ldap.inc:924
#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
#: include/simpleplugin/attributes/class_SetAttribute.inc:726
@@ -386,13 +386,13 @@ msgid "The specified user \"%s\" does not have full access to your ldap database
msgstr ""
#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1085
-#: setup/class_setupStep_Migrate.inc:1204
-#: setup/class_setupStep_Migrate.inc:1315
-#: setup/class_setupStep_Migrate.inc:1379
-#: setup/class_setupStep_Migrate.inc:1423 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:838
-#: include/functions.inc:2523 include/simpleplugin/class_simpleTabs.inc:322
+#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1203
+#: setup/class_setupStep_Migrate.inc:1314
+#: setup/class_setupStep_Migrate.inc:1378
+#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
+#: include/class_xml.inc:55 include/functions.inc:850
+#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
#: html/index.php:597 html/main.php:158
#: plugins/personal/posix/class_posixAccount.inc:482
#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
@@ -413,7 +413,7 @@ msgid "User migration"
msgstr ""
#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1029
+#: setup/class_setupStep_Migrate.inc:1028
msgid "Migration error"
msgstr ""
@@ -422,64 +422,64 @@ msgstr ""
msgid "Cannot migrate entry \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:859
+#: setup/class_setupStep_Migrate.inc:858
#, php-format
msgid "FD 1.0.7 administrative accounts found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:862
+#: setup/class_setupStep_Migrate.inc:861
#, php-format
msgid "FD 1.0.7 administrative groups found: %s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:864
+#: setup/class_setupStep_Migrate.inc:863
msgid ""
"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
"file at the end of the setup to migrate it.<br/>"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:867
+#: setup/class_setupStep_Migrate.inc:866
msgid ""
"There is no valid FusionDirectory 1.0.8 administrator account inside your "
"LDAP."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:868 setup/class_setupStep_Migrate.inc:883
+#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
#: include/simpleplugin/simple-list.xml:59
#: plugins/admin/departments/dep-list.xml:48
#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
msgid "Create"
msgstr "创建"
-#: setup/class_setupStep_Migrate.inc:873
+#: setup/class_setupStep_Migrate.inc:872
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: plugins/admin/users/class_userManagement.inc:42
msgid "Users"
msgstr "用户"
-#: setup/class_setupStep_Migrate.inc:876
+#: setup/class_setupStep_Migrate.inc:875
msgid "Groups"
msgstr "用户组"
-#: setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStep_Migrate.inc:881
msgid "There is no FusionDirectory administrator account inside your LDAP."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:920
+#: setup/class_setupStep_Migrate.inc:919
msgid "Gives all rights on all objects"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:937 include/class_management.inc:697
+#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
#: include/class_listing.inc:551 include/class_xml.inc:58
#: include/password-methods/class_password-methods-sasl.inc:60
#: include/password-methods/class_password-methods-sasl.inc:86
#: include/password-methods/class_password-methods.inc:393
#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3112
-#: include/functions.inc:3133 include/functions.inc:3173
-#: include/functions.inc:3185 include/functions.inc:3189
-#: include/functions.inc:3196 include/functions.inc:3205
-#: include/functions.inc:3267 include/class_msg_dialog.inc:128
+#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
+#: include/functions.inc:3146 include/functions.inc:3186
+#: include/functions.inc:3198 include/functions.inc:3202
+#: include/functions.inc:3209 include/functions.inc:3218
+#: include/functions.inc:3280 include/class_msg_dialog.inc:128
#: include/class_msg_dialog.inc:164 include/class_config.inc:357
#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
@@ -492,82 +492,82 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:34
#: include/simpleplugin/attributes/class_FileAttribute.inc:37
#: include/simpleplugin/attributes/class_FileAttribute.inc:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:801
-#: include/class_plugin.inc:1534 html/index.php:453 html/index.php:474
+#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
+#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
#: html/index.php:484 html/index.php:546 html/index.php:556
#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
msgid "Error"
msgstr "错误"
-#: setup/class_setupStep_Migrate.inc:997
+#: setup/class_setupStep_Migrate.inc:996
msgid "Default ACL roles have not been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:999
+#: setup/class_setupStep_Migrate.inc:998
msgid "Some default ACL roles are missing"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1001
+#: setup/class_setupStep_Migrate.inc:1000
msgid "Default ACL roles have been inserted"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1031
+#: setup/class_setupStep_Migrate.inc:1030
#, php-format
msgid "Cannot add ACL role \"%s\":"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1086
+#: setup/class_setupStep_Migrate.inc:1085
#, php-format
msgid "Found %s user(s) outside the configured tree \"%s\"."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1100
-#: setup/class_setupStep_Migrate.inc:1114
+#: setup/class_setupStep_Migrate.inc:1099
+#: setup/class_setupStep_Migrate.inc:1113
msgid "Move users into configured user tree"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1132
+#: setup/class_setupStep_Migrate.inc:1131
msgid "Cannot move entries to the requested department!"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "Entry will be moved from"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1144
+#: setup/class_setupStep_Migrate.inc:1143
msgid "to"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1154
+#: setup/class_setupStep_Migrate.inc:1153
msgid "The following references will be updated"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1205
+#: setup/class_setupStep_Migrate.inc:1204
#, php-format
msgid "Found %s groups outside the configured tree '%s'."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1219
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1218
+#: setup/class_setupStep_Migrate.inc:1232
msgid "Move groups into configured groups tree"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1316
+#: setup/class_setupStep_Migrate.inc:1315
#, php-format
msgid "Found %s department(s) that will not be visible in FusionDirectory."
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1325
-#: setup/class_setupStep_Migrate.inc:1330
+#: setup/class_setupStep_Migrate.inc:1324
+#: setup/class_setupStep_Migrate.inc:1329
msgid "Department migration"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1380
+#: setup/class_setupStep_Migrate.inc:1379
#, php-format
msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
msgstr ""
-#: setup/class_setupStep_Migrate.inc:1424
+#: setup/class_setupStep_Migrate.inc:1423
#, php-format
msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
msgstr ""
@@ -743,10 +743,10 @@ msgstr ""
#: include/class_logging.inc:80 include/class_session.inc:50
#: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:649
-#: include/functions.inc:770 include/functions.inc:1189
-#: include/functions.inc:2243 include/functions.inc:2285
-#: include/functions.inc:2314 include/class_ldap.inc:873
+#: include/functions.inc:564 include/functions.inc:651
+#: include/functions.inc:772 include/functions.inc:1201
+#: include/functions.inc:2255 include/functions.inc:2297
+#: include/functions.inc:2326 include/class_ldap.inc:873
#: include/class_ldap.inc:911 include/class_acl.inc:118
msgid "Internal error"
msgstr ""
@@ -813,12 +813,12 @@ msgid ""
"plugin instance!"
msgstr ""
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1188
+#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
#: include/class_listing.inc:1190
msgid "Root"
msgstr "æ ¹"
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
msgid "Submit"
msgstr "æ交"
@@ -919,7 +919,7 @@ msgid "Create a new snapshot from this object"
msgstr ""
#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3302 include/simpleplugin/class_simplePlugin.inc:272
+#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
#: include/simpleplugin/class_simplePlugin.inc:277
#: include/simpleplugin/class_simplePlugin.inc:289
#: html/class_passwordRecovery.inc:116
@@ -952,7 +952,7 @@ msgstr ""
#: include/password-methods/class_password-methods-sha.inc:69
#: include/password-methods/class_password-methods-ssha.inc:73
#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:659 include/class_timezone.inc:51
+#: include/functions.inc:661 include/class_timezone.inc:51
#: include/class_config.inc:159 include/class_config.inc:284
#: include/class_config.inc:843 include/class_config.inc:856
#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
@@ -990,7 +990,7 @@ msgid "Cannot paste"
msgstr ""
#: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
#: plugins/personal/generic/paste_generic.tpl.c:11
msgid "Login"
@@ -1034,245 +1034,245 @@ msgid ""
"administrator."
msgstr ""
-#: include/functions.inc:597
+#: include/functions.inc:599
msgid "Authentication error"
msgstr ""
-#: include/functions.inc:598
+#: include/functions.inc:600
msgid ""
"It seems your user password has expired. Please use <a "
"href=\"recovery.php\">password recovery</a> to change it."
msgstr ""
-#: include/functions.inc:649 include/functions.inc:770
+#: include/functions.inc:651 include/functions.inc:772
msgid "Error while adding a lock. Contact the developers!"
msgstr ""
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid ""
"Cannot create locking information in LDAP tree. Please contact your "
"administrator!"
msgstr ""
-#: include/functions.inc:659
+#: include/functions.inc:661
#, php-format
msgid "LDAP server returned: %s"
msgstr ""
-#: include/functions.inc:838
+#: include/functions.inc:850
msgid ""
"Found multiple locks for object to be locked. This should not happen - "
"cleaning up multiple references."
msgstr ""
-#: include/functions.inc:1109
+#: include/functions.inc:1121
#, php-format
msgid "The size limit of %d entries is exceed!"
msgstr "超过了 %d 个æ¡ç›®çš„大å°é™åˆ¶ï¼"
-#: include/functions.inc:1111
+#: include/functions.inc:1123
#, php-format
msgid ""
"Set the new size limit to %s and show me this message if the limit still "
"exceeds"
msgstr "设置新的大å°é™åˆ¶ä¸º %s 并且如果é™åˆ¶ä¾ç„¶è¶…出还显示这æ¡ä¿¡æ¯ã€‚"
-#: include/functions.inc:1128
+#: include/functions.inc:1140
msgid "Configure"
msgstr "é…ç½®"
-#: include/functions.inc:1133
+#: include/functions.inc:1145
msgid "incomplete"
msgstr "ä¸å®Œæ•´"
-#: include/functions.inc:1534
+#: include/functions.inc:1546
msgid "Continue anyway"
msgstr "ä»ç„¶ç»§ç»"
-#: include/functions.inc:1536
+#: include/functions.inc:1548
msgid "Edit anyway"
msgstr "ä»ç„¶ç¼–辑"
-#: include/functions.inc:1538
+#: include/functions.inc:1550
#, php-format
msgid "You're going to edit the LDAP entry/entries %s"
msgstr ""
-#: include/functions.inc:1766
+#: include/functions.inc:1778
msgid "Entries per page"
msgstr "æ¯é¡µæ¡ç›®æ•°"
-#: include/functions.inc:1797 include/class_filter.inc:353
+#: include/functions.inc:1809 include/class_filter.inc:353
msgid "Apply filter"
msgstr "应用过滤器"
-#: include/functions.inc:2065
+#: include/functions.inc:2077
#, php-format
msgid "%sB"
msgstr ""
-#: include/functions.inc:2066
+#: include/functions.inc:2078
#, php-format
msgid "%sKiB"
msgstr ""
-#: include/functions.inc:2067
+#: include/functions.inc:2079
#, php-format
msgid "%sMiB"
msgstr ""
-#: include/functions.inc:2068
+#: include/functions.inc:2080
#, php-format
msgid "%sGiB"
msgstr ""
-#: include/functions.inc:2069
+#: include/functions.inc:2081
#, php-format
msgid "%sTiB"
msgstr ""
-#: include/functions.inc:2070
+#: include/functions.inc:2082
#, php-format
msgid "%sPiB"
msgstr ""
-#: include/functions.inc:2071
+#: include/functions.inc:2083
#, php-format
msgid "%sEiB"
msgstr ""
-#: include/functions.inc:2072
+#: include/functions.inc:2084
#, php-format
msgid "%sZiB"
msgstr ""
-#: include/functions.inc:2073
+#: include/functions.inc:2085
#, php-format
msgid "%sYiB"
msgstr ""
-#: include/functions.inc:2105 include/class_filter.inc:315
+#: include/functions.inc:2117 include/class_filter.inc:315
msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
-#: include/functions.inc:2243
+#: include/functions.inc:2255
#, php-format
msgid ""
"File '%s' could not be deleted. Try fusiondirectory-setup --check-"
"directories to fix permissions."
msgstr ""
-#: include/functions.inc:2285
+#: include/functions.inc:2297
msgid "Cannot write to revision file!"
msgstr ""
-#: include/functions.inc:2314
+#: include/functions.inc:2326
msgid "Cannot read to revision file!"
msgstr ""
-#: include/functions.inc:2523
+#: include/functions.inc:2535
msgid "'nextIdHook' is not available. Using default base!"
msgstr ""
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "LDAP warning"
msgstr ""
-#: include/functions.inc:2541
+#: include/functions.inc:2554
msgid "Cannot get schema information from server. No schema check possible!"
msgstr ""
-#: include/functions.inc:2564
+#: include/functions.inc:2577
msgid "Main FusionDirectory schema"
msgstr ""
-#: include/functions.inc:2571
+#: include/functions.inc:2584
msgid "Schema used to store FusionDirectory configuration"
msgstr ""
-#: include/functions.inc:2578
+#: include/functions.inc:2591
msgid "Used to store trust mode information in users or groups."
msgstr ""
-#: include/functions.inc:2585
+#: include/functions.inc:2598
msgid "Used to store templates."
msgstr ""
-#: include/functions.inc:2592
+#: include/functions.inc:2605
msgid "Used to store POSIX information."
msgstr ""
-#: include/functions.inc:2599
+#: include/functions.inc:2612
#, php-format
msgid "Missing required object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2601
+#: include/functions.inc:2614
#, php-format
msgid "Missing optional object class \"%s\"!"
msgstr ""
-#: include/functions.inc:2605
+#: include/functions.inc:2618
#, php-format
msgid "Class(es) available"
msgstr ""
-#: include/functions.inc:2623
+#: include/functions.inc:2636
msgid ""
"You have installed the mixed groups plugin, but your schema configuration "
"does not support this."
msgstr ""
-#: include/functions.inc:2624
+#: include/functions.inc:2637
msgid ""
"In order to use mixed groups the objectClass \"posixGroup\" must be "
"AUXILIARY"
msgstr ""
-#: include/functions.inc:2627
+#: include/functions.inc:2640
msgid ""
"Your schema is configured to support mixed groups, but this plugin is not "
"present."
msgstr ""
-#: include/functions.inc:2628
+#: include/functions.inc:2641
msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
-#: include/functions.inc:3112 include/functions.inc:3133
-#: include/functions.inc:3173 include/functions.inc:3185
-#: include/functions.inc:3189 include/functions.inc:3196
-#: include/functions.inc:3205
+#: include/functions.inc:3125 include/functions.inc:3146
+#: include/functions.inc:3186 include/functions.inc:3198
+#: include/functions.inc:3202 include/functions.inc:3209
+#: include/functions.inc:3218
msgid "Cannot allocate a free ID:"
msgstr ""
-#: include/functions.inc:3112
+#: include/functions.inc:3125
msgid "unknown idAllocation method!"
msgstr ""
-#: include/functions.inc:3133
+#: include/functions.inc:3146
#, php-format
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3173
+#: include/functions.inc:3186
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3185 include/functions.inc:3189
+#: include/functions.inc:3198 include/functions.inc:3202
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3205
+#: include/functions.inc:3218
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3267
+#: include/functions.inc:3280
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3303
+#: include/functions.inc:3316
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
@@ -2102,7 +2102,7 @@ msgstr "å称"
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
#: plugins/admin/departments/class_department.inc:72
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/groups/class_roleGeneric.inc:91
@@ -2282,7 +2282,7 @@ msgid "The entry %s is not existing"
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:548
+#: include/class_plugin.inc:554
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!"
@@ -2398,14 +2398,19 @@ msgstr ""
msgid "There was a problem uncompressing snapshot data"
msgstr ""
-#: include/class_plugin.inc:803
+#: include/class_plugin.inc:809
#, php-format
msgid ""
"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
msgstr ""
-#: include/class_plugin.inc:1332
+#: include/class_plugin.inc:1350
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/class_plugin.inc:1352
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -2553,44 +2558,44 @@ msgstr "您的æµè§ˆå™¨å·²ç»ç¦ç”¨ cookies。请å¯ç”¨ cookies 并在登录å‰
msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
msgstr ""
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
msgid "Email address"
msgstr "邮件地å€"
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
#, php-format
msgid "Did not find an account with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
#, php-format
msgid "Found multiple accounts with login \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
#, php-format
msgid "There is no account using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
#, php-format
msgid "There are several accounts using email \"%s\""
msgstr ""
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
#, php-format
msgid "The user using email \"%s\" is locked. Please contact your administrator."
msgstr ""
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
msgid "Contact your administrator, there was a problem with mail server"
msgstr ""
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
msgid "This token is invalid"
msgstr ""
-#: html/class_passwordRecovery.inc:647
+#: html/class_passwordRecovery.inc:651
msgid "There was a problem with mail server, confirmation email not sent"
msgstr ""
@@ -2902,7 +2907,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
#: setup/setup_migrate_adminAccount.tpl.c:14
#: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
#: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2939,258 +2944,262 @@ msgstr ""
msgid "User account"
msgstr ""
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:296
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:307
msgid "Personal information"
msgstr "个人信æ¯"
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "姓"
-#: plugins/personal/generic/class_user.inc:309
+#: plugins/personal/generic/class_user.inc:312
msgid "Last name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "å"
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:317
msgid "First name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:319
+#: plugins/personal/generic/class_user.inc:322
msgid "Short description of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "Picture"
msgstr ""
-#: plugins/personal/generic/class_user.inc:323
+#: plugins/personal/generic/class_user.inc:326
msgid "The avatar for this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:330
+#: plugins/personal/generic/class_user.inc:333
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:334
+#: plugins/personal/generic/class_user.inc:337
#: plugins/admin/departments/class_department.inc:90
#: plugins/admin/departments/class_department.inc:96
msgid "Location"
msgstr "ä½ç½®"
-#: plugins/personal/generic/class_user.inc:338
+#: plugins/personal/generic/class_user.inc:341
#: plugins/admin/departments/class_department.inc:93
msgid "State"
msgstr "å·ž/çœ"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
#: plugins/admin/departments/class_department.inc:102
msgid "Address"
msgstr "ä½å€"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:345
msgid "Business postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room No."
msgstr "房间å·"
-#: plugins/personal/generic/class_user.inc:346
+#: plugins/personal/generic/class_user.inc:349
msgid "Room number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
#: plugins/admin/departments/class_department.inc:106
msgid "Phone"
msgstr "电è¯"
-#: plugins/personal/generic/class_user.inc:350
+#: plugins/personal/generic/class_user.inc:353
msgid "Business phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Mobile"
msgstr "手机"
-#: plugins/personal/generic/class_user.inc:355
+#: plugins/personal/generic/class_user.inc:358
msgid "Business mobile number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Pager"
msgstr "呼机"
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:362
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
#: plugins/admin/departments/class_department.inc:110
msgid "Fax"
msgstr "ä¼ çœŸ"
-#: plugins/personal/generic/class_user.inc:363
+#: plugins/personal/generic/class_user.inc:366
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Homepage"
msgstr "个人主页"
-#: plugins/personal/generic/class_user.inc:367
+#: plugins/personal/generic/class_user.inc:370
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:373
+#: plugins/personal/generic/class_user.inc:376
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:378
+#: plugins/personal/generic/class_user.inc:381
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:390
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:393
+#: plugins/personal/generic/class_user.inc:396
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Display name"
msgstr "显示å称"
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:400
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:401
+#: plugins/personal/generic/class_user.inc:404
msgid "Home postal address"
msgstr "ä½å®…地å€"
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Private phone"
msgstr "ç§äººç”µè¯"
-#: plugins/personal/generic/class_user.inc:405
+#: plugins/personal/generic/class_user.inc:408
msgid "Home phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:411
+#: plugins/personal/generic/class_user.inc:414
msgid "Organizational information"
msgstr "组织信æ¯"
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
msgid "Title"
msgstr "称谓"
-#: plugins/personal/generic/class_user.inc:416
+#: plugins/personal/generic/class_user.inc:419
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:421
+#: plugins/personal/generic/class_user.inc:424
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
msgid "Organization"
msgstr "组织/å…¬å¸"
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
#: plugins/admin/departments/class_department.inc:33
#: plugins/admin/departments/class_department.inc:39
#: plugins/admin/departments/dep-list.xml:21
msgid "Department"
msgstr "部门"
-#: plugins/personal/generic/class_user.inc:425
+#: plugins/personal/generic/class_user.inc:428
msgid "Department to which the user belongs"
msgstr ""
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department No."
msgstr "部门编å·"
-#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:432
msgid "Department number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee No."
msgstr "员工编å·"
-#: plugins/personal/generic/class_user.inc:433
+#: plugins/personal/generic/class_user.inc:436
msgid "Employee number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:437
+#: plugins/personal/generic/class_user.inc:440
msgid "Employee type"
msgstr "员工类别"
-#: plugins/personal/generic/class_user.inc:441
+#: plugins/personal/generic/class_user.inc:444
#: plugins/admin/departments/class_department.inc:84
msgid "Manager"
msgstr ""
-#: plugins/personal/generic/class_user.inc:608
+#: plugins/personal/generic/class_user.inc:611
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:614
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:622
+#: plugins/personal/generic/class_user.inc:625
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:636
+#: plugins/personal/generic/class_user.inc:639
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:641
-#: plugins/personal/generic/class_user.inc:645
+#: plugins/personal/generic/class_user.inc:644
+#: plugins/personal/generic/class_user.inc:648
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:652
+#: plugins/personal/generic/class_user.inc:655
msgid "You need to specify your current password in order to proceed."
msgstr "您需è¦è¾“入当å‰å£ä»¤æ‰èƒ½ç»§ç»ã€‚"
-#: plugins/personal/generic/class_user.inc:654
+#: plugins/personal/generic/class_user.inc:657
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:656
+#: plugins/personal/generic/class_user.inc:659
#: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
msgid "New password"
msgstr "æ–°å£ä»¤"
-#: plugins/personal/generic/class_user.inc:658
+#: plugins/personal/generic/class_user.inc:661
msgid "The password used as new and current are too similar."
msgstr "输入的新å£ä»¤å’Œå½“å‰å£ä»¤éžå¸¸ç›¸ä¼¼ã€‚"
-#: plugins/personal/generic/class_user.inc:660
+#: plugins/personal/generic/class_user.inc:663
msgid "The password used as new is to short."
msgstr "输入的新å£ä»¤å¤ªçŸäº†ã€‚"
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:665
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
@@ -3298,36 +3307,46 @@ msgid ""
"recover their password"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:189
+msgid "Login attribute"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
msgid "First email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
msgid "Subject"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
msgid "Subject of the first email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
msgid "[FusionDirectory] Password recovery link"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
#, php-format
msgid "Body (first %s is login, second is link)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
#, php-format
msgid ""
"Body of the first email, sent when the user ask for a new password. Use %s "
"for the login and the recovery link."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
#, php-format
msgid ""
"Hello,\n"
@@ -3339,31 +3358,31 @@ msgid ""
"This link is only valid for 10 minutes."
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
msgid "Second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
msgid "Subject of the second email"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
msgid "[FusionDirectory] Password recovery successful"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
#, php-format
msgid "Body (%s is login)"
msgstr ""
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
#, 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
+#: plugins/config/class_recoveryConfig.inc:118
#, php-format
msgid ""
"Hello,\n"
@@ -3530,10 +3549,6 @@ msgstr ""
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 ""
@@ -4396,7 +4411,7 @@ msgstr ""
msgid "Only allow this group to connect to this list of hosts"
msgstr ""
-#: plugins/admin/groups/class_ogroup.inc:321
+#: plugins/admin/groups/class_ogroup.inc:322
msgid ""
"Putting both workstations and terminals in the same group is not allowed"
msgstr ""
diff --git a/plugins/addons/dashboard/groups_stats.tpl b/plugins/addons/dashboard/groups_stats.tpl
index f7b7b69c2d66cd6cf6cb88bc9a2ececa06046d27..d23594febbc8d9eb57728b1772a2e57ad784ac1a 100644
--- a/plugins/addons/dashboard/groups_stats.tpl
+++ b/plugins/addons/dashboard/groups_stats.tpl
@@ -8,7 +8,7 @@
<ul>
{foreach from=$attributes.groups_stats.groups item=g}
<li style="list-style-image:url({$g.img|escape})">
- {if $g.nb > 0}
+ {if $g.nb >= 1}
{t count=$g.nb 1=$g.name 2=$g.nb plural="%2 are %1 groups"}One of them is a %1 group{/t}
{else}
{t 1=$g.name}There is no %1 group{/t}
diff --git a/plugins/addons/dashboard/pwd_stats.tpl b/plugins/addons/dashboard/pwd_stats.tpl
index fa830389da18919a9db2e0ea6adb56c2e0979e6e..81a392314cf984c5af6fa8fc31bd38a73a53c972 100644
--- a/plugins/addons/dashboard/pwd_stats.tpl
+++ b/plugins/addons/dashboard/pwd_stats.tpl
@@ -7,7 +7,7 @@
{t count=$attributes.pwds_stats.nb 1=$attributes.pwds_stats.nb plural="There are %1 users:"}There is 1 user:{/t}
<ul>
{foreach from=$attributes.pwds_stats.methods item=method}
- {if $method.nb > 0}
+ {if $method.nb >= 1}
{if $method.style == "default"}
<li style="color:green;">
{elseif $method.style == "clear"}
@@ -22,7 +22,7 @@
{/if}
{/foreach}
<li style="list-style-image:url({$attributes.pwds_stats.locked_accounts.img|escape})">
- {if $attributes.pwds_stats.locked_accounts.nb > 0}
+ {if $attributes.pwds_stats.locked_accounts.nb >= 1}
{t count=$attributes.pwds_stats.locked_accounts.nb 1=$attributes.pwds_stats.locked_accounts.nb plural="%1 of them are locked"}One of them is locked{/t}
{else}
{t}None of them is locked{/t}
diff --git a/plugins/addons/dashboard/users_accounts.tpl b/plugins/addons/dashboard/users_accounts.tpl
index fcb8f286284a29a58d280dc65e7ce1a5841d4c1d..696b9e7c1f415fb4e196c71ac77bc21a8f8b328c 100644
--- a/plugins/addons/dashboard/users_accounts.tpl
+++ b/plugins/addons/dashboard/users_accounts.tpl
@@ -4,13 +4,13 @@
</span>
<div>
<h1>
- {if $attributes.expired.accounts|@count > 0}
+ {if $attributes.expired.accounts|@count >= 1}
{t count=$attributes.expired.accounts|@count 1=$attributes.expired.accounts|@count plural="There are %1 expired accounts"}There is one expired account{/t}
{else}
{t}There is no expired account{/t}
{/if}
</h1>
- {if $attributes.expired.accounts|@count > 0}
+ {if $attributes.expired.accounts|@count >= 1}
<table style="width: 100%;" class="listingTable">
<colgroup>
<col width="10%"/>
@@ -54,13 +54,13 @@
{/if}
<h1>
- {if $attributes.expired.accounts_next_days|@count > 0}
+ {if $attributes.expired.accounts_next_days|@count >= 1}
{t count=$attributes.expired.accounts_next_days|@count 1=$attributes.expired.next_days 2=$attributes.expired.accounts_next_days|@count plural="There are %2 accounts expiring in the next %1 days"}There is one account expiring in the next %1 days{/t}
{else}
{t 1=$attributes.expired.next_days}There is no account expiring in the next %1 days{/t}
{/if}
</h1>
- {if $attributes.expired.accounts_next_days|@count > 0}
+ {if $attributes.expired.accounts_next_days|@count >= 1}
<table style="width: 100%;" class="listingTable">
<colgroup>
<col width="10%"/>
diff --git a/plugins/addons/dashboard/users_stats.tpl b/plugins/addons/dashboard/users_stats.tpl
index 2f963bdafe6fa7375aeea037377c96f5c0a252ab..8ab88c0999bb36fcb3bba890370b542031df11d0 100644
--- a/plugins/addons/dashboard/users_stats.tpl
+++ b/plugins/addons/dashboard/users_stats.tpl
@@ -8,7 +8,7 @@
<ul>
{foreach from=$attributes.users_stats.accounts item=acc}
<li style="list-style-image:url({$acc.img|escape})">
- {if $acc.nb > 0}
+ {if $acc.nb >= 1}
{t count=$acc.nb 1=$acc.name 2=$acc.nb plural="%2 of them have a %1 account"}One of them have a %1 account{/t}
{else}
{t 1=$acc.name}None of them have a %1 account{/t}
diff --git a/plugins/admin/groups/class_ogroup.inc b/plugins/admin/groups/class_ogroup.inc
index b00805b09fa4b9c9272059e63548bfce833306a9..731b94c4f3d6c7e9fe5afe63da0714853ed7ae2e 100644
--- a/plugins/admin/groups/class_ogroup.inc
+++ b/plugins/admin/groups/class_ogroup.inc
@@ -235,6 +235,7 @@ class ogroup extends simplePlugin
function __construct ($dn = NULL, $object = NULL, $parent = NULL, $mainTab = FALSE)
{
+ global $config;
parent::__construct($dn, $object, $parent, $mainTab);
$this->attributesAccess['trustMode']->setInLdap(FALSE);
diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc
index b748a8e2495551fa2462268459a210d9a994b463..7b7b2977e62c30fc6615ec284fb5469122912dcf 100644
--- a/plugins/admin/users/class_userManagement.inc
+++ b/plugins/admin/users/class_userManagement.inc
@@ -142,7 +142,7 @@ class userManagement extends simpleManagement
// Filter out entries we are not allowed to modify
$disallowed = array();
foreach ($entry as $dn) {
- if (!preg_match('/w/', $ui->get_permissions($dn, 'user/user', 'userPassword'))) {
+ if (!preg_match('/w/', $ui->get_permissions($dn, 'user/user', 'userLock'))) {
$disallowed[] = $dn;
} else {
$allowed[] = $dn;
diff --git a/plugins/config/class_recoveryConfig.inc b/plugins/config/class_recoveryConfig.inc
index d16163f1852a0d547b04f9ec93eb188e0aea264d..9492f5011601381876e24cbe2e8c5828d5d5a0d0 100644
--- a/plugins/config/class_recoveryConfig.inc
+++ b/plugins/config/class_recoveryConfig.inc
@@ -74,6 +74,11 @@ class recoveryConfig extends simplePlugin
'fdPasswordRecoveryUseAlternate',
FALSE
),
+ new StringAttribute (
+ _('Login attribute'), _('Usually uid, but you can use something else for instance in case of SSO'),
+ 'fdPasswordRecoveryLoginAttribute', TRUE,
+ 'uid'
+ ),
)
),
'first_email' => array (
diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index 05005f6935684c93571f82c5285b53adb4b53cc2..8c5679ffd88789c10e216f08e80cdd84e70f0db6 100644
--- a/plugins/personal/generic/class_user.inc
+++ b/plugins/personal/generic/class_user.inc
@@ -291,7 +291,10 @@ class user extends simplePlugin
'manager' => array('user','dn')
),
- 'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
+ 'plProvidedAcls' => array_merge(
+ parent::generatePlProvidedAcls(static::getAttributesInfo()),
+ array('userLock' => _('User lock status'))
+ )
);
}
diff --git a/plugins/personal/posix/class_posixAccount.inc b/plugins/personal/posix/class_posixAccount.inc
index 079fd325a0f7115a2eadf11fc5ad195ec8805774..e4afb7e54190ab98c0a8c069bfae2ad592d5dec3 100644
--- a/plugins/personal/posix/class_posixAccount.inc
+++ b/plugins/personal/posix/class_posixAccount.inc
@@ -679,8 +679,6 @@ class posixAccount extends simplePlugin
if (isset($this->attrs['posixGroups'])) {
unset($this->attrs['posixGroups']['count']);
$this->groupMembership = $this->attrs['posixGroups'];
- } else {
- $this->groupMembership = array();
}
if (isset($this->attrs['force_ids'])) {
diff --git a/plugins/personal/roles/class_userRoles.inc b/plugins/personal/roles/class_userRoles.inc
index cd4efc9d0cd892d6529ebd07e17f3a93a43f2ca0..b74f49813540d989496d175d33dbca0080759edb 100644
--- a/plugins/personal/roles/class_userRoles.inc
+++ b/plugins/personal/roles/class_userRoles.inc
@@ -75,7 +75,7 @@ class userRoles extends simplePlugin
/* Groups handling */
$groups = array();
- $groupsattrs = objects::ls('ogroup', array('cn' => 1, 'description' => 1));
+ $groupsattrs = objects::ls('ogroup', array('cn' => 1, 'description' => 1), NULL, '', TRUE);
foreach ($groupsattrs as $dn => $groupattr) {
$groupDisplay = $groupattr['cn'];
if (isset($groupattr['description'])) {
@@ -87,11 +87,12 @@ class userRoles extends simplePlugin
$groups[$dn] = $groupDisplay;
}
$this->attributesAccess['groupsMembership']->setInLdap(FALSE);
- $this->attributesAccess['groupsMembership']->attribute->setChoices(array_keys($groups), array_values($groups));
if ($this->is_template) {
if (isset($this->attrs['userGroups'])) {
unset($this->attrs['userGroups']['count']);
- $this->groupsMembership = $this->attrs['userGroups'];
+ $myGroups = array_combine($this->attrs['userGroups'], $this->attrs['userGroups']);
+ } else {
+ $myGroups = array();
}
} else {
if (($this->dn != '') && ($this->dn != 'new')) {
@@ -102,13 +103,16 @@ class userRoles extends simplePlugin
} else {
$myGroups = array();
}
- $this->attributesAccess['groupsMembership']->setValue(array_keys($myGroups));
$this->savedGroupsMembership = array_keys($myGroups);
}
+ /* We might be in some groups we have no read ACL on, so merge them in the choices */
+ $groups = array_merge($myGroups, $groups);
+ $this->attributesAccess['groupsMembership']->attribute->setChoices(array_keys($groups), array_values($groups));
+ $this->attributesAccess['groupsMembership']->setValue(array_keys($myGroups));
/* Roles handling */
$roles = array();
- $rolesattrs = objects::ls('role', array('cn' => 1, 'description' => 1));
+ $rolesattrs = objects::ls('role', array('cn' => 1, 'description' => 1), NULL, '', TRUE);
foreach ($rolesattrs as $dn => $roleattr) {
$roleDisplay = $roleattr['cn'];
if (isset($roleattr['description'])) {
@@ -120,11 +124,12 @@ class userRoles extends simplePlugin
$roles[$dn] = $roleDisplay;
}
$this->attributesAccess['rolesMembership']->setInLdap(FALSE);
- $this->attributesAccess['rolesMembership']->attribute->setChoices(array_keys($roles), array_values($roles));
if ($this->is_template) {
if (isset($this->attrs['userRoles'])) {
unset($this->attrs['userRoles']['count']);
- $this->rolesMembership = $this->attrs['userRoles'];
+ $myRoles = array_combine($this->attrs['userRoles'], $this->attrs['userRoles']);
+ } else {
+ $myRoles = array();
}
} else {
if (($this->dn != '') && ($this->dn != 'new')) {
@@ -135,9 +140,12 @@ class userRoles extends simplePlugin
} else {
$myRoles = array();
}
- $this->attributesAccess['rolesMembership']->setValue(array_keys($myRoles));
$this->savedRolesMembership = array_keys($myRoles);
}
+ /* We might be in some roles we have no read ACL on, so merge them in the choices */
+ $roles = array_merge($myRoles, $roles);
+ $this->attributesAccess['rolesMembership']->attribute->setChoices(array_keys($roles), array_values($roles));
+ $this->attributesAccess['rolesMembership']->setValue(array_keys($myRoles));
$this->is_account = ((count($this->rolesMembership) > 0) || (count($this->groupsMembership) > 0));
$this->initially_was_account = $this->is_account;
@@ -273,16 +281,14 @@ class userRoles extends simplePlugin
if (isset($this->attrs['userGroups'])) {
unset($this->attrs['userGroups']['count']);
$this->groupsMembership = $this->attrs['userGroups'];
- } else {
- $this->groupsMembership = array();
}
$this->savedRolesMembership = $this->rolesMembership;
if (isset($this->attrs['userRoles'])) {
unset($this->attrs['userRoles']['count']);
$this->rolesMembership = $this->attrs['userRoles'];
- } else {
- $this->rolesMembership = array();
}
+
+ $this->is_account = ((count($this->rolesMembership) > 0) || (count($this->groupsMembership) > 0));
}
}