diff --git a/Changelog b/Changelog
index d62b8622f3162d1aa50595ec86db333c84c85f22..03a429f420317448a54f4f38e1f1521ae10fe55f 100644
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,34 @@
FusionDirectory changelog
=========================
+* FusionDirectory 1.0.11
+
+|Fix] FusionDirectory plugins - Bugs #4391: Choices order seems random in shell
+|Fix] Bugs #4621: Use of mcrypt should be removed
+|Fix] FusionDirectory plugins - Bugs #4630: DNS adding reverse zone issue (tested on FD 1.0.10) in class B and class A
+|Fix] FusionDirectory plugins - Bugs #4631: DNS menu is not displayed without systems plugin
+|Fix] FusionDirectory plugins - Bugs #4632: Webservice needs a better method for modification
+|Fix] Bugs #4633: change requirement to php 5.4 for centos
+|Fix] Bugs #4634: DNS PTR migration does not work
+|Fix] FusionDirectory plugins - Bugs #4635: [DNS] Reverse zone association breaks when there are several A record for the same domain.
+|Fix] FusionDirectory plugins - Bugs #4636: [SYSTEMS] When add Windows Workstation (winStation) and enable DHCP it will not be enabled when edit again
+|Fix] FusionDirectory plugins - Bugs #4637: DNS tab won’t work on winstations
+|Fix] Bugs #4638: UI issue, entry disappear in 'Base' dropdown
+|Fix] Bugs #4639: depending on FD language setting, the calendar doesn't show up on icon click
+|Fix] Bugs #4640: strange error when following org's link from user "references" tab
+|Fix] Bugs #4652: The weird _copy fallback should be removed
+|Fix] Bugs #4653: Having a wrong default location should trigger a fatal error
+|Fix] FusionDirectory plugins - Bugs #4654: DHCP seems to use inexistant method getCn
+|Fix] Bugs #4655: The edit anyway button does not work in my account menu
+|Fix] FusionDirectory plugins - Bugs #4658: csv import with empty field
+|Fix] Bugs #4659: when creating a user via template or csv import, mandatory , alreay defined fields have to be re-inputed even if already defined
+|Fix] Bugs #4667: Samba munged dial fields are always asked when using a template
+|Fix] Bugs #4673: ImageAttribute are broken
+|Fix] FusionDirectory plugins - Bugs #4675: csv import, add an option for not importing anything in case of error
+|Fix] FusionDirectory plugins - Bugs #4676: Edit IDs problems related to our selenium test
+|Fix] FusionDirectory plugins - Wishlist #4657: community organization membership type
+|Fix] FusionDirectory plugins - Wishlist #4660: csv import lacks an option or help on what to do with the first line
+
* FusionDirectory 1.0.10
[Feature] Bugs #1217: DNS service must be redone
diff --git a/contrib/bin/fusiondirectory-setup b/contrib/bin/fusiondirectory-setup
index 4a50345cdf25f3bbd5a115b709ac218e4488add7..a008f2a1f35b85c912e38176c6d98be3719c54fa 100644
--- a/contrib/bin/fusiondirectory-setup
+++ b/contrib/bin/fusiondirectory-setup
@@ -732,7 +732,7 @@ sub get_ldap_connexion {
# read ldap's server's info from /etc/fusiondirectory/fusiondirectory.conf
if (-e $fd_config) {
my $twig = XML::Twig->new(); # create the twig
- $twig->parsefile($fd_config); # build it
+ $twig->safe_parsefile($fd_config) or die("There is an error in $fd_config XMLÂ code: ".(split /\n/, $@)[1]."\n");
my @locs = $twig->root->first_child('main')->children('location');
my %locations = ();
foreach my $loc (@locs) {
@@ -1363,7 +1363,27 @@ sub migrate_dns {
$result->code && die "Migration of DNS zone subentry failed, LDAP error: ".$result->error."\n";
}
+ # Fix reverse zone PTR records DNs
+ $mesg = $ldap->search(
+ base => $zoneDn,
+ filter => "(&(objectClass=dNSZone)(!(relativeDomainName=@))(|(zoneName=*.arpa)(zoneName=*.arpa.)))"
+ );
+ $mesg->code && die $mesg->error;
+
+ @entries = $mesg->entries;
+
+ foreach my $entry (@entries) {
+ $entry->dn() =~ m/^([^,]+),relativeDomainName=[^,]+,$zoneDn$/ or next;
+ $result = $ldap->moddn (
+ $entry->dn(),
+ newrdn => $1,
+ deleteoldrdn => '1',
+ newsuperior => 'zoneName='.$entry->get_value('zoneName').','.$zoneDn
+ );
+ $result->code && die "Migration of DNS reverse zone subentry ".$entry->dn()." failed, LDAP error: ".$result->error."\n";
+ }
+ # Add DNS tab on server
$mesg = $ldap->search(
base => $systemdn,
scope => 'base',
diff --git a/contrib/docs/UPGRADE b/contrib/docs/UPGRADE
index 1f06c27a8f16a170a67186ff4e52246609e79dae..7b2098f114716003db95a7c57718af521727c272 100644
--- a/contrib/docs/UPGRADE
+++ b/contrib/docs/UPGRADE
@@ -1265,6 +1265,32 @@ If they are old objectClasses it will warn you and you will have to remove it by
!! Please read it carefully before applying !!
+Migrate FusionDirectory from 1.0.10 to 1.0.11
+=============================================
+
+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
+
+
---
* Further information
diff --git a/html/include/datepicker.js b/html/include/datepicker.js
index 72de050f70d77ddf6e216dc77fe7ba5184b86e05..d6a21359540a5874e03d63d469a710ed9f640ceb 100644
--- a/html/include/datepicker.js
+++ b/html/include/datepicker.js
@@ -256,8 +256,12 @@ DatePicker.prototype = {
/* arguments */
this._relative= h_p["relative"];
- if (h_p["language"])
+ if (h_p["language"]) {
this._language = h_p["language"];
+ if (this._language_close.get(this._language) == undefined) {
+ this._language = 'en';
+ }
+ }
this._zindex = ( h_p["zindex"] ) ? parseInt(Number(h_p["zindex"])) : 999;
if (!Object.isUndefined(h_p["keepFieldEmpty"]))
this._keepFieldEmpty = h_p["keepFieldEmpty"];
diff --git a/include/class_config.inc b/include/class_config.inc
index ff25f9c41092bf804ad6528bdfee47aee27c9a04..25b01398ec6be48dd8448c8190b1eef76cd1eb30 100644
--- a/include/class_config.inc
+++ b/include/class_config.inc
@@ -293,11 +293,12 @@ class config {
session::global_set('HTTP_FDKEY_CACHE', $cache);
} catch (Exception $e) {
$msg = sprintf(
- _('It seems you are trying to decode something which is not encoded : %s<br/>\n'.
+ _('It seems you are trying to decode something which is not encoded : %s<br/>'."\n".
'Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted.'),
$e->getMessage()
);
- msg_dialog::display(_("Configuration error"), $msg, FATAL_ERROR_DIALOG);
+ msg_dialog::display(_('Configuration error'), $msg, FATAL_ERROR_DIALOG);
+ exit;
}
}
return $cache[$creds];
@@ -368,6 +369,10 @@ class config {
*/
function set_current($name)
{
+ if (!isset($this->data['LOCATIONS'][$name])) {
+ msg_dialog::display(_('Error'), sprintf(_('Location "%s" could not be found in the configuration file'), $name), FATAL_ERROR_DIALOG);
+ exit;
+ }
$this->current = $this->data['LOCATIONS'][$name];
if (isset($this->current['INITIAL_BASE'])) {
@@ -608,13 +613,10 @@ class config {
}
}
-
/*!
* \brief Store the departments from ldap in $this->departments
- *
- * \param string $ignore_dn dn of the department
*/
- function get_departments($ignore_dn = "")
+ function get_departments()
{
/* Initialize result hash */
$result = array();
@@ -629,14 +631,14 @@ class config {
$types = departmentManagement::getDepartmentTypes();
/* Create a list of attributes to fetch */
- $filter = "";
- $ldap_values = array("objectClass", "description");
+ $filter = '';
+ $ldap_values = array('objectClass', 'description');
foreach ($types as $type) {
$i = objects::infos($type);
$filter .= $i['filter'];
$ldap_values[] = $i['mainAttr']; // Specific key for departement objectTypes
}
- $filter = "(|".$filter.")";
+ $filter = '(|'.$filter.')';
/* Get list of department objects */
$ldap = $this->get_ldap_link();
@@ -660,17 +662,15 @@ class config {
$dn = $ldap->getDN();
$data = objects::infos($oc);
- $this->department_info[$dn] = array("img" => $data['icon'],
- "description" => isset($attrs['description'][0])?$attrs['description'][0]:"",
- "name" => $attrs[$data['mainAttr']][0]);
-
- if ($dn == $ignore_dn) {
- continue;
- }
- $c_dn = convert_department_dn($dn)." (".$data['mainAttr'].")";
+ $this->department_info[$dn] = array(
+ 'img' => $data['icon'],
+ 'description' => (isset($attrs['description'][0]) ? $attrs['description'][0] : ''),
+ 'name' => $attrs[$data['mainAttr']][0]
+ );
/* Only assign non-root departments */
if ($dn != $result['/']) {
+ $c_dn = convert_department_dn($dn).' ('.$data['mainAttr'].')';
$result[$c_dn] = $dn;
}
}
diff --git a/include/class_ldap.inc b/include/class_ldap.inc
index 33ddbdbb9bf808e5b77144105bda403c9d85ef61..9d3a9aaf66f756ebcf58f9eeb0c264376fef19e6 100644
--- a/include/class_ldap.inc
+++ b/include/class_ldap.inc
@@ -594,29 +594,6 @@ class LDAP
}
}
- /*!
- * \brief Rename the dn
- *
- * \param string $attrs
- *
- * \param string $dn The DN
- */
- function rename($attrs, $dn = "")
- {
- if ($this->hascon) {
- if ($this->reconnect) $this->connect();
- if ($dn == "")
- $dn = $this->basedn;
-
- $r = @ldap_mod_replace($this->cid, LDAP::fix($dn), $attrs);
- $this->error = @ldap_error($this->cid);
- return $r;
- } else {
- $this->error = "Could not connect to LDAP server";
- return "";
- }
- }
-
/*!
* \brief Remove directory
*
diff --git a/include/class_management.inc b/include/class_management.inc
index 05921a809b0e34e43a4fac3f84a9fe5c7e4260b8..f77657cf839d25548feabc65336d7301c3a138dc 100644
--- a/include/class_management.inc
+++ b/include/class_management.inc
@@ -145,6 +145,7 @@ class management
*/
function execute()
{
+ global $config;
// Ensure that html posts and gets are kept even if we see a 'Entry islocked' dialog.
$vars = array('/^act$/','/^listing/','/^PID$/','/^FILTER_PID$/');
session::set('LOCK_VARS_TO_USE', $vars);
@@ -167,6 +168,7 @@ class management
// Pre-render list to init things if a dn is gonna be opened on first load
if (isset($_REQUEST['dn'])) {
+ $this->headpage->setBase($config->current['BASE']);
$this->headpage->filter->setCurrentScope('sub');
$this->renderList();
}
diff --git a/include/class_plugin.inc b/include/class_plugin.inc
index 6149b7da0ed41f6472acb55e41a99625a70f96f6..fa517483faab1172124a9ee5f2de12deadd4a34e 100644
--- a/include/class_plugin.inc
+++ b/include/class_plugin.inc
@@ -797,7 +797,12 @@ class plugin
array_map(
function ($a) use (&$cache, $depends, $forbidden)
{
- return plugin::tpl_depends_of ($cache, $depends, $a, $forbidden);
+ $deps = plugin::tpl_depends_of ($cache, $depends, $a, $forbidden);
+ if (($askmeKey = array_search('askme', $deps)) !== FALSE) {
+ /* Do not flat special askme dependency */
+ unset($deps[$askmeKey]);
+ }
+ return $deps;
},
$depends[$key]
);
@@ -1039,152 +1044,6 @@ class plugin
return 'none';
}
- /*!
- * \brief ldap rebind
- *
- * \param string $ldap
- *
- * \param string $referral
- */
- function rebind($ldap, $referral)
- {
- $credentials = LDAP::get_credentials($referral, $this->config->current['REFERRAL']);
- if (ldap_bind($ldap, $credentials['ADMIN'], $this->config->get_credentials($credentials['PASSWORD']))) {
- $this->error = "Success";
- $this->hascon = TRUE;
- $this->reconnect = TRUE;
- return 0;
- } else {
- $this->error = "Could not bind to " . $credentials['ADMIN'];
- return NULL;
- }
- }
-
- /*
- * \brief Recursively copy ldap object
- *
- * \param string $src_dn The DN source
- *
- * \param string $dst_dn The DN destination
- */
- function _copy($src_dn, $dst_dn)
- {
- $ldap = $this->config->get_ldap_link();
- $ldap->cat($src_dn);
- $attrs = $ldap->fetch();
-
- /* Grummble. This really sucks. PHP ldap doesn't support rdn stuff. */
- $ds = ldap_connect($this->config->current['SERVER']);
- ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3);
- if (function_exists("ldap_set_rebind_proc") && isset($this->config->current['REFERRAL'])) {
- ldap_set_rebind_proc($ds, array(&$this, "rebind"));
- }
-
- $pwd = $this->config->get_credentials($this->config->current['ADMINPASSWORD']);
- ldap_bind($ds, $this->config->current['ADMINDN'], $pwd);
-
- /* Fill data from LDAP */
- $new = array();
- if ($sr = ldap_read($ds, LDAP::fix($src_dn), "objectClass=*")) {
- if ($ei = ldap_first_entry($ds, $sr)) {
- foreach (array_keys($attrs) as $attr) {
- if ($info = @ldap_get_values_len($ds, $ei, $attr)) {
- for ($i = 0; $i < $info['count']; $i++) {
- if ($info['count'] == 1) {
- $new[$attr] = $info[$i];
- } else {
- $new[$attr][] = $info[$i];
- }
- }
- }
- }
- }
- }
-
- /* close connexion */
- ldap_unbind($ds);
-
- /* Adapt naming attribute */
- $dst_name = preg_replace("/^([^=]+)=.*$/", "\\1", $dst_dn);
- $dst_val = preg_replace("/^[^=]+=([^,+]+).*,.*$/", "\\1", $dst_dn);
- $new[$dst_name] = LDAP::fix($dst_val);
-
- /* Check if this is a department.
- * If it is a dep. && there is a , override in his ou
- * change \2C to , again, else this entry can't be saved ...
- */
- if (isset($new['ou']) && preg_match("/\\,/", $new['ou'])) {
- $new['ou'] = str_replace("\\\\,", ",", $new['ou']);
- }
-
- /* Save copy */
- $ldap->connect();
- $ldap->cd($this->config->current['BASE']);
-
- $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $dst_dn));
-
- /* FAIvariable=.../..., cn=..
- could not be saved, because the attribute FAIvariable was different to
- the dn FAIvariable=..., cn=... */
-
- if (!is_array($new['objectClass'])) {
- $new['objectClass'] = array($new['objectClass']);
- }
-
- if (in_array_ics("FAIdebconfInfo", $new['objectClass'])) {
- $new['FAIvariable'] = $ldap->fix($new['FAIvariable']);
- }
- $ldap->cd($dst_dn);
- $ldap->add($new);
-
- if (!$ldap->success()) {
- trigger_error('Trying to save '.$dst_dn.' failed: '.$ldap->get_error(), E_USER_WARNING);
- return FALSE;
- }
- return TRUE;
- }
-
- /*
- * \brief Copy ldap object.
- * This is a workaround function
- *
- * \param string $src_dn The DN source
- *
- * \param string $dst_dn The DN destination
- */
- function copy($src_dn, $dst_dn)
- {
- /* Rename dn in possible object groups */
- $ldap = $this->config->get_ldap_link();
-
- $ldap->cat($dst_dn);
- $attrs = $ldap->fetch();
- if (count($attrs)) {
- trigger_error("Trying to overwrite ".LDAP::fix($dst_dn).", which already exists.",
- E_USER_WARNING);
- return FALSE;
- }
-
- $ldap->cat($src_dn);
- $attrs = $ldap->fetch();
- if (!count($attrs)) {
- trigger_error("Trying to move ".LDAP::fix($src_dn).", which does not seem to exist.",
- E_USER_WARNING);
- return FALSE;
- }
-
- $ldap->cd($src_dn);
- $ldap->search("objectClass=*", array("dn"));
- $res = TRUE;
- while ($attrs = $ldap->fetch()) {
- $src = $attrs['dn'];
- $dst = preg_replace("/".preg_quote($src_dn, '/')."$/", $dst_dn, $attrs['dn']);
- $res = $res && $this->_copy($src, $dst);
- }
- return $res;
- }
-
-
/*!
* \brief Rename/Move a given src_dn to the given dest_dn
*
@@ -1202,12 +1061,12 @@ class plugin
/* Try to move the source entry to the destination position */
$ldap = $this->config->get_ldap_link();
$ldap->cd($this->config->current['BASE']);
- $ldap->create_missing_trees(preg_replace("/^[^,]+,/", "", $dst_dn));
+ $ldap->create_missing_trees(preg_replace("/^[^,]+,/", '', $dst_dn));
if (!$ldap->rename_dn($src_dn, $dst_dn)) {
- new log("debug", "Ldap Protocol v3 implementation error, ldap_rename failed, falling back to manual copy.",
+ new log('debug', 'Ldap Protocol v3 implementation error, ldap_rename failed.',
"FROM: $src_dn -- TO: $dst_dn", array(), $ldap->get_error());
@DEBUG(DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__, "Rename failed FROM: $src_dn -- TO: $dst_dn",
- "Ldap Protocol v3 implementation error, falling back to manual method. Error:".$ldap->get_error());
+ 'Ldap Protocol v3 implementation error. Error:'.$ldap->get_error());
return FALSE;
}
@@ -1229,22 +1088,9 @@ class plugin
return TRUE;
}
- /* Try to move with ldap routines, if this was not successfull
- fall back to the old style copy & remove method
- */
+ /* Try to move with ldap routines */
if (!$this->rename($src_dn, $dst_dn)) {
- /* Copy source to destination */
- if (!$this->copy($src_dn, $dst_dn)) {
- return FALSE;
- }
-
- /* Delete source */
- $ldap = $this->config->get_ldap_link();
- $ldap->rmdir_recursive($src_dn);
- if (!$ldap->success()) {
- trigger_error('Trying to delete '.$src_dn.' failed: '.$ldap->get_error(), E_USER_WARNING);
- return FALSE;
- }
+ return FALSE;
}
/* Get list of users,groups and roles within this tree,
diff --git a/include/class_session.inc b/include/class_session.inc
index ddc47593a644e65f1c65c36224cabdf0ffbc19c8..72bf901508bd08390a109398ec6b10b34e93f0f6 100644
--- a/include/class_session.inc
+++ b/include/class_session.inc
@@ -48,6 +48,7 @@ class session {
/* Sanity check */
if (!session::channel_exists($channel)) {
msg_dialog::display(_("Internal error"), _("Requested channel does not exist! Please contact your Administrator."), FATAL_ERROR_DIALOG);
+ exit;
}
$channel = "gch_".$channel;
@@ -85,6 +86,7 @@ class session {
/* Sanity check */
if (!session::channel_exists($channel)) {
msg_dialog::display(_("Internal error"), _("Requested channel does not exist! Please contact your Administrator."), FATAL_ERROR_DIALOG);
+ exit;
}
$_SESSION[$channel][$name] = $value;
}
@@ -123,6 +125,7 @@ class session {
/* Sanity check */
if (!session::channel_exists($channel)) {
msg_dialog::display(_("Internal error"), _("Requested channel does not exist! Please contact your Administrator."), FATAL_ERROR_DIALOG);
+ exit;
}
$channel = "gch_".$channel;
diff --git a/include/class_template.inc b/include/class_template.inc
index 21bd8bc808671ca301c7f262e358658a1f79b895..32f59cf1ceb810008b511510fc673d53efe44782 100644
--- a/include/class_template.inc
+++ b/include/class_template.inc
@@ -50,7 +50,7 @@ class template
$this->attributes[$class] = array();
$attrs = array_unique(array_merge($this->tabObject->by_object[$class]->getRequiredAttributes(), $this->needed));
foreach (array_keys($this->tabObject->by_object[$class]->attributesAccess) as $attr) {
- if (isset($this->attrs[$attr])) {
+ if (!$plugin->showInTemplate($attr, $this->attrs)) {
continue;
}
if (in_array($attr, $attrs)) {
@@ -64,7 +64,8 @@ class template
/* Used when you need to re-apply the same template with different values */
function reset()
{
- list($this->attrs, ) = plugin::tpl_fetch_template($this->dn);
+ list($this->attrs, $depends) = plugin::tpl_fetch_template($this->dn);
+ $this->needed = plugin::tpl_needed_attrs($this->attrs, $depends); // This is needed because it removes %askme% values from attrs
$this->tabObject = objects::create($this->type);
$tempTabObject = objects::open($this->dn, $this->type); /* Used to know which tab is activated */
foreach ($tempTabObject->by_object as $class => &$plugin) {
diff --git a/include/functions.inc b/include/functions.inc
index 6c70c3a8ec132fd60d938c97c2103c03f43bbc45..6caf93cb1fc0b26b4a49f53cab4bf8966159ecd5 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -3023,7 +3023,7 @@ function cred_decrypt($input, $password)
$input = substr($input, 16);
$key_len = 32;
- $iv_len = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_CBC);
+ $iv_len = openssl_cipher_iv_length('aes-256-cbc');
$data = '';
$d = '';
@@ -3034,7 +3034,7 @@ function cred_decrypt($input, $password)
$key = substr($data, 0, $key_len);
$iv = substr($data, $key_len, $iv_len);
- return rtrim(mcrypt_decrypt(MCRYPT_RIJNDAEL_128, $key, $input, MCRYPT_MODE_CBC, $iv), "\x00..\x1F");
+ return openssl_decrypt($input, 'aes-256-cbc', $key, OPENSSL_RAW_DATA, $iv);
}
diff --git a/include/simpleplugin/class_attribute.inc b/include/simpleplugin/class_attribute.inc
index ec9329891d4380de3f6088b44808b04009c0c0c8..ca1e478b18e13e4cd6c1f0e730badab14940ac6b 100644
--- a/include/simpleplugin/class_attribute.inc
+++ b/include/simpleplugin/class_attribute.inc
@@ -1738,6 +1738,7 @@ class ImageAttribute extends FileAttribute
*/
function loadPostValue ()
{
+ $this->postValue = $this->value;
if (isset($_POST['upload'.$this->getHtmlId()])) {
parent::loadPostValue();
}
diff --git a/include/simpleplugin/class_simplePlugin.inc b/include/simpleplugin/class_simplePlugin.inc
index c7e6a471ab9518455e4d373b99dffc17646f0806..15934fcfabdf003e046fd13ff5bab239b892a455 100644
--- a/include/simpleplugin/class_simplePlugin.inc
+++ b/include/simpleplugin/class_simplePlugin.inc
@@ -778,8 +778,8 @@ class simplePlugin extends plugin
$lock_msg = "";
if ($edit_mode) {
/* Remove locks created by this plugin */
- if ($remove_lock || isset($_POST['edit_cancel'])) {
- if (session::is_set($classname) && session::is_set('edit')) {
+ if ($remove_lock || (isset($_POST['edit_cancel']) && session::is_set('edit'))) {
+ if (session::is_set($classname)) {
del_lock($entry_dn);
}
}
@@ -792,8 +792,8 @@ class simplePlugin extends plugin
} else {
/* Reset requested? */
if ($edit_mode && isset($_POST['edit_cancel'])) {
- session::un_set('edit');
session::un_set($classname);
+ session::un_set('edit');
}
/* Create account object on demand */
@@ -988,6 +988,15 @@ class simplePlugin extends plugin
}
unset($attr);
}
+
+ /* Returns TRUE if this attribute should be asked in the creation by template dialog */
+ function showInTemplate($attr, $templateAttrs)
+ {
+ if (isset($templateAttrs[$attr])) {
+ return FALSE;
+ }
+ return TRUE;
+ }
}
?>
diff --git a/include/variables_common.inc b/include/variables_common.inc
index 00ef7d60ddd316fcecf836bd4654c7990f6ff04a..5c127cdc487fcea924d7b0d75741eb341b8538e8 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.10"); /*! Define FusionDirectory version */
+define ("FD_VERSION", "1.0.11"); /*! Define FusionDirectory version */
/*!
* \brief FusionDirectory config object RDN
diff --git a/locale/ar/fusiondirectory.po b/locale/ar/fusiondirectory.po
index 509dfcad7e23f820ee25f3a104c4bcbd666cfd11..fee95f5e006120333dd011d33547e45a14139f98 100644
--- a/locale/ar/fusiondirectory.po
+++ b/locale/ar/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-03-14 12:07+0100\n"
-"PO-Revision-Date: 2016-03-07 12:09+0000\n"
+"POT-Creation-Date: 2016-04-06 11:27+0200\n"
+"PO-Revision-Date: 2016-04-06 09:24+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"
@@ -52,7 +52,7 @@ msgstr ""
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:174
+#: plugins/admin/departments/class_department.inc:176
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -75,7 +75,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:73
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/aclrole/class_aclRole.inc:105
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
msgid "Description"
@@ -281,8 +281,8 @@ msgstr ""
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
#: include/simpleplugin/class_dialogAttributes.inc:632
#: include/simpleplugin/class_dialogAttributes.inc:633
-#: include/simpleplugin/class_attribute.inc:2675
#: include/simpleplugin/class_attribute.inc:2676
+#: include/simpleplugin/class_attribute.inc:2677
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -393,7 +393,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:34
#: plugins/admin/departments/class_department.inc:40
#: plugins/admin/departments/dep-list.xml:21
-#: plugins/personal/generic/class_user.inc:394
+#: plugins/personal/generic/class_user.inc:419
msgid "Department"
msgstr "القسم"
@@ -441,7 +441,7 @@ msgid "Website of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:85
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:435
msgid "Manager"
msgstr ""
@@ -452,12 +452,12 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:91
#: plugins/admin/departments/class_department.inc:97
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:329
msgid "Location"
msgstr ""
#: plugins/admin/departments/class_department.inc:94
-#: plugins/personal/generic/class_user.inc:308
+#: plugins/personal/generic/class_user.inc:333
msgid "State"
msgstr ""
@@ -469,7 +469,7 @@ msgid "Country"
msgstr "البلد"
#: plugins/admin/departments/class_department.inc:103
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Address"
msgstr "العنوان"
@@ -479,7 +479,7 @@ msgid "A postal address for this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:107
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Phone"
msgstr "الهاتÙ"
@@ -488,7 +488,7 @@ msgid "Telephone number"
msgstr ""
#: plugins/admin/departments/class_department.inc:111
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Fax"
msgstr "الÙاكس"
@@ -541,7 +541,7 @@ msgstr ""
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:415
msgid "Organization"
msgstr ""
@@ -562,7 +562,7 @@ msgid "Given name"
msgstr ""
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
@@ -570,8 +570,8 @@ msgid "Login"
msgstr ""
#: plugins/admin/users/user-list.xml:79
-#: plugins/personal/generic/class_user.inc:246
-#: plugins/personal/generic/class_user.inc:252
+#: plugins/personal/generic/class_user.inc:271
+#: plugins/personal/generic/class_user.inc:277
msgid "User"
msgstr ""
@@ -624,9 +624,9 @@ msgid "Manage user accounts and their properties"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:140
-#: include/class_management.inc:341 include/class_management.inc:488
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571 include/class_CopyPasteHandler.inc:248
+#: include/class_management.inc:343 include/class_management.inc:490
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573 include/class_CopyPasteHandler.inc:248
#: include/simpleplugin/class_simpleManagement.inc:651
#: include/simpleplugin/class_simpleManagement.inc:749
#: include/simpleplugin/class_simpleManagement.inc:799
@@ -653,12 +653,12 @@ msgid "Lock account"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:253
+#: plugins/personal/generic/class_user.inc:278
msgid "User account"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:247
+#: plugins/personal/generic/class_user.inc:272
msgid "User account information"
msgstr ""
@@ -676,8 +676,8 @@ msgid "Edit category ACL"
msgstr ""
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
-#: include/simpleplugin/class_attribute.inc:2686
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2686
+#: include/simpleplugin/class_attribute.inc:2687
#, php-format
msgid "Delete"
msgstr ""
@@ -928,7 +928,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -949,215 +949,219 @@ msgstr ""
msgid "Same password as above, to avoid errors"
msgstr ""
-#: plugins/personal/generic/class_user.inc:274
+#: plugins/personal/generic/class_user.inc:299
msgid "Personal information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "الإسم العائلي"
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
msgid "Last name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "الإسم الأول"
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
msgid "First name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
msgid "Short description of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "Picture"
msgstr ""
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "The avatar for this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:300
+#: plugins/personal/generic/class_user.inc:325
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Business postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Business phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Mobile"
msgstr "الهات٠المØمول"
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Business mobile number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Pager"
msgstr ""
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:367
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:351
+#: plugins/personal/generic/class_user.inc:376
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr ""
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:387
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Display name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Private phone"
msgstr ""
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Home phone number"
msgstr "رقم المنزل"
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:405
msgid "Organizational information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid "Title"
msgstr ""
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid ""
"Title of a person in their organizational context. Each title is one value "
"of this multi-valued attribute"
msgstr ""
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:419
+msgid "Department to which the user belongs"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:423
msgid "Department No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:423
msgid "Department number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:431
msgid "Employee type"
msgstr ""
-#: plugins/personal/generic/class_user.inc:568
+#: plugins/personal/generic/class_user.inc:593
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:571
+#: plugins/personal/generic/class_user.inc:596
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:581
+#: plugins/personal/generic/class_user.inc:606
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:595
+#: plugins/personal/generic/class_user.inc:620
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:600
-#: plugins/personal/generic/class_user.inc:604
+#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:629
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:636
msgid "You need to specify your current password in order to proceed."
msgstr ""
-#: plugins/personal/generic/class_user.inc:613
+#: plugins/personal/generic/class_user.inc:638
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:615
+#: plugins/personal/generic/class_user.inc:640
#: ihtml/themes/default/recovery.tpl.c:26
#: ihtml/themes/default/recovery.tpl.c:29
msgid "New password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:617
+#: plugins/personal/generic/class_user.inc:642
msgid "The password used as new and current are too similar."
msgstr ""
-#: plugins/personal/generic/class_user.inc:619
+#: plugins/personal/generic/class_user.inc:644
msgid "The password used as new is to short."
msgstr ""
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:646
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
@@ -2133,13 +2137,13 @@ msgstr ""
msgid "Down"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
-#: include/simpleplugin/class_attribute.inc:2648
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2648
+#: include/simpleplugin/class_attribute.inc:2649
msgid "Sort up"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
-#: include/simpleplugin/class_attribute.inc:2661
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2661
+#: include/simpleplugin/class_attribute.inc:2662
msgid "Sort down"
msgstr ""
@@ -2147,23 +2151,23 @@ msgstr ""
msgid "Select all"
msgstr ""
-#: include/class_listing.inc:537 include/class_management.inc:679
-#: include/class_config.inc:479 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3107
-#: include/functions.inc:3128 include/functions.inc:3158
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198 include/functions.inc:3260
+#: include/class_listing.inc:537 include/class_management.inc:681
+#: include/class_config.inc:373 include/class_config.inc:484
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:682
+#: include/class_msgPool.inc:713 include/class_msgPool.inc:740
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200 include/functions.inc:3262
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/class_plugin.inc:1510 include/class_CopyPasteHandler.inc:278
#: include/simpleplugin/class_attribute.inc:1540
#: include/simpleplugin/class_attribute.inc:1543
#: include/simpleplugin/class_attribute.inc:1546
-#: include/simpleplugin/class_attribute.inc:1784
-#: include/simpleplugin/class_attribute.inc:1887
-#: include/simpleplugin/class_attribute.inc:1889
+#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1888
+#: include/simpleplugin/class_attribute.inc:1890
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: include/password-methods/class_password-methods-sasl.inc:60
@@ -2250,33 +2254,33 @@ msgstr ""
msgid "Create a new snapshot from this object"
msgstr ""
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "Filter error"
msgstr ""
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "The filter is incomplete!"
msgstr ""
-#: include/class_management.inc:412
+#: include/class_management.inc:414
#: include/simpleplugin/class_simpleManagement.inc:716
msgid "Permission error"
msgstr ""
-#: include/class_management.inc:488
+#: include/class_management.inc:490
#: include/simpleplugin/class_simpleManagement.inc:749
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr ""
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573
#: include/simpleplugin/class_simpleManagement.inc:799
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr ""
-#: include/class_management.inc:679
+#: include/class_management.inc:681
#, php-format
msgid ""
"No tab declaration for '%s' found in your configuration file. Cannot create "
@@ -2301,17 +2305,17 @@ msgstr ""
#: include/class_config.inc:296
#, php-format
msgid ""
-"It seems you are trying to decode something which is not encoded : "
-"%s<br/>\\nPlease check you are not using a fusiondirectory.secrets file "
-"while your passwords are not encrypted."
+"It seems you are trying to decode something which is not encoded : %s<br/>\n"
+"Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:918
-#: include/class_ldap.inc:1372 include/functions.inc:526
+#: include/class_config.inc:338 include/class_ldap.inc:895
+#: include/class_ldap.inc:1349 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
-#: include/simpleplugin/class_attribute.inc:2909
+#: include/functions.inc:2986 include/functions.inc:3160
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2910
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
@@ -2322,11 +2326,16 @@ msgstr ""
msgid "LDAP error"
msgstr ""
-#: include/class_config.inc:337
+#: include/class_config.inc:338
msgid "Cannot bind to LDAP. Please contact the system administrator."
msgstr ""
-#: include/class_config.inc:480
+#: include/class_config.inc:373
+#, php-format
+msgid "Location \"%s\" could not be found in the configuration file"
+msgstr ""
+
+#: include/class_config.inc:485
#, php-format
msgid "The selected mail method (class %s) is not available"
msgstr ""
@@ -2362,49 +2371,49 @@ msgstr ""
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr ""
-#: include/class_ldap.inc:869 include/class_ldap.inc:905
+#: include/class_ldap.inc:846 include/class_ldap.inc:882
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
#: include/functions.inc:2346 include/class_session.inc:50
-#: include/class_session.inc:87 include/class_session.inc:125
+#: include/class_session.inc:88 include/class_session.inc:127
#: include/class_log.inc:96 include/class_acl.inc:118
msgid "Internal error"
msgstr "خطأ داخلي"
-#: include/class_ldap.inc:869
+#: include/class_ldap.inc:846
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:905
+#: include/class_ldap.inc:882
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1017
+#: include/class_ldap.inc:994
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr ""
-#: include/class_ldap.inc:1019
+#: include/class_ldap.inc:996
#, php-format
msgid "while operating on LDAP server %s"
msgstr ""
-#: include/class_ldap.inc:1109
+#: include/class_ldap.inc:1086
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1221
+#: include/class_ldap.inc:1198
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr ""
-#: include/class_ldap.inc:1232
+#: include/class_ldap.inc:1209
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2992,7 +3001,7 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr ""
-#: include/functions.inc:496 include/functions.inc:3295
+#: include/functions.inc:496 include/functions.inc:3297
#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
#: include/simpleplugin/class_simplePlugin.inc:269
#: include/simpleplugin/class_simplePlugin.inc:281
@@ -3204,9 +3213,9 @@ msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
#: include/functions.inc:3107 include/functions.inc:3128
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200
msgid "Cannot allocate a free ID:"
msgstr ""
@@ -3219,33 +3228,29 @@ msgstr ""
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3158
-msgid "Cannot create sambaUnixIdPool entry!"
-msgstr ""
-
-#: include/functions.inc:3166
+#: include/functions.inc:3168
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3178 include/functions.inc:3182
+#: include/functions.inc:3180 include/functions.inc:3184
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3198
+#: include/functions.inc:3200
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3260
+#: include/functions.inc:3262
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3296
+#: include/functions.inc:3298
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
-#: include/class_session.inc:50 include/class_session.inc:87
-#: include/class_session.inc:125
+#: include/class_session.inc:50 include/class_session.inc:88
+#: include/class_session.inc:127
msgid "Requested channel does not exist! Please contact your Administrator."
msgstr ""
@@ -3401,7 +3406,7 @@ msgid ""
" be done by others will get lost if you save this entry!"
msgstr ""
-#: include/class_plugin.inc:1467
+#: include/class_plugin.inc:1313
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -3533,7 +3538,7 @@ msgid "days"
msgstr ""
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2171
+#: include/simpleplugin/class_attribute.inc:2172
#, php-format
msgid "%s (required)"
msgstr ""
@@ -3602,7 +3607,7 @@ msgid "%s (%d bytes)"
msgstr ""
#: include/simpleplugin/class_attribute.inc:1626
-#: include/simpleplugin/class_attribute.inc:1803
+#: include/simpleplugin/class_attribute.inc:1804
msgid "Upload"
msgstr ""
@@ -3611,22 +3616,22 @@ msgstr ""
msgid "Download"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1786
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1836
+#: include/simpleplugin/class_attribute.inc:1837
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1839
+#: include/simpleplugin/class_attribute.inc:1840
msgid "Object base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:2769
+#: include/simpleplugin/class_attribute.inc:2770
#, php-format
msgid "Invalid value for %s"
msgstr ""
diff --git a/locale/ca/fusiondirectory.po b/locale/ca/fusiondirectory.po
index 3f5e627ae2f43ecf052a86c39e651022fc70ac4e..382f55346f07995ed3f735c0bbbbe9063b1fd3b2 100644
--- a/locale/ca/fusiondirectory.po
+++ b/locale/ca/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-03-14 12:07+0100\n"
-"PO-Revision-Date: 2016-03-07 12:09+0000\n"
+"POT-Creation-Date: 2016-04-06 11:27+0200\n"
+"PO-Revision-Date: 2016-04-06 09:24+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"
@@ -52,7 +52,7 @@ msgstr ""
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:174
+#: plugins/admin/departments/class_department.inc:176
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -75,7 +75,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:73
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/aclrole/class_aclRole.inc:105
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
msgid "Description"
@@ -281,8 +281,8 @@ msgstr ""
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
#: include/simpleplugin/class_dialogAttributes.inc:632
#: include/simpleplugin/class_dialogAttributes.inc:633
-#: include/simpleplugin/class_attribute.inc:2675
#: include/simpleplugin/class_attribute.inc:2676
+#: include/simpleplugin/class_attribute.inc:2677
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -393,7 +393,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:34
#: plugins/admin/departments/class_department.inc:40
#: plugins/admin/departments/dep-list.xml:21
-#: plugins/personal/generic/class_user.inc:394
+#: plugins/personal/generic/class_user.inc:419
msgid "Department"
msgstr "Departament"
@@ -441,7 +441,7 @@ msgid "Website of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:85
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:435
msgid "Manager"
msgstr "Responsable"
@@ -452,12 +452,12 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:91
#: plugins/admin/departments/class_department.inc:97
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:329
msgid "Location"
msgstr "Localització"
#: plugins/admin/departments/class_department.inc:94
-#: plugins/personal/generic/class_user.inc:308
+#: plugins/personal/generic/class_user.inc:333
msgid "State"
msgstr "ProvÃncia"
@@ -469,7 +469,7 @@ msgid "Country"
msgstr "Estat"
#: plugins/admin/departments/class_department.inc:103
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Address"
msgstr "Adreça"
@@ -479,7 +479,7 @@ msgid "A postal address for this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:107
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Phone"
msgstr "Telèfon"
@@ -488,7 +488,7 @@ msgid "Telephone number"
msgstr ""
#: plugins/admin/departments/class_department.inc:111
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Fax"
msgstr "Fax"
@@ -541,7 +541,7 @@ msgstr ""
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:415
msgid "Organization"
msgstr "Organització"
@@ -562,7 +562,7 @@ msgid "Given name"
msgstr ""
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
@@ -570,8 +570,8 @@ msgid "Login"
msgstr "Entrada"
#: plugins/admin/users/user-list.xml:79
-#: plugins/personal/generic/class_user.inc:246
-#: plugins/personal/generic/class_user.inc:252
+#: plugins/personal/generic/class_user.inc:271
+#: plugins/personal/generic/class_user.inc:277
msgid "User"
msgstr ""
@@ -624,9 +624,9 @@ msgid "Manage user accounts and their properties"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:140
-#: include/class_management.inc:341 include/class_management.inc:488
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571 include/class_CopyPasteHandler.inc:248
+#: include/class_management.inc:343 include/class_management.inc:490
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573 include/class_CopyPasteHandler.inc:248
#: include/simpleplugin/class_simpleManagement.inc:651
#: include/simpleplugin/class_simpleManagement.inc:749
#: include/simpleplugin/class_simpleManagement.inc:799
@@ -653,12 +653,12 @@ msgid "Lock account"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:253
+#: plugins/personal/generic/class_user.inc:278
msgid "User account"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:247
+#: plugins/personal/generic/class_user.inc:272
msgid "User account information"
msgstr ""
@@ -676,8 +676,8 @@ msgid "Edit category ACL"
msgstr ""
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
-#: include/simpleplugin/class_attribute.inc:2686
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2686
+#: include/simpleplugin/class_attribute.inc:2687
#, php-format
msgid "Delete"
msgstr ""
@@ -928,7 +928,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -949,215 +949,219 @@ msgstr ""
msgid "Same password as above, to avoid errors"
msgstr ""
-#: plugins/personal/generic/class_user.inc:274
+#: plugins/personal/generic/class_user.inc:299
msgid "Personal information"
msgstr "Informació personal"
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "Cognoms"
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
msgid "Last name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "Nom"
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
msgid "First name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
msgid "Short description of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "Picture"
msgstr ""
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "The avatar for this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:300
+#: plugins/personal/generic/class_user.inc:325
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Business postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room No."
msgstr "Núm de sala"
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room number"
msgstr "Número de sala"
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Business phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Mobile"
msgstr "Mòbil"
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Business mobile number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Pager"
msgstr "Buscapersones"
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Homepage"
msgstr "PÃ gina principal"
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:367
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:351
+#: plugins/personal/generic/class_user.inc:376
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr "Llengua preferida"
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:387
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Display name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home postal address"
msgstr "Adreça postal personal"
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Private phone"
msgstr "Telèfon privat"
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Home phone number"
msgstr "Número de telèfon personal"
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:405
msgid "Organizational information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid "Title"
msgstr ""
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid ""
"Title of a person in their organizational context. Each title is one value "
"of this multi-valued attribute"
msgstr ""
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:419
+msgid "Department to which the user belongs"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:423
msgid "Department No."
msgstr "Núm de department"
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:423
msgid "Department number"
msgstr "Número de departament"
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee No."
msgstr "Núm d'empleat"
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee number"
msgstr "Número d'empleat"
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:431
msgid "Employee type"
msgstr "Categoria professional"
-#: plugins/personal/generic/class_user.inc:568
+#: plugins/personal/generic/class_user.inc:593
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:571
+#: plugins/personal/generic/class_user.inc:596
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:581
+#: plugins/personal/generic/class_user.inc:606
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:595
+#: plugins/personal/generic/class_user.inc:620
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:600
-#: plugins/personal/generic/class_user.inc:604
+#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:629
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:636
msgid "You need to specify your current password in order to proceed."
msgstr ""
-#: plugins/personal/generic/class_user.inc:613
+#: plugins/personal/generic/class_user.inc:638
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:615
+#: plugins/personal/generic/class_user.inc:640
#: ihtml/themes/default/recovery.tpl.c:26
#: ihtml/themes/default/recovery.tpl.c:29
msgid "New password"
msgstr "Contrasenya nova"
-#: plugins/personal/generic/class_user.inc:617
+#: plugins/personal/generic/class_user.inc:642
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:619
+#: plugins/personal/generic/class_user.inc:644
msgid "The password used as new is to short."
msgstr "La contrasenya nova és massa curta."
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:646
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
@@ -2133,13 +2137,13 @@ msgstr ""
msgid "Down"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
-#: include/simpleplugin/class_attribute.inc:2648
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2648
+#: include/simpleplugin/class_attribute.inc:2649
msgid "Sort up"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
-#: include/simpleplugin/class_attribute.inc:2661
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2661
+#: include/simpleplugin/class_attribute.inc:2662
msgid "Sort down"
msgstr ""
@@ -2147,23 +2151,23 @@ msgstr ""
msgid "Select all"
msgstr ""
-#: include/class_listing.inc:537 include/class_management.inc:679
-#: include/class_config.inc:479 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3107
-#: include/functions.inc:3128 include/functions.inc:3158
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198 include/functions.inc:3260
+#: include/class_listing.inc:537 include/class_management.inc:681
+#: include/class_config.inc:373 include/class_config.inc:484
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:682
+#: include/class_msgPool.inc:713 include/class_msgPool.inc:740
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200 include/functions.inc:3262
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/class_plugin.inc:1510 include/class_CopyPasteHandler.inc:278
#: include/simpleplugin/class_attribute.inc:1540
#: include/simpleplugin/class_attribute.inc:1543
#: include/simpleplugin/class_attribute.inc:1546
-#: include/simpleplugin/class_attribute.inc:1784
-#: include/simpleplugin/class_attribute.inc:1887
-#: include/simpleplugin/class_attribute.inc:1889
+#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1888
+#: include/simpleplugin/class_attribute.inc:1890
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: include/password-methods/class_password-methods-sasl.inc:60
@@ -2250,33 +2254,33 @@ msgstr ""
msgid "Create a new snapshot from this object"
msgstr ""
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "Filter error"
msgstr ""
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "The filter is incomplete!"
msgstr ""
-#: include/class_management.inc:412
+#: include/class_management.inc:414
#: include/simpleplugin/class_simpleManagement.inc:716
msgid "Permission error"
msgstr ""
-#: include/class_management.inc:488
+#: include/class_management.inc:490
#: include/simpleplugin/class_simpleManagement.inc:749
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr ""
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573
#: include/simpleplugin/class_simpleManagement.inc:799
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr ""
-#: include/class_management.inc:679
+#: include/class_management.inc:681
#, php-format
msgid ""
"No tab declaration for '%s' found in your configuration file. Cannot create "
@@ -2301,17 +2305,17 @@ msgstr "Error de la configuració"
#: include/class_config.inc:296
#, php-format
msgid ""
-"It seems you are trying to decode something which is not encoded : "
-"%s<br/>\\nPlease check you are not using a fusiondirectory.secrets file "
-"while your passwords are not encrypted."
+"It seems you are trying to decode something which is not encoded : %s<br/>\n"
+"Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:918
-#: include/class_ldap.inc:1372 include/functions.inc:526
+#: include/class_config.inc:338 include/class_ldap.inc:895
+#: include/class_ldap.inc:1349 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
-#: include/simpleplugin/class_attribute.inc:2909
+#: include/functions.inc:2986 include/functions.inc:3160
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2910
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
@@ -2322,11 +2326,16 @@ msgstr ""
msgid "LDAP error"
msgstr "Error d'LDAP"
-#: include/class_config.inc:337
+#: include/class_config.inc:338
msgid "Cannot bind to LDAP. Please contact the system administrator."
msgstr ""
-#: include/class_config.inc:480
+#: include/class_config.inc:373
+#, php-format
+msgid "Location \"%s\" could not be found in the configuration file"
+msgstr ""
+
+#: include/class_config.inc:485
#, php-format
msgid "The selected mail method (class %s) is not available"
msgstr ""
@@ -2362,49 +2371,49 @@ msgstr ""
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr ""
-#: include/class_ldap.inc:869 include/class_ldap.inc:905
+#: include/class_ldap.inc:846 include/class_ldap.inc:882
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
#: include/functions.inc:2346 include/class_session.inc:50
-#: include/class_session.inc:87 include/class_session.inc:125
+#: include/class_session.inc:88 include/class_session.inc:127
#: include/class_log.inc:96 include/class_acl.inc:118
msgid "Internal error"
msgstr ""
-#: include/class_ldap.inc:869
+#: include/class_ldap.inc:846
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:905
+#: include/class_ldap.inc:882
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1017
+#: include/class_ldap.inc:994
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr ""
-#: include/class_ldap.inc:1019
+#: include/class_ldap.inc:996
#, php-format
msgid "while operating on LDAP server %s"
msgstr ""
-#: include/class_ldap.inc:1109
+#: include/class_ldap.inc:1086
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1221
+#: include/class_ldap.inc:1198
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr ""
-#: include/class_ldap.inc:1232
+#: include/class_ldap.inc:1209
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2992,7 +3001,7 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr ""
-#: include/functions.inc:496 include/functions.inc:3295
+#: include/functions.inc:496 include/functions.inc:3297
#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
#: include/simpleplugin/class_simplePlugin.inc:269
#: include/simpleplugin/class_simplePlugin.inc:281
@@ -3204,9 +3213,9 @@ msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
#: include/functions.inc:3107 include/functions.inc:3128
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200
msgid "Cannot allocate a free ID:"
msgstr ""
@@ -3219,33 +3228,29 @@ msgstr ""
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3158
-msgid "Cannot create sambaUnixIdPool entry!"
-msgstr ""
-
-#: include/functions.inc:3166
+#: include/functions.inc:3168
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3178 include/functions.inc:3182
+#: include/functions.inc:3180 include/functions.inc:3184
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3198
+#: include/functions.inc:3200
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3260
+#: include/functions.inc:3262
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3296
+#: include/functions.inc:3298
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
-#: include/class_session.inc:50 include/class_session.inc:87
-#: include/class_session.inc:125
+#: include/class_session.inc:50 include/class_session.inc:88
+#: include/class_session.inc:127
msgid "Requested channel does not exist! Please contact your Administrator."
msgstr ""
@@ -3401,7 +3406,7 @@ msgid ""
" be done by others will get lost if you save this entry!"
msgstr ""
-#: include/class_plugin.inc:1467
+#: include/class_plugin.inc:1313
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -3533,7 +3538,7 @@ msgid "days"
msgstr ""
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2171
+#: include/simpleplugin/class_attribute.inc:2172
#, php-format
msgid "%s (required)"
msgstr ""
@@ -3602,7 +3607,7 @@ msgid "%s (%d bytes)"
msgstr ""
#: include/simpleplugin/class_attribute.inc:1626
-#: include/simpleplugin/class_attribute.inc:1803
+#: include/simpleplugin/class_attribute.inc:1804
msgid "Upload"
msgstr ""
@@ -3611,22 +3616,22 @@ msgstr ""
msgid "Download"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1786
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1836
+#: include/simpleplugin/class_attribute.inc:1837
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr "Base"
-#: include/simpleplugin/class_attribute.inc:1839
+#: include/simpleplugin/class_attribute.inc:1840
msgid "Object base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:2769
+#: include/simpleplugin/class_attribute.inc:2770
#, php-format
msgid "Invalid value for %s"
msgstr ""
diff --git a/locale/cs_CZ/fusiondirectory.po b/locale/cs_CZ/fusiondirectory.po
index 248f5616abb8b3765659ee97816922b7459392db..74884125585c61f66d2535054d2dbb8d2c085b4d 100644
--- a/locale/cs_CZ/fusiondirectory.po
+++ b/locale/cs_CZ/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-03-14 12:07+0100\n"
-"PO-Revision-Date: 2016-03-07 12:09+0000\n"
+"POT-Creation-Date: 2016-04-06 11:27+0200\n"
+"PO-Revision-Date: 2016-04-06 09:24+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"
@@ -52,7 +52,7 @@ msgstr "Informace"
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:174
+#: plugins/admin/departments/class_department.inc:176
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -75,7 +75,7 @@ msgstr "Název této skupiny"
#: plugins/admin/departments/class_department.inc:73
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/aclrole/class_aclRole.inc:105
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
msgid "Description"
@@ -281,8 +281,8 @@ msgstr "Vytvořit"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
#: include/simpleplugin/class_dialogAttributes.inc:632
#: include/simpleplugin/class_dialogAttributes.inc:633
-#: include/simpleplugin/class_attribute.inc:2675
#: include/simpleplugin/class_attribute.inc:2676
+#: include/simpleplugin/class_attribute.inc:2677
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -393,7 +393,7 @@ msgstr "Doménová Äást"
#: plugins/admin/departments/class_department.inc:34
#: plugins/admin/departments/class_department.inc:40
#: plugins/admin/departments/dep-list.xml:21
-#: plugins/personal/generic/class_user.inc:394
+#: plugins/personal/generic/class_user.inc:419
msgid "Department"
msgstr "OddÄ›lenÃ"
@@ -441,7 +441,7 @@ msgid "Website of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:85
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:435
msgid "Manager"
msgstr "NadÅ™Ãzený"
@@ -452,12 +452,12 @@ msgstr "NadÅ™Ãzený tohoto %s"
#: plugins/admin/departments/class_department.inc:91
#: plugins/admin/departments/class_department.inc:97
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:329
msgid "Location"
msgstr "UmÃstÄ›nÃ"
#: plugins/admin/departments/class_department.inc:94
-#: plugins/personal/generic/class_user.inc:308
+#: plugins/personal/generic/class_user.inc:333
msgid "State"
msgstr "Stav"
@@ -469,7 +469,7 @@ msgid "Country"
msgstr "ZemÄ›"
#: plugins/admin/departments/class_department.inc:103
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Address"
msgstr "Adresa"
@@ -479,7 +479,7 @@ msgid "A postal address for this %s"
msgstr "Poštovnà adresa pro toto %s"
#: plugins/admin/departments/class_department.inc:107
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Phone"
msgstr "Telefon"
@@ -488,7 +488,7 @@ msgid "Telephone number"
msgstr "Telefonnà ÄÃslo"
#: plugins/admin/departments/class_department.inc:111
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Fax"
msgstr "Fax"
@@ -541,7 +541,7 @@ msgstr "Seznam oddÄ›lenÃ"
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:415
msgid "Organization"
msgstr "Organizace"
@@ -562,7 +562,7 @@ msgid "Given name"
msgstr "Jméno"
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
@@ -570,8 +570,8 @@ msgid "Login"
msgstr "Přihlašovacà jméno"
#: plugins/admin/users/user-list.xml:79
-#: plugins/personal/generic/class_user.inc:246
-#: plugins/personal/generic/class_user.inc:252
+#: plugins/personal/generic/class_user.inc:271
+#: plugins/personal/generic/class_user.inc:277
msgid "User"
msgstr "Uživatel"
@@ -624,9 +624,9 @@ msgid "Manage user accounts and their properties"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:140
-#: include/class_management.inc:341 include/class_management.inc:488
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571 include/class_CopyPasteHandler.inc:248
+#: include/class_management.inc:343 include/class_management.inc:490
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573 include/class_CopyPasteHandler.inc:248
#: include/simpleplugin/class_simpleManagement.inc:651
#: include/simpleplugin/class_simpleManagement.inc:749
#: include/simpleplugin/class_simpleManagement.inc:799
@@ -653,12 +653,12 @@ msgid "Lock account"
msgstr "Uzamknout úÄet"
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:253
+#: plugins/personal/generic/class_user.inc:278
msgid "User account"
msgstr "Uživatelský úÄet"
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:247
+#: plugins/personal/generic/class_user.inc:272
msgid "User account information"
msgstr "Informace o uživatelském úÄtu"
@@ -676,8 +676,8 @@ msgid "Edit category ACL"
msgstr "upravit ACL kategorie"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
-#: include/simpleplugin/class_attribute.inc:2686
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2686
+#: include/simpleplugin/class_attribute.inc:2687
#, php-format
msgid "Delete"
msgstr "Smazat"
@@ -928,7 +928,7 @@ msgid "Password hash method to use"
msgstr "Metoda otisku hesla"
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -949,215 +949,219 @@ msgstr "Zopakovánà hesla"
msgid "Same password as above, to avoid errors"
msgstr "Stejné heslo jako výše, pro vylouÄenà chybného zadánÃ"
-#: plugins/personal/generic/class_user.inc:274
+#: plugins/personal/generic/class_user.inc:299
msgid "Personal information"
msgstr "Osobnà údaje"
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "PÅ™ÃjmenÃ"
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
msgid "Last name of this user"
msgstr "PÅ™Ãjmenà tohoto uživatele"
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "Jméno"
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
msgid "First name of this user"
msgstr "Křestnà jméno tohoto uživatele"
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
msgid "Short description of the user"
msgstr "StruÄný popis uživatele"
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "Picture"
msgstr "Fotografie"
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "The avatar for this user"
msgstr "Obrázek pro tohoto uživatele"
-#: plugins/personal/generic/class_user.inc:300
+#: plugins/personal/generic/class_user.inc:325
msgid "Organizational contact information"
msgstr "OrganizaÄnà kontaktnà údaje"
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Business postal address"
msgstr "Firemnà poštovnà adresa"
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room No."
msgstr "ÄŒÃslo mÃstnosti"
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room number"
msgstr "ÄŒÃslo mÃstnosti"
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Business phone number"
msgstr "Služebnà telefonà ÄÃslo"
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Mobile"
msgstr "MobilnÃ"
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Business mobile number"
msgstr "ÄŒÃslo služebnÃho mobilnÃho telefonu"
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Pager"
msgstr "Pager"
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Business pager number"
msgstr "ÄŒÃslo na pracovnà pager"
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Business fax number"
msgstr "ÄŒÃslo služebnÃho faxu"
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Homepage"
msgstr "Webové stránky"
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Personal homepage"
msgstr "Osobnà webové stránky"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:367
msgid "Account information"
msgstr "Informace o úÄtu"
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
msgid "Login of this user"
msgstr "Přihlašovacà jméno tohoto uživatele"
-#: plugins/personal/generic/class_user.inc:351
+#: plugins/personal/generic/class_user.inc:376
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr "Upřednostňovaný jazyk"
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
msgid "Password of the user"
msgstr "Uživatelovo heslo"
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:387
msgid "Personal contact information"
msgstr "Osobnà kontaktnà údaje"
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Display name"
msgstr "Zobrazovaný název"
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
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:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home address"
msgstr "Adresa bydliště"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home postal address"
msgstr "Soukromá poštovnà adresa"
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Private phone"
msgstr "Soukromý telefon"
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Home phone number"
msgstr "Telefonnà ÄÃslo domů"
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:405
msgid "Organizational information"
msgstr "OrganizaÄnà údaje"
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid "Title"
msgstr "Titul"
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
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:398
+#: plugins/personal/generic/class_user.inc:419
+msgid "Department to which the user belongs"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:423
msgid "Department No."
msgstr "ÄŒÃslo oddÄ›lenÃ"
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:423
msgid "Department number"
msgstr "ÄŒÃslo oddÄ›lenÃ"
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee No."
msgstr "ÄŒÃslo zamÄ›stnance"
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee number"
msgstr "ÄŒÃslo zamÄ›stnance"
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:431
msgid "Employee type"
msgstr "Typ zaměstnaneckého poměru"
-#: plugins/personal/generic/class_user.inc:568
+#: plugins/personal/generic/class_user.inc:593
#, 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:571
+#: plugins/personal/generic/class_user.inc:596
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:581
+#: plugins/personal/generic/class_user.inc:606
#, 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:595
+#: plugins/personal/generic/class_user.inc:620
msgid "Password is in history of old passwords"
msgstr "Toto heslo už bylo nedávno použito"
-#: plugins/personal/generic/class_user.inc:600
-#: plugins/personal/generic/class_user.inc:604
+#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:629
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:611
+#: plugins/personal/generic/class_user.inc:636
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:613
+#: plugins/personal/generic/class_user.inc:638
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:615
+#: plugins/personal/generic/class_user.inc:640
#: ihtml/themes/default/recovery.tpl.c:26
#: ihtml/themes/default/recovery.tpl.c:29
msgid "New password"
msgstr "Nové heslo"
-#: plugins/personal/generic/class_user.inc:617
+#: plugins/personal/generic/class_user.inc:642
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:619
+#: plugins/personal/generic/class_user.inc:644
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:621
+#: plugins/personal/generic/class_user.inc:646
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)."
@@ -2133,13 +2137,13 @@ msgstr "Nahoru"
msgid "Down"
msgstr "Dolů"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
-#: include/simpleplugin/class_attribute.inc:2648
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2648
+#: include/simpleplugin/class_attribute.inc:2649
msgid "Sort up"
msgstr "Seřadit vzestupně"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
-#: include/simpleplugin/class_attribute.inc:2661
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2661
+#: include/simpleplugin/class_attribute.inc:2662
msgid "Sort down"
msgstr "Seřadit sestupně"
@@ -2147,23 +2151,23 @@ msgstr "Seřadit sestupně"
msgid "Select all"
msgstr "Vybrat vše"
-#: include/class_listing.inc:537 include/class_management.inc:679
-#: include/class_config.inc:479 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3107
-#: include/functions.inc:3128 include/functions.inc:3158
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198 include/functions.inc:3260
+#: include/class_listing.inc:537 include/class_management.inc:681
+#: include/class_config.inc:373 include/class_config.inc:484
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:682
+#: include/class_msgPool.inc:713 include/class_msgPool.inc:740
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200 include/functions.inc:3262
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/class_plugin.inc:1510 include/class_CopyPasteHandler.inc:278
#: include/simpleplugin/class_attribute.inc:1540
#: include/simpleplugin/class_attribute.inc:1543
#: include/simpleplugin/class_attribute.inc:1546
-#: include/simpleplugin/class_attribute.inc:1784
-#: include/simpleplugin/class_attribute.inc:1887
-#: include/simpleplugin/class_attribute.inc:1889
+#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1888
+#: include/simpleplugin/class_attribute.inc:1890
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: include/password-methods/class_password-methods-sasl.inc:60
@@ -2250,33 +2254,33 @@ msgstr "PoÅ™Ãdit zachycený stav"
msgid "Create a new snapshot from this object"
msgstr "vytvoÅ™it nový snÃmek tohoto objektu"
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "Filter error"
msgstr "Chyba filtru"
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "The filter is incomplete!"
msgstr "Filtr je neúplný!"
-#: include/class_management.inc:412
+#: include/class_management.inc:414
#: include/simpleplugin/class_simpleManagement.inc:716
msgid "Permission error"
msgstr "Chyba oprávnÄ›nÃ"
-#: include/class_management.inc:488
+#: include/class_management.inc:490
#: include/simpleplugin/class_simpleManagement.inc:749
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr "Nejste oprávnÄ›n(a) vytvoÅ™it snÃmek %s."
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573
#: include/simpleplugin/class_simpleManagement.inc:799
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr "Nejste oprávněni obnovit zachycený stav %s."
-#: include/class_management.inc:679
+#: include/class_management.inc:681
#, php-format
msgid ""
"No tab declaration for '%s' found in your configuration file. Cannot create "
@@ -2301,17 +2305,17 @@ msgstr "Chyba v nastavenÃ"
#: include/class_config.inc:296
#, php-format
msgid ""
-"It seems you are trying to decode something which is not encoded : "
-"%s<br/>\\nPlease check you are not using a fusiondirectory.secrets file "
-"while your passwords are not encrypted."
-msgstr "Zdá se, že se pokouÅ¡Ãte dekódovat nÄ›co, co nenà zakódované : %s<br/>\\nOvěřte, zda nepoužÃváte soubor fusiondirectory.secrets byÅ¥ jsou vaÅ¡e hesla neÅ¡ifrovaná."
+"It seems you are trying to decode something which is not encoded : %s<br/>\n"
+"Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
+msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:918
-#: include/class_ldap.inc:1372 include/functions.inc:526
+#: include/class_config.inc:338 include/class_ldap.inc:895
+#: include/class_ldap.inc:1349 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
-#: include/simpleplugin/class_attribute.inc:2909
+#: include/functions.inc:2986 include/functions.inc:3160
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2910
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
@@ -2322,11 +2326,16 @@ msgstr "Zdá se, že se pokouÅ¡Ãte dekódovat nÄ›co, co nenà zakódované : %s
msgid "LDAP error"
msgstr "Chyba LDAP"
-#: include/class_config.inc:337
+#: include/class_config.inc:338
msgid "Cannot bind to LDAP. Please contact the system administrator."
msgstr "Nedařà se pÅ™ihlášenà do LDAPu. Kontaktujte prosÃm správce systémů."
-#: include/class_config.inc:480
+#: include/class_config.inc:373
+#, php-format
+msgid "Location \"%s\" could not be found in the configuration file"
+msgstr ""
+
+#: include/class_config.inc:485
#, php-format
msgid "The selected mail method (class %s) is not available"
msgstr "Zvolený způsob e-mailu (tÅ™Ãda %s) nenà dostupný"
@@ -2362,49 +2371,49 @@ msgstr "Varovánà ohledně výkonu"
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr "Výkonnost LDAPu je špatná: poslednà dotaz trval celých %.2fs!"
-#: include/class_ldap.inc:869 include/class_ldap.inc:905
+#: include/class_ldap.inc:846 include/class_ldap.inc:882
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
#: include/functions.inc:2346 include/class_session.inc:50
-#: include/class_session.inc:87 include/class_session.inc:125
+#: include/class_session.inc:88 include/class_session.inc:127
#: include/class_log.inc:96 include/class_acl.inc:118
msgid "Internal error"
msgstr "Vnitřnà chyba"
-#: include/class_ldap.inc:869
+#: include/class_ldap.inc:846
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr "Podstromy s RDN %s se nedařà automaticky vytvářet: nebyla nalezena žádná tÅ™Ãda objektu!"
-#: include/class_ldap.inc:905
+#: include/class_ldap.inc:882
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr "Nedařà se automaticky vytvořit podstromy s RDN %s: nepodporováno"
-#: include/class_ldap.inc:1017
+#: include/class_ldap.inc:994
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr "při operaci na %s na LDAP serveru %s"
-#: include/class_ldap.inc:1019
+#: include/class_ldap.inc:996
#, php-format
msgid "while operating on LDAP server %s"
msgstr "při operaci na LDAP serveru %s"
-#: include/class_ldap.inc:1109
+#: include/class_ldap.inc:1086
msgid "proc_open failed to execute ldapsearch"
msgstr "proc_open se nezdařilo vykonat ldapsearch"
-#: include/class_ldap.inc:1221
+#: include/class_ldap.inc:1198
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr "Toto nenà platné DN: '%s'. Celek pro import by mÄ›l zaÄÃnat na 'dn: …' na řádku %s"
-#: include/class_ldap.inc:1232
+#: include/class_ldap.inc:1209
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2992,7 +3001,7 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr "fatálnà chyba: nelze vytvoÅ™it instanci tÅ™Ãdy '%s' – pokuste se to napravit spuÅ¡tÄ›nÃm '%s' --update-cache (na serveru) a restartujte svůj webový prohlÞeÄ"
-#: include/functions.inc:496 include/functions.inc:3295
+#: include/functions.inc:496 include/functions.inc:3297
#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
#: include/simpleplugin/class_simplePlugin.inc:269
#: include/simpleplugin/class_simplePlugin.inc:281
@@ -3204,9 +3213,9 @@ msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr "Je tÅ™eba, aby ObjectClass posixGroup bylo STRUKTURÃLNÃ"
#: include/functions.inc:3107 include/functions.inc:3128
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200
msgid "Cannot allocate a free ID:"
msgstr "Nenà k dispozici volné ID:"
@@ -3219,33 +3228,29 @@ msgstr "Neznámá metoda idAllocation (přiřazovánà ID)!"
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3158
-msgid "Cannot create sambaUnixIdPool entry!"
-msgstr "Nedařà se vytvořit položku sambaUnixIdPool!"
-
-#: include/functions.inc:3166
+#: include/functions.inc:3168
msgid "sambaUnixIdPool is not unique!"
msgstr "Identifikátor sambaUnixIdPool nenà jedineÄný!"
-#: include/functions.inc:3178 include/functions.inc:3182
+#: include/functions.inc:3180 include/functions.inc:3184
msgid "no ID available!"
msgstr "Nenà k dispozici ID!"
-#: include/functions.inc:3198
+#: include/functions.inc:3200
msgid "maximum tries exceeded!"
msgstr "PÅ™ekroÄen nejvyÅ¡Å¡Ã pÅ™ijatelný poÄet neúspěšných pokusů!"
-#: include/functions.inc:3260
+#: include/functions.inc:3262
msgid "Cannot allocate a free ID!"
msgstr "Nenà k dispozici volné ID – nenà co přidělit!"
-#: include/functions.inc:3296
+#: include/functions.inc:3298
#, 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)"
-#: include/class_session.inc:50 include/class_session.inc:87
-#: include/class_session.inc:125
+#: include/class_session.inc:50 include/class_session.inc:88
+#: include/class_session.inc:127
msgid "Requested channel does not exist! Please contact your Administrator."
msgstr "Požadovaný kanál neexistuje! ProsÃm kontaktujte svého správce systémů."
@@ -3401,7 +3406,7 @@ msgid ""
" be done by others will get lost if you save this entry!"
msgstr ""
-#: include/class_plugin.inc:1467
+#: include/class_plugin.inc:1313
#, php-format
msgid "Tab \"%s\""
msgstr "Panel %s"
@@ -3533,7 +3538,7 @@ msgid "days"
msgstr "dny"
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2171
+#: include/simpleplugin/class_attribute.inc:2172
#, php-format
msgid "%s (required)"
msgstr "%s (vyžadováno)"
@@ -3602,7 +3607,7 @@ msgid "%s (%d bytes)"
msgstr "%s (%d bajtů)"
#: include/simpleplugin/class_attribute.inc:1626
-#: include/simpleplugin/class_attribute.inc:1803
+#: include/simpleplugin/class_attribute.inc:1804
msgid "Upload"
msgstr "Nahrát"
@@ -3611,22 +3616,22 @@ msgstr "Nahrát"
msgid "Download"
msgstr "staženÃ"
-#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1786
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr "Fotografii uživatele nelze uložit – FusionDirectory k tomu potÅ™ebuje, aby byl nainstalován balÃÄek php5-imagick !"
-#: include/simpleplugin/class_attribute.inc:1836
+#: include/simpleplugin/class_attribute.inc:1837
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr "Základ"
-#: include/simpleplugin/class_attribute.inc:1839
+#: include/simpleplugin/class_attribute.inc:1840
msgid "Object base"
msgstr "Základ objektu"
-#: include/simpleplugin/class_attribute.inc:2769
+#: include/simpleplugin/class_attribute.inc:2770
#, php-format
msgid "Invalid value for %s"
msgstr "Neplatná hodnota pro %s"
diff --git a/locale/de/fusiondirectory.po b/locale/de/fusiondirectory.po
index 671e3ab1287f1df63806e4dc925f239750ef4d5b..f8bb8ad4fe6e62dc07889d091c5c167025e0f18d 100644
--- a/locale/de/fusiondirectory.po
+++ b/locale/de/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-03-14 12:07+0100\n"
-"PO-Revision-Date: 2016-03-07 12:09+0000\n"
+"POT-Creation-Date: 2016-04-06 11:27+0200\n"
+"PO-Revision-Date: 2016-04-06 09:24+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"
@@ -52,7 +52,7 @@ msgstr "Informationen"
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:174
+#: plugins/admin/departments/class_department.inc:176
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -75,7 +75,7 @@ msgstr "Name dieser Gruppe"
#: plugins/admin/departments/class_department.inc:73
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/aclrole/class_aclRole.inc:105
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
msgid "Description"
@@ -281,8 +281,8 @@ msgstr "Anlegen"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
#: include/simpleplugin/class_dialogAttributes.inc:632
#: include/simpleplugin/class_dialogAttributes.inc:633
-#: include/simpleplugin/class_attribute.inc:2675
#: include/simpleplugin/class_attribute.inc:2676
+#: include/simpleplugin/class_attribute.inc:2677
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -393,7 +393,7 @@ msgstr "Domänenkomponente"
#: plugins/admin/departments/class_department.inc:34
#: plugins/admin/departments/class_department.inc:40
#: plugins/admin/departments/dep-list.xml:21
-#: plugins/personal/generic/class_user.inc:394
+#: plugins/personal/generic/class_user.inc:419
msgid "Department"
msgstr "Abteilung"
@@ -441,7 +441,7 @@ msgid "Website of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:85
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:435
msgid "Manager"
msgstr "Verwalter"
@@ -452,12 +452,12 @@ msgstr "Verwalter von diesem %s"
#: plugins/admin/departments/class_department.inc:91
#: plugins/admin/departments/class_department.inc:97
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:329
msgid "Location"
msgstr "Ort"
#: plugins/admin/departments/class_department.inc:94
-#: plugins/personal/generic/class_user.inc:308
+#: plugins/personal/generic/class_user.inc:333
msgid "State"
msgstr "Land"
@@ -469,7 +469,7 @@ msgid "Country"
msgstr "Land"
#: plugins/admin/departments/class_department.inc:103
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Address"
msgstr "Adresse"
@@ -479,7 +479,7 @@ msgid "A postal address for this %s"
msgstr "Eine postalische Anschrift für diesen %s"
#: plugins/admin/departments/class_department.inc:107
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Phone"
msgstr "Telefon"
@@ -488,7 +488,7 @@ msgid "Telephone number"
msgstr "Telefonnummer"
#: plugins/admin/departments/class_department.inc:111
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Fax"
msgstr "Fax"
@@ -541,7 +541,7 @@ msgstr "Liste der Abteilungen"
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:415
msgid "Organization"
msgstr "Organisation"
@@ -562,7 +562,7 @@ msgid "Given name"
msgstr "Vorname"
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
@@ -570,8 +570,8 @@ msgid "Login"
msgstr "Kennung"
#: plugins/admin/users/user-list.xml:79
-#: plugins/personal/generic/class_user.inc:246
-#: plugins/personal/generic/class_user.inc:252
+#: plugins/personal/generic/class_user.inc:271
+#: plugins/personal/generic/class_user.inc:277
msgid "User"
msgstr "Benutzer"
@@ -624,9 +624,9 @@ msgid "Manage user accounts and their properties"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:140
-#: include/class_management.inc:341 include/class_management.inc:488
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571 include/class_CopyPasteHandler.inc:248
+#: include/class_management.inc:343 include/class_management.inc:490
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573 include/class_CopyPasteHandler.inc:248
#: include/simpleplugin/class_simpleManagement.inc:651
#: include/simpleplugin/class_simpleManagement.inc:749
#: include/simpleplugin/class_simpleManagement.inc:799
@@ -653,12 +653,12 @@ msgid "Lock account"
msgstr "Konto deaktivieren"
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:253
+#: plugins/personal/generic/class_user.inc:278
msgid "User account"
msgstr "Benutzerkonto"
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:247
+#: plugins/personal/generic/class_user.inc:272
msgid "User account information"
msgstr "Benutzerkontoinformation"
@@ -676,8 +676,8 @@ msgid "Edit category ACL"
msgstr "ACL Kategorie bearbeiten"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
-#: include/simpleplugin/class_attribute.inc:2686
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2686
+#: include/simpleplugin/class_attribute.inc:2687
#, php-format
msgid "Delete"
msgstr "Entfernen"
@@ -928,7 +928,7 @@ msgid "Password hash method to use"
msgstr "Zu verwendende Passworthash-Methode"
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -949,215 +949,219 @@ msgstr "Passwort Wiederholung"
msgid "Same password as above, to avoid errors"
msgstr "Gleiches Passwort wie oben, um Fehler zu vermeiden"
-#: plugins/personal/generic/class_user.inc:274
+#: plugins/personal/generic/class_user.inc:299
msgid "Personal information"
msgstr "Persönliche Informationen"
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "Nachname"
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
msgid "Last name of this user"
msgstr "Nachname von diesem Benutzer"
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "Vorname"
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
msgid "First name of this user"
msgstr "Vorname von diesem Benutzer"
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
msgid "Short description of the user"
msgstr "Kurze Beschreibung des Benutzers"
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "Picture"
msgstr "Bild"
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "The avatar for this user"
msgstr "Der Avatar für diesen Benutzer"
-#: plugins/personal/generic/class_user.inc:300
+#: plugins/personal/generic/class_user.inc:325
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Business postal address"
msgstr "Geschäftliche Adresse"
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room No."
msgstr "Zimmer-Nr."
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room number"
msgstr "Raumnummer"
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Business phone number"
msgstr "Geschäftliche Telefonnummer"
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Mobile"
msgstr "Mobiltelefon"
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Business mobile number"
msgstr "Geschäftliche Mobiltelefonnummer"
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Pager"
msgstr "Pager"
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Business fax number"
msgstr "Geschäftliche Faxnummer"
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Homepage"
msgstr "Homepage"
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:367
msgid "Account information"
msgstr "Kontoinformation"
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:351
+#: plugins/personal/generic/class_user.inc:376
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr "Bevorzugte Sprache"
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
msgid "Password of the user"
msgstr "Passwort des Benutzers"
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:387
msgid "Personal contact information"
msgstr "Persönliche Kontaktinformation"
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Display name"
msgstr "Anzeigename"
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home postal address"
msgstr "Private Adresse"
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Private phone"
msgstr "Privat-Telefon"
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Home phone number"
msgstr "Telefonnummer (privat)"
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:405
msgid "Organizational information"
msgstr "Angabe zur Organisationseinheit"
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid "Title"
msgstr "Titel"
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid ""
"Title of a person in their organizational context. Each title is one value "
"of this multi-valued attribute"
msgstr ""
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:419
+msgid "Department to which the user belongs"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:423
msgid "Department No."
msgstr "Abteilungs-Nr."
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:423
msgid "Department number"
msgstr "Abteilungsnummer"
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee No."
msgstr "Angestellten-Nr."
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee number"
msgstr "Personalnummer"
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:431
msgid "Employee type"
msgstr "Anstellungsart"
-#: plugins/personal/generic/class_user.inc:568
+#: plugins/personal/generic/class_user.inc:593
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:571
+#: plugins/personal/generic/class_user.inc:596
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:581
+#: plugins/personal/generic/class_user.inc:606
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:595
+#: plugins/personal/generic/class_user.inc:620
msgid "Password is in history of old passwords"
msgstr "Passwörter ist im Verlauf alter Passwörter"
-#: plugins/personal/generic/class_user.inc:600
-#: plugins/personal/generic/class_user.inc:604
+#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:629
msgid "Password is not being changed from existing value"
msgstr "Bestehender Wert das Passworts wurde nicht geändert"
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:636
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:613
+#: plugins/personal/generic/class_user.inc:638
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:615
+#: plugins/personal/generic/class_user.inc:640
#: ihtml/themes/default/recovery.tpl.c:26
#: ihtml/themes/default/recovery.tpl.c:29
msgid "New password"
msgstr "Neues Passwort"
-#: plugins/personal/generic/class_user.inc:617
+#: plugins/personal/generic/class_user.inc:642
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:619
+#: plugins/personal/generic/class_user.inc:644
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:621
+#: plugins/personal/generic/class_user.inc:646
msgid "The password contains possibly problematic Unicode characters!"
msgstr "Das Passwort beinhaltet möglicherweise problematische Unicode-Zeichen!"
@@ -2133,13 +2137,13 @@ msgstr "Auf"
msgid "Down"
msgstr "Ab"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
-#: include/simpleplugin/class_attribute.inc:2648
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2648
+#: include/simpleplugin/class_attribute.inc:2649
msgid "Sort up"
msgstr "Aufsteigend sortieren"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
-#: include/simpleplugin/class_attribute.inc:2661
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2661
+#: include/simpleplugin/class_attribute.inc:2662
msgid "Sort down"
msgstr "Absteigend sortieren"
@@ -2147,23 +2151,23 @@ msgstr "Absteigend sortieren"
msgid "Select all"
msgstr "Alle auswählen"
-#: include/class_listing.inc:537 include/class_management.inc:679
-#: include/class_config.inc:479 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3107
-#: include/functions.inc:3128 include/functions.inc:3158
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198 include/functions.inc:3260
+#: include/class_listing.inc:537 include/class_management.inc:681
+#: include/class_config.inc:373 include/class_config.inc:484
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:682
+#: include/class_msgPool.inc:713 include/class_msgPool.inc:740
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200 include/functions.inc:3262
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/class_plugin.inc:1510 include/class_CopyPasteHandler.inc:278
#: include/simpleplugin/class_attribute.inc:1540
#: include/simpleplugin/class_attribute.inc:1543
#: include/simpleplugin/class_attribute.inc:1546
-#: include/simpleplugin/class_attribute.inc:1784
-#: include/simpleplugin/class_attribute.inc:1887
-#: include/simpleplugin/class_attribute.inc:1889
+#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1888
+#: include/simpleplugin/class_attribute.inc:1890
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: include/password-methods/class_password-methods-sasl.inc:60
@@ -2250,33 +2254,33 @@ msgstr "Snapshot erstellen"
msgid "Create a new snapshot from this object"
msgstr "Erstelle einen neuen Snapshot dieses Objekts"
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "Filter error"
msgstr "Filter Fehler"
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "The filter is incomplete!"
msgstr "Der Filter ist unvollständig!"
-#: include/class_management.inc:412
+#: include/class_management.inc:414
#: include/simpleplugin/class_simpleManagement.inc:716
msgid "Permission error"
msgstr "Berechtigungsfehler"
-#: include/class_management.inc:488
+#: include/class_management.inc:490
#: include/simpleplugin/class_simpleManagement.inc:749
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr "Ihnen ist es nicht erlaubt, einen Snapshot für %s zu erstellen."
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573
#: include/simpleplugin/class_simpleManagement.inc:799
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr "Ihnen ist es nicht erlaubt, einen Snapshot für %s wiederherzustellen."
-#: include/class_management.inc:679
+#: include/class_management.inc:681
#, php-format
msgid ""
"No tab declaration for '%s' found in your configuration file. Cannot create "
@@ -2301,17 +2305,17 @@ msgstr "Konfigurationsfehler"
#: include/class_config.inc:296
#, php-format
msgid ""
-"It seems you are trying to decode something which is not encoded : "
-"%s<br/>\\nPlease check you are not using a fusiondirectory.secrets file "
-"while your passwords are not encrypted."
-msgstr "Es scheint als wollen Sie etwas dekodieren, was nicht enkodiert wurde : %s</br>\\nBitte prüfen Sie ob Sie nicht eine fusiondirectory.secrets Datei nutzen während Ihre Passwörter nicht verschlüsselt werden."
+"It seems you are trying to decode something which is not encoded : %s<br/>\n"
+"Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
+msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:918
-#: include/class_ldap.inc:1372 include/functions.inc:526
+#: include/class_config.inc:338 include/class_ldap.inc:895
+#: include/class_ldap.inc:1349 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
-#: include/simpleplugin/class_attribute.inc:2909
+#: include/functions.inc:2986 include/functions.inc:3160
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2910
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
@@ -2322,11 +2326,16 @@ msgstr "Es scheint als wollen Sie etwas dekodieren, was nicht enkodiert wurde :
msgid "LDAP error"
msgstr "LDAP-Fehler"
-#: include/class_config.inc:337
+#: include/class_config.inc:338
msgid "Cannot bind to LDAP. Please contact the system administrator."
msgstr "Kann nicht mit dem LDAP-Server verbinden. Bitte benachrichtigen Sie den Administrator."
-#: include/class_config.inc:480
+#: include/class_config.inc:373
+#, php-format
+msgid "Location \"%s\" could not be found in the configuration file"
+msgstr ""
+
+#: include/class_config.inc:485
#, php-format
msgid "The selected mail method (class %s) is not available"
msgstr "Die gewählte Mailmethode (class %s) ist nicht verfügbar"
@@ -2362,49 +2371,49 @@ msgstr "Leistungswarnung"
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr "Die LDAP-Leistung ist mangelhaft: Die letzte Abfrage dauerte etwa %.2f Sekunden!"
-#: include/class_ldap.inc:869 include/class_ldap.inc:905
+#: include/class_ldap.inc:846 include/class_ldap.inc:882
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
#: include/functions.inc:2346 include/class_session.inc:50
-#: include/class_session.inc:87 include/class_session.inc:125
+#: include/class_session.inc:88 include/class_session.inc:127
#: include/class_log.inc:96 include/class_acl.inc:118
msgid "Internal error"
msgstr "Interner Fehler"
-#: include/class_ldap.inc:869
+#: include/class_ldap.inc:846
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:905
+#: include/class_ldap.inc:882
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1017
+#: include/class_ldap.inc:994
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr "während der Arbeit mit '%s' auf dem LDAP-Server '%s'"
-#: include/class_ldap.inc:1019
+#: include/class_ldap.inc:996
#, php-format
msgid "while operating on LDAP server %s"
msgstr "während der Arbeit auf LDAP-Server '%s'"
-#: include/class_ldap.inc:1109
+#: include/class_ldap.inc:1086
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1221
+#: include/class_ldap.inc:1198
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr "Dies ist keine valide DN: '%s'. Ein Block für den Import sollte mit 'dn:...' beginnen in Zeile %s"
-#: include/class_ldap.inc:1232
+#: include/class_ldap.inc:1209
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2992,7 +3001,7 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr "Schwerer Fehler: Kann Klasse '%s' nicht instanziieren - bitte führen Sie '%s' aus um das Problem zu beheben"
-#: include/functions.inc:496 include/functions.inc:3295
+#: include/functions.inc:496 include/functions.inc:3297
#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
#: include/simpleplugin/class_simplePlugin.inc:269
#: include/simpleplugin/class_simplePlugin.inc:281
@@ -3204,9 +3213,9 @@ msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
#: include/functions.inc:3107 include/functions.inc:3128
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200
msgid "Cannot allocate a free ID:"
msgstr "Konnte keine freie ID allozieren:"
@@ -3219,33 +3228,29 @@ msgstr "unbekannte idAllocation-Methode!"
msgid "%sPoolMin >= %sPoolMax!"
msgstr "%sPoolMin >= %sPoolMax!"
-#: include/functions.inc:3158
-msgid "Cannot create sambaUnixIdPool entry!"
-msgstr "kann sambaUnixIdPool-Eintrag nicht anlegen!"
-
-#: include/functions.inc:3166
+#: include/functions.inc:3168
msgid "sambaUnixIdPool is not unique!"
msgstr "sambaUnixIdPool ist nicht eindeutig!"
-#: include/functions.inc:3178 include/functions.inc:3182
+#: include/functions.inc:3180 include/functions.inc:3184
msgid "no ID available!"
msgstr "keine ID verfügbar!"
-#: include/functions.inc:3198
+#: include/functions.inc:3200
msgid "maximum tries exceeded!"
msgstr "maximale Anzahl von Versuchen abgelaufen!"
-#: include/functions.inc:3260
+#: include/functions.inc:3262
msgid "Cannot allocate a free ID!"
msgstr "Konnte keine freie ID allozieren!"
-#: include/functions.inc:3296
+#: include/functions.inc:3298
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr "Konnte Datei '%s' nicht finden - bitte führen Sie '%s' aus um das Problem zu beseitigen"
-#: include/class_session.inc:50 include/class_session.inc:87
-#: include/class_session.inc:125
+#: include/class_session.inc:50 include/class_session.inc:88
+#: include/class_session.inc:127
msgid "Requested channel does not exist! Please contact your Administrator."
msgstr "Der angeforderte Kanal existiert nicht! Bitte benachrichtigen Sie Ihren Administrator."
@@ -3401,7 +3406,7 @@ msgid ""
" be done by others will get lost if you save this entry!"
msgstr ""
-#: include/class_plugin.inc:1467
+#: include/class_plugin.inc:1313
#, php-format
msgid "Tab \"%s\""
msgstr "Tab \"%s\""
@@ -3533,7 +3538,7 @@ msgid "days"
msgstr "Tage"
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2171
+#: include/simpleplugin/class_attribute.inc:2172
#, php-format
msgid "%s (required)"
msgstr "%s (benötigt)"
@@ -3602,7 +3607,7 @@ msgid "%s (%d bytes)"
msgstr "%s (%d Bytes)"
#: include/simpleplugin/class_attribute.inc:1626
-#: include/simpleplugin/class_attribute.inc:1803
+#: include/simpleplugin/class_attribute.inc:1804
msgid "Upload"
msgstr "Hochladen"
@@ -3611,22 +3616,22 @@ msgstr "Hochladen"
msgid "Download"
msgstr "Herunterladen"
-#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1786
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr "Kann das Benutzerbild nicht speichern, FusionDirectory benötigt das Paket 'php5-imagick'!"
-#: include/simpleplugin/class_attribute.inc:1836
+#: include/simpleplugin/class_attribute.inc:1837
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr "Basis"
-#: include/simpleplugin/class_attribute.inc:1839
+#: include/simpleplugin/class_attribute.inc:1840
msgid "Object base"
msgstr "Objektbasis"
-#: include/simpleplugin/class_attribute.inc:2769
+#: include/simpleplugin/class_attribute.inc:2770
#, php-format
msgid "Invalid value for %s"
msgstr "Ungültiger Wert für %s"
diff --git a/locale/el_GR/fusiondirectory.po b/locale/el_GR/fusiondirectory.po
index cbda1d4f695a3ea146c0663bef70eb0c43484a36..c43555a40af657012650d12e9f9474c234beeaf2 100644
--- a/locale/el_GR/fusiondirectory.po
+++ b/locale/el_GR/fusiondirectory.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-03-14 12:07+0100\n"
-"PO-Revision-Date: 2016-03-07 12:09+0000\n"
+"POT-Creation-Date: 2016-04-06 11:27+0200\n"
+"PO-Revision-Date: 2016-04-06 09:24+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"
@@ -58,7 +58,7 @@ msgstr "ΠληÏοφοÏίες"
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:174
+#: plugins/admin/departments/class_department.inc:176
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -81,7 +81,7 @@ msgstr "Όνομα αυτής της ομάδας"
#: plugins/admin/departments/class_department.inc:73
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/aclrole/class_aclRole.inc:105
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
msgid "Description"
@@ -287,8 +287,8 @@ msgstr "ΔημιουÏγία"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
#: include/simpleplugin/class_dialogAttributes.inc:632
#: include/simpleplugin/class_dialogAttributes.inc:633
-#: include/simpleplugin/class_attribute.inc:2675
#: include/simpleplugin/class_attribute.inc:2676
+#: include/simpleplugin/class_attribute.inc:2677
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -399,7 +399,7 @@ msgstr "συστατικό στοιχείο τομÎα"
#: plugins/admin/departments/class_department.inc:34
#: plugins/admin/departments/class_department.inc:40
#: plugins/admin/departments/dep-list.xml:21
-#: plugins/personal/generic/class_user.inc:394
+#: plugins/personal/generic/class_user.inc:419
msgid "Department"
msgstr "Τμήμα"
@@ -447,7 +447,7 @@ msgid "Website of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:85
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:435
msgid "Manager"
msgstr "ΔιαχειÏιστής"
@@ -458,12 +458,12 @@ msgstr "ΔιαχειÏιστής του %s"
#: plugins/admin/departments/class_department.inc:91
#: plugins/admin/departments/class_department.inc:97
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:329
msgid "Location"
msgstr "Τοποθεσία"
#: plugins/admin/departments/class_department.inc:94
-#: plugins/personal/generic/class_user.inc:308
+#: plugins/personal/generic/class_user.inc:333
msgid "State"
msgstr "Πολιτεία"
@@ -475,7 +475,7 @@ msgid "Country"
msgstr "ΧώÏα"
#: plugins/admin/departments/class_department.inc:103
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Address"
msgstr "ΔιεÏθυνση"
@@ -485,7 +485,7 @@ msgid "A postal address for this %s"
msgstr "Μια ταχυδÏομική διεÏθυνση για %s"
#: plugins/admin/departments/class_department.inc:107
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Phone"
msgstr "ΤηλÎφωνο"
@@ -494,7 +494,7 @@ msgid "Telephone number"
msgstr "ΑÏιθμός τηλεφώνου"
#: plugins/admin/departments/class_department.inc:111
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Fax"
msgstr "Φαξ"
@@ -547,7 +547,7 @@ msgstr "Κατάλογος των τμημάτων"
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:415
msgid "Organization"
msgstr "ΟÏγανισμός"
@@ -568,7 +568,7 @@ msgid "Given name"
msgstr "Βαπτιστικό"
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
@@ -576,8 +576,8 @@ msgid "Login"
msgstr "ΣÏνδεση"
#: plugins/admin/users/user-list.xml:79
-#: plugins/personal/generic/class_user.inc:246
-#: plugins/personal/generic/class_user.inc:252
+#: plugins/personal/generic/class_user.inc:271
+#: plugins/personal/generic/class_user.inc:277
msgid "User"
msgstr "ΧÏήστης"
@@ -630,9 +630,9 @@ msgid "Manage user accounts and their properties"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:140
-#: include/class_management.inc:341 include/class_management.inc:488
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571 include/class_CopyPasteHandler.inc:248
+#: include/class_management.inc:343 include/class_management.inc:490
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573 include/class_CopyPasteHandler.inc:248
#: include/simpleplugin/class_simpleManagement.inc:651
#: include/simpleplugin/class_simpleManagement.inc:749
#: include/simpleplugin/class_simpleManagement.inc:799
@@ -659,12 +659,12 @@ msgid "Lock account"
msgstr "Κλείδωμα λογαÏιασμοÏ"
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:253
+#: plugins/personal/generic/class_user.inc:278
msgid "User account"
msgstr "ΛογαÏιασμός χÏήστη"
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:247
+#: plugins/personal/generic/class_user.inc:272
msgid "User account information"
msgstr "ΠληÏοφοÏίες λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï Ï‡Ïήστη"
@@ -682,8 +682,8 @@ msgid "Edit category ACL"
msgstr "ΕπεξεÏγασία κατηγοÏίας ACL"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
-#: include/simpleplugin/class_attribute.inc:2686
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2686
+#: include/simpleplugin/class_attribute.inc:2687
#, php-format
msgid "Delete"
msgstr "ΔιαγÏαφή"
@@ -934,7 +934,7 @@ msgid "Password hash method to use"
msgstr "ÎœÎθοδος hash για χÏήση κωδικοÏ"
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -955,215 +955,219 @@ msgstr "Κωδικός ξανά"
msgid "Same password as above, to avoid errors"
msgstr "Ίδιος Κωδικός Î Ïόσβασης με τον Ï€ÏοηγοÏμενο, για αποφυγή λαθών."
-#: plugins/personal/generic/class_user.inc:274
+#: plugins/personal/generic/class_user.inc:299
msgid "Personal information"
msgstr "Î ÏοσωπικÎÏ‚ πληÏοφοÏίες"
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "Επίθετο"
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
msgid "Last name of this user"
msgstr "Το επίθετο του χÏήστη."
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "Όνομα"
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
msgid "First name of this user"
msgstr "Το όνομα του χÏήστη"
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
msgid "Short description of the user"
msgstr "ΣÏντομη πεÏιγÏαφή του χÏήστη"
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "Picture"
msgstr "Εικόνα"
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "The avatar for this user"
msgstr "Το Î¬Î²Î±Ï„Î±Ï Ï„Î¿Ï… χÏήστη"
-#: plugins/personal/generic/class_user.inc:300
+#: plugins/personal/generic/class_user.inc:325
msgid "Organizational contact information"
msgstr "ΠληÏοφοÏιών επαφή οÏγανισμοÏ"
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Business postal address"
msgstr "ΤαχυδÏομική διεÏθυνση εταιÏίας"
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room No."
msgstr "ΑÏ. δωματίου"
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room number"
msgstr "ΑÏιθμός δωματίου"
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Business phone number"
msgstr "ΑÏιθμός τηλεφώνου εÏγασίας"
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Mobile"
msgstr "Κινητό"
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Business mobile number"
msgstr "ΑÏιθμός ÎºÎ¹Î½Î·Ï„Î¿Ï Ï„Î·Î»ÎµÏ†ÏŽÎ½Î¿Ï… εÏγασίας"
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Pager"
msgstr "Βομβητής"
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Business pager number"
msgstr "ΑÏιθμός βομβητή εÏγασίας"
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Business fax number"
msgstr "ΑÏιθμός φαξ εÏγασίας"
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Homepage"
msgstr "Ιστοσελίδα"
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Personal homepage"
msgstr "Î Ïοσωπική ιστοσελίδα"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:367
msgid "Account information"
msgstr "ΠληÏοφοÏίες λογαÏιασμοÏ"
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
msgid "Login of this user"
msgstr "ΛογαÏιασμός σÏνδεσης Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… χÏήστη."
-#: plugins/personal/generic/class_user.inc:351
+#: plugins/personal/generic/class_user.inc:376
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr "Î Ïοτιμώμενη γλώσσα"
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
msgid "Password of the user"
msgstr "Ο κωδικός του χÏήστη"
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:387
msgid "Personal contact information"
msgstr "Î ÏοσωπικÎÏ‚ πληÏοφοÏίες επαφής"
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Display name"
msgstr "Όνομα που εμφανίζεται"
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Name this user should appear as. Used by Exchange."
msgstr "Το όνομα με το οποίο Ï€ÏÎπει να εμφανίζεται ο χÏήστης. ΧÏησιμοποιείται από το Exchange."
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home address"
msgstr "ΔιεÏθυνση οικίας"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home postal address"
msgstr "ΤαχυδÏομική διεÏθυνση οικίας"
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Private phone"
msgstr "Ιδιωτικό τηλÎφωνο"
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Home phone number"
msgstr "ΤηλÎφωνο οικίας"
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:405
msgid "Organizational information"
msgstr "ΠληÏοφοÏίες οÏγανισμοÏ"
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid "Title"
msgstr "Τίτλος"
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid ""
"Title of a person in their organizational context. Each title is one value "
"of this multi-valued attribute"
msgstr "Τίτλος Ï€Ïοσώπου στο οÏγανωτικό του πλαίσιο. Κάθε τίτλος είναι μια από τις πολλÎÏ‚ τιμÎÏ‚ Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… χαÏακτηÏιστικοÏ"
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:419
+msgid "Department to which the user belongs"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:423
msgid "Department No."
msgstr "ΑÏ. τμήματος"
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:423
msgid "Department number"
msgstr "ΑÏιθμός τμήματος"
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee No."
msgstr "ΑÏ. Υπαλλήλου"
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee number"
msgstr "ΑÏιθμός Υπαλλήλου"
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:431
msgid "Employee type"
msgstr "ΤÏπος υπαλλήλου"
-#: plugins/personal/generic/class_user.inc:568
+#: plugins/personal/generic/class_user.inc:593
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr "Δεν ήταν δυνατή η εÏÏεση του Ppolicy \"%s\" στο LDAP!"
-#: plugins/personal/generic/class_user.inc:571
+#: plugins/personal/generic/class_user.inc:596
msgid "You are not allowed to change your own password"
msgstr "Δεν Îχετε δικαίωμα αλλαγής του ÎºÏ‰Î´Î¹ÎºÎ¿Ï ÏƒÎ±Ï‚"
-#: plugins/personal/generic/class_user.inc:581
+#: plugins/personal/generic/class_user.inc:606
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr "Θα Ï€ÏÎπει να πεÏιμÎνετε %d δευτεÏόλεπτα για να αλλάξετε το κωδικό σας"
-#: plugins/personal/generic/class_user.inc:595
+#: plugins/personal/generic/class_user.inc:620
msgid "Password is in history of old passwords"
msgstr "Ο κωδικός είναι στο ιστοÏικό παλιών κωδικών Ï€Ïόσβασης."
-#: plugins/personal/generic/class_user.inc:600
-#: plugins/personal/generic/class_user.inc:604
+#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:629
msgid "Password is not being changed from existing value"
msgstr "Ο κωδικός Ï€Ïόσβασής σας δεν Îχει αλλάξει από την Ï„ÏÎχουσα τιμή"
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:636
msgid "You need to specify your current password in order to proceed."
msgstr "Θα Ï€ÏÎπει να εισάγετε τον κÏÏιο κωδικό σας για να συνεχίσετε"
-#: plugins/personal/generic/class_user.inc:613
+#: plugins/personal/generic/class_user.inc:638
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr "Οι κωδικοί εισάγατε ως \"ÎÎο κωδικό\" και \"Επανάληψη νÎου κωδικοÏ\" δεν ταιÏιάζουν."
-#: plugins/personal/generic/class_user.inc:615
+#: plugins/personal/generic/class_user.inc:640
#: ihtml/themes/default/recovery.tpl.c:26
#: ihtml/themes/default/recovery.tpl.c:29
msgid "New password"
msgstr "ÎÎος κωδικός "
-#: plugins/personal/generic/class_user.inc:617
+#: plugins/personal/generic/class_user.inc:642
msgid "The password used as new and current are too similar."
msgstr "Ο παλιός και ο νÎος κωδικός Ï€Ïόσβασης μοιάζουν πολÏ"
-#: plugins/personal/generic/class_user.inc:619
+#: plugins/personal/generic/class_user.inc:644
msgid "The password used as new is to short."
msgstr "Ο κωδικός που εισάγατε είναι Ï€Î¿Î»Ï Î¼Î¹ÎºÏός"
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:646
msgid "The password contains possibly problematic Unicode characters!"
msgstr "Ο νÎος κωδικός Ï€Ïόσβασης πεÏιÎχει Ï€ÏοβληματικοÏÏ‚ χαÏακτήÏες Unicode!"
@@ -2139,13 +2143,13 @@ msgstr "Πάνω"
msgid "Down"
msgstr "Κάτω"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
-#: include/simpleplugin/class_attribute.inc:2648
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2648
+#: include/simpleplugin/class_attribute.inc:2649
msgid "Sort up"
msgstr "Ταξινόμηση πάνω"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
-#: include/simpleplugin/class_attribute.inc:2661
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2661
+#: include/simpleplugin/class_attribute.inc:2662
msgid "Sort down"
msgstr "Ταξινόμηση κάτω"
@@ -2153,23 +2157,23 @@ msgstr "Ταξινόμηση κάτω"
msgid "Select all"
msgstr "Επιλογή όλων"
-#: include/class_listing.inc:537 include/class_management.inc:679
-#: include/class_config.inc:479 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3107
-#: include/functions.inc:3128 include/functions.inc:3158
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198 include/functions.inc:3260
+#: include/class_listing.inc:537 include/class_management.inc:681
+#: include/class_config.inc:373 include/class_config.inc:484
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:682
+#: include/class_msgPool.inc:713 include/class_msgPool.inc:740
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200 include/functions.inc:3262
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/class_plugin.inc:1510 include/class_CopyPasteHandler.inc:278
#: include/simpleplugin/class_attribute.inc:1540
#: include/simpleplugin/class_attribute.inc:1543
#: include/simpleplugin/class_attribute.inc:1546
-#: include/simpleplugin/class_attribute.inc:1784
-#: include/simpleplugin/class_attribute.inc:1887
-#: include/simpleplugin/class_attribute.inc:1889
+#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1888
+#: include/simpleplugin/class_attribute.inc:1890
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: include/password-methods/class_password-methods-sasl.inc:60
@@ -2256,33 +2260,33 @@ msgstr "ΔημιουÏγία στιγμιότυπου"
msgid "Create a new snapshot from this object"
msgstr "ΔημιουÏγία νÎου στιγμιότυπου από αυτό το αντικείμενο"
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "Filter error"
msgstr "Σφάλμα φίλτÏου"
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "The filter is incomplete!"
msgstr "Το φίλτÏο είναι μη ολοκληÏωμÎνο!"
-#: include/class_management.inc:412
+#: include/class_management.inc:414
#: include/simpleplugin/class_simpleManagement.inc:716
msgid "Permission error"
msgstr "Σφάλμα άδειας"
-#: include/class_management.inc:488
+#: include/class_management.inc:490
#: include/simpleplugin/class_simpleManagement.inc:749
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr "Δεν επιτÏÎπεται να δημιουÏγήσετε Îνα στιγμιότυπο για %s."
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573
#: include/simpleplugin/class_simpleManagement.inc:799
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr "Δεν επιτÏÎπεται να επαναφÎÏετε Îνα στιγμιότυπο για %s."
-#: include/class_management.inc:679
+#: include/class_management.inc:681
#, php-format
msgid ""
"No tab declaration for '%s' found in your configuration file. Cannot create "
@@ -2307,17 +2311,17 @@ msgstr "Σφάλμα ÏÏθμισης"
#: include/class_config.inc:296
#, php-format
msgid ""
-"It seems you are trying to decode something which is not encoded : "
-"%s<br/>\\nPlease check you are not using a fusiondirectory.secrets file "
-"while your passwords are not encrypted."
+"It seems you are trying to decode something which is not encoded : %s<br/>\n"
+"Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:918
-#: include/class_ldap.inc:1372 include/functions.inc:526
+#: include/class_config.inc:338 include/class_ldap.inc:895
+#: include/class_ldap.inc:1349 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
-#: include/simpleplugin/class_attribute.inc:2909
+#: include/functions.inc:2986 include/functions.inc:3160
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2910
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
@@ -2328,11 +2332,16 @@ msgstr ""
msgid "LDAP error"
msgstr "Σφάλμα LDAP"
-#: include/class_config.inc:337
+#: include/class_config.inc:338
msgid "Cannot bind to LDAP. Please contact the system administrator."
msgstr "Αδυναμία bind σε LDAP. Επικοινωνήστε με τον διαχειÏιστή συστήματος"
-#: include/class_config.inc:480
+#: include/class_config.inc:373
+#, php-format
+msgid "Location \"%s\" could not be found in the configuration file"
+msgstr ""
+
+#: include/class_config.inc:485
#, php-format
msgid "The selected mail method (class %s) is not available"
msgstr ""
@@ -2368,49 +2377,49 @@ msgstr ""
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr ""
-#: include/class_ldap.inc:869 include/class_ldap.inc:905
+#: include/class_ldap.inc:846 include/class_ldap.inc:882
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
#: include/functions.inc:2346 include/class_session.inc:50
-#: include/class_session.inc:87 include/class_session.inc:125
+#: include/class_session.inc:88 include/class_session.inc:127
#: include/class_log.inc:96 include/class_acl.inc:118
msgid "Internal error"
msgstr "ΕσωτεÏικό σφάλμα"
-#: include/class_ldap.inc:869
+#: include/class_ldap.inc:846
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:905
+#: include/class_ldap.inc:882
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1017
+#: include/class_ldap.inc:994
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr ""
-#: include/class_ldap.inc:1019
+#: include/class_ldap.inc:996
#, php-format
msgid "while operating on LDAP server %s"
msgstr ""
-#: include/class_ldap.inc:1109
+#: include/class_ldap.inc:1086
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1221
+#: include/class_ldap.inc:1198
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr ""
-#: include/class_ldap.inc:1232
+#: include/class_ldap.inc:1209
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2998,7 +3007,7 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr ""
-#: include/functions.inc:496 include/functions.inc:3295
+#: include/functions.inc:496 include/functions.inc:3297
#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
#: include/simpleplugin/class_simplePlugin.inc:269
#: include/simpleplugin/class_simplePlugin.inc:281
@@ -3210,9 +3219,9 @@ msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
#: include/functions.inc:3107 include/functions.inc:3128
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200
msgid "Cannot allocate a free ID:"
msgstr "Δεν είναι δυνατό να ανατεθεί μια free ID:"
@@ -3225,33 +3234,29 @@ msgstr "αγνωστη μÎθοδος idAllocation"
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3158
-msgid "Cannot create sambaUnixIdPool entry!"
-msgstr "Αδυναμία δημιουÏγίας καταχώÏισης sambaUnixIdPool!"
-
-#: include/functions.inc:3166
+#: include/functions.inc:3168
msgid "sambaUnixIdPool is not unique!"
msgstr "sambaUnixIdPool δεν είναι μοναδική!"
-#: include/functions.inc:3178 include/functions.inc:3182
+#: include/functions.inc:3180 include/functions.inc:3184
msgid "no ID available!"
msgstr "Μη διαθÎσιμη ID!"
-#: include/functions.inc:3198
+#: include/functions.inc:3200
msgid "maximum tries exceeded!"
msgstr "ΥπÎÏβαση μεγίστου οÏίου Ï€Ïοσπαθειών!"
-#: include/functions.inc:3260
+#: include/functions.inc:3262
msgid "Cannot allocate a free ID!"
msgstr "Δεν είναι δυνατή η διάθεση μιας free ID!"
-#: include/functions.inc:3296
+#: include/functions.inc:3298
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr "ΑδÏνατος ο εντοπισμός του αÏχείου '%s' - ΠαÏακαλώ εκτελÎστε την εντολή '%s' για να το διοÏθώσετε"
-#: include/class_session.inc:50 include/class_session.inc:87
-#: include/class_session.inc:125
+#: include/class_session.inc:50 include/class_session.inc:88
+#: include/class_session.inc:127
msgid "Requested channel does not exist! Please contact your Administrator."
msgstr ""
@@ -3407,7 +3412,7 @@ msgid ""
" be done by others will get lost if you save this entry!"
msgstr ""
-#: include/class_plugin.inc:1467
+#: include/class_plugin.inc:1313
#, php-format
msgid "Tab \"%s\""
msgstr "Tab \"%s\""
@@ -3539,7 +3544,7 @@ msgid "days"
msgstr "ημÎÏες"
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2171
+#: include/simpleplugin/class_attribute.inc:2172
#, php-format
msgid "%s (required)"
msgstr "%s (απαιτείται)"
@@ -3608,7 +3613,7 @@ msgid "%s (%d bytes)"
msgstr ""
#: include/simpleplugin/class_attribute.inc:1626
-#: include/simpleplugin/class_attribute.inc:1803
+#: include/simpleplugin/class_attribute.inc:1804
msgid "Upload"
msgstr "Αποστολή"
@@ -3617,22 +3622,22 @@ msgstr "Αποστολή"
msgid "Download"
msgstr "Λήψη"
-#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1786
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1836
+#: include/simpleplugin/class_attribute.inc:1837
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr "Base"
-#: include/simpleplugin/class_attribute.inc:1839
+#: include/simpleplugin/class_attribute.inc:1840
msgid "Object base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:2769
+#: include/simpleplugin/class_attribute.inc:2770
#, php-format
msgid "Invalid value for %s"
msgstr ""
diff --git a/locale/en/fusiondirectory.po b/locale/en/fusiondirectory.po
index 1419cbb0a839c2299151a810f3df9460e3a8f49e..a7e7e1c8034e599b3f51268d44b6b2d7f596e713 100644
--- a/locale/en/fusiondirectory.po
+++ b/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory VERSION\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-03-08 17:12+0100\n"
+"POT-Creation-Date: 2016-04-06 11:27+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
"Language-Team: English\n"
@@ -29,31 +29,31 @@ msgstr ""
msgid "References"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:53
#: plugins/admin/groups/class_roleGeneric.inc:57
+#: plugins/admin/groups/class_roleGeneric.inc:61
#: plugins/admin/groups/class_groupManagement.inc:71
#: plugins/admin/aclrole/class_aclRole.inc:78
#: plugins/admin/acl/class_aclAssignment.inc:49
msgid "Role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:54
+#: plugins/admin/groups/class_roleGeneric.inc:58
msgid "Role information"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:58
+#: plugins/admin/groups/class_roleGeneric.inc:62
msgid "Organizational role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:80
+#: plugins/admin/groups/class_roleGeneric.inc:84
msgid "Informations"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:84
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:174
+#: plugins/admin/departments/class_department.inc:176
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -63,45 +63,45 @@ msgstr ""
msgid "Name"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:84
+#: plugins/admin/groups/class_roleGeneric.inc:88
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
msgid "Name of this group"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:89
+#: plugins/admin/groups/class_roleGeneric.inc:93
#: plugins/admin/groups/class_group.inc:66
#: plugins/admin/groups/class_ogroup.inc:192
#: plugins/admin/groups/group-list.xml:41
#: plugins/admin/departments/class_department.inc:73
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/aclrole/class_aclRole.inc:105
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
msgid "Description"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:89
+#: plugins/admin/groups/class_roleGeneric.inc:93
msgid "Description of the role"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:93
+#: plugins/admin/groups/class_roleGeneric.inc:97
msgid "Phone number"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:97
+#: plugins/admin/groups/class_roleGeneric.inc:101
msgid "Fax number"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:101
+#: plugins/admin/groups/class_roleGeneric.inc:105
#: plugins/admin/users/class_userManagement.inc:42
#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
#: setup/class_setupStep_Migrate.inc:871
msgid "Users"
msgstr ""
-#: plugins/admin/groups/class_roleGeneric.inc:101
+#: plugins/admin/groups/class_roleGeneric.inc:105
msgid "Add users for the role"
msgstr ""
@@ -282,8 +282,8 @@ msgstr ""
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
#: include/simpleplugin/class_dialogAttributes.inc:632
#: include/simpleplugin/class_dialogAttributes.inc:633
-#: include/simpleplugin/class_attribute.inc:2675
#: include/simpleplugin/class_attribute.inc:2676
+#: include/simpleplugin/class_attribute.inc:2677
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -394,7 +394,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:34
#: plugins/admin/departments/class_department.inc:40
#: plugins/admin/departments/dep-list.xml:21
-#: plugins/personal/generic/class_user.inc:394
+#: plugins/personal/generic/class_user.inc:419
msgid "Department"
msgstr ""
@@ -442,7 +442,7 @@ msgid "Website of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:85
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:435
msgid "Manager"
msgstr ""
@@ -453,12 +453,12 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:91
#: plugins/admin/departments/class_department.inc:97
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:329
msgid "Location"
msgstr ""
#: plugins/admin/departments/class_department.inc:94
-#: plugins/personal/generic/class_user.inc:308
+#: plugins/personal/generic/class_user.inc:333
msgid "State"
msgstr ""
@@ -470,7 +470,7 @@ msgid "Country"
msgstr ""
#: plugins/admin/departments/class_department.inc:103
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Address"
msgstr ""
@@ -480,7 +480,7 @@ msgid "A postal address for this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:107
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Phone"
msgstr ""
@@ -489,7 +489,7 @@ msgid "Telephone number"
msgstr ""
#: plugins/admin/departments/class_department.inc:111
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Fax"
msgstr ""
@@ -542,7 +542,7 @@ msgstr ""
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:415
msgid "Organization"
msgstr ""
@@ -563,7 +563,7 @@ msgid "Given name"
msgstr ""
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
@@ -571,8 +571,8 @@ msgid "Login"
msgstr ""
#: plugins/admin/users/user-list.xml:79
-#: plugins/personal/generic/class_user.inc:246
-#: plugins/personal/generic/class_user.inc:252
+#: plugins/personal/generic/class_user.inc:271
+#: plugins/personal/generic/class_user.inc:277
msgid "User"
msgstr ""
@@ -625,9 +625,9 @@ msgid "Manage user accounts and their properties"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:140
-#: include/class_management.inc:341 include/class_management.inc:488
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571 include/class_CopyPasteHandler.inc:248
+#: include/class_management.inc:343 include/class_management.inc:490
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573 include/class_CopyPasteHandler.inc:248
#: include/simpleplugin/class_simpleManagement.inc:651
#: include/simpleplugin/class_simpleManagement.inc:749
#: include/simpleplugin/class_simpleManagement.inc:799
@@ -654,12 +654,12 @@ msgid "Lock account"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:253
+#: plugins/personal/generic/class_user.inc:278
msgid "User account"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:247
+#: plugins/personal/generic/class_user.inc:272
msgid "User account information"
msgstr ""
@@ -677,8 +677,8 @@ msgid "Edit category ACL"
msgstr ""
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
-#: include/simpleplugin/class_attribute.inc:2686
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2686
+#: include/simpleplugin/class_attribute.inc:2687
#, php-format
msgid "Delete"
msgstr ""
@@ -929,7 +929,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -950,215 +950,219 @@ msgstr ""
msgid "Same password as above, to avoid errors"
msgstr ""
-#: plugins/personal/generic/class_user.inc:274
+#: plugins/personal/generic/class_user.inc:299
msgid "Personal information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
msgid "Last name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
msgid "First name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
msgid "Short description of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "Picture"
msgstr ""
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "The avatar for this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:300
+#: plugins/personal/generic/class_user.inc:325
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Business postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Business phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Mobile"
msgstr ""
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Business mobile number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Pager"
msgstr ""
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:367
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:351
+#: plugins/personal/generic/class_user.inc:376
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr ""
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:387
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Display name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Private phone"
msgstr ""
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Home phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:405
msgid "Organizational information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid "Title"
msgstr ""
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid ""
"Title of a person in their organizational context. Each title is one value "
"of this multi-valued attribute"
msgstr ""
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:419
+msgid "Department to which the user belongs"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:423
msgid "Department No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:423
msgid "Department number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:431
msgid "Employee type"
msgstr ""
-#: plugins/personal/generic/class_user.inc:568
+#: plugins/personal/generic/class_user.inc:593
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:571
+#: plugins/personal/generic/class_user.inc:596
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:581
+#: plugins/personal/generic/class_user.inc:606
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:595
+#: plugins/personal/generic/class_user.inc:620
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:600
-#: plugins/personal/generic/class_user.inc:604
+#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:629
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:636
msgid "You need to specify your current password in order to proceed."
msgstr ""
-#: plugins/personal/generic/class_user.inc:613
+#: plugins/personal/generic/class_user.inc:638
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new password"
"\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:615
+#: plugins/personal/generic/class_user.inc:640
#: ihtml/themes/default/recovery.tpl.c:26
#: ihtml/themes/default/recovery.tpl.c:29
msgid "New password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:617
+#: plugins/personal/generic/class_user.inc:642
msgid "The password used as new and current are too similar."
msgstr ""
-#: plugins/personal/generic/class_user.inc:619
+#: plugins/personal/generic/class_user.inc:644
msgid "The password used as new is to short."
msgstr ""
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:646
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
@@ -2133,13 +2137,13 @@ msgstr ""
msgid "Down"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
-#: include/simpleplugin/class_attribute.inc:2648
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2648
+#: include/simpleplugin/class_attribute.inc:2649
msgid "Sort up"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
-#: include/simpleplugin/class_attribute.inc:2661
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2661
+#: include/simpleplugin/class_attribute.inc:2662
msgid "Sort down"
msgstr ""
@@ -2147,23 +2151,23 @@ msgstr ""
msgid "Select all"
msgstr ""
-#: include/class_listing.inc:537 include/class_management.inc:679
-#: include/class_config.inc:479 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3107
-#: include/functions.inc:3128 include/functions.inc:3158
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198 include/functions.inc:3260
+#: include/class_listing.inc:537 include/class_management.inc:681
+#: include/class_config.inc:373 include/class_config.inc:484
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:682
+#: include/class_msgPool.inc:713 include/class_msgPool.inc:740
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200 include/functions.inc:3262
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/class_plugin.inc:1510 include/class_CopyPasteHandler.inc:278
#: include/simpleplugin/class_attribute.inc:1540
#: include/simpleplugin/class_attribute.inc:1543
#: include/simpleplugin/class_attribute.inc:1546
-#: include/simpleplugin/class_attribute.inc:1784
-#: include/simpleplugin/class_attribute.inc:1887
-#: include/simpleplugin/class_attribute.inc:1889
+#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1888
+#: include/simpleplugin/class_attribute.inc:1890
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: include/password-methods/class_password-methods-sasl.inc:60
@@ -2250,33 +2254,33 @@ msgstr ""
msgid "Create a new snapshot from this object"
msgstr ""
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "Filter error"
msgstr ""
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "The filter is incomplete!"
msgstr ""
-#: include/class_management.inc:412
+#: include/class_management.inc:414
#: include/simpleplugin/class_simpleManagement.inc:716
msgid "Permission error"
msgstr ""
-#: include/class_management.inc:488
+#: include/class_management.inc:490
#: include/simpleplugin/class_simpleManagement.inc:749
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr ""
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573
#: include/simpleplugin/class_simpleManagement.inc:799
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr ""
-#: include/class_management.inc:679
+#: include/class_management.inc:681
#, php-format
msgid ""
"No tab declaration for '%s' found in your configuration file. Cannot create "
@@ -2301,17 +2305,18 @@ msgstr ""
#: include/class_config.inc:296
#, php-format
msgid ""
-"It seems you are trying to decode something which is not encoded : %s<br/>"
-"\\nPlease check you are not using a fusiondirectory.secrets file while your "
+"It seems you are trying to decode something which is not encoded : %s<br/>\n"
+"Please check you are not using a fusiondirectory.secrets file while your "
"passwords are not encrypted."
msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:918
-#: include/class_ldap.inc:1372 include/functions.inc:526
+#: include/class_config.inc:338 include/class_ldap.inc:895
+#: include/class_ldap.inc:1349 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
-#: include/simpleplugin/class_attribute.inc:2909
+#: include/functions.inc:2986 include/functions.inc:3160
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2910
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
@@ -2322,11 +2327,16 @@ msgstr ""
msgid "LDAP error"
msgstr ""
-#: include/class_config.inc:337
+#: include/class_config.inc:338
msgid "Cannot bind to LDAP. Please contact the system administrator."
msgstr ""
-#: include/class_config.inc:480
+#: include/class_config.inc:373
+#, php-format
+msgid "Location \"%s\" could not be found in the configuration file"
+msgstr ""
+
+#: include/class_config.inc:485
#, php-format
msgid "The selected mail method (class %s) is not available"
msgstr ""
@@ -2362,49 +2372,49 @@ msgstr ""
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr ""
-#: include/class_ldap.inc:869 include/class_ldap.inc:905
+#: include/class_ldap.inc:846 include/class_ldap.inc:882
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
#: include/functions.inc:2346 include/class_session.inc:50
-#: include/class_session.inc:87 include/class_session.inc:125
+#: include/class_session.inc:88 include/class_session.inc:127
#: include/class_log.inc:96 include/class_acl.inc:118
msgid "Internal error"
msgstr ""
-#: include/class_ldap.inc:869
+#: include/class_ldap.inc:846
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:905
+#: include/class_ldap.inc:882
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1017
+#: include/class_ldap.inc:994
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr ""
-#: include/class_ldap.inc:1019
+#: include/class_ldap.inc:996
#, php-format
msgid "while operating on LDAP server %s"
msgstr ""
-#: include/class_ldap.inc:1109
+#: include/class_ldap.inc:1086
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1221
+#: include/class_ldap.inc:1198
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
"in line %s"
msgstr ""
-#: include/class_ldap.inc:1232
+#: include/class_ldap.inc:1209
#, php-format
msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
msgstr ""
@@ -2989,7 +2999,7 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr ""
-#: include/functions.inc:496 include/functions.inc:3295
+#: include/functions.inc:496 include/functions.inc:3297
#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
#: include/simpleplugin/class_simplePlugin.inc:269
#: include/simpleplugin/class_simplePlugin.inc:281
@@ -3200,9 +3210,9 @@ msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
#: include/functions.inc:3107 include/functions.inc:3128
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200
msgid "Cannot allocate a free ID:"
msgstr ""
@@ -3215,33 +3225,29 @@ msgstr ""
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3158
-msgid "Cannot create sambaUnixIdPool entry!"
-msgstr ""
-
-#: include/functions.inc:3166
+#: include/functions.inc:3168
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3178 include/functions.inc:3182
+#: include/functions.inc:3180 include/functions.inc:3184
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3198
+#: include/functions.inc:3200
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3260
+#: include/functions.inc:3262
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3296
+#: include/functions.inc:3298
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
-#: include/class_session.inc:50 include/class_session.inc:87
-#: include/class_session.inc:125
+#: include/class_session.inc:50 include/class_session.inc:88
+#: include/class_session.inc:127
msgid "Requested channel does not exist! Please contact your Administrator."
msgstr ""
@@ -3397,7 +3403,7 @@ msgid ""
"be done by others will get lost if you save this entry!"
msgstr ""
-#: include/class_plugin.inc:1467
+#: include/class_plugin.inc:1313
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -3529,7 +3535,7 @@ msgid "days"
msgstr ""
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2171
+#: include/simpleplugin/class_attribute.inc:2172
#, php-format
msgid "%s (required)"
msgstr ""
@@ -3599,7 +3605,7 @@ msgid "%s (%d bytes)"
msgstr ""
#: include/simpleplugin/class_attribute.inc:1626
-#: include/simpleplugin/class_attribute.inc:1803
+#: include/simpleplugin/class_attribute.inc:1804
msgid "Upload"
msgstr ""
@@ -3608,22 +3614,22 @@ msgstr ""
msgid "Download"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1786
msgid ""
"Cannot save user picture, FusionDirectory requires the package 'php5-"
"imagick' to be installed!"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1836
+#: include/simpleplugin/class_attribute.inc:1837
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1839
+#: include/simpleplugin/class_attribute.inc:1840
msgid "Object base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:2769
+#: include/simpleplugin/class_attribute.inc:2770
#, php-format
msgid "Invalid value for %s"
msgstr ""
diff --git a/locale/es/fusiondirectory.po b/locale/es/fusiondirectory.po
index fb254145efcae73b2775d6c07d9c20eebad65bf5..7e172f438162fd5aa2a103142f5bb542d618df37 100644
--- a/locale/es/fusiondirectory.po
+++ b/locale/es/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-03-14 12:07+0100\n"
-"PO-Revision-Date: 2016-03-07 12:09+0000\n"
+"POT-Creation-Date: 2016-04-06 11:27+0200\n"
+"PO-Revision-Date: 2016-04-06 09:24+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"
@@ -52,7 +52,7 @@ msgstr ""
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:174
+#: plugins/admin/departments/class_department.inc:176
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -75,7 +75,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:73
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/aclrole/class_aclRole.inc:105
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
msgid "Description"
@@ -281,8 +281,8 @@ msgstr "Crear"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
#: include/simpleplugin/class_dialogAttributes.inc:632
#: include/simpleplugin/class_dialogAttributes.inc:633
-#: include/simpleplugin/class_attribute.inc:2675
#: include/simpleplugin/class_attribute.inc:2676
+#: include/simpleplugin/class_attribute.inc:2677
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -393,7 +393,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:34
#: plugins/admin/departments/class_department.inc:40
#: plugins/admin/departments/dep-list.xml:21
-#: plugins/personal/generic/class_user.inc:394
+#: plugins/personal/generic/class_user.inc:419
msgid "Department"
msgstr "Departamento"
@@ -441,7 +441,7 @@ msgid "Website of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:85
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:435
msgid "Manager"
msgstr "Gestor"
@@ -452,12 +452,12 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:91
#: plugins/admin/departments/class_department.inc:97
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:329
msgid "Location"
msgstr "Localización"
#: plugins/admin/departments/class_department.inc:94
-#: plugins/personal/generic/class_user.inc:308
+#: plugins/personal/generic/class_user.inc:333
msgid "State"
msgstr "Provincia"
@@ -469,7 +469,7 @@ msgid "Country"
msgstr "PaÃs"
#: plugins/admin/departments/class_department.inc:103
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Address"
msgstr "Dirección"
@@ -479,7 +479,7 @@ msgid "A postal address for this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:107
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Phone"
msgstr "Teléfono"
@@ -488,7 +488,7 @@ msgid "Telephone number"
msgstr "Número de teléfono"
#: plugins/admin/departments/class_department.inc:111
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Fax"
msgstr "Fax"
@@ -541,7 +541,7 @@ msgstr "Lista de Departamentos"
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:415
msgid "Organization"
msgstr "Organización"
@@ -562,7 +562,7 @@ msgid "Given name"
msgstr "Nombre de pila"
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
@@ -570,8 +570,8 @@ msgid "Login"
msgstr "Inicio"
#: plugins/admin/users/user-list.xml:79
-#: plugins/personal/generic/class_user.inc:246
-#: plugins/personal/generic/class_user.inc:252
+#: plugins/personal/generic/class_user.inc:271
+#: plugins/personal/generic/class_user.inc:277
msgid "User"
msgstr "Usuario"
@@ -624,9 +624,9 @@ msgid "Manage user accounts and their properties"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:140
-#: include/class_management.inc:341 include/class_management.inc:488
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571 include/class_CopyPasteHandler.inc:248
+#: include/class_management.inc:343 include/class_management.inc:490
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573 include/class_CopyPasteHandler.inc:248
#: include/simpleplugin/class_simpleManagement.inc:651
#: include/simpleplugin/class_simpleManagement.inc:749
#: include/simpleplugin/class_simpleManagement.inc:799
@@ -653,12 +653,12 @@ msgid "Lock account"
msgstr "Bloquear cuenta"
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:253
+#: plugins/personal/generic/class_user.inc:278
msgid "User account"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:247
+#: plugins/personal/generic/class_user.inc:272
msgid "User account information"
msgstr ""
@@ -676,8 +676,8 @@ msgid "Edit category ACL"
msgstr "Editar la categorÃa ACL"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
-#: include/simpleplugin/class_attribute.inc:2686
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2686
+#: include/simpleplugin/class_attribute.inc:2687
#, php-format
msgid "Delete"
msgstr "Eliminar"
@@ -928,7 +928,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -949,215 +949,219 @@ msgstr ""
msgid "Same password as above, to avoid errors"
msgstr ""
-#: plugins/personal/generic/class_user.inc:274
+#: plugins/personal/generic/class_user.inc:299
msgid "Personal information"
msgstr "Información personal"
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "Apellido"
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
msgid "Last name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "Nombre"
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
msgid "First name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
msgid "Short description of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "Picture"
msgstr ""
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "The avatar for this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:300
+#: plugins/personal/generic/class_user.inc:325
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Business postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room No."
msgstr "Número sala"
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room number"
msgstr "Número de habitación"
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Business phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Mobile"
msgstr "Móvil"
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Business mobile number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Pager"
msgstr "Buscapersonas"
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Homepage"
msgstr "Página Web"
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:367
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:351
+#: plugins/personal/generic/class_user.inc:376
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr "Idioma preferido"
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:387
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Display name"
msgstr "Nombre a Mostrar"
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home postal address"
msgstr "Dirección Postal personal"
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Private phone"
msgstr "Teléfono privado"
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Home phone number"
msgstr "Número de teléfono personal"
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:405
msgid "Organizational information"
msgstr "Información corporativa"
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid "Title"
msgstr "TÃtulo"
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid ""
"Title of a person in their organizational context. Each title is one value "
"of this multi-valued attribute"
msgstr ""
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:419
+msgid "Department to which the user belongs"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:423
msgid "Department No."
msgstr "Número departamento"
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:423
msgid "Department number"
msgstr "Número del departamento"
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee No."
msgstr "Número empleado"
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee number"
msgstr "Número de empleado"
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:431
msgid "Employee type"
msgstr "CategorÃa profesional"
-#: plugins/personal/generic/class_user.inc:568
+#: plugins/personal/generic/class_user.inc:593
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:571
+#: plugins/personal/generic/class_user.inc:596
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:581
+#: plugins/personal/generic/class_user.inc:606
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:595
+#: plugins/personal/generic/class_user.inc:620
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:600
-#: plugins/personal/generic/class_user.inc:604
+#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:629
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:636
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:613
+#: plugins/personal/generic/class_user.inc:638
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:615
+#: plugins/personal/generic/class_user.inc:640
#: ihtml/themes/default/recovery.tpl.c:26
#: ihtml/themes/default/recovery.tpl.c:29
msgid "New password"
msgstr "Nueva contraseña"
-#: plugins/personal/generic/class_user.inc:617
+#: plugins/personal/generic/class_user.inc:642
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:619
+#: plugins/personal/generic/class_user.inc:644
msgid "The password used as new is to short."
msgstr "La nueva contraseña es demasiado corta."
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:646
msgid "The password contains possibly problematic Unicode characters!"
msgstr "La clave contiene caracteres unicode posiblemente problemáticos!"
@@ -2133,13 +2137,13 @@ msgstr "Arriba"
msgid "Down"
msgstr "Abajo"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
-#: include/simpleplugin/class_attribute.inc:2648
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2648
+#: include/simpleplugin/class_attribute.inc:2649
msgid "Sort up"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
-#: include/simpleplugin/class_attribute.inc:2661
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2661
+#: include/simpleplugin/class_attribute.inc:2662
msgid "Sort down"
msgstr ""
@@ -2147,23 +2151,23 @@ msgstr ""
msgid "Select all"
msgstr "Seleccione todos"
-#: include/class_listing.inc:537 include/class_management.inc:679
-#: include/class_config.inc:479 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3107
-#: include/functions.inc:3128 include/functions.inc:3158
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198 include/functions.inc:3260
+#: include/class_listing.inc:537 include/class_management.inc:681
+#: include/class_config.inc:373 include/class_config.inc:484
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:682
+#: include/class_msgPool.inc:713 include/class_msgPool.inc:740
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200 include/functions.inc:3262
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/class_plugin.inc:1510 include/class_CopyPasteHandler.inc:278
#: include/simpleplugin/class_attribute.inc:1540
#: include/simpleplugin/class_attribute.inc:1543
#: include/simpleplugin/class_attribute.inc:1546
-#: include/simpleplugin/class_attribute.inc:1784
-#: include/simpleplugin/class_attribute.inc:1887
-#: include/simpleplugin/class_attribute.inc:1889
+#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1888
+#: include/simpleplugin/class_attribute.inc:1890
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: include/password-methods/class_password-methods-sasl.inc:60
@@ -2250,33 +2254,33 @@ msgstr "Crear instantánea"
msgid "Create a new snapshot from this object"
msgstr "¡Crear una nueva instantánea de este objeto!"
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "Filter error"
msgstr "Error del filtro"
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "The filter is incomplete!"
msgstr "¡El filtro está incompleto!"
-#: include/class_management.inc:412
+#: include/class_management.inc:414
#: include/simpleplugin/class_simpleManagement.inc:716
msgid "Permission error"
msgstr "Error de permisos"
-#: include/class_management.inc:488
+#: include/class_management.inc:490
#: include/simpleplugin/class_simpleManagement.inc:749
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr "No tiene permisos para crear una instantanea para %s."
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573
#: include/simpleplugin/class_simpleManagement.inc:799
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr "No tiene permisos para recuperar una instantanea para %s."
-#: include/class_management.inc:679
+#: include/class_management.inc:681
#, php-format
msgid ""
"No tab declaration for '%s' found in your configuration file. Cannot create "
@@ -2301,17 +2305,17 @@ msgstr "Error en la configuración"
#: include/class_config.inc:296
#, php-format
msgid ""
-"It seems you are trying to decode something which is not encoded : "
-"%s<br/>\\nPlease check you are not using a fusiondirectory.secrets file "
-"while your passwords are not encrypted."
+"It seems you are trying to decode something which is not encoded : %s<br/>\n"
+"Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:918
-#: include/class_ldap.inc:1372 include/functions.inc:526
+#: include/class_config.inc:338 include/class_ldap.inc:895
+#: include/class_ldap.inc:1349 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
-#: include/simpleplugin/class_attribute.inc:2909
+#: include/functions.inc:2986 include/functions.inc:3160
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2910
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
@@ -2322,11 +2326,16 @@ msgstr ""
msgid "LDAP error"
msgstr "Error LDAP"
-#: include/class_config.inc:337
+#: include/class_config.inc:338
msgid "Cannot bind to LDAP. Please contact the system administrator."
msgstr "No se puede conectar a LDAP: Por favor consulte con el administrador de sistemas."
-#: include/class_config.inc:480
+#: include/class_config.inc:373
+#, php-format
+msgid "Location \"%s\" could not be found in the configuration file"
+msgstr ""
+
+#: include/class_config.inc:485
#, php-format
msgid "The selected mail method (class %s) is not available"
msgstr ""
@@ -2362,49 +2371,49 @@ msgstr "Aviso e rendimiento"
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr "El rendimiento LDAP es bajo: ¡la última consulta tardó sobre %.2fs!"
-#: include/class_ldap.inc:869 include/class_ldap.inc:905
+#: include/class_ldap.inc:846 include/class_ldap.inc:882
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
#: include/functions.inc:2346 include/class_session.inc:50
-#: include/class_session.inc:87 include/class_session.inc:125
+#: include/class_session.inc:88 include/class_session.inc:127
#: include/class_log.inc:96 include/class_acl.inc:118
msgid "Internal error"
msgstr "error interno"
-#: include/class_ldap.inc:869
+#: include/class_ldap.inc:846
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:905
+#: include/class_ldap.inc:882
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1017
+#: include/class_ldap.inc:994
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr "mientras operaba en '%s' usando el servidor LDAP '%s'"
-#: include/class_ldap.inc:1019
+#: include/class_ldap.inc:996
#, php-format
msgid "while operating on LDAP server %s"
msgstr "mientras operaba en el servidor LDAP '%s'"
-#: include/class_ldap.inc:1109
+#: include/class_ldap.inc:1086
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1221
+#: include/class_ldap.inc:1198
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr "No es un DN válido: '%s': El bloque para importar debe empezar por 'dn: ...' en la linea %s"
-#: include/class_ldap.inc:1232
+#: include/class_ldap.inc:1209
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2992,7 +3001,7 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr "Error fatal: no se puede instanciar la clase '%s' - intente solucionarlo ejecutando '%s'"
-#: include/functions.inc:496 include/functions.inc:3295
+#: include/functions.inc:496 include/functions.inc:3297
#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
#: include/simpleplugin/class_simplePlugin.inc:269
#: include/simpleplugin/class_simplePlugin.inc:281
@@ -3204,9 +3213,9 @@ msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
#: include/functions.inc:3107 include/functions.inc:3128
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200
msgid "Cannot allocate a free ID:"
msgstr "No se puede asignar un identificador (ID) libre:"
@@ -3219,33 +3228,29 @@ msgstr "¡método de asignación de id desconocido!"
msgid "%sPoolMin >= %sPoolMax!"
msgstr "¡%sPoolMin >= %sPoolMax!"
-#: include/functions.inc:3158
-msgid "Cannot create sambaUnixIdPool entry!"
-msgstr "¡No se puede crear la entrada sambaUnixIdPool!"
-
-#: include/functions.inc:3166
+#: include/functions.inc:3168
msgid "sambaUnixIdPool is not unique!"
msgstr "¡sambaUnixIdPool no es único!"
-#: include/functions.inc:3178 include/functions.inc:3182
+#: include/functions.inc:3180 include/functions.inc:3184
msgid "no ID available!"
msgstr "¡No hay ID disponibles!"
-#: include/functions.inc:3198
+#: include/functions.inc:3200
msgid "maximum tries exceeded!"
msgstr "¡Excedido el número de intentos máximo!"
-#: include/functions.inc:3260
+#: include/functions.inc:3262
msgid "Cannot allocate a free ID!"
msgstr "¡No se puede asignar un identificador (ID) libre!"
-#: include/functions.inc:3296
+#: include/functions.inc:3298
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr "No se puede encontrar el archivo '%s' - por favor ejecute '%s' para solucionarlo"
-#: include/class_session.inc:50 include/class_session.inc:87
-#: include/class_session.inc:125
+#: include/class_session.inc:50 include/class_session.inc:88
+#: include/class_session.inc:127
msgid "Requested channel does not exist! Please contact your Administrator."
msgstr "¡El canal requerido no existe!. Por favor contacte con su Administrador."
@@ -3401,7 +3406,7 @@ msgid ""
" be done by others will get lost if you save this entry!"
msgstr ""
-#: include/class_plugin.inc:1467
+#: include/class_plugin.inc:1313
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -3533,7 +3538,7 @@ msgid "days"
msgstr "dÃas"
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2171
+#: include/simpleplugin/class_attribute.inc:2172
#, php-format
msgid "%s (required)"
msgstr ""
@@ -3602,7 +3607,7 @@ msgid "%s (%d bytes)"
msgstr ""
#: include/simpleplugin/class_attribute.inc:1626
-#: include/simpleplugin/class_attribute.inc:1803
+#: include/simpleplugin/class_attribute.inc:1804
msgid "Upload"
msgstr "Enviar"
@@ -3611,22 +3616,22 @@ msgstr "Enviar"
msgid "Download"
msgstr "Descargar"
-#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1786
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr "No se puede guardar la foto del usuario, FusionDirectory requiere que este instalado el paquete 'php5-imagick'"
-#: include/simpleplugin/class_attribute.inc:1836
+#: include/simpleplugin/class_attribute.inc:1837
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr "Base"
-#: include/simpleplugin/class_attribute.inc:1839
+#: include/simpleplugin/class_attribute.inc:1840
msgid "Object base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:2769
+#: include/simpleplugin/class_attribute.inc:2770
#, php-format
msgid "Invalid value for %s"
msgstr ""
diff --git a/locale/es_CO/fusiondirectory.po b/locale/es_CO/fusiondirectory.po
index 70ea159eb114d534d095472f5261a67e69fef6ce..9614daee26d517dea5e93a0b98f71ddb8804b09b 100644
--- a/locale/es_CO/fusiondirectory.po
+++ b/locale/es_CO/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-03-14 12:07+0100\n"
-"PO-Revision-Date: 2016-03-07 12:09+0000\n"
+"POT-Creation-Date: 2016-04-06 11:27+0200\n"
+"PO-Revision-Date: 2016-04-06 09:24+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"
@@ -53,7 +53,7 @@ msgstr "Datos"
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:174
+#: plugins/admin/departments/class_department.inc:176
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -76,7 +76,7 @@ msgstr "Nombre de este grupo"
#: plugins/admin/departments/class_department.inc:73
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/aclrole/class_aclRole.inc:105
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
msgid "Description"
@@ -282,8 +282,8 @@ msgstr "Crear"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
#: include/simpleplugin/class_dialogAttributes.inc:632
#: include/simpleplugin/class_dialogAttributes.inc:633
-#: include/simpleplugin/class_attribute.inc:2675
#: include/simpleplugin/class_attribute.inc:2676
+#: include/simpleplugin/class_attribute.inc:2677
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -394,7 +394,7 @@ msgstr "componente de dominio"
#: plugins/admin/departments/class_department.inc:34
#: plugins/admin/departments/class_department.inc:40
#: plugins/admin/departments/dep-list.xml:21
-#: plugins/personal/generic/class_user.inc:394
+#: plugins/personal/generic/class_user.inc:419
msgid "Department"
msgstr "División"
@@ -442,7 +442,7 @@ msgid "Website of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:85
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:435
msgid "Manager"
msgstr "Mánager"
@@ -453,12 +453,12 @@ msgstr "Mánager de este %s"
#: plugins/admin/departments/class_department.inc:91
#: plugins/admin/departments/class_department.inc:97
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:329
msgid "Location"
msgstr "Ubicación"
#: plugins/admin/departments/class_department.inc:94
-#: plugins/personal/generic/class_user.inc:308
+#: plugins/personal/generic/class_user.inc:333
msgid "State"
msgstr "Estado"
@@ -470,7 +470,7 @@ msgid "Country"
msgstr "PaÃs"
#: plugins/admin/departments/class_department.inc:103
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Address"
msgstr "Dirección"
@@ -480,7 +480,7 @@ msgid "A postal address for this %s"
msgstr "Dirección postal de este %s"
#: plugins/admin/departments/class_department.inc:107
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Phone"
msgstr "Teléfono"
@@ -489,7 +489,7 @@ msgid "Telephone number"
msgstr "Número telefónico"
#: plugins/admin/departments/class_department.inc:111
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Fax"
msgstr "Fax"
@@ -542,7 +542,7 @@ msgstr "Lista de categorÃas"
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:415
msgid "Organization"
msgstr "Organización"
@@ -563,7 +563,7 @@ msgid "Given name"
msgstr "Nombre"
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
@@ -571,8 +571,8 @@ msgid "Login"
msgstr "Cuenta de usuario"
#: plugins/admin/users/user-list.xml:79
-#: plugins/personal/generic/class_user.inc:246
-#: plugins/personal/generic/class_user.inc:252
+#: plugins/personal/generic/class_user.inc:271
+#: plugins/personal/generic/class_user.inc:277
msgid "User"
msgstr "Usuario"
@@ -625,9 +625,9 @@ msgid "Manage user accounts and their properties"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:140
-#: include/class_management.inc:341 include/class_management.inc:488
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571 include/class_CopyPasteHandler.inc:248
+#: include/class_management.inc:343 include/class_management.inc:490
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573 include/class_CopyPasteHandler.inc:248
#: include/simpleplugin/class_simpleManagement.inc:651
#: include/simpleplugin/class_simpleManagement.inc:749
#: include/simpleplugin/class_simpleManagement.inc:799
@@ -654,12 +654,12 @@ msgid "Lock account"
msgstr "Bloquear cuenta"
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:253
+#: plugins/personal/generic/class_user.inc:278
msgid "User account"
msgstr "Cuenta de Usuario"
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:247
+#: plugins/personal/generic/class_user.inc:272
msgid "User account information"
msgstr "Información de Cuentas de Usuario"
@@ -677,8 +677,8 @@ msgid "Edit category ACL"
msgstr "Editar categiorÃa ACL"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
-#: include/simpleplugin/class_attribute.inc:2686
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2686
+#: include/simpleplugin/class_attribute.inc:2687
#, php-format
msgid "Delete"
msgstr "Borrar"
@@ -929,7 +929,7 @@ msgid "Password hash method to use"
msgstr "Tipo de 'hash' para la contraseña"
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -950,215 +950,219 @@ msgstr "Su contraseña de nuevo"
msgid "Same password as above, to avoid errors"
msgstr "Igual a la contraseña anterior para evitar errores"
-#: plugins/personal/generic/class_user.inc:274
+#: plugins/personal/generic/class_user.inc:299
msgid "Personal information"
msgstr "Información personal"
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "Apellido"
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
msgid "Last name of this user"
msgstr "Apellido de este usuario"
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "Primer nombre"
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
msgid "First name of this user"
msgstr "Primer nombre de este usuario"
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
msgid "Short description of the user"
msgstr "Descripción corta para éste usuario"
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "Picture"
msgstr "Imagen"
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "The avatar for this user"
msgstr "El avatar para este usuario"
-#: plugins/personal/generic/class_user.inc:300
+#: plugins/personal/generic/class_user.inc:325
msgid "Organizational contact information"
msgstr "Información de contacto Profesional"
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Business postal address"
msgstr "Dirección postal de trabajo"
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room No."
msgstr "Habitación Nro."
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room number"
msgstr "Número de habitación"
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Business phone number"
msgstr "Número telefónico de trabajo"
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Mobile"
msgstr "Celular"
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Business mobile number"
msgstr "Celular de trabajo"
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Pager"
msgstr "BÃper"
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Business pager number"
msgstr "BÃper laboral"
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Business fax number"
msgstr "Nro. Fax de trabajo"
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Homepage"
msgstr "Página web"
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Personal homepage"
msgstr "Página web personal"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:367
msgid "Account information"
msgstr "Información de cuenta"
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
msgid "Login of this user"
msgstr "Cuenta de este usuario"
-#: plugins/personal/generic/class_user.inc:351
+#: plugins/personal/generic/class_user.inc:376
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr "Idioma preferido"
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
msgid "Password of the user"
msgstr "Contraseña del usuario"
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:387
msgid "Personal contact information"
msgstr "Información de contacto 'Personal'"
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Display name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home address"
msgstr "Dirección personal"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home postal address"
msgstr "Código postal personal"
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Private phone"
msgstr "Teléfono personal"
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Home phone number"
msgstr "Teléfono de domicilio personal"
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:405
msgid "Organizational information"
msgstr "Información Profesional"
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid "Title"
msgstr "Tratamiento 'Sr, Sra...'"
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
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:398
+#: plugins/personal/generic/class_user.inc:419
+msgid "Department to which the user belongs"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:423
msgid "Department No."
msgstr "División No."
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:423
msgid "Department number"
msgstr "Número de División"
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee No."
msgstr "Empleado N°"
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee number"
msgstr "Número de empleado"
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:431
msgid "Employee type"
msgstr "Tipo de empleado"
-#: plugins/personal/generic/class_user.inc:568
+#: plugins/personal/generic/class_user.inc:593
#, 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:571
+#: plugins/personal/generic/class_user.inc:596
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:581
+#: plugins/personal/generic/class_user.inc:606
#, 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:595
+#: plugins/personal/generic/class_user.inc:620
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:600
-#: plugins/personal/generic/class_user.inc:604
+#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:629
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:611
+#: plugins/personal/generic/class_user.inc:636
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:613
+#: plugins/personal/generic/class_user.inc:638
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:615
+#: plugins/personal/generic/class_user.inc:640
#: ihtml/themes/default/recovery.tpl.c:26
#: ihtml/themes/default/recovery.tpl.c:29
msgid "New password"
msgstr "Nueva contraseña"
-#: plugins/personal/generic/class_user.inc:617
+#: plugins/personal/generic/class_user.inc:642
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:619
+#: plugins/personal/generic/class_user.inc:644
msgid "The password used as new is to short."
msgstr "La contraseña nueva es muy corta."
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:646
msgid "The password contains possibly problematic Unicode characters!"
msgstr "La contraseña posiblemente contiene caracteres 'Unicoide' que son problemáticos."
@@ -2134,13 +2138,13 @@ msgstr "Arriba"
msgid "Down"
msgstr "Abajo"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
-#: include/simpleplugin/class_attribute.inc:2648
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2648
+#: include/simpleplugin/class_attribute.inc:2649
msgid "Sort up"
msgstr "Ordenar "
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
-#: include/simpleplugin/class_attribute.inc:2661
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2661
+#: include/simpleplugin/class_attribute.inc:2662
msgid "Sort down"
msgstr "Ordenar de modo inverso"
@@ -2148,23 +2152,23 @@ msgstr "Ordenar de modo inverso"
msgid "Select all"
msgstr "Seleccionar todo"
-#: include/class_listing.inc:537 include/class_management.inc:679
-#: include/class_config.inc:479 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3107
-#: include/functions.inc:3128 include/functions.inc:3158
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198 include/functions.inc:3260
+#: include/class_listing.inc:537 include/class_management.inc:681
+#: include/class_config.inc:373 include/class_config.inc:484
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:682
+#: include/class_msgPool.inc:713 include/class_msgPool.inc:740
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200 include/functions.inc:3262
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/class_plugin.inc:1510 include/class_CopyPasteHandler.inc:278
#: include/simpleplugin/class_attribute.inc:1540
#: include/simpleplugin/class_attribute.inc:1543
#: include/simpleplugin/class_attribute.inc:1546
-#: include/simpleplugin/class_attribute.inc:1784
-#: include/simpleplugin/class_attribute.inc:1887
-#: include/simpleplugin/class_attribute.inc:1889
+#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1888
+#: include/simpleplugin/class_attribute.inc:1890
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: include/password-methods/class_password-methods-sasl.inc:60
@@ -2251,33 +2255,33 @@ msgstr "Crear 'snapshot'"
msgid "Create a new snapshot from this object"
msgstr "Crear un nuevo 'snapshot' de este objeto"
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "Filter error"
msgstr "Error al filtrar"
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "The filter is incomplete!"
msgstr "¡El filtro está incompleto!"
-#: include/class_management.inc:412
+#: include/class_management.inc:414
#: include/simpleplugin/class_simpleManagement.inc:716
msgid "Permission error"
msgstr "Error de permisos"
-#: include/class_management.inc:488
+#: include/class_management.inc:490
#: include/simpleplugin/class_simpleManagement.inc:749
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr "Usted no tiene permitido crear un 'snashot' para %s."
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573
#: include/simpleplugin/class_simpleManagement.inc:799
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr "Usted no tiene permitido restaurar un 'snapshot' para %s"
-#: include/class_management.inc:679
+#: include/class_management.inc:681
#, php-format
msgid ""
"No tab declaration for '%s' found in your configuration file. Cannot create "
@@ -2302,17 +2306,17 @@ msgstr "Error de configuración"
#: include/class_config.inc:296
#, php-format
msgid ""
-"It seems you are trying to decode something which is not encoded : "
-"%s<br/>\\nPlease check you are not using a fusiondirectory.secrets file "
-"while your passwords are not encrypted."
-msgstr "Parece que usted intenta decodificar algo que no está codificado: %s<br/>\\nPor favor revise que no esté usando el archivo fusiondirectory.secrets mientras sus contraseñas no están encriptadas."
+"It seems you are trying to decode something which is not encoded : %s<br/>\n"
+"Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
+msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:918
-#: include/class_ldap.inc:1372 include/functions.inc:526
+#: include/class_config.inc:338 include/class_ldap.inc:895
+#: include/class_ldap.inc:1349 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
-#: include/simpleplugin/class_attribute.inc:2909
+#: include/functions.inc:2986 include/functions.inc:3160
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2910
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
@@ -2323,11 +2327,16 @@ msgstr "Parece que usted intenta decodificar algo que no está codificado: %s<br
msgid "LDAP error"
msgstr "Error LDAP"
-#: include/class_config.inc:337
+#: include/class_config.inc:338
msgid "Cannot bind to LDAP. Please contact the system administrator."
msgstr "No se puede contactar a LDAP. Por favor contacte al adminsitrador del sistema."
-#: include/class_config.inc:480
+#: include/class_config.inc:373
+#, php-format
+msgid "Location \"%s\" could not be found in the configuration file"
+msgstr ""
+
+#: include/class_config.inc:485
#, php-format
msgid "The selected mail method (class %s) is not available"
msgstr "El método de mail seleccionado (class%s) no está disponible."
@@ -2363,49 +2372,49 @@ msgstr "Advertencia de Rendmiento"
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr "LDAP tiene un desempeño lento: su última consulta tomó %.2fs!"
-#: include/class_ldap.inc:869 include/class_ldap.inc:905
+#: include/class_ldap.inc:846 include/class_ldap.inc:882
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
#: include/functions.inc:2346 include/class_session.inc:50
-#: include/class_session.inc:87 include/class_session.inc:125
+#: include/class_session.inc:88 include/class_session.inc:127
#: include/class_log.inc:96 include/class_acl.inc:118
msgid "Internal error"
msgstr "Error Interno"
-#: include/class_ldap.inc:869
+#: include/class_ldap.inc:846
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:905
+#: include/class_ldap.inc:882
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1017
+#: include/class_ldap.inc:994
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr "mientras se realizan operaciones en '%s' usando el servidor LDAP %s"
-#: include/class_ldap.inc:1019
+#: include/class_ldap.inc:996
#, php-format
msgid "while operating on LDAP server %s"
msgstr "mientras se realizan operaciones en el servidor LDAP %s"
-#: include/class_ldap.inc:1109
+#: include/class_ldap.inc:1086
msgid "proc_open failed to execute ldapsearch"
msgstr "proc_open falló al ejecutar ldapsearch"
-#: include/class_ldap.inc:1221
+#: include/class_ldap.inc:1198
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr "Esto no es un DN válido: '%s'. Un bloque a importar deberÃa comenzar con 'dn: ...' en la lÃnea %s"
-#: include/class_ldap.inc:1232
+#: include/class_ldap.inc:1209
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2993,7 +3002,7 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr "Error fatal: No se puede ejemplificar la clase '%s' - intente ejecutar '%s' para arreglar esto."
-#: include/functions.inc:496 include/functions.inc:3295
+#: include/functions.inc:496 include/functions.inc:3297
#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
#: include/simpleplugin/class_simplePlugin.inc:269
#: include/simpleplugin/class_simplePlugin.inc:281
@@ -3205,9 +3214,9 @@ msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
#: include/functions.inc:3107 include/functions.inc:3128
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200
msgid "Cannot allocate a free ID:"
msgstr ""
@@ -3220,33 +3229,29 @@ msgstr "¡método 'idAllocation' desconocido!"
msgid "%sPoolMin >= %sPoolMax!"
msgstr "%sPoolMin >= %sPoolMax!"
-#: include/functions.inc:3158
-msgid "Cannot create sambaUnixIdPool entry!"
-msgstr "¡No se puede crear la entrada sambaUnixIdPool!"
-
-#: include/functions.inc:3166
+#: include/functions.inc:3168
msgid "sambaUnixIdPool is not unique!"
msgstr "!sambaUnixIdPool no es un valor único!"
-#: include/functions.inc:3178 include/functions.inc:3182
+#: include/functions.inc:3180 include/functions.inc:3184
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3198
+#: include/functions.inc:3200
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3260
+#: include/functions.inc:3262
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3296
+#: include/functions.inc:3298
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr "No se encuentra el archivo '%s' - por favor ejecute '%s' para arreglar esto."
-#: include/class_session.inc:50 include/class_session.inc:87
-#: include/class_session.inc:125
+#: include/class_session.inc:50 include/class_session.inc:88
+#: include/class_session.inc:127
msgid "Requested channel does not exist! Please contact your Administrator."
msgstr "El canal requerido no existe. Por favor contacte a su administrador."
@@ -3402,7 +3407,7 @@ msgid ""
" be done by others will get lost if you save this entry!"
msgstr ""
-#: include/class_plugin.inc:1467
+#: include/class_plugin.inc:1313
#, php-format
msgid "Tab \"%s\""
msgstr "Pestaña \"%s\""
@@ -3534,7 +3539,7 @@ msgid "days"
msgstr "dÃas"
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2171
+#: include/simpleplugin/class_attribute.inc:2172
#, php-format
msgid "%s (required)"
msgstr "%s (necesario)"
@@ -3603,7 +3608,7 @@ msgid "%s (%d bytes)"
msgstr "%s (%d bytes)"
#: include/simpleplugin/class_attribute.inc:1626
-#: include/simpleplugin/class_attribute.inc:1803
+#: include/simpleplugin/class_attribute.inc:1804
msgid "Upload"
msgstr "Subir"
@@ -3612,22 +3617,22 @@ msgstr "Subir"
msgid "Download"
msgstr "Descargar"
-#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1786
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr "No se puede salvar la imágen del usuario, ¡FusionDirectory necesita tener instaladoel paquete 'php5-imagick' !"
-#: include/simpleplugin/class_attribute.inc:1836
+#: include/simpleplugin/class_attribute.inc:1837
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr "Base"
-#: include/simpleplugin/class_attribute.inc:1839
+#: include/simpleplugin/class_attribute.inc:1840
msgid "Object base"
msgstr "Objeto base"
-#: include/simpleplugin/class_attribute.inc:2769
+#: include/simpleplugin/class_attribute.inc:2770
#, php-format
msgid "Invalid value for %s"
msgstr "Valor inválido para %s"
diff --git a/locale/es_VE/fusiondirectory.po b/locale/es_VE/fusiondirectory.po
index dc5e1aa0b62c5080872ea304cd2ba32e2f8e5706..19ba18017719c68ad96d667c6508bf816730c7dd 100644
--- a/locale/es_VE/fusiondirectory.po
+++ b/locale/es_VE/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-03-14 12:07+0100\n"
-"PO-Revision-Date: 2016-03-07 12:09+0000\n"
+"POT-Creation-Date: 2016-04-06 11:27+0200\n"
+"PO-Revision-Date: 2016-04-06 09:24+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"
@@ -52,7 +52,7 @@ msgstr ""
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:174
+#: plugins/admin/departments/class_department.inc:176
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -75,7 +75,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:73
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/aclrole/class_aclRole.inc:105
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
msgid "Description"
@@ -281,8 +281,8 @@ msgstr "Crear"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
#: include/simpleplugin/class_dialogAttributes.inc:632
#: include/simpleplugin/class_dialogAttributes.inc:633
-#: include/simpleplugin/class_attribute.inc:2675
#: include/simpleplugin/class_attribute.inc:2676
+#: include/simpleplugin/class_attribute.inc:2677
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -393,7 +393,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:34
#: plugins/admin/departments/class_department.inc:40
#: plugins/admin/departments/dep-list.xml:21
-#: plugins/personal/generic/class_user.inc:394
+#: plugins/personal/generic/class_user.inc:419
msgid "Department"
msgstr "Departamento"
@@ -441,7 +441,7 @@ msgid "Website of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:85
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:435
msgid "Manager"
msgstr "Gestor"
@@ -452,12 +452,12 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:91
#: plugins/admin/departments/class_department.inc:97
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:329
msgid "Location"
msgstr "Localización"
#: plugins/admin/departments/class_department.inc:94
-#: plugins/personal/generic/class_user.inc:308
+#: plugins/personal/generic/class_user.inc:333
msgid "State"
msgstr "Provincia"
@@ -469,7 +469,7 @@ msgid "Country"
msgstr "PaÃs"
#: plugins/admin/departments/class_department.inc:103
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Address"
msgstr "Dirección"
@@ -479,7 +479,7 @@ msgid "A postal address for this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:107
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Phone"
msgstr "Teléfono"
@@ -488,7 +488,7 @@ msgid "Telephone number"
msgstr "Número de teléfono"
#: plugins/admin/departments/class_department.inc:111
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Fax"
msgstr "Fax"
@@ -541,7 +541,7 @@ msgstr "Lista de Departamentos"
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:415
msgid "Organization"
msgstr "Organización"
@@ -562,7 +562,7 @@ msgid "Given name"
msgstr "Nombre de pila"
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
@@ -570,8 +570,8 @@ msgid "Login"
msgstr "Inicio"
#: plugins/admin/users/user-list.xml:79
-#: plugins/personal/generic/class_user.inc:246
-#: plugins/personal/generic/class_user.inc:252
+#: plugins/personal/generic/class_user.inc:271
+#: plugins/personal/generic/class_user.inc:277
msgid "User"
msgstr "Usuario"
@@ -624,9 +624,9 @@ msgid "Manage user accounts and their properties"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:140
-#: include/class_management.inc:341 include/class_management.inc:488
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571 include/class_CopyPasteHandler.inc:248
+#: include/class_management.inc:343 include/class_management.inc:490
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573 include/class_CopyPasteHandler.inc:248
#: include/simpleplugin/class_simpleManagement.inc:651
#: include/simpleplugin/class_simpleManagement.inc:749
#: include/simpleplugin/class_simpleManagement.inc:799
@@ -653,12 +653,12 @@ msgid "Lock account"
msgstr "Bloquear cuenta"
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:253
+#: plugins/personal/generic/class_user.inc:278
msgid "User account"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:247
+#: plugins/personal/generic/class_user.inc:272
msgid "User account information"
msgstr ""
@@ -676,8 +676,8 @@ msgid "Edit category ACL"
msgstr "Editar la categorÃa ACL"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
-#: include/simpleplugin/class_attribute.inc:2686
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2686
+#: include/simpleplugin/class_attribute.inc:2687
#, php-format
msgid "Delete"
msgstr "Eliminar"
@@ -928,7 +928,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -949,215 +949,219 @@ msgstr ""
msgid "Same password as above, to avoid errors"
msgstr ""
-#: plugins/personal/generic/class_user.inc:274
+#: plugins/personal/generic/class_user.inc:299
msgid "Personal information"
msgstr "Información personal"
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "Apellido"
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
msgid "Last name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "Nombre"
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
msgid "First name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
msgid "Short description of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "Picture"
msgstr ""
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "The avatar for this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:300
+#: plugins/personal/generic/class_user.inc:325
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Business postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room No."
msgstr "Número sala"
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room number"
msgstr "Número de habitación"
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Business phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Mobile"
msgstr "Móvil"
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Business mobile number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Pager"
msgstr "Buscapersonas"
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Homepage"
msgstr "Página Web"
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:367
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:351
+#: plugins/personal/generic/class_user.inc:376
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr "Idioma preferido"
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:387
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Display name"
msgstr "Nombre a Mostrar"
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home postal address"
msgstr "Dirección Postal personal"
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Private phone"
msgstr "Teléfono privado"
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Home phone number"
msgstr "Número de teléfono personal"
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:405
msgid "Organizational information"
msgstr "Información corporativa"
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid "Title"
msgstr "TÃtulo"
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid ""
"Title of a person in their organizational context. Each title is one value "
"of this multi-valued attribute"
msgstr ""
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:419
+msgid "Department to which the user belongs"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:423
msgid "Department No."
msgstr "Número departamento"
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:423
msgid "Department number"
msgstr "Número del departamento"
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee No."
msgstr "Número empleado"
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee number"
msgstr "Número de empleado"
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:431
msgid "Employee type"
msgstr "CategorÃa profesional"
-#: plugins/personal/generic/class_user.inc:568
+#: plugins/personal/generic/class_user.inc:593
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:571
+#: plugins/personal/generic/class_user.inc:596
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:581
+#: plugins/personal/generic/class_user.inc:606
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:595
+#: plugins/personal/generic/class_user.inc:620
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:600
-#: plugins/personal/generic/class_user.inc:604
+#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:629
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:636
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:613
+#: plugins/personal/generic/class_user.inc:638
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:615
+#: plugins/personal/generic/class_user.inc:640
#: ihtml/themes/default/recovery.tpl.c:26
#: ihtml/themes/default/recovery.tpl.c:29
msgid "New password"
msgstr "Nueva contraseña"
-#: plugins/personal/generic/class_user.inc:617
+#: plugins/personal/generic/class_user.inc:642
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:619
+#: plugins/personal/generic/class_user.inc:644
msgid "The password used as new is to short."
msgstr "La nueva contraseña es demasiado corta."
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:646
msgid "The password contains possibly problematic Unicode characters!"
msgstr "La clave contiene caracteres unicode posiblemente problemáticos!"
@@ -2133,13 +2137,13 @@ msgstr "Arriba"
msgid "Down"
msgstr "Abajo"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
-#: include/simpleplugin/class_attribute.inc:2648
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2648
+#: include/simpleplugin/class_attribute.inc:2649
msgid "Sort up"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
-#: include/simpleplugin/class_attribute.inc:2661
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2661
+#: include/simpleplugin/class_attribute.inc:2662
msgid "Sort down"
msgstr ""
@@ -2147,23 +2151,23 @@ msgstr ""
msgid "Select all"
msgstr "Seleccione todos"
-#: include/class_listing.inc:537 include/class_management.inc:679
-#: include/class_config.inc:479 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3107
-#: include/functions.inc:3128 include/functions.inc:3158
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198 include/functions.inc:3260
+#: include/class_listing.inc:537 include/class_management.inc:681
+#: include/class_config.inc:373 include/class_config.inc:484
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:682
+#: include/class_msgPool.inc:713 include/class_msgPool.inc:740
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200 include/functions.inc:3262
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/class_plugin.inc:1510 include/class_CopyPasteHandler.inc:278
#: include/simpleplugin/class_attribute.inc:1540
#: include/simpleplugin/class_attribute.inc:1543
#: include/simpleplugin/class_attribute.inc:1546
-#: include/simpleplugin/class_attribute.inc:1784
-#: include/simpleplugin/class_attribute.inc:1887
-#: include/simpleplugin/class_attribute.inc:1889
+#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1888
+#: include/simpleplugin/class_attribute.inc:1890
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: include/password-methods/class_password-methods-sasl.inc:60
@@ -2250,33 +2254,33 @@ msgstr "Crear instantánea"
msgid "Create a new snapshot from this object"
msgstr "¡Crear una nueva instantánea de este objeto!"
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "Filter error"
msgstr "Error del filtro"
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "The filter is incomplete!"
msgstr "¡El filtro está incompleto!"
-#: include/class_management.inc:412
+#: include/class_management.inc:414
#: include/simpleplugin/class_simpleManagement.inc:716
msgid "Permission error"
msgstr "Error de permisos"
-#: include/class_management.inc:488
+#: include/class_management.inc:490
#: include/simpleplugin/class_simpleManagement.inc:749
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr "No tiene permisos para crear una instantanea para %s."
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573
#: include/simpleplugin/class_simpleManagement.inc:799
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr "No tiene permisos para recuperar una instantanea para %s."
-#: include/class_management.inc:679
+#: include/class_management.inc:681
#, php-format
msgid ""
"No tab declaration for '%s' found in your configuration file. Cannot create "
@@ -2301,17 +2305,17 @@ msgstr "Error en la configuración"
#: include/class_config.inc:296
#, php-format
msgid ""
-"It seems you are trying to decode something which is not encoded : "
-"%s<br/>\\nPlease check you are not using a fusiondirectory.secrets file "
-"while your passwords are not encrypted."
+"It seems you are trying to decode something which is not encoded : %s<br/>\n"
+"Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:918
-#: include/class_ldap.inc:1372 include/functions.inc:526
+#: include/class_config.inc:338 include/class_ldap.inc:895
+#: include/class_ldap.inc:1349 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
-#: include/simpleplugin/class_attribute.inc:2909
+#: include/functions.inc:2986 include/functions.inc:3160
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2910
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
@@ -2322,11 +2326,16 @@ msgstr ""
msgid "LDAP error"
msgstr "Error LDAP"
-#: include/class_config.inc:337
+#: include/class_config.inc:338
msgid "Cannot bind to LDAP. Please contact the system administrator."
msgstr "No se puede conectar a LDAP: Por favor consulte con el administrador de sistemas."
-#: include/class_config.inc:480
+#: include/class_config.inc:373
+#, php-format
+msgid "Location \"%s\" could not be found in the configuration file"
+msgstr ""
+
+#: include/class_config.inc:485
#, php-format
msgid "The selected mail method (class %s) is not available"
msgstr ""
@@ -2362,49 +2371,49 @@ msgstr "Aviso e rendimiento"
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr "El rendimiento LDAP es bajo: ¡la última consulta tardó sobre %.2fs!"
-#: include/class_ldap.inc:869 include/class_ldap.inc:905
+#: include/class_ldap.inc:846 include/class_ldap.inc:882
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
#: include/functions.inc:2346 include/class_session.inc:50
-#: include/class_session.inc:87 include/class_session.inc:125
+#: include/class_session.inc:88 include/class_session.inc:127
#: include/class_log.inc:96 include/class_acl.inc:118
msgid "Internal error"
msgstr "error interno"
-#: include/class_ldap.inc:869
+#: include/class_ldap.inc:846
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:905
+#: include/class_ldap.inc:882
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1017
+#: include/class_ldap.inc:994
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr "mientras operaba en '%s' usando el servidor LDAP '%s'"
-#: include/class_ldap.inc:1019
+#: include/class_ldap.inc:996
#, php-format
msgid "while operating on LDAP server %s"
msgstr "mientras operaba en el servidor LDAP '%s'"
-#: include/class_ldap.inc:1109
+#: include/class_ldap.inc:1086
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1221
+#: include/class_ldap.inc:1198
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr "No es un DN válido: '%s': El bloque para importar debe empezar por 'dn: ...' en la linea %s"
-#: include/class_ldap.inc:1232
+#: include/class_ldap.inc:1209
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2992,7 +3001,7 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr "Error fatal: no se puede instanciar la clase '%s' - intente solucionarlo ejecutando '%s'"
-#: include/functions.inc:496 include/functions.inc:3295
+#: include/functions.inc:496 include/functions.inc:3297
#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
#: include/simpleplugin/class_simplePlugin.inc:269
#: include/simpleplugin/class_simplePlugin.inc:281
@@ -3204,9 +3213,9 @@ msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
#: include/functions.inc:3107 include/functions.inc:3128
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200
msgid "Cannot allocate a free ID:"
msgstr "No se puede asignar un identificador (ID) libre:"
@@ -3219,33 +3228,29 @@ msgstr "¡método de asignación de id desconocido!"
msgid "%sPoolMin >= %sPoolMax!"
msgstr "¡%sPoolMin >= %sPoolMax!"
-#: include/functions.inc:3158
-msgid "Cannot create sambaUnixIdPool entry!"
-msgstr "¡No se puede crear la entrada sambaUnixIdPool!"
-
-#: include/functions.inc:3166
+#: include/functions.inc:3168
msgid "sambaUnixIdPool is not unique!"
msgstr "¡sambaUnixIdPool no es único!"
-#: include/functions.inc:3178 include/functions.inc:3182
+#: include/functions.inc:3180 include/functions.inc:3184
msgid "no ID available!"
msgstr "¡No hay ID disponibles!"
-#: include/functions.inc:3198
+#: include/functions.inc:3200
msgid "maximum tries exceeded!"
msgstr "¡Excedido el número de intentos máximo!"
-#: include/functions.inc:3260
+#: include/functions.inc:3262
msgid "Cannot allocate a free ID!"
msgstr "¡No se puede asignar un identificador (ID) libre!"
-#: include/functions.inc:3296
+#: include/functions.inc:3298
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr "No se puede encontrar el archivo '%s' - por favor ejecute '%s' para solucionarlo"
-#: include/class_session.inc:50 include/class_session.inc:87
-#: include/class_session.inc:125
+#: include/class_session.inc:50 include/class_session.inc:88
+#: include/class_session.inc:127
msgid "Requested channel does not exist! Please contact your Administrator."
msgstr "¡El canal requerido no existe!. Por favor contacte con su Administrador."
@@ -3401,7 +3406,7 @@ msgid ""
" be done by others will get lost if you save this entry!"
msgstr ""
-#: include/class_plugin.inc:1467
+#: include/class_plugin.inc:1313
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -3533,7 +3538,7 @@ msgid "days"
msgstr "dÃas"
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2171
+#: include/simpleplugin/class_attribute.inc:2172
#, php-format
msgid "%s (required)"
msgstr ""
@@ -3602,7 +3607,7 @@ msgid "%s (%d bytes)"
msgstr ""
#: include/simpleplugin/class_attribute.inc:1626
-#: include/simpleplugin/class_attribute.inc:1803
+#: include/simpleplugin/class_attribute.inc:1804
msgid "Upload"
msgstr "Enviar"
@@ -3611,22 +3616,22 @@ msgstr "Enviar"
msgid "Download"
msgstr "Descargar"
-#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1786
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr "No se puede guardar la foto del usuario, FusionDirectory requiere que este instalado el paquete 'php5-imagick'"
-#: include/simpleplugin/class_attribute.inc:1836
+#: include/simpleplugin/class_attribute.inc:1837
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr "Base"
-#: include/simpleplugin/class_attribute.inc:1839
+#: include/simpleplugin/class_attribute.inc:1840
msgid "Object base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:2769
+#: include/simpleplugin/class_attribute.inc:2770
#, php-format
msgid "Invalid value for %s"
msgstr ""
diff --git a/locale/fa_IR/fusiondirectory.po b/locale/fa_IR/fusiondirectory.po
index b348fc439e1c40b583b1a0eef654327975016fc3..09acd42ec0e649850a4768598a7dffae5e2c3a45 100644
--- a/locale/fa_IR/fusiondirectory.po
+++ b/locale/fa_IR/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-03-14 12:07+0100\n"
-"PO-Revision-Date: 2016-03-07 12:09+0000\n"
+"POT-Creation-Date: 2016-04-06 11:27+0200\n"
+"PO-Revision-Date: 2016-04-06 09:24+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"
@@ -52,7 +52,7 @@ msgstr ""
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:174
+#: plugins/admin/departments/class_department.inc:176
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -75,7 +75,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:73
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/aclrole/class_aclRole.inc:105
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
msgid "Description"
@@ -281,8 +281,8 @@ msgstr ""
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
#: include/simpleplugin/class_dialogAttributes.inc:632
#: include/simpleplugin/class_dialogAttributes.inc:633
-#: include/simpleplugin/class_attribute.inc:2675
#: include/simpleplugin/class_attribute.inc:2676
+#: include/simpleplugin/class_attribute.inc:2677
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -393,7 +393,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:34
#: plugins/admin/departments/class_department.inc:40
#: plugins/admin/departments/dep-list.xml:21
-#: plugins/personal/generic/class_user.inc:394
+#: plugins/personal/generic/class_user.inc:419
msgid "Department"
msgstr "دپارتمان"
@@ -441,7 +441,7 @@ msgid "Website of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:85
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:435
msgid "Manager"
msgstr ""
@@ -452,12 +452,12 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:91
#: plugins/admin/departments/class_department.inc:97
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:329
msgid "Location"
msgstr ""
#: plugins/admin/departments/class_department.inc:94
-#: plugins/personal/generic/class_user.inc:308
+#: plugins/personal/generic/class_user.inc:333
msgid "State"
msgstr ""
@@ -469,7 +469,7 @@ msgid "Country"
msgstr "کشور"
#: plugins/admin/departments/class_department.inc:103
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Address"
msgstr "آدرس"
@@ -479,7 +479,7 @@ msgid "A postal address for this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:107
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Phone"
msgstr "تلÙÙ†"
@@ -488,7 +488,7 @@ msgid "Telephone number"
msgstr ""
#: plugins/admin/departments/class_department.inc:111
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Fax"
msgstr ""
@@ -541,7 +541,7 @@ msgstr ""
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:415
msgid "Organization"
msgstr ""
@@ -562,7 +562,7 @@ msgid "Given name"
msgstr ""
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
@@ -570,8 +570,8 @@ msgid "Login"
msgstr ""
#: plugins/admin/users/user-list.xml:79
-#: plugins/personal/generic/class_user.inc:246
-#: plugins/personal/generic/class_user.inc:252
+#: plugins/personal/generic/class_user.inc:271
+#: plugins/personal/generic/class_user.inc:277
msgid "User"
msgstr ""
@@ -624,9 +624,9 @@ msgid "Manage user accounts and their properties"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:140
-#: include/class_management.inc:341 include/class_management.inc:488
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571 include/class_CopyPasteHandler.inc:248
+#: include/class_management.inc:343 include/class_management.inc:490
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573 include/class_CopyPasteHandler.inc:248
#: include/simpleplugin/class_simpleManagement.inc:651
#: include/simpleplugin/class_simpleManagement.inc:749
#: include/simpleplugin/class_simpleManagement.inc:799
@@ -653,12 +653,12 @@ msgid "Lock account"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:253
+#: plugins/personal/generic/class_user.inc:278
msgid "User account"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:247
+#: plugins/personal/generic/class_user.inc:272
msgid "User account information"
msgstr ""
@@ -676,8 +676,8 @@ msgid "Edit category ACL"
msgstr ""
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
-#: include/simpleplugin/class_attribute.inc:2686
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2686
+#: include/simpleplugin/class_attribute.inc:2687
#, php-format
msgid "Delete"
msgstr ""
@@ -928,7 +928,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -949,215 +949,219 @@ msgstr ""
msgid "Same password as above, to avoid errors"
msgstr ""
-#: plugins/personal/generic/class_user.inc:274
+#: plugins/personal/generic/class_user.inc:299
msgid "Personal information"
msgstr "اطلاعات شخصی"
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "Ùامیل"
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
msgid "Last name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "نام"
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
msgid "First name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
msgid "Short description of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "Picture"
msgstr ""
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "The avatar for this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:300
+#: plugins/personal/generic/class_user.inc:325
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Business postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room No."
msgstr "شماره اتاق."
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room number"
msgstr "شماره اتاق"
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Business phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Mobile"
msgstr "تلÙÙ† همراه"
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Business mobile number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Pager"
msgstr "پیجر"
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:367
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:351
+#: plugins/personal/generic/class_user.inc:376
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr ""
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:387
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Display name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home postal address"
msgstr "آدرس پستی منزل"
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Private phone"
msgstr "شماره تماس خصوصی"
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Home phone number"
msgstr "شماره تلÙÙ† منزل"
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:405
msgid "Organizational information"
msgstr "اطلاعات سازمان"
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid "Title"
msgstr ""
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid ""
"Title of a person in their organizational context. Each title is one value "
"of this multi-valued attribute"
msgstr ""
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:419
+msgid "Department to which the user belongs"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:423
msgid "Department No."
msgstr "شماره دپارتمان."
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:423
msgid "Department number"
msgstr "شماره دپارتمان"
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee No."
msgstr "شماره کارمندی."
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee number"
msgstr "شماره کارمندی"
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:431
msgid "Employee type"
msgstr ""
-#: plugins/personal/generic/class_user.inc:568
+#: plugins/personal/generic/class_user.inc:593
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:571
+#: plugins/personal/generic/class_user.inc:596
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:581
+#: plugins/personal/generic/class_user.inc:606
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:595
+#: plugins/personal/generic/class_user.inc:620
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:600
-#: plugins/personal/generic/class_user.inc:604
+#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:629
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:636
msgid "You need to specify your current password in order to proceed."
msgstr ""
-#: plugins/personal/generic/class_user.inc:613
+#: plugins/personal/generic/class_user.inc:638
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:615
+#: plugins/personal/generic/class_user.inc:640
#: ihtml/themes/default/recovery.tpl.c:26
#: ihtml/themes/default/recovery.tpl.c:29
msgid "New password"
msgstr "کلمه عبور جدید"
-#: plugins/personal/generic/class_user.inc:617
+#: plugins/personal/generic/class_user.inc:642
msgid "The password used as new and current are too similar."
msgstr ""
-#: plugins/personal/generic/class_user.inc:619
+#: plugins/personal/generic/class_user.inc:644
msgid "The password used as new is to short."
msgstr ""
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:646
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
@@ -2133,13 +2137,13 @@ msgstr ""
msgid "Down"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
-#: include/simpleplugin/class_attribute.inc:2648
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2648
+#: include/simpleplugin/class_attribute.inc:2649
msgid "Sort up"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
-#: include/simpleplugin/class_attribute.inc:2661
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2661
+#: include/simpleplugin/class_attribute.inc:2662
msgid "Sort down"
msgstr ""
@@ -2147,23 +2151,23 @@ msgstr ""
msgid "Select all"
msgstr ""
-#: include/class_listing.inc:537 include/class_management.inc:679
-#: include/class_config.inc:479 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3107
-#: include/functions.inc:3128 include/functions.inc:3158
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198 include/functions.inc:3260
+#: include/class_listing.inc:537 include/class_management.inc:681
+#: include/class_config.inc:373 include/class_config.inc:484
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:682
+#: include/class_msgPool.inc:713 include/class_msgPool.inc:740
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200 include/functions.inc:3262
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/class_plugin.inc:1510 include/class_CopyPasteHandler.inc:278
#: include/simpleplugin/class_attribute.inc:1540
#: include/simpleplugin/class_attribute.inc:1543
#: include/simpleplugin/class_attribute.inc:1546
-#: include/simpleplugin/class_attribute.inc:1784
-#: include/simpleplugin/class_attribute.inc:1887
-#: include/simpleplugin/class_attribute.inc:1889
+#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1888
+#: include/simpleplugin/class_attribute.inc:1890
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: include/password-methods/class_password-methods-sasl.inc:60
@@ -2250,33 +2254,33 @@ msgstr ""
msgid "Create a new snapshot from this object"
msgstr ""
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "Filter error"
msgstr ""
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "The filter is incomplete!"
msgstr ""
-#: include/class_management.inc:412
+#: include/class_management.inc:414
#: include/simpleplugin/class_simpleManagement.inc:716
msgid "Permission error"
msgstr ""
-#: include/class_management.inc:488
+#: include/class_management.inc:490
#: include/simpleplugin/class_simpleManagement.inc:749
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr ""
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573
#: include/simpleplugin/class_simpleManagement.inc:799
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr ""
-#: include/class_management.inc:679
+#: include/class_management.inc:681
#, php-format
msgid ""
"No tab declaration for '%s' found in your configuration file. Cannot create "
@@ -2301,17 +2305,17 @@ msgstr ""
#: include/class_config.inc:296
#, php-format
msgid ""
-"It seems you are trying to decode something which is not encoded : "
-"%s<br/>\\nPlease check you are not using a fusiondirectory.secrets file "
-"while your passwords are not encrypted."
+"It seems you are trying to decode something which is not encoded : %s<br/>\n"
+"Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:918
-#: include/class_ldap.inc:1372 include/functions.inc:526
+#: include/class_config.inc:338 include/class_ldap.inc:895
+#: include/class_ldap.inc:1349 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
-#: include/simpleplugin/class_attribute.inc:2909
+#: include/functions.inc:2986 include/functions.inc:3160
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2910
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
@@ -2322,11 +2326,16 @@ msgstr ""
msgid "LDAP error"
msgstr "خطای LDAP"
-#: include/class_config.inc:337
+#: include/class_config.inc:338
msgid "Cannot bind to LDAP. Please contact the system administrator."
msgstr ""
-#: include/class_config.inc:480
+#: include/class_config.inc:373
+#, php-format
+msgid "Location \"%s\" could not be found in the configuration file"
+msgstr ""
+
+#: include/class_config.inc:485
#, php-format
msgid "The selected mail method (class %s) is not available"
msgstr ""
@@ -2362,49 +2371,49 @@ msgstr ""
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr ""
-#: include/class_ldap.inc:869 include/class_ldap.inc:905
+#: include/class_ldap.inc:846 include/class_ldap.inc:882
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
#: include/functions.inc:2346 include/class_session.inc:50
-#: include/class_session.inc:87 include/class_session.inc:125
+#: include/class_session.inc:88 include/class_session.inc:127
#: include/class_log.inc:96 include/class_acl.inc:118
msgid "Internal error"
msgstr "خطای داخلی"
-#: include/class_ldap.inc:869
+#: include/class_ldap.inc:846
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:905
+#: include/class_ldap.inc:882
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1017
+#: include/class_ldap.inc:994
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr ""
-#: include/class_ldap.inc:1019
+#: include/class_ldap.inc:996
#, php-format
msgid "while operating on LDAP server %s"
msgstr ""
-#: include/class_ldap.inc:1109
+#: include/class_ldap.inc:1086
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1221
+#: include/class_ldap.inc:1198
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr ""
-#: include/class_ldap.inc:1232
+#: include/class_ldap.inc:1209
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2992,7 +3001,7 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr ""
-#: include/functions.inc:496 include/functions.inc:3295
+#: include/functions.inc:496 include/functions.inc:3297
#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
#: include/simpleplugin/class_simplePlugin.inc:269
#: include/simpleplugin/class_simplePlugin.inc:281
@@ -3204,9 +3213,9 @@ msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
#: include/functions.inc:3107 include/functions.inc:3128
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200
msgid "Cannot allocate a free ID:"
msgstr ""
@@ -3219,33 +3228,29 @@ msgstr ""
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3158
-msgid "Cannot create sambaUnixIdPool entry!"
-msgstr ""
-
-#: include/functions.inc:3166
+#: include/functions.inc:3168
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3178 include/functions.inc:3182
+#: include/functions.inc:3180 include/functions.inc:3184
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3198
+#: include/functions.inc:3200
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3260
+#: include/functions.inc:3262
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3296
+#: include/functions.inc:3298
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr "Ùایل '%s' را نمی توانم پیدا کنم برای رÙع مشکل دستور '%s' را بزنید."
-#: include/class_session.inc:50 include/class_session.inc:87
-#: include/class_session.inc:125
+#: include/class_session.inc:50 include/class_session.inc:88
+#: include/class_session.inc:127
msgid "Requested channel does not exist! Please contact your Administrator."
msgstr ""
@@ -3401,7 +3406,7 @@ msgid ""
" be done by others will get lost if you save this entry!"
msgstr ""
-#: include/class_plugin.inc:1467
+#: include/class_plugin.inc:1313
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -3533,7 +3538,7 @@ msgid "days"
msgstr ""
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2171
+#: include/simpleplugin/class_attribute.inc:2172
#, php-format
msgid "%s (required)"
msgstr ""
@@ -3602,7 +3607,7 @@ msgid "%s (%d bytes)"
msgstr ""
#: include/simpleplugin/class_attribute.inc:1626
-#: include/simpleplugin/class_attribute.inc:1803
+#: include/simpleplugin/class_attribute.inc:1804
msgid "Upload"
msgstr ""
@@ -3611,22 +3616,22 @@ msgstr ""
msgid "Download"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1786
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1836
+#: include/simpleplugin/class_attribute.inc:1837
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1839
+#: include/simpleplugin/class_attribute.inc:1840
msgid "Object base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:2769
+#: include/simpleplugin/class_attribute.inc:2770
#, php-format
msgid "Invalid value for %s"
msgstr ""
diff --git a/locale/fr/fusiondirectory.po b/locale/fr/fusiondirectory.po
index 38da0fda52f5abf6a095b84efce972602ae42418..3c8ba8fc52bdf166294dfebe8a6ebe695aad71df 100644
--- a/locale/fr/fusiondirectory.po
+++ b/locale/fr/fusiondirectory.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-03-14 12:07+0100\n"
-"PO-Revision-Date: 2016-03-07 12:34+0000\n"
+"POT-Creation-Date: 2016-04-06 11:27+0200\n"
+"PO-Revision-Date: 2016-04-06 09:27+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"
@@ -55,7 +55,7 @@ msgstr "Informations"
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:174
+#: plugins/admin/departments/class_department.inc:176
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -78,7 +78,7 @@ msgstr "Nom du groupe"
#: plugins/admin/departments/class_department.inc:73
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/aclrole/class_aclRole.inc:105
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
msgid "Description"
@@ -284,8 +284,8 @@ msgstr "Créer"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
#: include/simpleplugin/class_dialogAttributes.inc:632
#: include/simpleplugin/class_dialogAttributes.inc:633
-#: include/simpleplugin/class_attribute.inc:2675
#: include/simpleplugin/class_attribute.inc:2676
+#: include/simpleplugin/class_attribute.inc:2677
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -396,7 +396,7 @@ msgstr "composant de domaine"
#: plugins/admin/departments/class_department.inc:34
#: plugins/admin/departments/class_department.inc:40
#: plugins/admin/departments/dep-list.xml:21
-#: plugins/personal/generic/class_user.inc:394
+#: plugins/personal/generic/class_user.inc:419
msgid "Department"
msgstr "Département"
@@ -444,7 +444,7 @@ msgid "Website of this %s"
msgstr "Site Web de %s"
#: plugins/admin/departments/class_department.inc:85
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:435
msgid "Manager"
msgstr "Responsable"
@@ -455,12 +455,12 @@ msgstr "Responsable de ce %s"
#: plugins/admin/departments/class_department.inc:91
#: plugins/admin/departments/class_department.inc:97
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:329
msgid "Location"
msgstr "Lieu"
#: plugins/admin/departments/class_department.inc:94
-#: plugins/personal/generic/class_user.inc:308
+#: plugins/personal/generic/class_user.inc:333
msgid "State"
msgstr "État"
@@ -472,7 +472,7 @@ msgid "Country"
msgstr "Pays"
#: plugins/admin/departments/class_department.inc:103
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Address"
msgstr "Adresse"
@@ -482,7 +482,7 @@ msgid "A postal address for this %s"
msgstr "Adresse postale pour ce %s"
#: plugins/admin/departments/class_department.inc:107
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Phone"
msgstr "Téléphone"
@@ -491,7 +491,7 @@ msgid "Telephone number"
msgstr "Numéro de téléphone"
#: plugins/admin/departments/class_department.inc:111
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Fax"
msgstr "Fax"
@@ -544,7 +544,7 @@ msgstr "Liste des départements"
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:415
msgid "Organization"
msgstr "Organisme"
@@ -565,7 +565,7 @@ msgid "Given name"
msgstr "Prénom"
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
@@ -573,8 +573,8 @@ msgid "Login"
msgstr "Identifiant"
#: plugins/admin/users/user-list.xml:79
-#: plugins/personal/generic/class_user.inc:246
-#: plugins/personal/generic/class_user.inc:252
+#: plugins/personal/generic/class_user.inc:271
+#: plugins/personal/generic/class_user.inc:277
msgid "User"
msgstr "Utilisateur"
@@ -627,9 +627,9 @@ msgid "Manage user accounts and their properties"
msgstr "Gérer les comptes utilisateurs et leurs propriétés"
#: plugins/admin/users/class_userManagement.inc:140
-#: include/class_management.inc:341 include/class_management.inc:488
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571 include/class_CopyPasteHandler.inc:248
+#: include/class_management.inc:343 include/class_management.inc:490
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573 include/class_CopyPasteHandler.inc:248
#: include/simpleplugin/class_simpleManagement.inc:651
#: include/simpleplugin/class_simpleManagement.inc:749
#: include/simpleplugin/class_simpleManagement.inc:799
@@ -656,12 +656,12 @@ msgid "Lock account"
msgstr "Verrouiller le compte"
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:253
+#: plugins/personal/generic/class_user.inc:278
msgid "User account"
msgstr "Compte utilisateur"
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:247
+#: plugins/personal/generic/class_user.inc:272
msgid "User account information"
msgstr "Information du compte utilisateur"
@@ -679,8 +679,8 @@ msgid "Edit category ACL"
msgstr "Éditer les catégories ACL"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
-#: include/simpleplugin/class_attribute.inc:2686
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2686
+#: include/simpleplugin/class_attribute.inc:2687
#, php-format
msgid "Delete"
msgstr "Supprimer"
@@ -931,7 +931,7 @@ msgid "Password hash method to use"
msgstr "Méthode de chiffrement des mots de passe"
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -952,215 +952,219 @@ msgstr "Mot de passe (de nouveau)"
msgid "Same password as above, to avoid errors"
msgstr "Veuillez réintroduire le mot de passe pour éviter les erreurs"
-#: plugins/personal/generic/class_user.inc:274
+#: plugins/personal/generic/class_user.inc:299
msgid "Personal information"
msgstr "Informations personnelles"
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "Nom de famille"
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
msgid "Last name of this user"
msgstr "Nom de famille de cet utilisateur"
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "Prénom"
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
msgid "First name of this user"
msgstr "Prénom de cet utilisateur"
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
msgid "Short description of the user"
msgstr "Courte description de l'utilisateur"
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "Picture"
msgstr "Photo"
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "The avatar for this user"
msgstr "L'avatar pour cet utilisateur"
-#: plugins/personal/generic/class_user.inc:300
+#: plugins/personal/generic/class_user.inc:325
msgid "Organizational contact information"
msgstr "Information de contact organisationnelles"
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Business postal address"
msgstr "Adresse postale professionnelle"
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room No."
msgstr "No. de bureau"
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room number"
msgstr "Numéro du bureau"
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Business phone number"
msgstr "Numéro de téléphone professionnel"
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Mobile"
msgstr "Mobile"
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Business mobile number"
msgstr "Numéro de mobile professionnel "
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Pager"
msgstr "Bip"
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Business pager number"
msgstr "Numéro de bip professionnel"
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Business fax number"
msgstr "Numéro de fax professionnel"
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Homepage"
msgstr "Site web"
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Personal homepage"
msgstr "Site web personnel"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:367
msgid "Account information"
msgstr "Compte utilisateur"
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
msgid "Login of this user"
msgstr "Identifiant de l'utilisateur"
-#: plugins/personal/generic/class_user.inc:351
+#: plugins/personal/generic/class_user.inc:376
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr "Langue préférée"
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
msgid "Password of the user"
msgstr "Mot de passe de l'utilisateur"
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:387
msgid "Personal contact information"
msgstr "Informations de contact personnelles"
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Display name"
msgstr "Nom à afficher"
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
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:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home address"
msgstr "Adresse postale"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home postal address"
msgstr "Adresse postale personnelle"
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Private phone"
msgstr "Numéro de téléphone privé"
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Home phone number"
msgstr "Numéro de téléphone privé"
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:405
msgid "Organizational information"
msgstr "Informations organisationnelles"
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid "Title"
msgstr "Titre"
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
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:398
+#: plugins/personal/generic/class_user.inc:419
+msgid "Department to which the user belongs"
+msgstr "Département auquel l'utilisateur appartient"
+
+#: plugins/personal/generic/class_user.inc:423
msgid "Department No."
-msgstr "No. du département"
+msgstr "Numéro du département"
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:423
msgid "Department number"
msgstr "Numéro du département"
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee No."
msgstr "No. de l'employé"
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee number"
msgstr "Numéro de l'employé"
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:431
msgid "Employee type"
msgstr "Type d'employé"
-#: plugins/personal/generic/class_user.inc:568
+#: plugins/personal/generic/class_user.inc:593
#, 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:571
+#: plugins/personal/generic/class_user.inc:596
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:581
+#: plugins/personal/generic/class_user.inc:606
#, 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:595
+#: plugins/personal/generic/class_user.inc:620
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:600
-#: plugins/personal/generic/class_user.inc:604
+#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:629
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:611
+#: plugins/personal/generic/class_user.inc:636
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:613
+#: plugins/personal/generic/class_user.inc:638
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:615
+#: plugins/personal/generic/class_user.inc:640
#: ihtml/themes/default/recovery.tpl.c:26
#: ihtml/themes/default/recovery.tpl.c:29
msgid "New password"
msgstr "Nouveau mot de passe"
-#: plugins/personal/generic/class_user.inc:617
+#: plugins/personal/generic/class_user.inc:642
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:619
+#: plugins/personal/generic/class_user.inc:644
msgid "The password used as new is to short."
msgstr "Le nouveau mot de passe est trop court."
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:646
msgid "The password contains possibly problematic Unicode characters!"
msgstr "Le mot de passe contient probablement des caractères Unicode qui sont problématique"
@@ -2136,13 +2140,13 @@ msgstr "Haut"
msgid "Down"
msgstr "Bas"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
-#: include/simpleplugin/class_attribute.inc:2648
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2648
+#: include/simpleplugin/class_attribute.inc:2649
msgid "Sort up"
msgstr "Trier vers le haut"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
-#: include/simpleplugin/class_attribute.inc:2661
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2661
+#: include/simpleplugin/class_attribute.inc:2662
msgid "Sort down"
msgstr "Trier vers le bas"
@@ -2150,23 +2154,23 @@ msgstr "Trier vers le bas"
msgid "Select all"
msgstr "Sélectionner tout"
-#: include/class_listing.inc:537 include/class_management.inc:679
-#: include/class_config.inc:479 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3107
-#: include/functions.inc:3128 include/functions.inc:3158
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198 include/functions.inc:3260
+#: include/class_listing.inc:537 include/class_management.inc:681
+#: include/class_config.inc:373 include/class_config.inc:484
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:682
+#: include/class_msgPool.inc:713 include/class_msgPool.inc:740
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200 include/functions.inc:3262
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/class_plugin.inc:1510 include/class_CopyPasteHandler.inc:278
#: include/simpleplugin/class_attribute.inc:1540
#: include/simpleplugin/class_attribute.inc:1543
#: include/simpleplugin/class_attribute.inc:1546
-#: include/simpleplugin/class_attribute.inc:1784
-#: include/simpleplugin/class_attribute.inc:1887
-#: include/simpleplugin/class_attribute.inc:1889
+#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1888
+#: include/simpleplugin/class_attribute.inc:1890
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: include/password-methods/class_password-methods-sasl.inc:60
@@ -2253,33 +2257,33 @@ msgstr "Créer un instantané"
msgid "Create a new snapshot from this object"
msgstr "Créer un nouvel instantané depuis cet objet"
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "Filter error"
msgstr "Erreur de filtre"
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "The filter is incomplete!"
msgstr "Le filtre est incomplet !"
-#: include/class_management.inc:412
+#: include/class_management.inc:414
#: include/simpleplugin/class_simpleManagement.inc:716
msgid "Permission error"
msgstr "Erreur de permission"
-#: include/class_management.inc:488
+#: include/class_management.inc:490
#: include/simpleplugin/class_simpleManagement.inc:749
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr "Vous n'êtes pas autorisé à créer un nouvel instantané pour %s."
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573
#: include/simpleplugin/class_simpleManagement.inc:799
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr "Vous n'êtes pas autorisé à restaurer un instantané de %s."
-#: include/class_management.inc:679
+#: include/class_management.inc:681
#, php-format
msgid ""
"No tab declaration for '%s' found in your configuration file. Cannot create "
@@ -2304,17 +2308,17 @@ msgstr "Erreur de configuration"
#: include/class_config.inc:296
#, php-format
msgid ""
-"It seems you are trying to decode something which is not encoded : "
-"%s<br/>\\nPlease check you are not using a fusiondirectory.secrets file "
-"while your passwords are not encrypted."
+"It seems you are trying to decode something which is not encoded : %s<br/>\n"
+"Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
msgstr "Il semble que vous essayez de déchiffrer quelque chose qui n'est pas chiffré :%s<br/>\\nVeuillez vérifier que vous n'utilisez pas un fichier fusiondirectory.secrets alors que vos mots de passe ne sont pas chiffrés."
-#: include/class_config.inc:337 include/class_ldap.inc:918
-#: include/class_ldap.inc:1372 include/functions.inc:526
+#: include/class_config.inc:338 include/class_ldap.inc:895
+#: include/class_ldap.inc:1349 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
-#: include/simpleplugin/class_attribute.inc:2909
+#: include/functions.inc:2986 include/functions.inc:3160
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2910
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
@@ -2325,11 +2329,16 @@ msgstr "Il semble que vous essayez de déchiffrer quelque chose qui n'est pas ch
msgid "LDAP error"
msgstr "Erreur LDAP"
-#: include/class_config.inc:337
+#: include/class_config.inc:338
msgid "Cannot bind to LDAP. Please contact the system administrator."
msgstr "Impossible de se connecter à l'annuaire LDAP. Veuillez contacter l'administrateur du système."
-#: include/class_config.inc:480
+#: include/class_config.inc:373
+#, php-format
+msgid "Location \"%s\" could not be found in the configuration file"
+msgstr "La location \"%s\" n'est pas présente dans le fichier de configuration"
+
+#: include/class_config.inc:485
#, php-format
msgid "The selected mail method (class %s) is not available"
msgstr "La méthode de messagerie sélectionnée (classe %s) n'est pas disponible"
@@ -2365,49 +2374,49 @@ msgstr "Avertissement de performance"
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr "La performance de votre annuaire est faible : la dernière requête a duré %.2fs !"
-#: include/class_ldap.inc:869 include/class_ldap.inc:905
+#: include/class_ldap.inc:846 include/class_ldap.inc:882
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
#: include/functions.inc:2346 include/class_session.inc:50
-#: include/class_session.inc:87 include/class_session.inc:125
+#: include/class_session.inc:88 include/class_session.inc:127
#: include/class_log.inc:96 include/class_acl.inc:118
msgid "Internal error"
msgstr "Erreur interne"
-#: include/class_ldap.inc:869
+#: include/class_ldap.inc:846
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr "Impossible de créer automatiquement des sous-arbres avec le RDN '%s' : object class non trouvée !"
-#: include/class_ldap.inc:905
+#: include/class_ldap.inc:882
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr "Impossible de créer automatiquement des sous-arbres avec le RDN '%s' : non supporté"
-#: include/class_ldap.inc:1017
+#: include/class_ldap.inc:994
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr "lors de l'opération sur '%s' en utilisant le serveur LDAP '%s'"
-#: include/class_ldap.inc:1019
+#: include/class_ldap.inc:996
#, php-format
msgid "while operating on LDAP server %s"
msgstr "lors de l'opération sur le serveur LDAP %s"
-#: include/class_ldap.inc:1109
+#: include/class_ldap.inc:1086
msgid "proc_open failed to execute ldapsearch"
msgstr "proc_open a échoué lors de l’exécution de ldapsearch"
-#: include/class_ldap.inc:1221
+#: include/class_ldap.inc:1198
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr "Ceci n'est pas un DN valide : '%s'. Le fichier d'importation doit commencer avec 'dn: ...' à la ligne %s"
-#: include/class_ldap.inc:1232
+#: include/class_ldap.inc:1209
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2995,7 +3004,7 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr "Erreur fatale : impossible d'initialiser la classe '%s' - veuillez exécuter '%s' pour essayer de régler le problème"
-#: include/functions.inc:496 include/functions.inc:3295
+#: include/functions.inc:496 include/functions.inc:3297
#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
#: include/simpleplugin/class_simplePlugin.inc:269
#: include/simpleplugin/class_simplePlugin.inc:281
@@ -3207,9 +3216,9 @@ msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr "L’objectClass «posixGroup» doit être structurelle («STRUCTURAL»)"
#: include/functions.inc:3107 include/functions.inc:3128
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200
msgid "Cannot allocate a free ID:"
msgstr "Impossible d'allouer un ID libre :"
@@ -3222,33 +3231,29 @@ msgstr "Méthode d'allocation des id inconnue !"
msgid "%sPoolMin >= %sPoolMax!"
msgstr "%sPoolMin >= %sPoolMax !"
-#: include/functions.inc:3158
-msgid "Cannot create sambaUnixIdPool entry!"
-msgstr "Impossible de créer l'entrée sambaUnixIdPool !"
-
-#: include/functions.inc:3166
+#: include/functions.inc:3168
msgid "sambaUnixIdPool is not unique!"
msgstr "sambaUnixIdPool n'est pas unique !"
-#: include/functions.inc:3178 include/functions.inc:3182
+#: include/functions.inc:3180 include/functions.inc:3184
msgid "no ID available!"
msgstr "Pas d’ID disponibles !"
-#: include/functions.inc:3198
+#: include/functions.inc:3200
msgid "maximum tries exceeded!"
msgstr "Nombre maximum d'essais dépassé !"
-#: include/functions.inc:3260
+#: include/functions.inc:3262
msgid "Cannot allocate a free ID!"
msgstr "Impossible d'assigner un ID !"
-#: include/functions.inc:3296
+#: include/functions.inc:3298
#, 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"
-#: include/class_session.inc:50 include/class_session.inc:87
-#: include/class_session.inc:125
+#: include/class_session.inc:50 include/class_session.inc:88
+#: include/class_session.inc:127
msgid "Requested channel does not exist! Please contact your Administrator."
msgstr "Le canal demandé n'existe pas ! Veuillez contacter votre administrateur système."
@@ -3404,7 +3409,7 @@ msgid ""
" be done by others will get lost if you save this entry!"
msgstr "L'objet a changé depuis son ouverture dans FusionDirectory. Toutes les modifications qui peuvent être faites par d'autres seront perdus si vous enregistrez cette entrée!"
-#: include/class_plugin.inc:1467
+#: include/class_plugin.inc:1313
#, php-format
msgid "Tab \"%s\""
msgstr "Onglet \"%s\""
@@ -3536,7 +3541,7 @@ msgid "days"
msgstr "jours"
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2171
+#: include/simpleplugin/class_attribute.inc:2172
#, php-format
msgid "%s (required)"
msgstr "%s (requis)"
@@ -3605,7 +3610,7 @@ msgid "%s (%d bytes)"
msgstr "%s (%d octets)"
#: include/simpleplugin/class_attribute.inc:1626
-#: include/simpleplugin/class_attribute.inc:1803
+#: include/simpleplugin/class_attribute.inc:1804
msgid "Upload"
msgstr "Téléverser"
@@ -3614,22 +3619,22 @@ msgstr "Téléverser"
msgid "Download"
msgstr "Télécharger"
-#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1786
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr "Impossible de sauver la photo de l'utilisateur, FusionDirectory a besoin que la bibliothèque 'php5-imagick' soit installée pour cela."
-#: include/simpleplugin/class_attribute.inc:1836
+#: include/simpleplugin/class_attribute.inc:1837
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr "Base"
-#: include/simpleplugin/class_attribute.inc:1839
+#: include/simpleplugin/class_attribute.inc:1840
msgid "Object base"
msgstr "Base de l'objet"
-#: include/simpleplugin/class_attribute.inc:2769
+#: include/simpleplugin/class_attribute.inc:2770
#, php-format
msgid "Invalid value for %s"
msgstr "Valeur invalide pour %s"
diff --git a/locale/hu_HU/fusiondirectory.po b/locale/hu_HU/fusiondirectory.po
index bf8abde15479d08b3cbe744982352230bf36c0ce..516aafceca933b847f11756462845e1be4013acd 100644
--- a/locale/hu_HU/fusiondirectory.po
+++ b/locale/hu_HU/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-03-14 12:07+0100\n"
-"PO-Revision-Date: 2016-03-07 12:09+0000\n"
+"POT-Creation-Date: 2016-04-06 11:27+0200\n"
+"PO-Revision-Date: 2016-04-06 09:24+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"
@@ -53,7 +53,7 @@ msgstr ""
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:174
+#: plugins/admin/departments/class_department.inc:176
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -76,7 +76,7 @@ msgstr "Csoport neve"
#: plugins/admin/departments/class_department.inc:73
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/aclrole/class_aclRole.inc:105
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
msgid "Description"
@@ -282,8 +282,8 @@ msgstr ""
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
#: include/simpleplugin/class_dialogAttributes.inc:632
#: include/simpleplugin/class_dialogAttributes.inc:633
-#: include/simpleplugin/class_attribute.inc:2675
#: include/simpleplugin/class_attribute.inc:2676
+#: include/simpleplugin/class_attribute.inc:2677
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -394,7 +394,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:34
#: plugins/admin/departments/class_department.inc:40
#: plugins/admin/departments/dep-list.xml:21
-#: plugins/personal/generic/class_user.inc:394
+#: plugins/personal/generic/class_user.inc:419
msgid "Department"
msgstr ""
@@ -442,7 +442,7 @@ msgid "Website of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:85
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:435
msgid "Manager"
msgstr ""
@@ -453,12 +453,12 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:91
#: plugins/admin/departments/class_department.inc:97
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:329
msgid "Location"
msgstr ""
#: plugins/admin/departments/class_department.inc:94
-#: plugins/personal/generic/class_user.inc:308
+#: plugins/personal/generic/class_user.inc:333
msgid "State"
msgstr ""
@@ -470,7 +470,7 @@ msgid "Country"
msgstr ""
#: plugins/admin/departments/class_department.inc:103
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Address"
msgstr ""
@@ -480,7 +480,7 @@ msgid "A postal address for this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:107
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Phone"
msgstr ""
@@ -489,7 +489,7 @@ msgid "Telephone number"
msgstr ""
#: plugins/admin/departments/class_department.inc:111
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Fax"
msgstr ""
@@ -542,7 +542,7 @@ msgstr ""
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:415
msgid "Organization"
msgstr ""
@@ -563,7 +563,7 @@ msgid "Given name"
msgstr ""
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
@@ -571,8 +571,8 @@ msgid "Login"
msgstr ""
#: plugins/admin/users/user-list.xml:79
-#: plugins/personal/generic/class_user.inc:246
-#: plugins/personal/generic/class_user.inc:252
+#: plugins/personal/generic/class_user.inc:271
+#: plugins/personal/generic/class_user.inc:277
msgid "User"
msgstr ""
@@ -625,9 +625,9 @@ msgid "Manage user accounts and their properties"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:140
-#: include/class_management.inc:341 include/class_management.inc:488
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571 include/class_CopyPasteHandler.inc:248
+#: include/class_management.inc:343 include/class_management.inc:490
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573 include/class_CopyPasteHandler.inc:248
#: include/simpleplugin/class_simpleManagement.inc:651
#: include/simpleplugin/class_simpleManagement.inc:749
#: include/simpleplugin/class_simpleManagement.inc:799
@@ -654,12 +654,12 @@ msgid "Lock account"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:253
+#: plugins/personal/generic/class_user.inc:278
msgid "User account"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:247
+#: plugins/personal/generic/class_user.inc:272
msgid "User account information"
msgstr ""
@@ -677,8 +677,8 @@ msgid "Edit category ACL"
msgstr ""
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
-#: include/simpleplugin/class_attribute.inc:2686
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2686
+#: include/simpleplugin/class_attribute.inc:2687
#, php-format
msgid "Delete"
msgstr ""
@@ -929,7 +929,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -950,215 +950,219 @@ msgstr ""
msgid "Same password as above, to avoid errors"
msgstr ""
-#: plugins/personal/generic/class_user.inc:274
+#: plugins/personal/generic/class_user.inc:299
msgid "Personal information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
msgid "Last name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
msgid "First name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
msgid "Short description of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "Picture"
msgstr ""
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "The avatar for this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:300
+#: plugins/personal/generic/class_user.inc:325
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Business postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Business phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Mobile"
msgstr ""
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Business mobile number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Pager"
msgstr ""
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:367
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:351
+#: plugins/personal/generic/class_user.inc:376
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr ""
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:387
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Display name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Private phone"
msgstr ""
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Home phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:405
msgid "Organizational information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid "Title"
msgstr ""
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid ""
"Title of a person in their organizational context. Each title is one value "
"of this multi-valued attribute"
msgstr ""
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:419
+msgid "Department to which the user belongs"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:423
msgid "Department No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:423
msgid "Department number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:431
msgid "Employee type"
msgstr ""
-#: plugins/personal/generic/class_user.inc:568
+#: plugins/personal/generic/class_user.inc:593
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:571
+#: plugins/personal/generic/class_user.inc:596
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:581
+#: plugins/personal/generic/class_user.inc:606
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:595
+#: plugins/personal/generic/class_user.inc:620
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:600
-#: plugins/personal/generic/class_user.inc:604
+#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:629
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:636
msgid "You need to specify your current password in order to proceed."
msgstr ""
-#: plugins/personal/generic/class_user.inc:613
+#: plugins/personal/generic/class_user.inc:638
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:615
+#: plugins/personal/generic/class_user.inc:640
#: ihtml/themes/default/recovery.tpl.c:26
#: ihtml/themes/default/recovery.tpl.c:29
msgid "New password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:617
+#: plugins/personal/generic/class_user.inc:642
msgid "The password used as new and current are too similar."
msgstr ""
-#: plugins/personal/generic/class_user.inc:619
+#: plugins/personal/generic/class_user.inc:644
msgid "The password used as new is to short."
msgstr ""
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:646
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
@@ -2134,13 +2138,13 @@ msgstr ""
msgid "Down"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
-#: include/simpleplugin/class_attribute.inc:2648
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2648
+#: include/simpleplugin/class_attribute.inc:2649
msgid "Sort up"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
-#: include/simpleplugin/class_attribute.inc:2661
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2661
+#: include/simpleplugin/class_attribute.inc:2662
msgid "Sort down"
msgstr ""
@@ -2148,23 +2152,23 @@ msgstr ""
msgid "Select all"
msgstr ""
-#: include/class_listing.inc:537 include/class_management.inc:679
-#: include/class_config.inc:479 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3107
-#: include/functions.inc:3128 include/functions.inc:3158
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198 include/functions.inc:3260
+#: include/class_listing.inc:537 include/class_management.inc:681
+#: include/class_config.inc:373 include/class_config.inc:484
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:682
+#: include/class_msgPool.inc:713 include/class_msgPool.inc:740
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200 include/functions.inc:3262
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/class_plugin.inc:1510 include/class_CopyPasteHandler.inc:278
#: include/simpleplugin/class_attribute.inc:1540
#: include/simpleplugin/class_attribute.inc:1543
#: include/simpleplugin/class_attribute.inc:1546
-#: include/simpleplugin/class_attribute.inc:1784
-#: include/simpleplugin/class_attribute.inc:1887
-#: include/simpleplugin/class_attribute.inc:1889
+#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1888
+#: include/simpleplugin/class_attribute.inc:1890
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: include/password-methods/class_password-methods-sasl.inc:60
@@ -2251,33 +2255,33 @@ msgstr ""
msgid "Create a new snapshot from this object"
msgstr ""
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "Filter error"
msgstr ""
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "The filter is incomplete!"
msgstr ""
-#: include/class_management.inc:412
+#: include/class_management.inc:414
#: include/simpleplugin/class_simpleManagement.inc:716
msgid "Permission error"
msgstr ""
-#: include/class_management.inc:488
+#: include/class_management.inc:490
#: include/simpleplugin/class_simpleManagement.inc:749
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr ""
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573
#: include/simpleplugin/class_simpleManagement.inc:799
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr ""
-#: include/class_management.inc:679
+#: include/class_management.inc:681
#, php-format
msgid ""
"No tab declaration for '%s' found in your configuration file. Cannot create "
@@ -2302,17 +2306,17 @@ msgstr ""
#: include/class_config.inc:296
#, php-format
msgid ""
-"It seems you are trying to decode something which is not encoded : "
-"%s<br/>\\nPlease check you are not using a fusiondirectory.secrets file "
-"while your passwords are not encrypted."
+"It seems you are trying to decode something which is not encoded : %s<br/>\n"
+"Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:918
-#: include/class_ldap.inc:1372 include/functions.inc:526
+#: include/class_config.inc:338 include/class_ldap.inc:895
+#: include/class_ldap.inc:1349 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
-#: include/simpleplugin/class_attribute.inc:2909
+#: include/functions.inc:2986 include/functions.inc:3160
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2910
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
@@ -2323,11 +2327,16 @@ msgstr ""
msgid "LDAP error"
msgstr ""
-#: include/class_config.inc:337
+#: include/class_config.inc:338
msgid "Cannot bind to LDAP. Please contact the system administrator."
msgstr ""
-#: include/class_config.inc:480
+#: include/class_config.inc:373
+#, php-format
+msgid "Location \"%s\" could not be found in the configuration file"
+msgstr ""
+
+#: include/class_config.inc:485
#, php-format
msgid "The selected mail method (class %s) is not available"
msgstr ""
@@ -2363,49 +2372,49 @@ msgstr ""
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr ""
-#: include/class_ldap.inc:869 include/class_ldap.inc:905
+#: include/class_ldap.inc:846 include/class_ldap.inc:882
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
#: include/functions.inc:2346 include/class_session.inc:50
-#: include/class_session.inc:87 include/class_session.inc:125
+#: include/class_session.inc:88 include/class_session.inc:127
#: include/class_log.inc:96 include/class_acl.inc:118
msgid "Internal error"
msgstr ""
-#: include/class_ldap.inc:869
+#: include/class_ldap.inc:846
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:905
+#: include/class_ldap.inc:882
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1017
+#: include/class_ldap.inc:994
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr ""
-#: include/class_ldap.inc:1019
+#: include/class_ldap.inc:996
#, php-format
msgid "while operating on LDAP server %s"
msgstr ""
-#: include/class_ldap.inc:1109
+#: include/class_ldap.inc:1086
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1221
+#: include/class_ldap.inc:1198
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr ""
-#: include/class_ldap.inc:1232
+#: include/class_ldap.inc:1209
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2993,7 +3002,7 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr ""
-#: include/functions.inc:496 include/functions.inc:3295
+#: include/functions.inc:496 include/functions.inc:3297
#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
#: include/simpleplugin/class_simplePlugin.inc:269
#: include/simpleplugin/class_simplePlugin.inc:281
@@ -3205,9 +3214,9 @@ msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
#: include/functions.inc:3107 include/functions.inc:3128
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200
msgid "Cannot allocate a free ID:"
msgstr ""
@@ -3220,33 +3229,29 @@ msgstr ""
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3158
-msgid "Cannot create sambaUnixIdPool entry!"
-msgstr ""
-
-#: include/functions.inc:3166
+#: include/functions.inc:3168
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3178 include/functions.inc:3182
+#: include/functions.inc:3180 include/functions.inc:3184
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3198
+#: include/functions.inc:3200
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3260
+#: include/functions.inc:3262
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3296
+#: include/functions.inc:3298
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
-#: include/class_session.inc:50 include/class_session.inc:87
-#: include/class_session.inc:125
+#: include/class_session.inc:50 include/class_session.inc:88
+#: include/class_session.inc:127
msgid "Requested channel does not exist! Please contact your Administrator."
msgstr ""
@@ -3402,7 +3407,7 @@ msgid ""
" be done by others will get lost if you save this entry!"
msgstr ""
-#: include/class_plugin.inc:1467
+#: include/class_plugin.inc:1313
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -3534,7 +3539,7 @@ msgid "days"
msgstr ""
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2171
+#: include/simpleplugin/class_attribute.inc:2172
#, php-format
msgid "%s (required)"
msgstr ""
@@ -3603,7 +3608,7 @@ msgid "%s (%d bytes)"
msgstr ""
#: include/simpleplugin/class_attribute.inc:1626
-#: include/simpleplugin/class_attribute.inc:1803
+#: include/simpleplugin/class_attribute.inc:1804
msgid "Upload"
msgstr ""
@@ -3612,22 +3617,22 @@ msgstr ""
msgid "Download"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1786
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1836
+#: include/simpleplugin/class_attribute.inc:1837
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1839
+#: include/simpleplugin/class_attribute.inc:1840
msgid "Object base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:2769
+#: include/simpleplugin/class_attribute.inc:2770
#, php-format
msgid "Invalid value for %s"
msgstr ""
diff --git a/locale/id/fusiondirectory.po b/locale/id/fusiondirectory.po
index 1fe05646bb72daa415484efbe97a68798e99f289..e228fcff63f67aab2ed3235d3ecb34123c0364cc 100644
--- a/locale/id/fusiondirectory.po
+++ b/locale/id/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-03-14 12:07+0100\n"
-"PO-Revision-Date: 2016-03-07 12:09+0000\n"
+"POT-Creation-Date: 2016-04-06 11:27+0200\n"
+"PO-Revision-Date: 2016-04-06 09:24+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"
@@ -52,7 +52,7 @@ msgstr ""
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:174
+#: plugins/admin/departments/class_department.inc:176
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -75,7 +75,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:73
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/aclrole/class_aclRole.inc:105
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
msgid "Description"
@@ -281,8 +281,8 @@ msgstr ""
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
#: include/simpleplugin/class_dialogAttributes.inc:632
#: include/simpleplugin/class_dialogAttributes.inc:633
-#: include/simpleplugin/class_attribute.inc:2675
#: include/simpleplugin/class_attribute.inc:2676
+#: include/simpleplugin/class_attribute.inc:2677
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -393,7 +393,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:34
#: plugins/admin/departments/class_department.inc:40
#: plugins/admin/departments/dep-list.xml:21
-#: plugins/personal/generic/class_user.inc:394
+#: plugins/personal/generic/class_user.inc:419
msgid "Department"
msgstr ""
@@ -441,7 +441,7 @@ msgid "Website of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:85
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:435
msgid "Manager"
msgstr ""
@@ -452,12 +452,12 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:91
#: plugins/admin/departments/class_department.inc:97
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:329
msgid "Location"
msgstr ""
#: plugins/admin/departments/class_department.inc:94
-#: plugins/personal/generic/class_user.inc:308
+#: plugins/personal/generic/class_user.inc:333
msgid "State"
msgstr ""
@@ -469,7 +469,7 @@ msgid "Country"
msgstr ""
#: plugins/admin/departments/class_department.inc:103
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Address"
msgstr ""
@@ -479,7 +479,7 @@ msgid "A postal address for this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:107
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Phone"
msgstr ""
@@ -488,7 +488,7 @@ msgid "Telephone number"
msgstr ""
#: plugins/admin/departments/class_department.inc:111
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Fax"
msgstr ""
@@ -541,7 +541,7 @@ msgstr ""
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:415
msgid "Organization"
msgstr ""
@@ -562,7 +562,7 @@ msgid "Given name"
msgstr ""
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
@@ -570,8 +570,8 @@ msgid "Login"
msgstr ""
#: plugins/admin/users/user-list.xml:79
-#: plugins/personal/generic/class_user.inc:246
-#: plugins/personal/generic/class_user.inc:252
+#: plugins/personal/generic/class_user.inc:271
+#: plugins/personal/generic/class_user.inc:277
msgid "User"
msgstr ""
@@ -624,9 +624,9 @@ msgid "Manage user accounts and their properties"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:140
-#: include/class_management.inc:341 include/class_management.inc:488
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571 include/class_CopyPasteHandler.inc:248
+#: include/class_management.inc:343 include/class_management.inc:490
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573 include/class_CopyPasteHandler.inc:248
#: include/simpleplugin/class_simpleManagement.inc:651
#: include/simpleplugin/class_simpleManagement.inc:749
#: include/simpleplugin/class_simpleManagement.inc:799
@@ -653,12 +653,12 @@ msgid "Lock account"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:253
+#: plugins/personal/generic/class_user.inc:278
msgid "User account"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:247
+#: plugins/personal/generic/class_user.inc:272
msgid "User account information"
msgstr ""
@@ -676,8 +676,8 @@ msgid "Edit category ACL"
msgstr ""
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
-#: include/simpleplugin/class_attribute.inc:2686
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2686
+#: include/simpleplugin/class_attribute.inc:2687
#, php-format
msgid "Delete"
msgstr ""
@@ -928,7 +928,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -949,215 +949,219 @@ msgstr ""
msgid "Same password as above, to avoid errors"
msgstr ""
-#: plugins/personal/generic/class_user.inc:274
+#: plugins/personal/generic/class_user.inc:299
msgid "Personal information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
msgid "Last name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
msgid "First name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
msgid "Short description of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "Picture"
msgstr ""
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "The avatar for this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:300
+#: plugins/personal/generic/class_user.inc:325
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Business postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Business phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Mobile"
msgstr ""
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Business mobile number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Pager"
msgstr ""
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:367
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:351
+#: plugins/personal/generic/class_user.inc:376
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr ""
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:387
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Display name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Private phone"
msgstr ""
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Home phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:405
msgid "Organizational information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid "Title"
msgstr ""
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid ""
"Title of a person in their organizational context. Each title is one value "
"of this multi-valued attribute"
msgstr ""
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:419
+msgid "Department to which the user belongs"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:423
msgid "Department No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:423
msgid "Department number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:431
msgid "Employee type"
msgstr ""
-#: plugins/personal/generic/class_user.inc:568
+#: plugins/personal/generic/class_user.inc:593
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:571
+#: plugins/personal/generic/class_user.inc:596
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:581
+#: plugins/personal/generic/class_user.inc:606
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:595
+#: plugins/personal/generic/class_user.inc:620
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:600
-#: plugins/personal/generic/class_user.inc:604
+#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:629
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:636
msgid "You need to specify your current password in order to proceed."
msgstr ""
-#: plugins/personal/generic/class_user.inc:613
+#: plugins/personal/generic/class_user.inc:638
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:615
+#: plugins/personal/generic/class_user.inc:640
#: ihtml/themes/default/recovery.tpl.c:26
#: ihtml/themes/default/recovery.tpl.c:29
msgid "New password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:617
+#: plugins/personal/generic/class_user.inc:642
msgid "The password used as new and current are too similar."
msgstr ""
-#: plugins/personal/generic/class_user.inc:619
+#: plugins/personal/generic/class_user.inc:644
msgid "The password used as new is to short."
msgstr ""
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:646
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
@@ -2133,13 +2137,13 @@ msgstr ""
msgid "Down"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
-#: include/simpleplugin/class_attribute.inc:2648
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2648
+#: include/simpleplugin/class_attribute.inc:2649
msgid "Sort up"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
-#: include/simpleplugin/class_attribute.inc:2661
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2661
+#: include/simpleplugin/class_attribute.inc:2662
msgid "Sort down"
msgstr ""
@@ -2147,23 +2151,23 @@ msgstr ""
msgid "Select all"
msgstr ""
-#: include/class_listing.inc:537 include/class_management.inc:679
-#: include/class_config.inc:479 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3107
-#: include/functions.inc:3128 include/functions.inc:3158
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198 include/functions.inc:3260
+#: include/class_listing.inc:537 include/class_management.inc:681
+#: include/class_config.inc:373 include/class_config.inc:484
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:682
+#: include/class_msgPool.inc:713 include/class_msgPool.inc:740
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200 include/functions.inc:3262
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/class_plugin.inc:1510 include/class_CopyPasteHandler.inc:278
#: include/simpleplugin/class_attribute.inc:1540
#: include/simpleplugin/class_attribute.inc:1543
#: include/simpleplugin/class_attribute.inc:1546
-#: include/simpleplugin/class_attribute.inc:1784
-#: include/simpleplugin/class_attribute.inc:1887
-#: include/simpleplugin/class_attribute.inc:1889
+#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1888
+#: include/simpleplugin/class_attribute.inc:1890
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: include/password-methods/class_password-methods-sasl.inc:60
@@ -2250,33 +2254,33 @@ msgstr ""
msgid "Create a new snapshot from this object"
msgstr ""
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "Filter error"
msgstr ""
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "The filter is incomplete!"
msgstr ""
-#: include/class_management.inc:412
+#: include/class_management.inc:414
#: include/simpleplugin/class_simpleManagement.inc:716
msgid "Permission error"
msgstr ""
-#: include/class_management.inc:488
+#: include/class_management.inc:490
#: include/simpleplugin/class_simpleManagement.inc:749
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr ""
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573
#: include/simpleplugin/class_simpleManagement.inc:799
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr ""
-#: include/class_management.inc:679
+#: include/class_management.inc:681
#, php-format
msgid ""
"No tab declaration for '%s' found in your configuration file. Cannot create "
@@ -2301,17 +2305,17 @@ msgstr ""
#: include/class_config.inc:296
#, php-format
msgid ""
-"It seems you are trying to decode something which is not encoded : "
-"%s<br/>\\nPlease check you are not using a fusiondirectory.secrets file "
-"while your passwords are not encrypted."
+"It seems you are trying to decode something which is not encoded : %s<br/>\n"
+"Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:918
-#: include/class_ldap.inc:1372 include/functions.inc:526
+#: include/class_config.inc:338 include/class_ldap.inc:895
+#: include/class_ldap.inc:1349 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
-#: include/simpleplugin/class_attribute.inc:2909
+#: include/functions.inc:2986 include/functions.inc:3160
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2910
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
@@ -2322,11 +2326,16 @@ msgstr ""
msgid "LDAP error"
msgstr ""
-#: include/class_config.inc:337
+#: include/class_config.inc:338
msgid "Cannot bind to LDAP. Please contact the system administrator."
msgstr ""
-#: include/class_config.inc:480
+#: include/class_config.inc:373
+#, php-format
+msgid "Location \"%s\" could not be found in the configuration file"
+msgstr ""
+
+#: include/class_config.inc:485
#, php-format
msgid "The selected mail method (class %s) is not available"
msgstr ""
@@ -2362,49 +2371,49 @@ msgstr ""
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr ""
-#: include/class_ldap.inc:869 include/class_ldap.inc:905
+#: include/class_ldap.inc:846 include/class_ldap.inc:882
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
#: include/functions.inc:2346 include/class_session.inc:50
-#: include/class_session.inc:87 include/class_session.inc:125
+#: include/class_session.inc:88 include/class_session.inc:127
#: include/class_log.inc:96 include/class_acl.inc:118
msgid "Internal error"
msgstr ""
-#: include/class_ldap.inc:869
+#: include/class_ldap.inc:846
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:905
+#: include/class_ldap.inc:882
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1017
+#: include/class_ldap.inc:994
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr ""
-#: include/class_ldap.inc:1019
+#: include/class_ldap.inc:996
#, php-format
msgid "while operating on LDAP server %s"
msgstr ""
-#: include/class_ldap.inc:1109
+#: include/class_ldap.inc:1086
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1221
+#: include/class_ldap.inc:1198
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr ""
-#: include/class_ldap.inc:1232
+#: include/class_ldap.inc:1209
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2992,7 +3001,7 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr ""
-#: include/functions.inc:496 include/functions.inc:3295
+#: include/functions.inc:496 include/functions.inc:3297
#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
#: include/simpleplugin/class_simplePlugin.inc:269
#: include/simpleplugin/class_simplePlugin.inc:281
@@ -3204,9 +3213,9 @@ msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
#: include/functions.inc:3107 include/functions.inc:3128
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200
msgid "Cannot allocate a free ID:"
msgstr ""
@@ -3219,33 +3228,29 @@ msgstr ""
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3158
-msgid "Cannot create sambaUnixIdPool entry!"
-msgstr ""
-
-#: include/functions.inc:3166
+#: include/functions.inc:3168
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3178 include/functions.inc:3182
+#: include/functions.inc:3180 include/functions.inc:3184
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3198
+#: include/functions.inc:3200
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3260
+#: include/functions.inc:3262
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3296
+#: include/functions.inc:3298
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
-#: include/class_session.inc:50 include/class_session.inc:87
-#: include/class_session.inc:125
+#: include/class_session.inc:50 include/class_session.inc:88
+#: include/class_session.inc:127
msgid "Requested channel does not exist! Please contact your Administrator."
msgstr ""
@@ -3401,7 +3406,7 @@ msgid ""
" be done by others will get lost if you save this entry!"
msgstr ""
-#: include/class_plugin.inc:1467
+#: include/class_plugin.inc:1313
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -3533,7 +3538,7 @@ msgid "days"
msgstr ""
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2171
+#: include/simpleplugin/class_attribute.inc:2172
#, php-format
msgid "%s (required)"
msgstr ""
@@ -3602,7 +3607,7 @@ msgid "%s (%d bytes)"
msgstr ""
#: include/simpleplugin/class_attribute.inc:1626
-#: include/simpleplugin/class_attribute.inc:1803
+#: include/simpleplugin/class_attribute.inc:1804
msgid "Upload"
msgstr ""
@@ -3611,22 +3616,22 @@ msgstr ""
msgid "Download"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1786
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1836
+#: include/simpleplugin/class_attribute.inc:1837
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1839
+#: include/simpleplugin/class_attribute.inc:1840
msgid "Object base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:2769
+#: include/simpleplugin/class_attribute.inc:2770
#, php-format
msgid "Invalid value for %s"
msgstr ""
diff --git a/locale/it_IT/fusiondirectory.po b/locale/it_IT/fusiondirectory.po
index e04391e4fbe2f497d547e18251b84f32770c5745..d03ff7168bf06e366a63c16d4c4468f33be98aca 100644
--- a/locale/it_IT/fusiondirectory.po
+++ b/locale/it_IT/fusiondirectory.po
@@ -4,14 +4,15 @@
#
# Translators:
# Ilaria Montaruli <Ilaria.Montaruli@gmail.com>, 2015
-# Penati <penati@avaya.com>, 2016
+# Paola Penati <penati@avaya.com>, 2016
+# Paola Penati <penati@avaya.com>, 2016
msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-03-14 12:07+0100\n"
-"PO-Revision-Date: 2016-03-07 13:09+0000\n"
-"Last-Translator: Penati <penati@avaya.com>\n"
+"POT-Creation-Date: 2016-04-06 11:27+0200\n"
+"PO-Revision-Date: 2016-04-06 09:32+0000\n"
+"Last-Translator: Paola Penati <penati@avaya.com>\n"
"Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -54,7 +55,7 @@ msgstr "Informazioni"
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:174
+#: plugins/admin/departments/class_department.inc:176
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -77,7 +78,7 @@ msgstr "Nome del gruppo"
#: plugins/admin/departments/class_department.inc:73
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/aclrole/class_aclRole.inc:105
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
msgid "Description"
@@ -283,8 +284,8 @@ msgstr "Crea"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
#: include/simpleplugin/class_dialogAttributes.inc:632
#: include/simpleplugin/class_dialogAttributes.inc:633
-#: include/simpleplugin/class_attribute.inc:2675
#: include/simpleplugin/class_attribute.inc:2676
+#: include/simpleplugin/class_attribute.inc:2677
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -395,7 +396,7 @@ msgstr "Oggetto di dominio"
#: plugins/admin/departments/class_department.inc:34
#: plugins/admin/departments/class_department.inc:40
#: plugins/admin/departments/dep-list.xml:21
-#: plugins/personal/generic/class_user.inc:394
+#: plugins/personal/generic/class_user.inc:419
msgid "Department"
msgstr "Dipartimento"
@@ -443,7 +444,7 @@ msgid "Website of this %s"
msgstr "Sito Web di questo %s"
#: plugins/admin/departments/class_department.inc:85
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:435
msgid "Manager"
msgstr "Manager"
@@ -454,12 +455,12 @@ msgstr "Responsabile di questo %s "
#: plugins/admin/departments/class_department.inc:91
#: plugins/admin/departments/class_department.inc:97
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:329
msgid "Location"
msgstr "Località "
#: plugins/admin/departments/class_department.inc:94
-#: plugins/personal/generic/class_user.inc:308
+#: plugins/personal/generic/class_user.inc:333
msgid "State"
msgstr "Regione"
@@ -471,7 +472,7 @@ msgid "Country"
msgstr "Stato"
#: plugins/admin/departments/class_department.inc:103
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Address"
msgstr "Indirizzo"
@@ -481,7 +482,7 @@ msgid "A postal address for this %s"
msgstr "Indirizzo postale di questo %s "
#: plugins/admin/departments/class_department.inc:107
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Phone"
msgstr "Telefono"
@@ -490,7 +491,7 @@ msgid "Telephone number"
msgstr "Numero di telefono"
#: plugins/admin/departments/class_department.inc:111
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Fax"
msgstr "Fax"
@@ -543,7 +544,7 @@ msgstr "Elenco dei dipartimenti"
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:415
msgid "Organization"
msgstr "Organizzazione"
@@ -564,7 +565,7 @@ msgid "Given name"
msgstr "Nome"
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
@@ -572,8 +573,8 @@ msgid "Login"
msgstr "Nome utente"
#: plugins/admin/users/user-list.xml:79
-#: plugins/personal/generic/class_user.inc:246
-#: plugins/personal/generic/class_user.inc:252
+#: plugins/personal/generic/class_user.inc:271
+#: plugins/personal/generic/class_user.inc:277
msgid "User"
msgstr "Utente"
@@ -626,9 +627,9 @@ msgid "Manage user accounts and their properties"
msgstr "Gestire gli account utente e le loro proprietà "
#: plugins/admin/users/class_userManagement.inc:140
-#: include/class_management.inc:341 include/class_management.inc:488
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571 include/class_CopyPasteHandler.inc:248
+#: include/class_management.inc:343 include/class_management.inc:490
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573 include/class_CopyPasteHandler.inc:248
#: include/simpleplugin/class_simpleManagement.inc:651
#: include/simpleplugin/class_simpleManagement.inc:749
#: include/simpleplugin/class_simpleManagement.inc:799
@@ -655,12 +656,12 @@ msgid "Lock account"
msgstr "Blocca l'account"
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:253
+#: plugins/personal/generic/class_user.inc:278
msgid "User account"
msgstr "Account utente"
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:247
+#: plugins/personal/generic/class_user.inc:272
msgid "User account information"
msgstr "Informazioni account utente"
@@ -678,8 +679,8 @@ msgid "Edit category ACL"
msgstr "Modifica la categoria di ACL"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
-#: include/simpleplugin/class_attribute.inc:2686
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2686
+#: include/simpleplugin/class_attribute.inc:2687
#, php-format
msgid "Delete"
msgstr "Elimina"
@@ -930,7 +931,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:356
+#: plugins/personal/generic/class_user.inc:381
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -951,215 +952,219 @@ msgstr "Ripeti password"
msgid "Same password as above, to avoid errors"
msgstr "Stessa password come sopra, per evitare errori"
-#: plugins/personal/generic/class_user.inc:274
+#: plugins/personal/generic/class_user.inc:299
msgid "Personal information"
msgstr "Informazioni personali"
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "Cognome"
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
msgid "Last name of this user"
msgstr "Cognome utente"
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "Nome"
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
msgid "First name of this user"
msgstr "Nme utente"
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
msgid "Short description of the user"
msgstr "Breve descrizione dell'utente"
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "Picture"
msgstr "Foto"
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "The avatar for this user"
msgstr "Avatar di questo utente"
-#: plugins/personal/generic/class_user.inc:300
+#: plugins/personal/generic/class_user.inc:325
msgid "Organizational contact information"
msgstr "Informazioni di contatto organizzativo"
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Business postal address"
msgstr "Indirizzo postale ufficio"
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room No."
msgstr "Stanza No."
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room number"
msgstr "Numero dell'ufficio"
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Business phone number"
msgstr "Telefono ufficio"
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Mobile"
msgstr "Cellulare"
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Business mobile number"
msgstr "Telefono cellulare professionale"
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Pager"
msgstr "Cercapersone"
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Business pager number"
msgstr "Numero pager ufficio"
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Business fax number"
msgstr "Numero fax ufficio"
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Homepage"
msgstr "Home Page"
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Personal homepage"
msgstr "Pagina Web personale"
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:367
msgid "Account information"
msgstr "Informazioni account utente"
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
msgid "Login of this user"
msgstr "Login utente"
-#: plugins/personal/generic/class_user.inc:351
+#: plugins/personal/generic/class_user.inc:376
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr "Lingua preferita"
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
msgid "Password of the user"
msgstr "Password dell'utente"
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:387
msgid "Personal contact information"
msgstr "Informazioni personali utente"
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Display name"
msgstr "Mostra il nome"
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
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:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home address"
msgstr "Indirizzo di casa"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home postal address"
msgstr "Indirizzo postale di casa"
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Private phone"
msgstr "Numero di telefono privato"
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Home phone number"
msgstr "Numero di telefono di casa"
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:405
msgid "Organizational information"
msgstr "Informazioni organizzazione"
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid "Title"
msgstr "Titolo"
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
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:398
+#: plugins/personal/generic/class_user.inc:419
+msgid "Department to which the user belongs"
+msgstr "Dipartimento al quale appartiene l'utente"
+
+#: plugins/personal/generic/class_user.inc:423
msgid "Department No."
msgstr "Dipartimento No."
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:423
msgid "Department number"
msgstr "Numero del dipartimento"
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee No."
msgstr "Matricola No."
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee number"
msgstr "Matricola dell'impiegato"
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:431
msgid "Employee type"
msgstr "Qualifica"
-#: plugins/personal/generic/class_user.inc:568
+#: plugins/personal/generic/class_user.inc:593
#, 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:571
+#: plugins/personal/generic/class_user.inc:596
msgid "You are not allowed to change your own password"
msgstr "Non le é permesso cambiare la propria password"
-#: plugins/personal/generic/class_user.inc:581
+#: plugins/personal/generic/class_user.inc:606
#, 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:595
+#: plugins/personal/generic/class_user.inc:620
msgid "Password is in history of old passwords"
msgstr "La password si trova nella cronologia delle vecchie password"
-#: plugins/personal/generic/class_user.inc:600
-#: plugins/personal/generic/class_user.inc:604
+#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:629
msgid "Password is not being changed from existing value"
msgstr "La password non è stata cambiata dal valore esistente"
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:636
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:613
+#: plugins/personal/generic/class_user.inc:638
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:615
+#: plugins/personal/generic/class_user.inc:640
#: ihtml/themes/default/recovery.tpl.c:26
#: ihtml/themes/default/recovery.tpl.c:29
msgid "New password"
msgstr "Imposta la nuova password"
-#: plugins/personal/generic/class_user.inc:617
+#: plugins/personal/generic/class_user.inc:642
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:619
+#: plugins/personal/generic/class_user.inc:644
msgid "The password used as new is to short."
msgstr "La 'Nuova password' immessa è troppo corta."
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:646
msgid "The password contains possibly problematic Unicode characters!"
msgstr "La password contiene caratteri Unicode eventualmente problematici!"
@@ -2135,13 +2140,13 @@ msgstr "Sopra"
msgid "Down"
msgstr "Sotto"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
-#: include/simpleplugin/class_attribute.inc:2648
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2648
+#: include/simpleplugin/class_attribute.inc:2649
msgid "Sort up"
msgstr "Ordina in modo crescente"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
-#: include/simpleplugin/class_attribute.inc:2661
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2661
+#: include/simpleplugin/class_attribute.inc:2662
msgid "Sort down"
msgstr "Ordina in modo decrescente"
@@ -2149,23 +2154,23 @@ msgstr "Ordina in modo decrescente"
msgid "Select all"
msgstr "Seleziona tutto"
-#: include/class_listing.inc:537 include/class_management.inc:679
-#: include/class_config.inc:479 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3107
-#: include/functions.inc:3128 include/functions.inc:3158
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198 include/functions.inc:3260
+#: include/class_listing.inc:537 include/class_management.inc:681
+#: include/class_config.inc:373 include/class_config.inc:484
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:682
+#: include/class_msgPool.inc:713 include/class_msgPool.inc:740
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200 include/functions.inc:3262
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/class_plugin.inc:1510 include/class_CopyPasteHandler.inc:278
#: include/simpleplugin/class_attribute.inc:1540
#: include/simpleplugin/class_attribute.inc:1543
#: include/simpleplugin/class_attribute.inc:1546
-#: include/simpleplugin/class_attribute.inc:1784
-#: include/simpleplugin/class_attribute.inc:1887
-#: include/simpleplugin/class_attribute.inc:1889
+#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1888
+#: include/simpleplugin/class_attribute.inc:1890
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: include/password-methods/class_password-methods-sasl.inc:60
@@ -2252,33 +2257,33 @@ msgstr "Crea una 'copia istantanea'"
msgid "Create a new snapshot from this object"
msgstr "Crea una nuova 'copia istantanea a partire da questi oggetti"
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "Filter error"
msgstr "Errore di filtro"
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "The filter is incomplete!"
msgstr "Il filtro non è completo!"
-#: include/class_management.inc:412
+#: include/class_management.inc:414
#: include/simpleplugin/class_simpleManagement.inc:716
msgid "Permission error"
msgstr "Errore d'autorizzazione"
-#: include/class_management.inc:488
+#: include/class_management.inc:490
#: include/simpleplugin/class_simpleManagement.inc:749
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr "Non sei autorizzato a creare una 'copia instantanea' di %s."
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573
#: include/simpleplugin/class_simpleManagement.inc:799
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr "Non sei autorizzato a restaurare una 'copia instantanea' di %s."
-#: include/class_management.inc:679
+#: include/class_management.inc:681
#, php-format
msgid ""
"No tab declaration for '%s' found in your configuration file. Cannot create "
@@ -2303,17 +2308,17 @@ msgstr "Errore di configurazione"
#: include/class_config.inc:296
#, php-format
msgid ""
-"It seems you are trying to decode something which is not encoded : "
-"%s<br/>\\nPlease check you are not using a fusiondirectory.secrets file "
-"while your passwords are not encrypted."
-msgstr "Sembrerebbe che stiate provando a decodificare qualcosa che non é codificato : %s<br/>\\nSi prega di controllare che non si stia utilizzando un file fusiondirectory.secrets mentre le password non sono crittografate."
+"It seems you are trying to decode something which is not encoded : %s<br/>\n"
+"Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
+msgstr "Sembra che si stia tentando di decodificare qualcosa che non è codificato : \n%s <br/> Si prega di controllare non si stia utilizzando un file fusiondirectory.secrets mentre le password non sono crittografate."
-#: include/class_config.inc:337 include/class_ldap.inc:918
-#: include/class_ldap.inc:1372 include/functions.inc:526
+#: include/class_config.inc:338 include/class_ldap.inc:895
+#: include/class_ldap.inc:1349 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
-#: include/simpleplugin/class_attribute.inc:2909
+#: include/functions.inc:2986 include/functions.inc:3160
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2910
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
@@ -2324,11 +2329,16 @@ msgstr "Sembrerebbe che stiate provando a decodificare qualcosa che non é codif
msgid "LDAP error"
msgstr "Errore LDAP"
-#: include/class_config.inc:337
+#: include/class_config.inc:338
msgid "Cannot bind to LDAP. Please contact the system administrator."
msgstr "Errore di connessione al server LDAP. Contatta l'amministratore del sistema."
-#: include/class_config.inc:480
+#: include/class_config.inc:373
+#, php-format
+msgid "Location \"%s\" could not be found in the configuration file"
+msgstr "Location \" %s\" non è stata trovata nel file di configurazione"
+
+#: include/class_config.inc:485
#, php-format
msgid "The selected mail method (class %s) is not available"
msgstr "Il metodo mail (classe %s) selezionato non è disponibile "
@@ -2364,49 +2374,49 @@ msgstr "Avvertimento sul rendimento"
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr "Il rendimento del tuo annuario LDAP è scarso: l'ultima richiesta è durata %.2fs !"
-#: include/class_ldap.inc:869 include/class_ldap.inc:905
+#: include/class_ldap.inc:846 include/class_ldap.inc:882
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
#: include/functions.inc:2346 include/class_session.inc:50
-#: include/class_session.inc:87 include/class_session.inc:125
+#: include/class_session.inc:88 include/class_session.inc:127
#: include/class_log.inc:96 include/class_acl.inc:118
msgid "Internal error"
msgstr "Errore interno"
-#: include/class_ldap.inc:869
+#: include/class_ldap.inc:846
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr "Impossibile creare automaticamente delle sottostrutture con RDN \"%s\": alcun class object trovato!"
-#: include/class_ldap.inc:905
+#: include/class_ldap.inc:882
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr "Impossibile creare automaticamente delle sottostrutture con RDN \"%s\": non supportato"
-#: include/class_ldap.inc:1017
+#: include/class_ldap.inc:994
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr "durante l'operazione su '%s' usando il server LDAP '%s'"
-#: include/class_ldap.inc:1019
+#: include/class_ldap.inc:996
#, php-format
msgid "while operating on LDAP server %s"
msgstr "durante l'operazione sul server LDAP %s"
-#: include/class_ldap.inc:1109
+#: include/class_ldap.inc:1086
msgid "proc_open failed to execute ldapsearch"
msgstr "proc_open non é riuscito ad eseguire la ricerca LDAP"
-#: include/class_ldap.inc:1221
+#: include/class_ldap.inc:1198
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr "Questo non è un DN valido: '%s'. Il file da importare deve cominciare con 'dn: ...' alla linea %s "
-#: include/class_ldap.inc:1232
+#: include/class_ldap.inc:1209
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2994,7 +3004,7 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr "Errore fatale: impossibile inizializzare la classe '%s' - esegui '%s' per porre rimedio al problema"
-#: include/functions.inc:496 include/functions.inc:3295
+#: include/functions.inc:496 include/functions.inc:3297
#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
#: include/simpleplugin/class_simplePlugin.inc:269
#: include/simpleplugin/class_simplePlugin.inc:281
@@ -3206,9 +3216,9 @@ msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr "L'objectClass \"posixGroup\" deve essere STRUTTURALE"
#: include/functions.inc:3107 include/functions.inc:3128
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200
msgid "Cannot allocate a free ID:"
msgstr "Impossibile assegnare un ID libero:"
@@ -3221,33 +3231,29 @@ msgstr "Metodo idAllocation sconosciuto !"
msgid "%sPoolMin >= %sPoolMax!"
msgstr "%sPoolMin >= %sPoolMax!"
-#: include/functions.inc:3158
-msgid "Cannot create sambaUnixIdPool entry!"
-msgstr "Impossibile creare la voce sambaUnixIdPool !"
-
-#: include/functions.inc:3166
+#: include/functions.inc:3168
msgid "sambaUnixIdPool is not unique!"
msgstr "sambaUnixIdPool non è univoco !"
-#: include/functions.inc:3178 include/functions.inc:3182
+#: include/functions.inc:3180 include/functions.inc:3184
msgid "no ID available!"
msgstr "nessun ID disponibile !"
-#: include/functions.inc:3198
+#: include/functions.inc:3200
msgid "maximum tries exceeded!"
msgstr "Il numero massimo di tentativi è stato superato"
-#: include/functions.inc:3260
+#: include/functions.inc:3262
msgid "Cannot allocate a free ID!"
msgstr "Impossibile assegnare un ID libero!"
-#: include/functions.inc:3296
+#: include/functions.inc:3298
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr "Impossibile trovare il file '%s' - esegui '%s' per porre rimedio al problema"
-#: include/class_session.inc:50 include/class_session.inc:87
-#: include/class_session.inc:125
+#: include/class_session.inc:50 include/class_session.inc:88
+#: include/class_session.inc:127
msgid "Requested channel does not exist! Please contact your Administrator."
msgstr "Il canale richiesto non esiste! Contatta l'amministratore del sistema."
@@ -3403,7 +3409,7 @@ msgid ""
" be done by others will get lost if you save this entry!"
msgstr "L'oggetto é cambiato dopo l'apertura in FusionDurectory. Tutte le modifiche che possono essere state fatte da altri andranno perse se si salva questa voce !"
-#: include/class_plugin.inc:1467
+#: include/class_plugin.inc:1313
#, php-format
msgid "Tab \"%s\""
msgstr "Tab \"%s\""
@@ -3535,7 +3541,7 @@ msgid "days"
msgstr "giorni"
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2171
+#: include/simpleplugin/class_attribute.inc:2172
#, php-format
msgid "%s (required)"
msgstr "%s (necessario)"
@@ -3604,7 +3610,7 @@ msgid "%s (%d bytes)"
msgstr "%s (%d bytes)"
#: include/simpleplugin/class_attribute.inc:1626
-#: include/simpleplugin/class_attribute.inc:1803
+#: include/simpleplugin/class_attribute.inc:1804
msgid "Upload"
msgstr "Caricare"
@@ -3613,22 +3619,22 @@ msgstr "Caricare"
msgid "Download"
msgstr "Scarica"
-#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1786
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr "Impossibile salvare la foto dell'utente, FusionDirectory richiede che il pacchetto 'php5-imagick' sia installato!"
-#: include/simpleplugin/class_attribute.inc:1836
+#: include/simpleplugin/class_attribute.inc:1837
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr "Base"
-#: include/simpleplugin/class_attribute.inc:1839
+#: include/simpleplugin/class_attribute.inc:1840
msgid "Object base"
msgstr "Base dell'oggetto"
-#: include/simpleplugin/class_attribute.inc:2769
+#: include/simpleplugin/class_attribute.inc:2770
#, php-format
msgid "Invalid value for %s"
msgstr "Valore non valido per %s"
diff --git a/locale/lv/fusiondirectory.po b/locale/lv/fusiondirectory.po
index e57f838ae0b331cf09960e4df3e21ad6c07d0881..4b81d7d7423768e3e33c0d2a36f2da6c10de3794 100644
--- a/locale/lv/fusiondirectory.po
+++ b/locale/lv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-03-14 12:07+0100\n"
-"PO-Revision-Date: 2016-03-07 12:09+0000\n"
+"POT-Creation-Date: 2016-04-06 11:27+0200\n"
+"PO-Revision-Date: 2016-04-06 09:24+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"
@@ -52,7 +52,7 @@ msgstr ""
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:174
+#: plugins/admin/departments/class_department.inc:176
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -75,7 +75,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:73
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/aclrole/class_aclRole.inc:105
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
msgid "Description"
@@ -281,8 +281,8 @@ msgstr "Izveidot"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
#: include/simpleplugin/class_dialogAttributes.inc:632
#: include/simpleplugin/class_dialogAttributes.inc:633
-#: include/simpleplugin/class_attribute.inc:2675
#: include/simpleplugin/class_attribute.inc:2676
+#: include/simpleplugin/class_attribute.inc:2677
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -393,7 +393,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:34
#: plugins/admin/departments/class_department.inc:40
#: plugins/admin/departments/dep-list.xml:21
-#: plugins/personal/generic/class_user.inc:394
+#: plugins/personal/generic/class_user.inc:419
msgid "Department"
msgstr "Nodaļa"
@@ -441,7 +441,7 @@ msgid "Website of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:85
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:435
msgid "Manager"
msgstr ""
@@ -452,12 +452,12 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:91
#: plugins/admin/departments/class_department.inc:97
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:329
msgid "Location"
msgstr "AtraÅ¡anÄs vieta"
#: plugins/admin/departments/class_department.inc:94
-#: plugins/personal/generic/class_user.inc:308
+#: plugins/personal/generic/class_user.inc:333
msgid "State"
msgstr "Valsts"
@@ -469,7 +469,7 @@ msgid "Country"
msgstr "Valsts"
#: plugins/admin/departments/class_department.inc:103
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Address"
msgstr "Adrese"
@@ -479,7 +479,7 @@ msgid "A postal address for this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:107
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Phone"
msgstr "TÄlrunis"
@@ -488,7 +488,7 @@ msgid "Telephone number"
msgstr "TÄlruņa numurs"
#: plugins/admin/departments/class_department.inc:111
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Fax"
msgstr "Fakss"
@@ -541,7 +541,7 @@ msgstr ""
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:415
msgid "Organization"
msgstr "OrganizÄcija"
@@ -562,7 +562,7 @@ msgid "Given name"
msgstr "VÄrds"
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
@@ -570,8 +570,8 @@ msgid "Login"
msgstr ""
#: plugins/admin/users/user-list.xml:79
-#: plugins/personal/generic/class_user.inc:246
-#: plugins/personal/generic/class_user.inc:252
+#: plugins/personal/generic/class_user.inc:271
+#: plugins/personal/generic/class_user.inc:277
msgid "User"
msgstr ""
@@ -624,9 +624,9 @@ msgid "Manage user accounts and their properties"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:140
-#: include/class_management.inc:341 include/class_management.inc:488
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571 include/class_CopyPasteHandler.inc:248
+#: include/class_management.inc:343 include/class_management.inc:490
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573 include/class_CopyPasteHandler.inc:248
#: include/simpleplugin/class_simpleManagement.inc:651
#: include/simpleplugin/class_simpleManagement.inc:749
#: include/simpleplugin/class_simpleManagement.inc:799
@@ -653,12 +653,12 @@ msgid "Lock account"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:253
+#: plugins/personal/generic/class_user.inc:278
msgid "User account"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:247
+#: plugins/personal/generic/class_user.inc:272
msgid "User account information"
msgstr ""
@@ -676,8 +676,8 @@ msgid "Edit category ACL"
msgstr ""
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
-#: include/simpleplugin/class_attribute.inc:2686
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2686
+#: include/simpleplugin/class_attribute.inc:2687
#, php-format
msgid "Delete"
msgstr ""
@@ -928,7 +928,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -949,215 +949,219 @@ msgstr ""
msgid "Same password as above, to avoid errors"
msgstr ""
-#: plugins/personal/generic/class_user.inc:274
+#: plugins/personal/generic/class_user.inc:299
msgid "Personal information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "UzvÄrds"
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
msgid "Last name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "VÄrds"
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
msgid "First name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
msgid "Short description of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "Picture"
msgstr ""
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "The avatar for this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:300
+#: plugins/personal/generic/class_user.inc:325
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Business postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Business phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Mobile"
msgstr "Mobilais"
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Business mobile number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Pager"
msgstr "Peidžeris"
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:367
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:351
+#: plugins/personal/generic/class_user.inc:376
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr ""
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:387
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Display name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home postal address"
msgstr "MÄjas pasta adrese"
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Private phone"
msgstr ""
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Home phone number"
msgstr "MÄjas tÄlruņa numurs"
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:405
msgid "Organizational information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid "Title"
msgstr "Nosaukums"
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid ""
"Title of a person in their organizational context. Each title is one value "
"of this multi-valued attribute"
msgstr ""
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:419
+msgid "Department to which the user belongs"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:423
msgid "Department No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:423
msgid "Department number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:431
msgid "Employee type"
msgstr ""
-#: plugins/personal/generic/class_user.inc:568
+#: plugins/personal/generic/class_user.inc:593
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:571
+#: plugins/personal/generic/class_user.inc:596
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:581
+#: plugins/personal/generic/class_user.inc:606
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:595
+#: plugins/personal/generic/class_user.inc:620
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:600
-#: plugins/personal/generic/class_user.inc:604
+#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:629
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:636
msgid "You need to specify your current password in order to proceed."
msgstr ""
-#: plugins/personal/generic/class_user.inc:613
+#: plugins/personal/generic/class_user.inc:638
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:615
+#: plugins/personal/generic/class_user.inc:640
#: ihtml/themes/default/recovery.tpl.c:26
#: ihtml/themes/default/recovery.tpl.c:29
msgid "New password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:617
+#: plugins/personal/generic/class_user.inc:642
msgid "The password used as new and current are too similar."
msgstr ""
-#: plugins/personal/generic/class_user.inc:619
+#: plugins/personal/generic/class_user.inc:644
msgid "The password used as new is to short."
msgstr ""
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:646
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
@@ -2133,13 +2137,13 @@ msgstr ""
msgid "Down"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
-#: include/simpleplugin/class_attribute.inc:2648
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2648
+#: include/simpleplugin/class_attribute.inc:2649
msgid "Sort up"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
-#: include/simpleplugin/class_attribute.inc:2661
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2661
+#: include/simpleplugin/class_attribute.inc:2662
msgid "Sort down"
msgstr ""
@@ -2147,23 +2151,23 @@ msgstr ""
msgid "Select all"
msgstr ""
-#: include/class_listing.inc:537 include/class_management.inc:679
-#: include/class_config.inc:479 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3107
-#: include/functions.inc:3128 include/functions.inc:3158
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198 include/functions.inc:3260
+#: include/class_listing.inc:537 include/class_management.inc:681
+#: include/class_config.inc:373 include/class_config.inc:484
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:682
+#: include/class_msgPool.inc:713 include/class_msgPool.inc:740
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200 include/functions.inc:3262
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/class_plugin.inc:1510 include/class_CopyPasteHandler.inc:278
#: include/simpleplugin/class_attribute.inc:1540
#: include/simpleplugin/class_attribute.inc:1543
#: include/simpleplugin/class_attribute.inc:1546
-#: include/simpleplugin/class_attribute.inc:1784
-#: include/simpleplugin/class_attribute.inc:1887
-#: include/simpleplugin/class_attribute.inc:1889
+#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1888
+#: include/simpleplugin/class_attribute.inc:1890
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: include/password-methods/class_password-methods-sasl.inc:60
@@ -2250,33 +2254,33 @@ msgstr ""
msgid "Create a new snapshot from this object"
msgstr ""
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "Filter error"
msgstr ""
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "The filter is incomplete!"
msgstr ""
-#: include/class_management.inc:412
+#: include/class_management.inc:414
#: include/simpleplugin/class_simpleManagement.inc:716
msgid "Permission error"
msgstr ""
-#: include/class_management.inc:488
+#: include/class_management.inc:490
#: include/simpleplugin/class_simpleManagement.inc:749
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr ""
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573
#: include/simpleplugin/class_simpleManagement.inc:799
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr ""
-#: include/class_management.inc:679
+#: include/class_management.inc:681
#, php-format
msgid ""
"No tab declaration for '%s' found in your configuration file. Cannot create "
@@ -2301,17 +2305,17 @@ msgstr ""
#: include/class_config.inc:296
#, php-format
msgid ""
-"It seems you are trying to decode something which is not encoded : "
-"%s<br/>\\nPlease check you are not using a fusiondirectory.secrets file "
-"while your passwords are not encrypted."
+"It seems you are trying to decode something which is not encoded : %s<br/>\n"
+"Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:918
-#: include/class_ldap.inc:1372 include/functions.inc:526
+#: include/class_config.inc:338 include/class_ldap.inc:895
+#: include/class_ldap.inc:1349 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
-#: include/simpleplugin/class_attribute.inc:2909
+#: include/functions.inc:2986 include/functions.inc:3160
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2910
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
@@ -2322,11 +2326,16 @@ msgstr ""
msgid "LDAP error"
msgstr "LDAP kļūda"
-#: include/class_config.inc:337
+#: include/class_config.inc:338
msgid "Cannot bind to LDAP. Please contact the system administrator."
msgstr ""
-#: include/class_config.inc:480
+#: include/class_config.inc:373
+#, php-format
+msgid "Location \"%s\" could not be found in the configuration file"
+msgstr ""
+
+#: include/class_config.inc:485
#, php-format
msgid "The selected mail method (class %s) is not available"
msgstr ""
@@ -2362,49 +2371,49 @@ msgstr ""
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr ""
-#: include/class_ldap.inc:869 include/class_ldap.inc:905
+#: include/class_ldap.inc:846 include/class_ldap.inc:882
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
#: include/functions.inc:2346 include/class_session.inc:50
-#: include/class_session.inc:87 include/class_session.inc:125
+#: include/class_session.inc:88 include/class_session.inc:127
#: include/class_log.inc:96 include/class_acl.inc:118
msgid "Internal error"
msgstr "IekÅ¡Ä“jÄ kļūda"
-#: include/class_ldap.inc:869
+#: include/class_ldap.inc:846
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:905
+#: include/class_ldap.inc:882
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1017
+#: include/class_ldap.inc:994
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr ""
-#: include/class_ldap.inc:1019
+#: include/class_ldap.inc:996
#, php-format
msgid "while operating on LDAP server %s"
msgstr ""
-#: include/class_ldap.inc:1109
+#: include/class_ldap.inc:1086
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1221
+#: include/class_ldap.inc:1198
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr ""
-#: include/class_ldap.inc:1232
+#: include/class_ldap.inc:1209
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2992,7 +3001,7 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr ""
-#: include/functions.inc:496 include/functions.inc:3295
+#: include/functions.inc:496 include/functions.inc:3297
#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
#: include/simpleplugin/class_simplePlugin.inc:269
#: include/simpleplugin/class_simplePlugin.inc:281
@@ -3204,9 +3213,9 @@ msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
#: include/functions.inc:3107 include/functions.inc:3128
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200
msgid "Cannot allocate a free ID:"
msgstr ""
@@ -3219,33 +3228,29 @@ msgstr ""
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3158
-msgid "Cannot create sambaUnixIdPool entry!"
-msgstr ""
-
-#: include/functions.inc:3166
+#: include/functions.inc:3168
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3178 include/functions.inc:3182
+#: include/functions.inc:3180 include/functions.inc:3184
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3198
+#: include/functions.inc:3200
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3260
+#: include/functions.inc:3262
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3296
+#: include/functions.inc:3298
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
-#: include/class_session.inc:50 include/class_session.inc:87
-#: include/class_session.inc:125
+#: include/class_session.inc:50 include/class_session.inc:88
+#: include/class_session.inc:127
msgid "Requested channel does not exist! Please contact your Administrator."
msgstr ""
@@ -3401,7 +3406,7 @@ msgid ""
" be done by others will get lost if you save this entry!"
msgstr ""
-#: include/class_plugin.inc:1467
+#: include/class_plugin.inc:1313
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -3533,7 +3538,7 @@ msgid "days"
msgstr ""
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2171
+#: include/simpleplugin/class_attribute.inc:2172
#, php-format
msgid "%s (required)"
msgstr ""
@@ -3602,7 +3607,7 @@ msgid "%s (%d bytes)"
msgstr ""
#: include/simpleplugin/class_attribute.inc:1626
-#: include/simpleplugin/class_attribute.inc:1803
+#: include/simpleplugin/class_attribute.inc:1804
msgid "Upload"
msgstr ""
@@ -3611,22 +3616,22 @@ msgstr ""
msgid "Download"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1786
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1836
+#: include/simpleplugin/class_attribute.inc:1837
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1839
+#: include/simpleplugin/class_attribute.inc:1840
msgid "Object base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:2769
+#: include/simpleplugin/class_attribute.inc:2770
#, php-format
msgid "Invalid value for %s"
msgstr ""
diff --git a/locale/nb/fusiondirectory.po b/locale/nb/fusiondirectory.po
index a4e3843e1b3cf87d11f9e2d5c07b7e3107982960..bc255a51e20931503b9bf12857d5aa10995ab0ea 100644
--- a/locale/nb/fusiondirectory.po
+++ b/locale/nb/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-03-14 12:07+0100\n"
-"PO-Revision-Date: 2016-03-07 12:09+0000\n"
+"POT-Creation-Date: 2016-04-06 11:27+0200\n"
+"PO-Revision-Date: 2016-04-06 09:24+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"
@@ -52,7 +52,7 @@ msgstr ""
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:174
+#: plugins/admin/departments/class_department.inc:176
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -75,7 +75,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:73
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/aclrole/class_aclRole.inc:105
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
msgid "Description"
@@ -281,8 +281,8 @@ msgstr "Opprett"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
#: include/simpleplugin/class_dialogAttributes.inc:632
#: include/simpleplugin/class_dialogAttributes.inc:633
-#: include/simpleplugin/class_attribute.inc:2675
#: include/simpleplugin/class_attribute.inc:2676
+#: include/simpleplugin/class_attribute.inc:2677
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -393,7 +393,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:34
#: plugins/admin/departments/class_department.inc:40
#: plugins/admin/departments/dep-list.xml:21
-#: plugins/personal/generic/class_user.inc:394
+#: plugins/personal/generic/class_user.inc:419
msgid "Department"
msgstr ""
@@ -441,7 +441,7 @@ msgid "Website of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:85
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:435
msgid "Manager"
msgstr ""
@@ -452,12 +452,12 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:91
#: plugins/admin/departments/class_department.inc:97
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:329
msgid "Location"
msgstr ""
#: plugins/admin/departments/class_department.inc:94
-#: plugins/personal/generic/class_user.inc:308
+#: plugins/personal/generic/class_user.inc:333
msgid "State"
msgstr ""
@@ -469,7 +469,7 @@ msgid "Country"
msgstr ""
#: plugins/admin/departments/class_department.inc:103
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Address"
msgstr ""
@@ -479,7 +479,7 @@ msgid "A postal address for this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:107
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Phone"
msgstr ""
@@ -488,7 +488,7 @@ msgid "Telephone number"
msgstr ""
#: plugins/admin/departments/class_department.inc:111
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Fax"
msgstr ""
@@ -541,7 +541,7 @@ msgstr ""
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:415
msgid "Organization"
msgstr ""
@@ -562,7 +562,7 @@ msgid "Given name"
msgstr ""
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
@@ -570,8 +570,8 @@ msgid "Login"
msgstr ""
#: plugins/admin/users/user-list.xml:79
-#: plugins/personal/generic/class_user.inc:246
-#: plugins/personal/generic/class_user.inc:252
+#: plugins/personal/generic/class_user.inc:271
+#: plugins/personal/generic/class_user.inc:277
msgid "User"
msgstr "Bruker"
@@ -624,9 +624,9 @@ msgid "Manage user accounts and their properties"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:140
-#: include/class_management.inc:341 include/class_management.inc:488
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571 include/class_CopyPasteHandler.inc:248
+#: include/class_management.inc:343 include/class_management.inc:490
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573 include/class_CopyPasteHandler.inc:248
#: include/simpleplugin/class_simpleManagement.inc:651
#: include/simpleplugin/class_simpleManagement.inc:749
#: include/simpleplugin/class_simpleManagement.inc:799
@@ -653,12 +653,12 @@ msgid "Lock account"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:253
+#: plugins/personal/generic/class_user.inc:278
msgid "User account"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:247
+#: plugins/personal/generic/class_user.inc:272
msgid "User account information"
msgstr ""
@@ -676,8 +676,8 @@ msgid "Edit category ACL"
msgstr ""
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
-#: include/simpleplugin/class_attribute.inc:2686
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2686
+#: include/simpleplugin/class_attribute.inc:2687
#, php-format
msgid "Delete"
msgstr ""
@@ -928,7 +928,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -949,215 +949,219 @@ msgstr ""
msgid "Same password as above, to avoid errors"
msgstr ""
-#: plugins/personal/generic/class_user.inc:274
+#: plugins/personal/generic/class_user.inc:299
msgid "Personal information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
msgid "Last name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
msgid "First name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
msgid "Short description of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "Picture"
msgstr ""
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "The avatar for this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:300
+#: plugins/personal/generic/class_user.inc:325
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Business postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Business phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Mobile"
msgstr ""
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Business mobile number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Pager"
msgstr ""
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:367
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:351
+#: plugins/personal/generic/class_user.inc:376
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr ""
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:387
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Display name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Private phone"
msgstr ""
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Home phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:405
msgid "Organizational information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid "Title"
msgstr ""
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid ""
"Title of a person in their organizational context. Each title is one value "
"of this multi-valued attribute"
msgstr ""
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:419
+msgid "Department to which the user belongs"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:423
msgid "Department No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:423
msgid "Department number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:431
msgid "Employee type"
msgstr ""
-#: plugins/personal/generic/class_user.inc:568
+#: plugins/personal/generic/class_user.inc:593
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:571
+#: plugins/personal/generic/class_user.inc:596
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:581
+#: plugins/personal/generic/class_user.inc:606
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:595
+#: plugins/personal/generic/class_user.inc:620
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:600
-#: plugins/personal/generic/class_user.inc:604
+#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:629
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:636
msgid "You need to specify your current password in order to proceed."
msgstr ""
-#: plugins/personal/generic/class_user.inc:613
+#: plugins/personal/generic/class_user.inc:638
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:615
+#: plugins/personal/generic/class_user.inc:640
#: ihtml/themes/default/recovery.tpl.c:26
#: ihtml/themes/default/recovery.tpl.c:29
msgid "New password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:617
+#: plugins/personal/generic/class_user.inc:642
msgid "The password used as new and current are too similar."
msgstr ""
-#: plugins/personal/generic/class_user.inc:619
+#: plugins/personal/generic/class_user.inc:644
msgid "The password used as new is to short."
msgstr ""
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:646
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
@@ -2133,13 +2137,13 @@ msgstr ""
msgid "Down"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
-#: include/simpleplugin/class_attribute.inc:2648
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2648
+#: include/simpleplugin/class_attribute.inc:2649
msgid "Sort up"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
-#: include/simpleplugin/class_attribute.inc:2661
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2661
+#: include/simpleplugin/class_attribute.inc:2662
msgid "Sort down"
msgstr ""
@@ -2147,23 +2151,23 @@ msgstr ""
msgid "Select all"
msgstr ""
-#: include/class_listing.inc:537 include/class_management.inc:679
-#: include/class_config.inc:479 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3107
-#: include/functions.inc:3128 include/functions.inc:3158
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198 include/functions.inc:3260
+#: include/class_listing.inc:537 include/class_management.inc:681
+#: include/class_config.inc:373 include/class_config.inc:484
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:682
+#: include/class_msgPool.inc:713 include/class_msgPool.inc:740
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200 include/functions.inc:3262
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/class_plugin.inc:1510 include/class_CopyPasteHandler.inc:278
#: include/simpleplugin/class_attribute.inc:1540
#: include/simpleplugin/class_attribute.inc:1543
#: include/simpleplugin/class_attribute.inc:1546
-#: include/simpleplugin/class_attribute.inc:1784
-#: include/simpleplugin/class_attribute.inc:1887
-#: include/simpleplugin/class_attribute.inc:1889
+#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1888
+#: include/simpleplugin/class_attribute.inc:1890
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: include/password-methods/class_password-methods-sasl.inc:60
@@ -2250,33 +2254,33 @@ msgstr ""
msgid "Create a new snapshot from this object"
msgstr ""
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "Filter error"
msgstr ""
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "The filter is incomplete!"
msgstr ""
-#: include/class_management.inc:412
+#: include/class_management.inc:414
#: include/simpleplugin/class_simpleManagement.inc:716
msgid "Permission error"
msgstr ""
-#: include/class_management.inc:488
+#: include/class_management.inc:490
#: include/simpleplugin/class_simpleManagement.inc:749
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr ""
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573
#: include/simpleplugin/class_simpleManagement.inc:799
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr ""
-#: include/class_management.inc:679
+#: include/class_management.inc:681
#, php-format
msgid ""
"No tab declaration for '%s' found in your configuration file. Cannot create "
@@ -2301,17 +2305,17 @@ msgstr ""
#: include/class_config.inc:296
#, php-format
msgid ""
-"It seems you are trying to decode something which is not encoded : "
-"%s<br/>\\nPlease check you are not using a fusiondirectory.secrets file "
-"while your passwords are not encrypted."
+"It seems you are trying to decode something which is not encoded : %s<br/>\n"
+"Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:918
-#: include/class_ldap.inc:1372 include/functions.inc:526
+#: include/class_config.inc:338 include/class_ldap.inc:895
+#: include/class_ldap.inc:1349 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
-#: include/simpleplugin/class_attribute.inc:2909
+#: include/functions.inc:2986 include/functions.inc:3160
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2910
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
@@ -2322,11 +2326,16 @@ msgstr ""
msgid "LDAP error"
msgstr "LDAP-feil"
-#: include/class_config.inc:337
+#: include/class_config.inc:338
msgid "Cannot bind to LDAP. Please contact the system administrator."
msgstr ""
-#: include/class_config.inc:480
+#: include/class_config.inc:373
+#, php-format
+msgid "Location \"%s\" could not be found in the configuration file"
+msgstr ""
+
+#: include/class_config.inc:485
#, php-format
msgid "The selected mail method (class %s) is not available"
msgstr ""
@@ -2362,49 +2371,49 @@ msgstr ""
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr ""
-#: include/class_ldap.inc:869 include/class_ldap.inc:905
+#: include/class_ldap.inc:846 include/class_ldap.inc:882
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
#: include/functions.inc:2346 include/class_session.inc:50
-#: include/class_session.inc:87 include/class_session.inc:125
+#: include/class_session.inc:88 include/class_session.inc:127
#: include/class_log.inc:96 include/class_acl.inc:118
msgid "Internal error"
msgstr ""
-#: include/class_ldap.inc:869
+#: include/class_ldap.inc:846
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:905
+#: include/class_ldap.inc:882
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1017
+#: include/class_ldap.inc:994
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr ""
-#: include/class_ldap.inc:1019
+#: include/class_ldap.inc:996
#, php-format
msgid "while operating on LDAP server %s"
msgstr ""
-#: include/class_ldap.inc:1109
+#: include/class_ldap.inc:1086
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1221
+#: include/class_ldap.inc:1198
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr ""
-#: include/class_ldap.inc:1232
+#: include/class_ldap.inc:1209
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2992,7 +3001,7 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr ""
-#: include/functions.inc:496 include/functions.inc:3295
+#: include/functions.inc:496 include/functions.inc:3297
#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
#: include/simpleplugin/class_simplePlugin.inc:269
#: include/simpleplugin/class_simplePlugin.inc:281
@@ -3204,9 +3213,9 @@ msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
#: include/functions.inc:3107 include/functions.inc:3128
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200
msgid "Cannot allocate a free ID:"
msgstr ""
@@ -3219,33 +3228,29 @@ msgstr ""
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3158
-msgid "Cannot create sambaUnixIdPool entry!"
-msgstr ""
-
-#: include/functions.inc:3166
+#: include/functions.inc:3168
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3178 include/functions.inc:3182
+#: include/functions.inc:3180 include/functions.inc:3184
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3198
+#: include/functions.inc:3200
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3260
+#: include/functions.inc:3262
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3296
+#: include/functions.inc:3298
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
-#: include/class_session.inc:50 include/class_session.inc:87
-#: include/class_session.inc:125
+#: include/class_session.inc:50 include/class_session.inc:88
+#: include/class_session.inc:127
msgid "Requested channel does not exist! Please contact your Administrator."
msgstr ""
@@ -3401,7 +3406,7 @@ msgid ""
" be done by others will get lost if you save this entry!"
msgstr ""
-#: include/class_plugin.inc:1467
+#: include/class_plugin.inc:1313
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -3533,7 +3538,7 @@ msgid "days"
msgstr ""
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2171
+#: include/simpleplugin/class_attribute.inc:2172
#, php-format
msgid "%s (required)"
msgstr ""
@@ -3602,7 +3607,7 @@ msgid "%s (%d bytes)"
msgstr ""
#: include/simpleplugin/class_attribute.inc:1626
-#: include/simpleplugin/class_attribute.inc:1803
+#: include/simpleplugin/class_attribute.inc:1804
msgid "Upload"
msgstr ""
@@ -3611,22 +3616,22 @@ msgstr ""
msgid "Download"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1786
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1836
+#: include/simpleplugin/class_attribute.inc:1837
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1839
+#: include/simpleplugin/class_attribute.inc:1840
msgid "Object base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:2769
+#: include/simpleplugin/class_attribute.inc:2770
#, php-format
msgid "Invalid value for %s"
msgstr ""
diff --git a/locale/nl/fusiondirectory.po b/locale/nl/fusiondirectory.po
index 7de2d0e9a4adb3520e477c11fcc86a172ac8f767..446738af685ae9ebfe2ace0770be3d0b74807643 100644
--- a/locale/nl/fusiondirectory.po
+++ b/locale/nl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-03-14 12:07+0100\n"
-"PO-Revision-Date: 2016-03-07 12:09+0000\n"
+"POT-Creation-Date: 2016-04-06 11:27+0200\n"
+"PO-Revision-Date: 2016-04-06 09:24+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"
@@ -52,7 +52,7 @@ msgstr "Informatie"
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:174
+#: plugins/admin/departments/class_department.inc:176
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -75,7 +75,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:73
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/aclrole/class_aclRole.inc:105
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
msgid "Description"
@@ -281,8 +281,8 @@ msgstr "Aanmaken"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
#: include/simpleplugin/class_dialogAttributes.inc:632
#: include/simpleplugin/class_dialogAttributes.inc:633
-#: include/simpleplugin/class_attribute.inc:2675
#: include/simpleplugin/class_attribute.inc:2676
+#: include/simpleplugin/class_attribute.inc:2677
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -393,7 +393,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:34
#: plugins/admin/departments/class_department.inc:40
#: plugins/admin/departments/dep-list.xml:21
-#: plugins/personal/generic/class_user.inc:394
+#: plugins/personal/generic/class_user.inc:419
msgid "Department"
msgstr "Afdeling"
@@ -441,7 +441,7 @@ msgid "Website of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:85
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:435
msgid "Manager"
msgstr "Beheerder"
@@ -452,12 +452,12 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:91
#: plugins/admin/departments/class_department.inc:97
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:329
msgid "Location"
msgstr "Plaats"
#: plugins/admin/departments/class_department.inc:94
-#: plugins/personal/generic/class_user.inc:308
+#: plugins/personal/generic/class_user.inc:333
msgid "State"
msgstr "Provincie"
@@ -469,7 +469,7 @@ msgid "Country"
msgstr "Land"
#: plugins/admin/departments/class_department.inc:103
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Address"
msgstr "Adres"
@@ -479,7 +479,7 @@ msgid "A postal address for this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:107
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Phone"
msgstr "Telefoon"
@@ -488,7 +488,7 @@ msgid "Telephone number"
msgstr "Telefoonnummer"
#: plugins/admin/departments/class_department.inc:111
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Fax"
msgstr "Fax"
@@ -541,7 +541,7 @@ msgstr "Lijst met afdelingen"
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:415
msgid "Organization"
msgstr "Organisatie"
@@ -562,7 +562,7 @@ msgid "Given name"
msgstr "Naam"
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
@@ -570,8 +570,8 @@ msgid "Login"
msgstr "Inlognaam"
#: plugins/admin/users/user-list.xml:79
-#: plugins/personal/generic/class_user.inc:246
-#: plugins/personal/generic/class_user.inc:252
+#: plugins/personal/generic/class_user.inc:271
+#: plugins/personal/generic/class_user.inc:277
msgid "User"
msgstr "Gebruiker"
@@ -624,9 +624,9 @@ msgid "Manage user accounts and their properties"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:140
-#: include/class_management.inc:341 include/class_management.inc:488
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571 include/class_CopyPasteHandler.inc:248
+#: include/class_management.inc:343 include/class_management.inc:490
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573 include/class_CopyPasteHandler.inc:248
#: include/simpleplugin/class_simpleManagement.inc:651
#: include/simpleplugin/class_simpleManagement.inc:749
#: include/simpleplugin/class_simpleManagement.inc:799
@@ -653,12 +653,12 @@ msgid "Lock account"
msgstr "Blokkeer account"
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:253
+#: plugins/personal/generic/class_user.inc:278
msgid "User account"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:247
+#: plugins/personal/generic/class_user.inc:272
msgid "User account information"
msgstr ""
@@ -676,8 +676,8 @@ msgid "Edit category ACL"
msgstr "Wijzig ACL categorie"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
-#: include/simpleplugin/class_attribute.inc:2686
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2686
+#: include/simpleplugin/class_attribute.inc:2687
#, php-format
msgid "Delete"
msgstr "Verwijderen"
@@ -928,7 +928,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -949,215 +949,219 @@ msgstr ""
msgid "Same password as above, to avoid errors"
msgstr ""
-#: plugins/personal/generic/class_user.inc:274
+#: plugins/personal/generic/class_user.inc:299
msgid "Personal information"
msgstr "Persoonlijke informatie"
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "Achternaam"
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
msgid "Last name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "Voornaam"
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
msgid "First name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
msgid "Short description of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "Picture"
msgstr ""
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "The avatar for this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:300
+#: plugins/personal/generic/class_user.inc:325
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Business postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room No."
msgstr "Kamer nr."
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room number"
msgstr "Kamernummer"
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Business phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Mobile"
msgstr "GSM"
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Business mobile number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Pager"
msgstr "Pieper"
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Homepage"
msgstr "Homepage"
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:367
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:351
+#: plugins/personal/generic/class_user.inc:376
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr "Gewenste taal"
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:387
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Display name"
msgstr "Getoonde naam"
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home postal address"
msgstr "Postadres thuis"
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Private phone"
msgstr "Telefoon privé"
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Home phone number"
msgstr "Prive nummer"
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:405
msgid "Organizational information"
msgstr "Organisatie informatie"
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid "Title"
msgstr "Titel"
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid ""
"Title of a person in their organizational context. Each title is one value "
"of this multi-valued attribute"
msgstr ""
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:419
+msgid "Department to which the user belongs"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:423
msgid "Department No."
msgstr "Afdeling nr."
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:423
msgid "Department number"
msgstr "Departement nummer"
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee No."
msgstr "Personeel nr."
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee number"
msgstr "Werknemer nummer"
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:431
msgid "Employee type"
msgstr "Functie"
-#: plugins/personal/generic/class_user.inc:568
+#: plugins/personal/generic/class_user.inc:593
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:571
+#: plugins/personal/generic/class_user.inc:596
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:581
+#: plugins/personal/generic/class_user.inc:606
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:595
+#: plugins/personal/generic/class_user.inc:620
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:600
-#: plugins/personal/generic/class_user.inc:604
+#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:629
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:636
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:613
+#: plugins/personal/generic/class_user.inc:638
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:615
+#: plugins/personal/generic/class_user.inc:640
#: ihtml/themes/default/recovery.tpl.c:26
#: ihtml/themes/default/recovery.tpl.c:29
msgid "New password"
msgstr "Nieuw wachtwoord"
-#: plugins/personal/generic/class_user.inc:617
+#: plugins/personal/generic/class_user.inc:642
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:619
+#: plugins/personal/generic/class_user.inc:644
msgid "The password used as new is to short."
msgstr "Het nieuw opgegeven wachtwoord is te kort."
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:646
msgid "The password contains possibly problematic Unicode characters!"
msgstr "Het paswoord bevat mogelijke probleemgevende Unicode karakters!"
@@ -2133,13 +2137,13 @@ msgstr "Omhoog"
msgid "Down"
msgstr "Omlaag"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
-#: include/simpleplugin/class_attribute.inc:2648
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2648
+#: include/simpleplugin/class_attribute.inc:2649
msgid "Sort up"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
-#: include/simpleplugin/class_attribute.inc:2661
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2661
+#: include/simpleplugin/class_attribute.inc:2662
msgid "Sort down"
msgstr ""
@@ -2147,23 +2151,23 @@ msgstr ""
msgid "Select all"
msgstr "Selecteer alles"
-#: include/class_listing.inc:537 include/class_management.inc:679
-#: include/class_config.inc:479 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3107
-#: include/functions.inc:3128 include/functions.inc:3158
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198 include/functions.inc:3260
+#: include/class_listing.inc:537 include/class_management.inc:681
+#: include/class_config.inc:373 include/class_config.inc:484
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:682
+#: include/class_msgPool.inc:713 include/class_msgPool.inc:740
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200 include/functions.inc:3262
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/class_plugin.inc:1510 include/class_CopyPasteHandler.inc:278
#: include/simpleplugin/class_attribute.inc:1540
#: include/simpleplugin/class_attribute.inc:1543
#: include/simpleplugin/class_attribute.inc:1546
-#: include/simpleplugin/class_attribute.inc:1784
-#: include/simpleplugin/class_attribute.inc:1887
-#: include/simpleplugin/class_attribute.inc:1889
+#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1888
+#: include/simpleplugin/class_attribute.inc:1890
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: include/password-methods/class_password-methods-sasl.inc:60
@@ -2250,33 +2254,33 @@ msgstr "Maak snapshot"
msgid "Create a new snapshot from this object"
msgstr "Maak een nieuw snapshot van dit object"
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "Filter error"
msgstr "Filter fout"
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "The filter is incomplete!"
msgstr "Deze filter is niet compleet!"
-#: include/class_management.inc:412
+#: include/class_management.inc:414
#: include/simpleplugin/class_simpleManagement.inc:716
msgid "Permission error"
msgstr "Permissiefout"
-#: include/class_management.inc:488
+#: include/class_management.inc:490
#: include/simpleplugin/class_simpleManagement.inc:749
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr "U heeft geen toestemming om een snapshot te maken voor %s."
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573
#: include/simpleplugin/class_simpleManagement.inc:799
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr "U heeft geen toestemming om een snapshot te herstellen voor %s."
-#: include/class_management.inc:679
+#: include/class_management.inc:681
#, php-format
msgid ""
"No tab declaration for '%s' found in your configuration file. Cannot create "
@@ -2301,17 +2305,17 @@ msgstr "Configuratie fout"
#: include/class_config.inc:296
#, php-format
msgid ""
-"It seems you are trying to decode something which is not encoded : "
-"%s<br/>\\nPlease check you are not using a fusiondirectory.secrets file "
-"while your passwords are not encrypted."
+"It seems you are trying to decode something which is not encoded : %s<br/>\n"
+"Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:918
-#: include/class_ldap.inc:1372 include/functions.inc:526
+#: include/class_config.inc:338 include/class_ldap.inc:895
+#: include/class_ldap.inc:1349 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
-#: include/simpleplugin/class_attribute.inc:2909
+#: include/functions.inc:2986 include/functions.inc:3160
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2910
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
@@ -2322,11 +2326,16 @@ msgstr ""
msgid "LDAP error"
msgstr "LDAP fout"
-#: include/class_config.inc:337
+#: include/class_config.inc:338
msgid "Cannot bind to LDAP. Please contact the system administrator."
msgstr "Kan niet binden met de LDAP. Gelie je systeembeheerder te contacteren."
-#: include/class_config.inc:480
+#: include/class_config.inc:373
+#, php-format
+msgid "Location \"%s\" could not be found in the configuration file"
+msgstr ""
+
+#: include/class_config.inc:485
#, php-format
msgid "The selected mail method (class %s) is not available"
msgstr "De geselecteerde mail methode (class %s) is niet beschikbaar"
@@ -2362,49 +2371,49 @@ msgstr "Performantie waarschuwing"
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr "LDAP performantie is slecht: laatste query duurde ongeveer %.2fs!"
-#: include/class_ldap.inc:869 include/class_ldap.inc:905
+#: include/class_ldap.inc:846 include/class_ldap.inc:882
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
#: include/functions.inc:2346 include/class_session.inc:50
-#: include/class_session.inc:87 include/class_session.inc:125
+#: include/class_session.inc:88 include/class_session.inc:127
#: include/class_log.inc:96 include/class_acl.inc:118
msgid "Internal error"
msgstr "Interne fout"
-#: include/class_ldap.inc:869
+#: include/class_ldap.inc:846
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:905
+#: include/class_ldap.inc:882
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1017
+#: include/class_ldap.inc:994
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr "bij het bewerken van '%s' op LDAP server '%s'"
-#: include/class_ldap.inc:1019
+#: include/class_ldap.inc:996
#, php-format
msgid "while operating on LDAP server %s"
msgstr "bij het bewerken van LDAP server %s"
-#: include/class_ldap.inc:1109
+#: include/class_ldap.inc:1086
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1221
+#: include/class_ldap.inc:1198
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr "Dit is geen geldige DN: '%s'. Een blok dat geïmporteerd wordt, dient te beginnen met 'dn: ...' op regel %s"
-#: include/class_ldap.inc:1232
+#: include/class_ldap.inc:1209
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2992,7 +3001,7 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr "Fatale error: kan class '%s' niet instantiëren - probeer '%s' te draaien om dit op te lossen"
-#: include/functions.inc:496 include/functions.inc:3295
+#: include/functions.inc:496 include/functions.inc:3297
#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
#: include/simpleplugin/class_simplePlugin.inc:269
#: include/simpleplugin/class_simplePlugin.inc:281
@@ -3204,9 +3213,9 @@ msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
#: include/functions.inc:3107 include/functions.inc:3128
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200
msgid "Cannot allocate a free ID:"
msgstr "Kan geen vrij ID toekennen:"
@@ -3219,33 +3228,29 @@ msgstr "onbekende idAllocation methode!"
msgid "%sPoolMin >= %sPoolMax!"
msgstr "%sPoolMin >=%sPoolMax!"
-#: include/functions.inc:3158
-msgid "Cannot create sambaUnixIdPool entry!"
-msgstr "Kan inzending sambaUnixIdPool niet aanmaken!"
-
-#: include/functions.inc:3166
+#: include/functions.inc:3168
msgid "sambaUnixIdPool is not unique!"
msgstr "sambaUnixIdPool is niet uniek!"
-#: include/functions.inc:3178 include/functions.inc:3182
+#: include/functions.inc:3180 include/functions.inc:3184
msgid "no ID available!"
msgstr "Geen ID beschikbaar!"
-#: include/functions.inc:3198
+#: include/functions.inc:3200
msgid "maximum tries exceeded!"
msgstr "maximum pogingen overschreden!"
-#: include/functions.inc:3260
+#: include/functions.inc:3262
msgid "Cannot allocate a free ID!"
msgstr "Kan geen vrij ID toekennen!"
-#: include/functions.inc:3296
+#: include/functions.inc:3298
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr "Kan bestand '%s' niet vinden - gebruik aub '%s' om dit op te lossen"
-#: include/class_session.inc:50 include/class_session.inc:87
-#: include/class_session.inc:125
+#: include/class_session.inc:50 include/class_session.inc:88
+#: include/class_session.inc:127
msgid "Requested channel does not exist! Please contact your Administrator."
msgstr "Gevraagde kanaal bestaat niet! Gelieve je Systeembeheerder te contacteren."
@@ -3401,7 +3406,7 @@ msgid ""
" be done by others will get lost if you save this entry!"
msgstr ""
-#: include/class_plugin.inc:1467
+#: include/class_plugin.inc:1313
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -3533,7 +3538,7 @@ msgid "days"
msgstr "dagen"
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2171
+#: include/simpleplugin/class_attribute.inc:2172
#, php-format
msgid "%s (required)"
msgstr ""
@@ -3602,7 +3607,7 @@ msgid "%s (%d bytes)"
msgstr ""
#: include/simpleplugin/class_attribute.inc:1626
-#: include/simpleplugin/class_attribute.inc:1803
+#: include/simpleplugin/class_attribute.inc:1804
msgid "Upload"
msgstr "Uploaden"
@@ -3611,22 +3616,22 @@ msgstr "Uploaden"
msgid "Download"
msgstr "Downloaden"
-#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1786
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr "Kan gebruikersfoto niet opslaan, FusionDirectory heeft het pakket 'php5-imagick' nodig"
-#: include/simpleplugin/class_attribute.inc:1836
+#: include/simpleplugin/class_attribute.inc:1837
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr "Basis"
-#: include/simpleplugin/class_attribute.inc:1839
+#: include/simpleplugin/class_attribute.inc:1840
msgid "Object base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:2769
+#: include/simpleplugin/class_attribute.inc:2770
#, php-format
msgid "Invalid value for %s"
msgstr ""
diff --git a/locale/pl/fusiondirectory.po b/locale/pl/fusiondirectory.po
index d538f4f2a0357ebeb9ce81fadb62472e6b59606b..0db5825bf94b83086ebe958c050a80e7d6723eed 100644
--- a/locale/pl/fusiondirectory.po
+++ b/locale/pl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-03-14 12:07+0100\n"
-"PO-Revision-Date: 2016-03-07 12:09+0000\n"
+"POT-Creation-Date: 2016-04-06 11:27+0200\n"
+"PO-Revision-Date: 2016-04-06 09:24+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"
@@ -52,7 +52,7 @@ msgstr ""
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:174
+#: plugins/admin/departments/class_department.inc:176
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -75,7 +75,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:73
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/aclrole/class_aclRole.inc:105
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
msgid "Description"
@@ -281,8 +281,8 @@ msgstr "Utwórz"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
#: include/simpleplugin/class_dialogAttributes.inc:632
#: include/simpleplugin/class_dialogAttributes.inc:633
-#: include/simpleplugin/class_attribute.inc:2675
#: include/simpleplugin/class_attribute.inc:2676
+#: include/simpleplugin/class_attribute.inc:2677
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -393,7 +393,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:34
#: plugins/admin/departments/class_department.inc:40
#: plugins/admin/departments/dep-list.xml:21
-#: plugins/personal/generic/class_user.inc:394
+#: plugins/personal/generic/class_user.inc:419
msgid "Department"
msgstr "Departament"
@@ -441,7 +441,7 @@ msgid "Website of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:85
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:435
msgid "Manager"
msgstr ""
@@ -452,12 +452,12 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:91
#: plugins/admin/departments/class_department.inc:97
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:329
msgid "Location"
msgstr "Lokalizacja"
#: plugins/admin/departments/class_department.inc:94
-#: plugins/personal/generic/class_user.inc:308
+#: plugins/personal/generic/class_user.inc:333
msgid "State"
msgstr "Stan"
@@ -469,7 +469,7 @@ msgid "Country"
msgstr "Kraj"
#: plugins/admin/departments/class_department.inc:103
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Address"
msgstr "Adres"
@@ -479,7 +479,7 @@ msgid "A postal address for this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:107
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Phone"
msgstr "Telefon"
@@ -488,7 +488,7 @@ msgid "Telephone number"
msgstr "Numer telefonu"
#: plugins/admin/departments/class_department.inc:111
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Fax"
msgstr "Fax"
@@ -541,7 +541,7 @@ msgstr "Lista departamentów"
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:415
msgid "Organization"
msgstr "Organizacja"
@@ -562,7 +562,7 @@ msgid "Given name"
msgstr "ImiÄ™"
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
@@ -570,8 +570,8 @@ msgid "Login"
msgstr "Login"
#: plugins/admin/users/user-list.xml:79
-#: plugins/personal/generic/class_user.inc:246
-#: plugins/personal/generic/class_user.inc:252
+#: plugins/personal/generic/class_user.inc:271
+#: plugins/personal/generic/class_user.inc:277
msgid "User"
msgstr "Użytkownik"
@@ -624,9 +624,9 @@ msgid "Manage user accounts and their properties"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:140
-#: include/class_management.inc:341 include/class_management.inc:488
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571 include/class_CopyPasteHandler.inc:248
+#: include/class_management.inc:343 include/class_management.inc:490
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573 include/class_CopyPasteHandler.inc:248
#: include/simpleplugin/class_simpleManagement.inc:651
#: include/simpleplugin/class_simpleManagement.inc:749
#: include/simpleplugin/class_simpleManagement.inc:799
@@ -653,12 +653,12 @@ msgid "Lock account"
msgstr "Zablokuj konto"
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:253
+#: plugins/personal/generic/class_user.inc:278
msgid "User account"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:247
+#: plugins/personal/generic/class_user.inc:272
msgid "User account information"
msgstr ""
@@ -676,8 +676,8 @@ msgid "Edit category ACL"
msgstr ""
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
-#: include/simpleplugin/class_attribute.inc:2686
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2686
+#: include/simpleplugin/class_attribute.inc:2687
#, php-format
msgid "Delete"
msgstr "Usuń"
@@ -928,7 +928,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -949,215 +949,219 @@ msgstr ""
msgid "Same password as above, to avoid errors"
msgstr ""
-#: plugins/personal/generic/class_user.inc:274
+#: plugins/personal/generic/class_user.inc:299
msgid "Personal information"
msgstr "Informacje osobiste"
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "Nazwisko"
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
msgid "Last name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "ImiÄ™"
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
msgid "First name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
msgid "Short description of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "Picture"
msgstr ""
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "The avatar for this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:300
+#: plugins/personal/generic/class_user.inc:325
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Business postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room No."
msgstr "Numer pokoju"
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room number"
msgstr "Numer pokoju"
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Business phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Mobile"
msgstr "Komórka"
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Business mobile number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Pager"
msgstr "Pager"
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Homepage"
msgstr "Strona domowa"
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:367
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:351
+#: plugins/personal/generic/class_user.inc:376
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr "Preferowany język"
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:387
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Display name"
msgstr "Wyświetl nazwę"
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home postal address"
msgstr "Adres domowy"
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Private phone"
msgstr "Telefon prywatny"
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Home phone number"
msgstr "Numer telefonu domowego"
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:405
msgid "Organizational information"
msgstr "Informacje organizacyjne"
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid "Title"
msgstr "Tytuł"
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid ""
"Title of a person in their organizational context. Each title is one value "
"of this multi-valued attribute"
msgstr ""
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:419
+msgid "Department to which the user belongs"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:423
msgid "Department No."
msgstr "Numer departamentu"
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:423
msgid "Department number"
msgstr "Numer departamentu"
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee No."
msgstr "Numer pracownika"
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee number"
msgstr "Numer pracownika"
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:431
msgid "Employee type"
msgstr "Typ pracownika"
-#: plugins/personal/generic/class_user.inc:568
+#: plugins/personal/generic/class_user.inc:593
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:571
+#: plugins/personal/generic/class_user.inc:596
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:581
+#: plugins/personal/generic/class_user.inc:606
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:595
+#: plugins/personal/generic/class_user.inc:620
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:600
-#: plugins/personal/generic/class_user.inc:604
+#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:629
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:636
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:613
+#: plugins/personal/generic/class_user.inc:638
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:615
+#: plugins/personal/generic/class_user.inc:640
#: ihtml/themes/default/recovery.tpl.c:26
#: ihtml/themes/default/recovery.tpl.c:29
msgid "New password"
msgstr "Nowe hasło"
-#: plugins/personal/generic/class_user.inc:617
+#: plugins/personal/generic/class_user.inc:642
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:619
+#: plugins/personal/generic/class_user.inc:644
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:621
+#: plugins/personal/generic/class_user.inc:646
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
@@ -2133,13 +2137,13 @@ msgstr "Góra"
msgid "Down"
msgstr "W dół"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
-#: include/simpleplugin/class_attribute.inc:2648
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2648
+#: include/simpleplugin/class_attribute.inc:2649
msgid "Sort up"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
-#: include/simpleplugin/class_attribute.inc:2661
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2661
+#: include/simpleplugin/class_attribute.inc:2662
msgid "Sort down"
msgstr ""
@@ -2147,23 +2151,23 @@ msgstr ""
msgid "Select all"
msgstr "Wybierz wszystko"
-#: include/class_listing.inc:537 include/class_management.inc:679
-#: include/class_config.inc:479 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3107
-#: include/functions.inc:3128 include/functions.inc:3158
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198 include/functions.inc:3260
+#: include/class_listing.inc:537 include/class_management.inc:681
+#: include/class_config.inc:373 include/class_config.inc:484
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:682
+#: include/class_msgPool.inc:713 include/class_msgPool.inc:740
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200 include/functions.inc:3262
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/class_plugin.inc:1510 include/class_CopyPasteHandler.inc:278
#: include/simpleplugin/class_attribute.inc:1540
#: include/simpleplugin/class_attribute.inc:1543
#: include/simpleplugin/class_attribute.inc:1546
-#: include/simpleplugin/class_attribute.inc:1784
-#: include/simpleplugin/class_attribute.inc:1887
-#: include/simpleplugin/class_attribute.inc:1889
+#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1888
+#: include/simpleplugin/class_attribute.inc:1890
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: include/password-methods/class_password-methods-sasl.inc:60
@@ -2250,33 +2254,33 @@ msgstr "Utwórz spanshot"
msgid "Create a new snapshot from this object"
msgstr "Utwórz nowy snapshot z tego obiektu"
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "Filter error"
msgstr ""
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "The filter is incomplete!"
msgstr ""
-#: include/class_management.inc:412
+#: include/class_management.inc:414
#: include/simpleplugin/class_simpleManagement.inc:716
msgid "Permission error"
msgstr ""
-#: include/class_management.inc:488
+#: include/class_management.inc:490
#: include/simpleplugin/class_simpleManagement.inc:749
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr ""
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573
#: include/simpleplugin/class_simpleManagement.inc:799
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr ""
-#: include/class_management.inc:679
+#: include/class_management.inc:681
#, php-format
msgid ""
"No tab declaration for '%s' found in your configuration file. Cannot create "
@@ -2301,17 +2305,17 @@ msgstr "BÅ‚Ä…d konfiguracji"
#: include/class_config.inc:296
#, php-format
msgid ""
-"It seems you are trying to decode something which is not encoded : "
-"%s<br/>\\nPlease check you are not using a fusiondirectory.secrets file "
-"while your passwords are not encrypted."
+"It seems you are trying to decode something which is not encoded : %s<br/>\n"
+"Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:918
-#: include/class_ldap.inc:1372 include/functions.inc:526
+#: include/class_config.inc:338 include/class_ldap.inc:895
+#: include/class_ldap.inc:1349 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
-#: include/simpleplugin/class_attribute.inc:2909
+#: include/functions.inc:2986 include/functions.inc:3160
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2910
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
@@ -2322,11 +2326,16 @@ msgstr ""
msgid "LDAP error"
msgstr "błąd LDAP"
-#: include/class_config.inc:337
+#: include/class_config.inc:338
msgid "Cannot bind to LDAP. Please contact the system administrator."
msgstr ""
-#: include/class_config.inc:480
+#: include/class_config.inc:373
+#, php-format
+msgid "Location \"%s\" could not be found in the configuration file"
+msgstr ""
+
+#: include/class_config.inc:485
#, php-format
msgid "The selected mail method (class %s) is not available"
msgstr ""
@@ -2362,49 +2371,49 @@ msgstr "Ostrzeżenie wydajności"
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr ""
-#: include/class_ldap.inc:869 include/class_ldap.inc:905
+#: include/class_ldap.inc:846 include/class_ldap.inc:882
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
#: include/functions.inc:2346 include/class_session.inc:50
-#: include/class_session.inc:87 include/class_session.inc:125
+#: include/class_session.inc:88 include/class_session.inc:127
#: include/class_log.inc:96 include/class_acl.inc:118
msgid "Internal error"
msgstr "Błąd wewnętrzny"
-#: include/class_ldap.inc:869
+#: include/class_ldap.inc:846
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:905
+#: include/class_ldap.inc:882
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1017
+#: include/class_ldap.inc:994
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr "podczas działania na '%s' używając serwera LDAP '%s'"
-#: include/class_ldap.inc:1019
+#: include/class_ldap.inc:996
#, php-format
msgid "while operating on LDAP server %s"
msgstr "podczas połączenia z serwerem LDAP '%s'"
-#: include/class_ldap.inc:1109
+#: include/class_ldap.inc:1086
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1221
+#: include/class_ldap.inc:1198
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr "To nie jest poprawne DN: '%s'. Blok dla importu powinien zaczynać się 'dn: ...' w linii %s"
-#: include/class_ldap.inc:1232
+#: include/class_ldap.inc:1209
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2992,7 +3001,7 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr ""
-#: include/functions.inc:496 include/functions.inc:3295
+#: include/functions.inc:496 include/functions.inc:3297
#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
#: include/simpleplugin/class_simplePlugin.inc:269
#: include/simpleplugin/class_simplePlugin.inc:281
@@ -3204,9 +3213,9 @@ msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
#: include/functions.inc:3107 include/functions.inc:3128
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200
msgid "Cannot allocate a free ID:"
msgstr ""
@@ -3219,33 +3228,29 @@ msgstr ""
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3158
-msgid "Cannot create sambaUnixIdPool entry!"
-msgstr ""
-
-#: include/functions.inc:3166
+#: include/functions.inc:3168
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3178 include/functions.inc:3182
+#: include/functions.inc:3180 include/functions.inc:3184
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3198
+#: include/functions.inc:3200
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3260
+#: include/functions.inc:3262
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3296
+#: include/functions.inc:3298
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
-#: include/class_session.inc:50 include/class_session.inc:87
-#: include/class_session.inc:125
+#: include/class_session.inc:50 include/class_session.inc:88
+#: include/class_session.inc:127
msgid "Requested channel does not exist! Please contact your Administrator."
msgstr ""
@@ -3401,7 +3406,7 @@ msgid ""
" be done by others will get lost if you save this entry!"
msgstr ""
-#: include/class_plugin.inc:1467
+#: include/class_plugin.inc:1313
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -3533,7 +3538,7 @@ msgid "days"
msgstr "dni"
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2171
+#: include/simpleplugin/class_attribute.inc:2172
#, php-format
msgid "%s (required)"
msgstr ""
@@ -3602,7 +3607,7 @@ msgid "%s (%d bytes)"
msgstr ""
#: include/simpleplugin/class_attribute.inc:1626
-#: include/simpleplugin/class_attribute.inc:1803
+#: include/simpleplugin/class_attribute.inc:1804
msgid "Upload"
msgstr "Wgraj"
@@ -3611,22 +3616,22 @@ msgstr "Wgraj"
msgid "Download"
msgstr "ÅšciÄ…gnij"
-#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1786
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1836
+#: include/simpleplugin/class_attribute.inc:1837
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr "Kontener"
-#: include/simpleplugin/class_attribute.inc:1839
+#: include/simpleplugin/class_attribute.inc:1840
msgid "Object base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:2769
+#: include/simpleplugin/class_attribute.inc:2770
#, php-format
msgid "Invalid value for %s"
msgstr ""
diff --git a/locale/pt/fusiondirectory.po b/locale/pt/fusiondirectory.po
index 26024a476d6960bbbbab163d653c975296ca5604..a6ec28e8a176c5d9db0823defc1936cd0db34d57 100644
--- a/locale/pt/fusiondirectory.po
+++ b/locale/pt/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-03-14 12:07+0100\n"
-"PO-Revision-Date: 2016-03-07 12:09+0000\n"
+"POT-Creation-Date: 2016-04-06 11:27+0200\n"
+"PO-Revision-Date: 2016-04-06 09:24+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"
@@ -52,7 +52,7 @@ msgstr ""
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:174
+#: plugins/admin/departments/class_department.inc:176
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -75,7 +75,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:73
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/aclrole/class_aclRole.inc:105
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
msgid "Description"
@@ -281,8 +281,8 @@ msgstr "Criar"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
#: include/simpleplugin/class_dialogAttributes.inc:632
#: include/simpleplugin/class_dialogAttributes.inc:633
-#: include/simpleplugin/class_attribute.inc:2675
#: include/simpleplugin/class_attribute.inc:2676
+#: include/simpleplugin/class_attribute.inc:2677
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -393,7 +393,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:34
#: plugins/admin/departments/class_department.inc:40
#: plugins/admin/departments/dep-list.xml:21
-#: plugins/personal/generic/class_user.inc:394
+#: plugins/personal/generic/class_user.inc:419
msgid "Department"
msgstr "Departamento"
@@ -441,7 +441,7 @@ msgid "Website of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:85
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:435
msgid "Manager"
msgstr ""
@@ -452,12 +452,12 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:91
#: plugins/admin/departments/class_department.inc:97
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:329
msgid "Location"
msgstr "Localização"
#: plugins/admin/departments/class_department.inc:94
-#: plugins/personal/generic/class_user.inc:308
+#: plugins/personal/generic/class_user.inc:333
msgid "State"
msgstr "Estado"
@@ -469,7 +469,7 @@ msgid "Country"
msgstr "PaÃs"
#: plugins/admin/departments/class_department.inc:103
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Address"
msgstr "Endereço"
@@ -479,7 +479,7 @@ msgid "A postal address for this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:107
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Phone"
msgstr "Fone"
@@ -488,7 +488,7 @@ msgid "Telephone number"
msgstr ""
#: plugins/admin/departments/class_department.inc:111
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Fax"
msgstr "Fax"
@@ -541,7 +541,7 @@ msgstr "Lista dos departamentos"
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:415
msgid "Organization"
msgstr "Organização"
@@ -562,7 +562,7 @@ msgid "Given name"
msgstr "Nome fornecido"
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
@@ -570,8 +570,8 @@ msgid "Login"
msgstr "Login"
#: plugins/admin/users/user-list.xml:79
-#: plugins/personal/generic/class_user.inc:246
-#: plugins/personal/generic/class_user.inc:252
+#: plugins/personal/generic/class_user.inc:271
+#: plugins/personal/generic/class_user.inc:277
msgid "User"
msgstr "Usuário"
@@ -624,9 +624,9 @@ msgid "Manage user accounts and their properties"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:140
-#: include/class_management.inc:341 include/class_management.inc:488
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571 include/class_CopyPasteHandler.inc:248
+#: include/class_management.inc:343 include/class_management.inc:490
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573 include/class_CopyPasteHandler.inc:248
#: include/simpleplugin/class_simpleManagement.inc:651
#: include/simpleplugin/class_simpleManagement.inc:749
#: include/simpleplugin/class_simpleManagement.inc:799
@@ -653,12 +653,12 @@ msgid "Lock account"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:253
+#: plugins/personal/generic/class_user.inc:278
msgid "User account"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:247
+#: plugins/personal/generic/class_user.inc:272
msgid "User account information"
msgstr ""
@@ -676,8 +676,8 @@ msgid "Edit category ACL"
msgstr ""
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
-#: include/simpleplugin/class_attribute.inc:2686
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2686
+#: include/simpleplugin/class_attribute.inc:2687
#, php-format
msgid "Delete"
msgstr "Deletar"
@@ -928,7 +928,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -949,215 +949,219 @@ msgstr ""
msgid "Same password as above, to avoid errors"
msgstr ""
-#: plugins/personal/generic/class_user.inc:274
+#: plugins/personal/generic/class_user.inc:299
msgid "Personal information"
msgstr "Informação pessoal"
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "Último nome"
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
msgid "Last name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "Primeiro nome"
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
msgid "First name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
msgid "Short description of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "Picture"
msgstr ""
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "The avatar for this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:300
+#: plugins/personal/generic/class_user.inc:325
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Business postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room No."
msgstr "Nº da sala"
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Business phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Mobile"
msgstr "Celular"
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Business mobile number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Pager"
msgstr "Pager"
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Homepage"
msgstr "Página pessoal"
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:367
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:351
+#: plugins/personal/generic/class_user.inc:376
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr ""
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:387
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Display name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home postal address"
msgstr "Caixa postal residencial"
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Private phone"
msgstr "Telefone privativo"
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Home phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:405
msgid "Organizational information"
msgstr "Informação organizacional"
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid "Title"
msgstr ""
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid ""
"Title of a person in their organizational context. Each title is one value "
"of this multi-valued attribute"
msgstr ""
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:419
+msgid "Department to which the user belongs"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:423
msgid "Department No."
msgstr "Nº do departamento"
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:423
msgid "Department number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee No."
msgstr "Nº do empregado"
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:431
msgid "Employee type"
msgstr "Tipo de empregado"
-#: plugins/personal/generic/class_user.inc:568
+#: plugins/personal/generic/class_user.inc:593
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:571
+#: plugins/personal/generic/class_user.inc:596
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:581
+#: plugins/personal/generic/class_user.inc:606
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:595
+#: plugins/personal/generic/class_user.inc:620
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:600
-#: plugins/personal/generic/class_user.inc:604
+#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:629
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:636
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:613
+#: plugins/personal/generic/class_user.inc:638
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:615
+#: plugins/personal/generic/class_user.inc:640
#: ihtml/themes/default/recovery.tpl.c:26
#: ihtml/themes/default/recovery.tpl.c:29
msgid "New password"
msgstr "Nova senha"
-#: plugins/personal/generic/class_user.inc:617
+#: plugins/personal/generic/class_user.inc:642
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:619
+#: plugins/personal/generic/class_user.inc:644
msgid "The password used as new is to short."
msgstr "A senha utilizada como nova é curta."
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:646
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
@@ -2133,13 +2137,13 @@ msgstr "Para cima"
msgid "Down"
msgstr "Para baixo"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
-#: include/simpleplugin/class_attribute.inc:2648
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2648
+#: include/simpleplugin/class_attribute.inc:2649
msgid "Sort up"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
-#: include/simpleplugin/class_attribute.inc:2661
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2661
+#: include/simpleplugin/class_attribute.inc:2662
msgid "Sort down"
msgstr ""
@@ -2147,23 +2151,23 @@ msgstr ""
msgid "Select all"
msgstr ""
-#: include/class_listing.inc:537 include/class_management.inc:679
-#: include/class_config.inc:479 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3107
-#: include/functions.inc:3128 include/functions.inc:3158
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198 include/functions.inc:3260
+#: include/class_listing.inc:537 include/class_management.inc:681
+#: include/class_config.inc:373 include/class_config.inc:484
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:682
+#: include/class_msgPool.inc:713 include/class_msgPool.inc:740
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200 include/functions.inc:3262
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/class_plugin.inc:1510 include/class_CopyPasteHandler.inc:278
#: include/simpleplugin/class_attribute.inc:1540
#: include/simpleplugin/class_attribute.inc:1543
#: include/simpleplugin/class_attribute.inc:1546
-#: include/simpleplugin/class_attribute.inc:1784
-#: include/simpleplugin/class_attribute.inc:1887
-#: include/simpleplugin/class_attribute.inc:1889
+#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1888
+#: include/simpleplugin/class_attribute.inc:1890
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: include/password-methods/class_password-methods-sasl.inc:60
@@ -2250,33 +2254,33 @@ msgstr ""
msgid "Create a new snapshot from this object"
msgstr ""
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "Filter error"
msgstr ""
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "The filter is incomplete!"
msgstr ""
-#: include/class_management.inc:412
+#: include/class_management.inc:414
#: include/simpleplugin/class_simpleManagement.inc:716
msgid "Permission error"
msgstr ""
-#: include/class_management.inc:488
+#: include/class_management.inc:490
#: include/simpleplugin/class_simpleManagement.inc:749
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr ""
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573
#: include/simpleplugin/class_simpleManagement.inc:799
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr ""
-#: include/class_management.inc:679
+#: include/class_management.inc:681
#, php-format
msgid ""
"No tab declaration for '%s' found in your configuration file. Cannot create "
@@ -2301,17 +2305,17 @@ msgstr "Erro de configuração"
#: include/class_config.inc:296
#, php-format
msgid ""
-"It seems you are trying to decode something which is not encoded : "
-"%s<br/>\\nPlease check you are not using a fusiondirectory.secrets file "
-"while your passwords are not encrypted."
+"It seems you are trying to decode something which is not encoded : %s<br/>\n"
+"Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:918
-#: include/class_ldap.inc:1372 include/functions.inc:526
+#: include/class_config.inc:338 include/class_ldap.inc:895
+#: include/class_ldap.inc:1349 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
-#: include/simpleplugin/class_attribute.inc:2909
+#: include/functions.inc:2986 include/functions.inc:3160
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2910
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
@@ -2322,11 +2326,16 @@ msgstr ""
msgid "LDAP error"
msgstr "Erro de LDAP"
-#: include/class_config.inc:337
+#: include/class_config.inc:338
msgid "Cannot bind to LDAP. Please contact the system administrator."
msgstr "Não foi possÃvel realizar bind para o LDAP. Por favor, contacte o administrador do sistema."
-#: include/class_config.inc:480
+#: include/class_config.inc:373
+#, php-format
+msgid "Location \"%s\" could not be found in the configuration file"
+msgstr ""
+
+#: include/class_config.inc:485
#, php-format
msgid "The selected mail method (class %s) is not available"
msgstr ""
@@ -2362,49 +2371,49 @@ msgstr "Alerta de performance"
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr "A performance do LDAP está ruim: a última pesquisa levou cerca de %.2fs!"
-#: include/class_ldap.inc:869 include/class_ldap.inc:905
+#: include/class_ldap.inc:846 include/class_ldap.inc:882
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
#: include/functions.inc:2346 include/class_session.inc:50
-#: include/class_session.inc:87 include/class_session.inc:125
+#: include/class_session.inc:88 include/class_session.inc:127
#: include/class_log.inc:96 include/class_acl.inc:118
msgid "Internal error"
msgstr "Erro interno"
-#: include/class_ldap.inc:869
+#: include/class_ldap.inc:846
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:905
+#: include/class_ldap.inc:882
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1017
+#: include/class_ldap.inc:994
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr "enquanto executava em '%s' usando LDAP server '%s'"
-#: include/class_ldap.inc:1019
+#: include/class_ldap.inc:996
#, php-format
msgid "while operating on LDAP server %s"
msgstr "enquanto executava no LDAP server %s"
-#: include/class_ldap.inc:1109
+#: include/class_ldap.inc:1086
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1221
+#: include/class_ldap.inc:1198
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr "Esse não é um DN válido: '%s'. O bloco para importação deve iniciar com 'dn: ...' na linha %s"
-#: include/class_ldap.inc:1232
+#: include/class_ldap.inc:1209
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2992,7 +3001,7 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr ""
-#: include/functions.inc:496 include/functions.inc:3295
+#: include/functions.inc:496 include/functions.inc:3297
#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
#: include/simpleplugin/class_simplePlugin.inc:269
#: include/simpleplugin/class_simplePlugin.inc:281
@@ -3204,9 +3213,9 @@ msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
#: include/functions.inc:3107 include/functions.inc:3128
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200
msgid "Cannot allocate a free ID:"
msgstr ""
@@ -3219,33 +3228,29 @@ msgstr ""
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3158
-msgid "Cannot create sambaUnixIdPool entry!"
-msgstr ""
-
-#: include/functions.inc:3166
+#: include/functions.inc:3168
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3178 include/functions.inc:3182
+#: include/functions.inc:3180 include/functions.inc:3184
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3198
+#: include/functions.inc:3200
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3260
+#: include/functions.inc:3262
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3296
+#: include/functions.inc:3298
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
-#: include/class_session.inc:50 include/class_session.inc:87
-#: include/class_session.inc:125
+#: include/class_session.inc:50 include/class_session.inc:88
+#: include/class_session.inc:127
msgid "Requested channel does not exist! Please contact your Administrator."
msgstr ""
@@ -3401,7 +3406,7 @@ msgid ""
" be done by others will get lost if you save this entry!"
msgstr ""
-#: include/class_plugin.inc:1467
+#: include/class_plugin.inc:1313
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -3533,7 +3538,7 @@ msgid "days"
msgstr ""
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2171
+#: include/simpleplugin/class_attribute.inc:2172
#, php-format
msgid "%s (required)"
msgstr ""
@@ -3602,7 +3607,7 @@ msgid "%s (%d bytes)"
msgstr ""
#: include/simpleplugin/class_attribute.inc:1626
-#: include/simpleplugin/class_attribute.inc:1803
+#: include/simpleplugin/class_attribute.inc:1804
msgid "Upload"
msgstr ""
@@ -3611,22 +3616,22 @@ msgstr ""
msgid "Download"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1786
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1836
+#: include/simpleplugin/class_attribute.inc:1837
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr "Base"
-#: include/simpleplugin/class_attribute.inc:1839
+#: include/simpleplugin/class_attribute.inc:1840
msgid "Object base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:2769
+#: include/simpleplugin/class_attribute.inc:2770
#, php-format
msgid "Invalid value for %s"
msgstr ""
diff --git a/locale/pt_BR/fusiondirectory.po b/locale/pt_BR/fusiondirectory.po
index 964bb671ed9a907515a73bbd4200fca41c018bef..8726fd708451acd075017e7fa734d05ba7df6b39 100644
--- a/locale/pt_BR/fusiondirectory.po
+++ b/locale/pt_BR/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-03-14 12:07+0100\n"
-"PO-Revision-Date: 2016-03-07 12:09+0000\n"
+"POT-Creation-Date: 2016-04-06 11:27+0200\n"
+"PO-Revision-Date: 2016-04-06 09:24+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"
@@ -52,7 +52,7 @@ msgstr "Informações"
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:174
+#: plugins/admin/departments/class_department.inc:176
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -75,7 +75,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:73
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/aclrole/class_aclRole.inc:105
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
msgid "Description"
@@ -281,8 +281,8 @@ msgstr "Criar"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
#: include/simpleplugin/class_dialogAttributes.inc:632
#: include/simpleplugin/class_dialogAttributes.inc:633
-#: include/simpleplugin/class_attribute.inc:2675
#: include/simpleplugin/class_attribute.inc:2676
+#: include/simpleplugin/class_attribute.inc:2677
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -393,7 +393,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:34
#: plugins/admin/departments/class_department.inc:40
#: plugins/admin/departments/dep-list.xml:21
-#: plugins/personal/generic/class_user.inc:394
+#: plugins/personal/generic/class_user.inc:419
msgid "Department"
msgstr "Departamento"
@@ -441,7 +441,7 @@ msgid "Website of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:85
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:435
msgid "Manager"
msgstr "Gerente"
@@ -452,12 +452,12 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:91
#: plugins/admin/departments/class_department.inc:97
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:329
msgid "Location"
msgstr "Localização"
#: plugins/admin/departments/class_department.inc:94
-#: plugins/personal/generic/class_user.inc:308
+#: plugins/personal/generic/class_user.inc:333
msgid "State"
msgstr "Estado"
@@ -469,7 +469,7 @@ msgid "Country"
msgstr "PaÃs"
#: plugins/admin/departments/class_department.inc:103
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Address"
msgstr "Endereço"
@@ -479,7 +479,7 @@ msgid "A postal address for this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:107
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Phone"
msgstr "Telefone"
@@ -488,7 +488,7 @@ msgid "Telephone number"
msgstr "Número de telefone"
#: plugins/admin/departments/class_department.inc:111
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Fax"
msgstr "Fax"
@@ -541,7 +541,7 @@ msgstr "Lista de departamentos"
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:415
msgid "Organization"
msgstr "Organização"
@@ -562,7 +562,7 @@ msgid "Given name"
msgstr "Primeiro nome"
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
@@ -570,8 +570,8 @@ msgid "Login"
msgstr "Login"
#: plugins/admin/users/user-list.xml:79
-#: plugins/personal/generic/class_user.inc:246
-#: plugins/personal/generic/class_user.inc:252
+#: plugins/personal/generic/class_user.inc:271
+#: plugins/personal/generic/class_user.inc:277
msgid "User"
msgstr "Usuário"
@@ -624,9 +624,9 @@ msgid "Manage user accounts and their properties"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:140
-#: include/class_management.inc:341 include/class_management.inc:488
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571 include/class_CopyPasteHandler.inc:248
+#: include/class_management.inc:343 include/class_management.inc:490
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573 include/class_CopyPasteHandler.inc:248
#: include/simpleplugin/class_simpleManagement.inc:651
#: include/simpleplugin/class_simpleManagement.inc:749
#: include/simpleplugin/class_simpleManagement.inc:799
@@ -653,12 +653,12 @@ msgid "Lock account"
msgstr "Bloquear conta"
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:253
+#: plugins/personal/generic/class_user.inc:278
msgid "User account"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:247
+#: plugins/personal/generic/class_user.inc:272
msgid "User account information"
msgstr ""
@@ -676,8 +676,8 @@ msgid "Edit category ACL"
msgstr "Editar categoria de ACL"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
-#: include/simpleplugin/class_attribute.inc:2686
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2686
+#: include/simpleplugin/class_attribute.inc:2687
#, php-format
msgid "Delete"
msgstr "Deletar"
@@ -928,7 +928,7 @@ msgid "Password hash method to use"
msgstr "Método de hash para usar na senha"
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -949,215 +949,219 @@ msgstr "Senha novamente"
msgid "Same password as above, to avoid errors"
msgstr "Mesma senha como acima, para evitar erros"
-#: plugins/personal/generic/class_user.inc:274
+#: plugins/personal/generic/class_user.inc:299
msgid "Personal information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "Sobrenome"
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
msgid "Last name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "Nome"
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
msgid "First name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
msgid "Short description of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "Picture"
msgstr ""
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "The avatar for this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:300
+#: plugins/personal/generic/class_user.inc:325
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Business postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room number"
msgstr "Número da sala"
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Business phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Mobile"
msgstr "Celular"
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Business mobile number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Pager"
msgstr "Pager"
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Homepage"
msgstr "Página inicial"
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:367
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:351
+#: plugins/personal/generic/class_user.inc:376
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr "Idioma desejado"
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:387
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Display name"
msgstr "Nome de exibição"
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home postal address"
msgstr "Endereço residencial"
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Private phone"
msgstr ""
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Home phone number"
msgstr "Telefone residencial"
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:405
msgid "Organizational information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid "Title"
msgstr "TÃtulo"
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid ""
"Title of a person in their organizational context. Each title is one value "
"of this multi-valued attribute"
msgstr ""
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:419
+msgid "Department to which the user belongs"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:423
msgid "Department No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:423
msgid "Department number"
msgstr "Número do departamento"
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee number"
msgstr "Número do funcionário"
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:431
msgid "Employee type"
msgstr "Tipo de funcionário"
-#: plugins/personal/generic/class_user.inc:568
+#: plugins/personal/generic/class_user.inc:593
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:571
+#: plugins/personal/generic/class_user.inc:596
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:581
+#: plugins/personal/generic/class_user.inc:606
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:595
+#: plugins/personal/generic/class_user.inc:620
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:600
-#: plugins/personal/generic/class_user.inc:604
+#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:629
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:636
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:613
+#: plugins/personal/generic/class_user.inc:638
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:615
+#: plugins/personal/generic/class_user.inc:640
#: ihtml/themes/default/recovery.tpl.c:26
#: ihtml/themes/default/recovery.tpl.c:29
msgid "New password"
msgstr "Nova senha"
-#: plugins/personal/generic/class_user.inc:617
+#: plugins/personal/generic/class_user.inc:642
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:619
+#: plugins/personal/generic/class_user.inc:644
msgid "The password used as new is to short."
msgstr "A nova senha é muito curta."
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:646
msgid "The password contains possibly problematic Unicode characters!"
msgstr "A senha contém caracteres Unicode problemáticos."
@@ -2133,13 +2137,13 @@ msgstr "Subir"
msgid "Down"
msgstr "Descer"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
-#: include/simpleplugin/class_attribute.inc:2648
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2648
+#: include/simpleplugin/class_attribute.inc:2649
msgid "Sort up"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
-#: include/simpleplugin/class_attribute.inc:2661
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2661
+#: include/simpleplugin/class_attribute.inc:2662
msgid "Sort down"
msgstr ""
@@ -2147,23 +2151,23 @@ msgstr ""
msgid "Select all"
msgstr "Selecionar tudo"
-#: include/class_listing.inc:537 include/class_management.inc:679
-#: include/class_config.inc:479 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3107
-#: include/functions.inc:3128 include/functions.inc:3158
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198 include/functions.inc:3260
+#: include/class_listing.inc:537 include/class_management.inc:681
+#: include/class_config.inc:373 include/class_config.inc:484
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:682
+#: include/class_msgPool.inc:713 include/class_msgPool.inc:740
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200 include/functions.inc:3262
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/class_plugin.inc:1510 include/class_CopyPasteHandler.inc:278
#: include/simpleplugin/class_attribute.inc:1540
#: include/simpleplugin/class_attribute.inc:1543
#: include/simpleplugin/class_attribute.inc:1546
-#: include/simpleplugin/class_attribute.inc:1784
-#: include/simpleplugin/class_attribute.inc:1887
-#: include/simpleplugin/class_attribute.inc:1889
+#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1888
+#: include/simpleplugin/class_attribute.inc:1890
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: include/password-methods/class_password-methods-sasl.inc:60
@@ -2250,33 +2254,33 @@ msgstr "Criar snapshot"
msgid "Create a new snapshot from this object"
msgstr "Criar um novo snapshots deste objeto"
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "Filter error"
msgstr "Erro no filtro"
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "The filter is incomplete!"
msgstr "O filtro está incompleto!"
-#: include/class_management.inc:412
+#: include/class_management.inc:414
#: include/simpleplugin/class_simpleManagement.inc:716
msgid "Permission error"
msgstr "Erro de permissão"
-#: include/class_management.inc:488
+#: include/class_management.inc:490
#: include/simpleplugin/class_simpleManagement.inc:749
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr "Você não tem permissões para criar um snapshot para %s."
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573
#: include/simpleplugin/class_simpleManagement.inc:799
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr "Você não tem permissões para restaurar um snapshot para %s."
-#: include/class_management.inc:679
+#: include/class_management.inc:681
#, php-format
msgid ""
"No tab declaration for '%s' found in your configuration file. Cannot create "
@@ -2301,17 +2305,17 @@ msgstr "Erro de configuração"
#: include/class_config.inc:296
#, php-format
msgid ""
-"It seems you are trying to decode something which is not encoded : "
-"%s<br/>\\nPlease check you are not using a fusiondirectory.secrets file "
-"while your passwords are not encrypted."
-msgstr "Você está tentando decodificar algo que não está codificado: %s<br/>\\nPor favor, verifique se você não está utilizando um arquivo fusiondirectory.secrets enquanto suas senhas não estão encriptadas."
+"It seems you are trying to decode something which is not encoded : %s<br/>\n"
+"Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
+msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:918
-#: include/class_ldap.inc:1372 include/functions.inc:526
+#: include/class_config.inc:338 include/class_ldap.inc:895
+#: include/class_ldap.inc:1349 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
-#: include/simpleplugin/class_attribute.inc:2909
+#: include/functions.inc:2986 include/functions.inc:3160
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2910
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
@@ -2322,11 +2326,16 @@ msgstr "Você está tentando decodificar algo que não está codificado: %s<br/>
msgid "LDAP error"
msgstr "Erro de LDAP"
-#: include/class_config.inc:337
+#: include/class_config.inc:338
msgid "Cannot bind to LDAP. Please contact the system administrator."
msgstr ""
-#: include/class_config.inc:480
+#: include/class_config.inc:373
+#, php-format
+msgid "Location \"%s\" could not be found in the configuration file"
+msgstr ""
+
+#: include/class_config.inc:485
#, php-format
msgid "The selected mail method (class %s) is not available"
msgstr ""
@@ -2362,49 +2371,49 @@ msgstr ""
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr ""
-#: include/class_ldap.inc:869 include/class_ldap.inc:905
+#: include/class_ldap.inc:846 include/class_ldap.inc:882
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
#: include/functions.inc:2346 include/class_session.inc:50
-#: include/class_session.inc:87 include/class_session.inc:125
+#: include/class_session.inc:88 include/class_session.inc:127
#: include/class_log.inc:96 include/class_acl.inc:118
msgid "Internal error"
msgstr "Erro interno"
-#: include/class_ldap.inc:869
+#: include/class_ldap.inc:846
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:905
+#: include/class_ldap.inc:882
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1017
+#: include/class_ldap.inc:994
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr ""
-#: include/class_ldap.inc:1019
+#: include/class_ldap.inc:996
#, php-format
msgid "while operating on LDAP server %s"
msgstr ""
-#: include/class_ldap.inc:1109
+#: include/class_ldap.inc:1086
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1221
+#: include/class_ldap.inc:1198
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr ""
-#: include/class_ldap.inc:1232
+#: include/class_ldap.inc:1209
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2992,7 +3001,7 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr ""
-#: include/functions.inc:496 include/functions.inc:3295
+#: include/functions.inc:496 include/functions.inc:3297
#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
#: include/simpleplugin/class_simplePlugin.inc:269
#: include/simpleplugin/class_simplePlugin.inc:281
@@ -3204,9 +3213,9 @@ msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
#: include/functions.inc:3107 include/functions.inc:3128
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200
msgid "Cannot allocate a free ID:"
msgstr ""
@@ -3219,33 +3228,29 @@ msgstr ""
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3158
-msgid "Cannot create sambaUnixIdPool entry!"
-msgstr ""
-
-#: include/functions.inc:3166
+#: include/functions.inc:3168
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3178 include/functions.inc:3182
+#: include/functions.inc:3180 include/functions.inc:3184
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3198
+#: include/functions.inc:3200
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3260
+#: include/functions.inc:3262
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3296
+#: include/functions.inc:3298
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr "Não foi possÃvel localizar o arquivo '%s' - execute '%s' para solucionar o problema"
-#: include/class_session.inc:50 include/class_session.inc:87
-#: include/class_session.inc:125
+#: include/class_session.inc:50 include/class_session.inc:88
+#: include/class_session.inc:127
msgid "Requested channel does not exist! Please contact your Administrator."
msgstr ""
@@ -3401,7 +3406,7 @@ msgid ""
" be done by others will get lost if you save this entry!"
msgstr ""
-#: include/class_plugin.inc:1467
+#: include/class_plugin.inc:1313
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -3533,7 +3538,7 @@ msgid "days"
msgstr "dias"
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2171
+#: include/simpleplugin/class_attribute.inc:2172
#, php-format
msgid "%s (required)"
msgstr "%s (required)"
@@ -3602,7 +3607,7 @@ msgid "%s (%d bytes)"
msgstr ""
#: include/simpleplugin/class_attribute.inc:1626
-#: include/simpleplugin/class_attribute.inc:1803
+#: include/simpleplugin/class_attribute.inc:1804
msgid "Upload"
msgstr "Upload"
@@ -3611,22 +3616,22 @@ msgstr "Upload"
msgid "Download"
msgstr "Download"
-#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1786
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr "Não foi possÃvel salvar esta imagem, FusionDirectory requer o pacote 'php5-omagick' instalado"
-#: include/simpleplugin/class_attribute.inc:1836
+#: include/simpleplugin/class_attribute.inc:1837
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr "Base"
-#: include/simpleplugin/class_attribute.inc:1839
+#: include/simpleplugin/class_attribute.inc:1840
msgid "Object base"
msgstr "Base de objeto"
-#: include/simpleplugin/class_attribute.inc:2769
+#: include/simpleplugin/class_attribute.inc:2770
#, php-format
msgid "Invalid value for %s"
msgstr "Valor inválido para %s"
diff --git a/locale/ru/fusiondirectory.po b/locale/ru/fusiondirectory.po
index 9f5b496c64c300e72b234a21bbaa8a7be371cae9..830e81d471a91ebe3bd0a718ca877327bd493cef 100644
--- a/locale/ru/fusiondirectory.po
+++ b/locale/ru/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-03-14 12:07+0100\n"
-"PO-Revision-Date: 2016-03-07 12:09+0000\n"
+"POT-Creation-Date: 2016-04-06 11:27+0200\n"
+"PO-Revision-Date: 2016-04-06 09:24+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"
@@ -53,7 +53,7 @@ msgstr "ИнформациÑ"
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:174
+#: plugins/admin/departments/class_department.inc:176
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -76,7 +76,7 @@ msgstr "Ðазвание Ñтой группы"
#: plugins/admin/departments/class_department.inc:73
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/aclrole/class_aclRole.inc:105
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
msgid "Description"
@@ -282,8 +282,8 @@ msgstr "Создать"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
#: include/simpleplugin/class_dialogAttributes.inc:632
#: include/simpleplugin/class_dialogAttributes.inc:633
-#: include/simpleplugin/class_attribute.inc:2675
#: include/simpleplugin/class_attribute.inc:2676
+#: include/simpleplugin/class_attribute.inc:2677
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -394,7 +394,7 @@ msgstr "доменный компонент"
#: plugins/admin/departments/class_department.inc:34
#: plugins/admin/departments/class_department.inc:40
#: plugins/admin/departments/dep-list.xml:21
-#: plugins/personal/generic/class_user.inc:394
+#: plugins/personal/generic/class_user.inc:419
msgid "Department"
msgstr "Подразделение"
@@ -442,7 +442,7 @@ msgid "Website of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:85
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:435
msgid "Manager"
msgstr "Руководитель"
@@ -453,12 +453,12 @@ msgstr "Руководитель Ñтого %s"
#: plugins/admin/departments/class_department.inc:91
#: plugins/admin/departments/class_department.inc:97
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:329
msgid "Location"
msgstr "МеÑтоположение"
#: plugins/admin/departments/class_department.inc:94
-#: plugins/personal/generic/class_user.inc:308
+#: plugins/personal/generic/class_user.inc:333
msgid "State"
msgstr "Ðдм. единица"
@@ -470,7 +470,7 @@ msgid "Country"
msgstr "Страна"
#: plugins/admin/departments/class_department.inc:103
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Address"
msgstr "ÐдреÑ"
@@ -480,7 +480,7 @@ msgid "A postal address for this %s"
msgstr "Почтовый Ð°Ð´Ñ€ÐµÑ Ð´Ð»Ñ %s"
#: plugins/admin/departments/class_department.inc:107
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Phone"
msgstr "Телефон"
@@ -489,7 +489,7 @@ msgid "Telephone number"
msgstr "Ðомер телефона"
#: plugins/admin/departments/class_department.inc:111
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Fax"
msgstr "ФакÑ"
@@ -542,7 +542,7 @@ msgstr "СпиÑок подразделений"
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:415
msgid "Organization"
msgstr "ОрганизациÑ"
@@ -563,7 +563,7 @@ msgid "Given name"
msgstr "ИмÑ"
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
@@ -571,8 +571,8 @@ msgid "Login"
msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
#: plugins/admin/users/user-list.xml:79
-#: plugins/personal/generic/class_user.inc:246
-#: plugins/personal/generic/class_user.inc:252
+#: plugins/personal/generic/class_user.inc:271
+#: plugins/personal/generic/class_user.inc:277
msgid "User"
msgstr "Пользователь"
@@ -625,9 +625,9 @@ msgid "Manage user accounts and their properties"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:140
-#: include/class_management.inc:341 include/class_management.inc:488
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571 include/class_CopyPasteHandler.inc:248
+#: include/class_management.inc:343 include/class_management.inc:490
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573 include/class_CopyPasteHandler.inc:248
#: include/simpleplugin/class_simpleManagement.inc:651
#: include/simpleplugin/class_simpleManagement.inc:749
#: include/simpleplugin/class_simpleManagement.inc:799
@@ -654,12 +654,12 @@ msgid "Lock account"
msgstr "Заблокировать акаунт"
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:253
+#: plugins/personal/generic/class_user.inc:278
msgid "User account"
msgstr "Ð£Ñ‡ÐµÑ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ пользователÑ"
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:247
+#: plugins/personal/generic/class_user.inc:272
msgid "User account information"
msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ð± учетной запиÑи пользователÑ"
@@ -677,8 +677,8 @@ msgid "Edit category ACL"
msgstr "Редактировать категорию ACL"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
-#: include/simpleplugin/class_attribute.inc:2686
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2686
+#: include/simpleplugin/class_attribute.inc:2687
#, php-format
msgid "Delete"
msgstr "Удалить"
@@ -929,7 +929,7 @@ msgid "Password hash method to use"
msgstr "ПрименÑемый метод Ð´Ð»Ñ Ñ…Ñша паролÑ"
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -950,215 +950,219 @@ msgstr "Пароль еще раз"
msgid "Same password as above, to avoid errors"
msgstr ""
-#: plugins/personal/generic/class_user.inc:274
+#: plugins/personal/generic/class_user.inc:299
msgid "Personal information"
msgstr "Ð›Ð¸Ñ‡Ð½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ"
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "ФамилиÑ"
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
msgid "Last name of this user"
msgstr "Ð¤Ð°Ð¼Ð¸Ð»Ð¸Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "ИмÑ"
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
msgid "First name of this user"
msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
msgid "Short description of the user"
msgstr "Краткое опиÑание пользователÑ"
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "Picture"
msgstr "ФотографиÑ"
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "The avatar for this user"
msgstr "Ðватар пользователÑ"
-#: plugins/personal/generic/class_user.inc:300
+#: plugins/personal/generic/class_user.inc:325
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Business postal address"
msgstr "Рабочий почтовый адреÑ"
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room No."
msgstr "Ðомер комнаты"
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room number"
msgstr "Ðомер комнаты"
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Business phone number"
msgstr "Рабочий номер телефона"
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Mobile"
msgstr "Мобильный"
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Business mobile number"
msgstr "Рабочий номер мобильного телефона"
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Pager"
msgstr "Пейджер"
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Business pager number"
msgstr "Рабочий номер пейджера"
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Business fax number"
msgstr "Рабочий номер факÑа"
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Homepage"
msgstr "ДомашнÑÑ Ñтраница"
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:367
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:351
+#: plugins/personal/generic/class_user.inc:376
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr "Предпочитаемый Ñзык"
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
msgid "Password of the user"
msgstr "Пароль пользователÑ"
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:387
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Display name"
msgstr "Отображаемое имÑ"
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home address"
msgstr "Домашний адреÑ"
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home postal address"
msgstr "Домашний почтовый адреÑ"
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Private phone"
msgstr "Личный телефон"
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Home phone number"
msgstr "Домашний телефон"
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:405
msgid "Organizational information"
msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ð± организации"
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid "Title"
msgstr ""
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid ""
"Title of a person in their organizational context. Each title is one value "
"of this multi-valued attribute"
msgstr ""
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:419
+msgid "Department to which the user belongs"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:423
msgid "Department No."
msgstr "Ðомер подразделениÑ"
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:423
msgid "Department number"
msgstr "Ðомер отдела"
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee No."
msgstr "Ðомер работника"
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee number"
msgstr "Ðомер работника"
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:431
msgid "Employee type"
msgstr "Форма трудоуÑтройÑтва"
-#: plugins/personal/generic/class_user.inc:568
+#: plugins/personal/generic/class_user.inc:593
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:571
+#: plugins/personal/generic/class_user.inc:596
msgid "You are not allowed to change your own password"
msgstr "Вам не разрешено изменÑÑ‚ÑŒ Ñвой пароль"
-#: plugins/personal/generic/class_user.inc:581
+#: plugins/personal/generic/class_user.inc:606
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr "Ð’Ñ‹ должны подождать %d Ñекунд перед повторным изменением паролÑ"
-#: plugins/personal/generic/class_user.inc:595
+#: plugins/personal/generic/class_user.inc:620
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:600
-#: plugins/personal/generic/class_user.inc:604
+#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:629
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:636
msgid "You need to specify your current password in order to proceed."
msgstr "Ð”Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ ÑƒÐºÐ°Ð¶Ð¸Ñ‚Ðµ Ñвой текущий пароль."
-#: plugins/personal/generic/class_user.inc:613
+#: plugins/personal/generic/class_user.inc:638
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:615
+#: plugins/personal/generic/class_user.inc:640
#: ihtml/themes/default/recovery.tpl.c:26
#: ihtml/themes/default/recovery.tpl.c:29
msgid "New password"
msgstr "Ðовый пароль"
-#: plugins/personal/generic/class_user.inc:617
+#: plugins/personal/generic/class_user.inc:642
msgid "The password used as new and current are too similar."
msgstr "Ðовый и текущий пароли Ñлишком похожи."
-#: plugins/personal/generic/class_user.inc:619
+#: plugins/personal/generic/class_user.inc:644
msgid "The password used as new is to short."
msgstr "Ðовый пароль Ñлишком короткий."
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:646
msgid "The password contains possibly problematic Unicode characters!"
msgstr "Пароль Ñодержит Ñимволы Unicode, которые могут проблемы!"
@@ -2134,13 +2138,13 @@ msgstr "По убыванию"
msgid "Down"
msgstr "Вниз"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
-#: include/simpleplugin/class_attribute.inc:2648
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2648
+#: include/simpleplugin/class_attribute.inc:2649
msgid "Sort up"
msgstr "Сортировать по возвраÑтанию"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
-#: include/simpleplugin/class_attribute.inc:2661
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2661
+#: include/simpleplugin/class_attribute.inc:2662
msgid "Sort down"
msgstr "Сортировать по убыванию"
@@ -2148,23 +2152,23 @@ msgstr "Сортировать по убыванию"
msgid "Select all"
msgstr "Выбрать вÑе"
-#: include/class_listing.inc:537 include/class_management.inc:679
-#: include/class_config.inc:479 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3107
-#: include/functions.inc:3128 include/functions.inc:3158
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198 include/functions.inc:3260
+#: include/class_listing.inc:537 include/class_management.inc:681
+#: include/class_config.inc:373 include/class_config.inc:484
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:682
+#: include/class_msgPool.inc:713 include/class_msgPool.inc:740
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200 include/functions.inc:3262
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/class_plugin.inc:1510 include/class_CopyPasteHandler.inc:278
#: include/simpleplugin/class_attribute.inc:1540
#: include/simpleplugin/class_attribute.inc:1543
#: include/simpleplugin/class_attribute.inc:1546
-#: include/simpleplugin/class_attribute.inc:1784
-#: include/simpleplugin/class_attribute.inc:1887
-#: include/simpleplugin/class_attribute.inc:1889
+#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1888
+#: include/simpleplugin/class_attribute.inc:1890
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: include/password-methods/class_password-methods-sasl.inc:60
@@ -2251,33 +2255,33 @@ msgstr "Создать Ñнапшот"
msgid "Create a new snapshot from this object"
msgstr "Создать новый Ñнапшот из объекта"
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "Filter error"
msgstr "Ошибка фильтра"
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "The filter is incomplete!"
msgstr "Фильтр неполный!"
-#: include/class_management.inc:412
+#: include/class_management.inc:414
#: include/simpleplugin/class_simpleManagement.inc:716
msgid "Permission error"
msgstr "Ошибка доÑтупа"
-#: include/class_management.inc:488
+#: include/class_management.inc:490
#: include/simpleplugin/class_simpleManagement.inc:749
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr "Вам не разрешено Ñоздавать Ñнапшот Ð´Ð»Ñ %s."
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573
#: include/simpleplugin/class_simpleManagement.inc:799
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr "Вам не разрешено воÑÑтанавливать Ñнапшот Ð´Ð»Ñ %s."
-#: include/class_management.inc:679
+#: include/class_management.inc:681
#, php-format
msgid ""
"No tab declaration for '%s' found in your configuration file. Cannot create "
@@ -2302,17 +2306,17 @@ msgstr "Ошибка конфигурации"
#: include/class_config.inc:296
#, php-format
msgid ""
-"It seems you are trying to decode something which is not encoded : "
-"%s<br/>\\nPlease check you are not using a fusiondirectory.secrets file "
-"while your passwords are not encrypted."
-msgstr "КажетÑÑ Ð²Ñ‹ пытаетеÑÑŒ раÑшифровать что то, что не было зашифровано: %s<br/>\\n ПожалуйÑта проверьте, что вы не иÑпользуете файле fusiondirectory.secrets пароль в котором не зашифрован."
+"It seems you are trying to decode something which is not encoded : %s<br/>\n"
+"Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
+msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:918
-#: include/class_ldap.inc:1372 include/functions.inc:526
+#: include/class_config.inc:338 include/class_ldap.inc:895
+#: include/class_ldap.inc:1349 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
-#: include/simpleplugin/class_attribute.inc:2909
+#: include/functions.inc:2986 include/functions.inc:3160
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2910
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
@@ -2323,11 +2327,16 @@ msgstr "КажетÑÑ Ð²Ñ‹ пытаетеÑÑŒ раÑшифровать что
msgid "LDAP error"
msgstr "Ошибка LDAP"
-#: include/class_config.inc:337
+#: include/class_config.inc:338
msgid "Cannot bind to LDAP. Please contact the system administrator."
msgstr "Ðе могу привÑзатьÑÑ Ðº LDAP. ПожалуйÑта ÑвÑжитеÑÑŒ Ñ ÑиÑтемным админиÑтратором."
-#: include/class_config.inc:480
+#: include/class_config.inc:373
+#, php-format
+msgid "Location \"%s\" could not be found in the configuration file"
+msgstr ""
+
+#: include/class_config.inc:485
#, php-format
msgid "The selected mail method (class %s) is not available"
msgstr "Выбранные почтовый метод (клаÑÑ %s) не доÑтупен"
@@ -2363,49 +2372,49 @@ msgstr "Предупреждение о производительноÑти"
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr "ÐÐ¸Ð·ÐºÐ°Ñ Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ÑÑ‚ÑŒ LDAP: поÑледний Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð·Ð°Ð½Ñл около %.2fs!"
-#: include/class_ldap.inc:869 include/class_ldap.inc:905
+#: include/class_ldap.inc:846 include/class_ldap.inc:882
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
#: include/functions.inc:2346 include/class_session.inc:50
-#: include/class_session.inc:87 include/class_session.inc:125
+#: include/class_session.inc:88 include/class_session.inc:127
#: include/class_log.inc:96 include/class_acl.inc:118
msgid "Internal error"
msgstr "ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°"
-#: include/class_ldap.inc:869
+#: include/class_ldap.inc:846
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:905
+#: include/class_ldap.inc:882
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1017
+#: include/class_ldap.inc:994
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr "во Ð²Ñ€ÐµÐ¼Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ð¸ на '%s' иÑпользовалÑÑ LDAP Ñервер '%s'"
-#: include/class_ldap.inc:1019
+#: include/class_ldap.inc:996
#, php-format
msgid "while operating on LDAP server %s"
msgstr "во Ð²Ñ€ÐµÐ¼Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ð¸ на LDAP Ñервер %s"
-#: include/class_ldap.inc:1109
+#: include/class_ldap.inc:1086
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1221
+#: include/class_ldap.inc:1198
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr "Ðеправильный DN: '%s'. Блок Ð´Ð»Ñ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð° должен начинатьÑÑ Ñ dn: ...' в Ñтроке %s."
-#: include/class_ldap.inc:1232
+#: include/class_ldap.inc:1209
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2993,7 +3002,7 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr "КритичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°: не могу Ñоздать ÑкземплÑÑ€ клаÑÑа '%s' - попробуйте запуÑтить '%s' чтобы иÑправить Ñто"
-#: include/functions.inc:496 include/functions.inc:3295
+#: include/functions.inc:496 include/functions.inc:3297
#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
#: include/simpleplugin/class_simplePlugin.inc:269
#: include/simpleplugin/class_simplePlugin.inc:281
@@ -3205,9 +3214,9 @@ msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
#: include/functions.inc:3107 include/functions.inc:3128
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200
msgid "Cannot allocate a free ID:"
msgstr "Ðе могу выделить Ñвободный ID:"
@@ -3220,33 +3229,29 @@ msgstr " неизвеÑтный idAllocation метод!"
msgid "%sPoolMin >= %sPoolMax!"
msgstr "%sPoolMin >= %sPoolMax!"
-#: include/functions.inc:3158
-msgid "Cannot create sambaUnixIdPool entry!"
-msgstr "Ðе могу Ñоздать запиÑÑŒ sambaUnixIdPool!"
-
-#: include/functions.inc:3166
+#: include/functions.inc:3168
msgid "sambaUnixIdPool is not unique!"
msgstr "sambaUnixIdPool не уникальна!"
-#: include/functions.inc:3178 include/functions.inc:3182
+#: include/functions.inc:3180 include/functions.inc:3184
msgid "no ID available!"
msgstr "нет доÑтупных ID!"
-#: include/functions.inc:3198
+#: include/functions.inc:3200
msgid "maximum tries exceeded!"
msgstr "Превышено макÑимальное чиÑло попыток!"
-#: include/functions.inc:3260
+#: include/functions.inc:3262
msgid "Cannot allocate a free ID!"
msgstr "Ðе могу выделить Ñвободный ID!"
-#: include/functions.inc:3296
+#: include/functions.inc:3298
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr "Ðе могу обнаружить файл '%s' - пожалуйÑта запуÑтите '%s', чтобы иÑправить Ñто."
-#: include/class_session.inc:50 include/class_session.inc:87
-#: include/class_session.inc:125
+#: include/class_session.inc:50 include/class_session.inc:88
+#: include/class_session.inc:127
msgid "Requested channel does not exist! Please contact your Administrator."
msgstr "Запрашиваемый канал не ÑущеÑтвует! ПожалуйÑта ÑвÑжитеÑÑŒ Ñ Ð²Ð°ÑˆÐ¸Ð¼ ÑиÑтемным админиÑтратором."
@@ -3402,7 +3407,7 @@ msgid ""
" be done by others will get lost if you save this entry!"
msgstr ""
-#: include/class_plugin.inc:1467
+#: include/class_plugin.inc:1313
#, php-format
msgid "Tab \"%s\""
msgstr "Вкладка \"%s\""
@@ -3534,7 +3539,7 @@ msgid "days"
msgstr "дни"
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2171
+#: include/simpleplugin/class_attribute.inc:2172
#, php-format
msgid "%s (required)"
msgstr "%s (обÑзательный)"
@@ -3603,7 +3608,7 @@ msgid "%s (%d bytes)"
msgstr "%s (%d байт)"
#: include/simpleplugin/class_attribute.inc:1626
-#: include/simpleplugin/class_attribute.inc:1803
+#: include/simpleplugin/class_attribute.inc:1804
msgid "Upload"
msgstr "Загрузить"
@@ -3612,22 +3617,22 @@ msgstr "Загрузить"
msgid "Download"
msgstr "Скачать"
-#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1786
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr "Ðе могу Ñохранить фотографию пользователÑ, FusionDirectory нужен уÑтановленный пакета 'php5-imagick'!"
-#: include/simpleplugin/class_attribute.inc:1836
+#: include/simpleplugin/class_attribute.inc:1837
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr "Ветка"
-#: include/simpleplugin/class_attribute.inc:1839
+#: include/simpleplugin/class_attribute.inc:1840
msgid "Object base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:2769
+#: include/simpleplugin/class_attribute.inc:2770
#, php-format
msgid "Invalid value for %s"
msgstr "Ðеверное значение Ð´Ð»Ñ %s"
diff --git a/locale/ru@petr1708/fusiondirectory.po b/locale/ru@petr1708/fusiondirectory.po
index e3e7377ac55ae7880cd9efeb137ee8142e8fc26c..1c0aa3275ae231ec65e851b81e480c285b3ce611 100644
--- a/locale/ru@petr1708/fusiondirectory.po
+++ b/locale/ru@petr1708/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-03-14 12:07+0100\n"
-"PO-Revision-Date: 2016-03-07 12:09+0000\n"
+"POT-Creation-Date: 2016-04-06 11:27+0200\n"
+"PO-Revision-Date: 2016-04-06 09:24+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"
@@ -52,7 +52,7 @@ msgstr ""
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:174
+#: plugins/admin/departments/class_department.inc:176
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -75,7 +75,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:73
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/aclrole/class_aclRole.inc:105
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
msgid "Description"
@@ -281,8 +281,8 @@ msgstr ""
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
#: include/simpleplugin/class_dialogAttributes.inc:632
#: include/simpleplugin/class_dialogAttributes.inc:633
-#: include/simpleplugin/class_attribute.inc:2675
#: include/simpleplugin/class_attribute.inc:2676
+#: include/simpleplugin/class_attribute.inc:2677
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -393,7 +393,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:34
#: plugins/admin/departments/class_department.inc:40
#: plugins/admin/departments/dep-list.xml:21
-#: plugins/personal/generic/class_user.inc:394
+#: plugins/personal/generic/class_user.inc:419
msgid "Department"
msgstr ""
@@ -441,7 +441,7 @@ msgid "Website of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:85
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:435
msgid "Manager"
msgstr ""
@@ -452,12 +452,12 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:91
#: plugins/admin/departments/class_department.inc:97
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:329
msgid "Location"
msgstr ""
#: plugins/admin/departments/class_department.inc:94
-#: plugins/personal/generic/class_user.inc:308
+#: plugins/personal/generic/class_user.inc:333
msgid "State"
msgstr ""
@@ -469,7 +469,7 @@ msgid "Country"
msgstr ""
#: plugins/admin/departments/class_department.inc:103
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Address"
msgstr ""
@@ -479,7 +479,7 @@ msgid "A postal address for this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:107
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Phone"
msgstr ""
@@ -488,7 +488,7 @@ msgid "Telephone number"
msgstr ""
#: plugins/admin/departments/class_department.inc:111
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Fax"
msgstr ""
@@ -541,7 +541,7 @@ msgstr ""
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:415
msgid "Organization"
msgstr ""
@@ -562,7 +562,7 @@ msgid "Given name"
msgstr ""
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
@@ -570,8 +570,8 @@ msgid "Login"
msgstr ""
#: plugins/admin/users/user-list.xml:79
-#: plugins/personal/generic/class_user.inc:246
-#: plugins/personal/generic/class_user.inc:252
+#: plugins/personal/generic/class_user.inc:271
+#: plugins/personal/generic/class_user.inc:277
msgid "User"
msgstr ""
@@ -624,9 +624,9 @@ msgid "Manage user accounts and their properties"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:140
-#: include/class_management.inc:341 include/class_management.inc:488
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571 include/class_CopyPasteHandler.inc:248
+#: include/class_management.inc:343 include/class_management.inc:490
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573 include/class_CopyPasteHandler.inc:248
#: include/simpleplugin/class_simpleManagement.inc:651
#: include/simpleplugin/class_simpleManagement.inc:749
#: include/simpleplugin/class_simpleManagement.inc:799
@@ -653,12 +653,12 @@ msgid "Lock account"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:253
+#: plugins/personal/generic/class_user.inc:278
msgid "User account"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:247
+#: plugins/personal/generic/class_user.inc:272
msgid "User account information"
msgstr ""
@@ -676,8 +676,8 @@ msgid "Edit category ACL"
msgstr ""
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
-#: include/simpleplugin/class_attribute.inc:2686
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2686
+#: include/simpleplugin/class_attribute.inc:2687
#, php-format
msgid "Delete"
msgstr ""
@@ -928,7 +928,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -949,215 +949,219 @@ msgstr ""
msgid "Same password as above, to avoid errors"
msgstr ""
-#: plugins/personal/generic/class_user.inc:274
+#: plugins/personal/generic/class_user.inc:299
msgid "Personal information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
msgid "Last name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
msgid "First name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
msgid "Short description of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "Picture"
msgstr ""
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "The avatar for this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:300
+#: plugins/personal/generic/class_user.inc:325
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Business postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Business phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Mobile"
msgstr ""
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Business mobile number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Pager"
msgstr ""
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:367
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:351
+#: plugins/personal/generic/class_user.inc:376
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr ""
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:387
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Display name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Private phone"
msgstr ""
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Home phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:405
msgid "Organizational information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid "Title"
msgstr ""
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid ""
"Title of a person in their organizational context. Each title is one value "
"of this multi-valued attribute"
msgstr ""
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:419
+msgid "Department to which the user belongs"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:423
msgid "Department No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:423
msgid "Department number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:431
msgid "Employee type"
msgstr ""
-#: plugins/personal/generic/class_user.inc:568
+#: plugins/personal/generic/class_user.inc:593
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:571
+#: plugins/personal/generic/class_user.inc:596
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:581
+#: plugins/personal/generic/class_user.inc:606
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:595
+#: plugins/personal/generic/class_user.inc:620
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:600
-#: plugins/personal/generic/class_user.inc:604
+#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:629
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:636
msgid "You need to specify your current password in order to proceed."
msgstr ""
-#: plugins/personal/generic/class_user.inc:613
+#: plugins/personal/generic/class_user.inc:638
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:615
+#: plugins/personal/generic/class_user.inc:640
#: ihtml/themes/default/recovery.tpl.c:26
#: ihtml/themes/default/recovery.tpl.c:29
msgid "New password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:617
+#: plugins/personal/generic/class_user.inc:642
msgid "The password used as new and current are too similar."
msgstr ""
-#: plugins/personal/generic/class_user.inc:619
+#: plugins/personal/generic/class_user.inc:644
msgid "The password used as new is to short."
msgstr ""
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:646
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
@@ -2133,13 +2137,13 @@ msgstr ""
msgid "Down"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
-#: include/simpleplugin/class_attribute.inc:2648
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2648
+#: include/simpleplugin/class_attribute.inc:2649
msgid "Sort up"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
-#: include/simpleplugin/class_attribute.inc:2661
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2661
+#: include/simpleplugin/class_attribute.inc:2662
msgid "Sort down"
msgstr ""
@@ -2147,23 +2151,23 @@ msgstr ""
msgid "Select all"
msgstr ""
-#: include/class_listing.inc:537 include/class_management.inc:679
-#: include/class_config.inc:479 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3107
-#: include/functions.inc:3128 include/functions.inc:3158
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198 include/functions.inc:3260
+#: include/class_listing.inc:537 include/class_management.inc:681
+#: include/class_config.inc:373 include/class_config.inc:484
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:682
+#: include/class_msgPool.inc:713 include/class_msgPool.inc:740
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200 include/functions.inc:3262
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/class_plugin.inc:1510 include/class_CopyPasteHandler.inc:278
#: include/simpleplugin/class_attribute.inc:1540
#: include/simpleplugin/class_attribute.inc:1543
#: include/simpleplugin/class_attribute.inc:1546
-#: include/simpleplugin/class_attribute.inc:1784
-#: include/simpleplugin/class_attribute.inc:1887
-#: include/simpleplugin/class_attribute.inc:1889
+#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1888
+#: include/simpleplugin/class_attribute.inc:1890
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: include/password-methods/class_password-methods-sasl.inc:60
@@ -2250,33 +2254,33 @@ msgstr ""
msgid "Create a new snapshot from this object"
msgstr ""
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "Filter error"
msgstr ""
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "The filter is incomplete!"
msgstr ""
-#: include/class_management.inc:412
+#: include/class_management.inc:414
#: include/simpleplugin/class_simpleManagement.inc:716
msgid "Permission error"
msgstr ""
-#: include/class_management.inc:488
+#: include/class_management.inc:490
#: include/simpleplugin/class_simpleManagement.inc:749
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr ""
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573
#: include/simpleplugin/class_simpleManagement.inc:799
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr ""
-#: include/class_management.inc:679
+#: include/class_management.inc:681
#, php-format
msgid ""
"No tab declaration for '%s' found in your configuration file. Cannot create "
@@ -2301,17 +2305,17 @@ msgstr ""
#: include/class_config.inc:296
#, php-format
msgid ""
-"It seems you are trying to decode something which is not encoded : "
-"%s<br/>\\nPlease check you are not using a fusiondirectory.secrets file "
-"while your passwords are not encrypted."
+"It seems you are trying to decode something which is not encoded : %s<br/>\n"
+"Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:918
-#: include/class_ldap.inc:1372 include/functions.inc:526
+#: include/class_config.inc:338 include/class_ldap.inc:895
+#: include/class_ldap.inc:1349 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
-#: include/simpleplugin/class_attribute.inc:2909
+#: include/functions.inc:2986 include/functions.inc:3160
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2910
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
@@ -2322,11 +2326,16 @@ msgstr ""
msgid "LDAP error"
msgstr ""
-#: include/class_config.inc:337
+#: include/class_config.inc:338
msgid "Cannot bind to LDAP. Please contact the system administrator."
msgstr ""
-#: include/class_config.inc:480
+#: include/class_config.inc:373
+#, php-format
+msgid "Location \"%s\" could not be found in the configuration file"
+msgstr ""
+
+#: include/class_config.inc:485
#, php-format
msgid "The selected mail method (class %s) is not available"
msgstr ""
@@ -2362,49 +2371,49 @@ msgstr ""
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr ""
-#: include/class_ldap.inc:869 include/class_ldap.inc:905
+#: include/class_ldap.inc:846 include/class_ldap.inc:882
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
#: include/functions.inc:2346 include/class_session.inc:50
-#: include/class_session.inc:87 include/class_session.inc:125
+#: include/class_session.inc:88 include/class_session.inc:127
#: include/class_log.inc:96 include/class_acl.inc:118
msgid "Internal error"
msgstr ""
-#: include/class_ldap.inc:869
+#: include/class_ldap.inc:846
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:905
+#: include/class_ldap.inc:882
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1017
+#: include/class_ldap.inc:994
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr ""
-#: include/class_ldap.inc:1019
+#: include/class_ldap.inc:996
#, php-format
msgid "while operating on LDAP server %s"
msgstr ""
-#: include/class_ldap.inc:1109
+#: include/class_ldap.inc:1086
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1221
+#: include/class_ldap.inc:1198
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr ""
-#: include/class_ldap.inc:1232
+#: include/class_ldap.inc:1209
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2992,7 +3001,7 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr ""
-#: include/functions.inc:496 include/functions.inc:3295
+#: include/functions.inc:496 include/functions.inc:3297
#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
#: include/simpleplugin/class_simplePlugin.inc:269
#: include/simpleplugin/class_simplePlugin.inc:281
@@ -3204,9 +3213,9 @@ msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
#: include/functions.inc:3107 include/functions.inc:3128
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200
msgid "Cannot allocate a free ID:"
msgstr ""
@@ -3219,33 +3228,29 @@ msgstr ""
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3158
-msgid "Cannot create sambaUnixIdPool entry!"
-msgstr ""
-
-#: include/functions.inc:3166
+#: include/functions.inc:3168
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3178 include/functions.inc:3182
+#: include/functions.inc:3180 include/functions.inc:3184
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3198
+#: include/functions.inc:3200
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3260
+#: include/functions.inc:3262
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3296
+#: include/functions.inc:3298
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
-#: include/class_session.inc:50 include/class_session.inc:87
-#: include/class_session.inc:125
+#: include/class_session.inc:50 include/class_session.inc:88
+#: include/class_session.inc:127
msgid "Requested channel does not exist! Please contact your Administrator."
msgstr ""
@@ -3401,7 +3406,7 @@ msgid ""
" be done by others will get lost if you save this entry!"
msgstr ""
-#: include/class_plugin.inc:1467
+#: include/class_plugin.inc:1313
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -3533,7 +3538,7 @@ msgid "days"
msgstr ""
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2171
+#: include/simpleplugin/class_attribute.inc:2172
#, php-format
msgid "%s (required)"
msgstr ""
@@ -3602,7 +3607,7 @@ msgid "%s (%d bytes)"
msgstr ""
#: include/simpleplugin/class_attribute.inc:1626
-#: include/simpleplugin/class_attribute.inc:1803
+#: include/simpleplugin/class_attribute.inc:1804
msgid "Upload"
msgstr ""
@@ -3611,22 +3616,22 @@ msgstr ""
msgid "Download"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1786
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1836
+#: include/simpleplugin/class_attribute.inc:1837
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1839
+#: include/simpleplugin/class_attribute.inc:1840
msgid "Object base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:2769
+#: include/simpleplugin/class_attribute.inc:2770
#, php-format
msgid "Invalid value for %s"
msgstr ""
diff --git a/locale/sv/fusiondirectory.po b/locale/sv/fusiondirectory.po
index 92874f5a604fefb85046e274bb23f4278fe1e4a8..fe2900a28c45009a30cde7136d8e3566c38c1761 100644
--- a/locale/sv/fusiondirectory.po
+++ b/locale/sv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-03-14 12:07+0100\n"
-"PO-Revision-Date: 2016-03-07 12:09+0000\n"
+"POT-Creation-Date: 2016-04-06 11:27+0200\n"
+"PO-Revision-Date: 2016-04-06 09:24+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"
@@ -52,7 +52,7 @@ msgstr ""
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:174
+#: plugins/admin/departments/class_department.inc:176
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -75,7 +75,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:73
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/aclrole/class_aclRole.inc:105
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
msgid "Description"
@@ -281,8 +281,8 @@ msgstr "Skapa"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
#: include/simpleplugin/class_dialogAttributes.inc:632
#: include/simpleplugin/class_dialogAttributes.inc:633
-#: include/simpleplugin/class_attribute.inc:2675
#: include/simpleplugin/class_attribute.inc:2676
+#: include/simpleplugin/class_attribute.inc:2677
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -393,7 +393,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:34
#: plugins/admin/departments/class_department.inc:40
#: plugins/admin/departments/dep-list.xml:21
-#: plugins/personal/generic/class_user.inc:394
+#: plugins/personal/generic/class_user.inc:419
msgid "Department"
msgstr "Avdelning"
@@ -441,7 +441,7 @@ msgid "Website of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:85
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:435
msgid "Manager"
msgstr "Manager"
@@ -452,12 +452,12 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:91
#: plugins/admin/departments/class_department.inc:97
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:329
msgid "Location"
msgstr "Plats"
#: plugins/admin/departments/class_department.inc:94
-#: plugins/personal/generic/class_user.inc:308
+#: plugins/personal/generic/class_user.inc:333
msgid "State"
msgstr "Län"
@@ -469,7 +469,7 @@ msgid "Country"
msgstr "Land"
#: plugins/admin/departments/class_department.inc:103
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Address"
msgstr "Adress"
@@ -479,7 +479,7 @@ msgid "A postal address for this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:107
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Phone"
msgstr "Telefon"
@@ -488,7 +488,7 @@ msgid "Telephone number"
msgstr ""
#: plugins/admin/departments/class_department.inc:111
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Fax"
msgstr "Fax"
@@ -541,7 +541,7 @@ msgstr "Avdelningslista"
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:415
msgid "Organization"
msgstr "Organisation"
@@ -562,7 +562,7 @@ msgid "Given name"
msgstr "Förnamn"
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
@@ -570,8 +570,8 @@ msgid "Login"
msgstr "Användarnamn"
#: plugins/admin/users/user-list.xml:79
-#: plugins/personal/generic/class_user.inc:246
-#: plugins/personal/generic/class_user.inc:252
+#: plugins/personal/generic/class_user.inc:271
+#: plugins/personal/generic/class_user.inc:277
msgid "User"
msgstr "Användare"
@@ -624,9 +624,9 @@ msgid "Manage user accounts and their properties"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:140
-#: include/class_management.inc:341 include/class_management.inc:488
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571 include/class_CopyPasteHandler.inc:248
+#: include/class_management.inc:343 include/class_management.inc:490
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573 include/class_CopyPasteHandler.inc:248
#: include/simpleplugin/class_simpleManagement.inc:651
#: include/simpleplugin/class_simpleManagement.inc:749
#: include/simpleplugin/class_simpleManagement.inc:799
@@ -653,12 +653,12 @@ msgid "Lock account"
msgstr "LÃ¥s konto"
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:253
+#: plugins/personal/generic/class_user.inc:278
msgid "User account"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:247
+#: plugins/personal/generic/class_user.inc:272
msgid "User account information"
msgstr ""
@@ -676,8 +676,8 @@ msgid "Edit category ACL"
msgstr "Redigera kategori-ACL"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
-#: include/simpleplugin/class_attribute.inc:2686
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2686
+#: include/simpleplugin/class_attribute.inc:2687
#, php-format
msgid "Delete"
msgstr "Ta bort"
@@ -928,7 +928,7 @@ msgid "Password hash method to use"
msgstr "Lösenords-hash att använda"
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -949,215 +949,219 @@ msgstr "Lösenordet igen"
msgid "Same password as above, to avoid errors"
msgstr "Samma lösenord som ovan, för att undvika fel"
-#: plugins/personal/generic/class_user.inc:274
+#: plugins/personal/generic/class_user.inc:299
msgid "Personal information"
msgstr "Personlig information"
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "Efternamn"
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
msgid "Last name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "Förnamn"
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
msgid "First name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
msgid "Short description of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "Picture"
msgstr ""
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "The avatar for this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:300
+#: plugins/personal/generic/class_user.inc:325
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Business postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room No."
msgstr "Rumsnummer"
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room number"
msgstr "Rumsnummer"
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Business phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Mobile"
msgstr "Mobil"
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Business mobile number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Pager"
msgstr "Pager"
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Homepage"
msgstr "Hemsida"
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:367
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:351
+#: plugins/personal/generic/class_user.inc:376
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr "Föredraget språk"
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:387
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Display name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home postal address"
msgstr "Hempostadress"
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Private phone"
msgstr "Privat telefon"
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Home phone number"
msgstr "Hemtelefonnummer"
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:405
msgid "Organizational information"
msgstr "Organisationsinformation"
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid "Title"
msgstr ""
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid ""
"Title of a person in their organizational context. Each title is one value "
"of this multi-valued attribute"
msgstr ""
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:419
+msgid "Department to which the user belongs"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:423
msgid "Department No."
msgstr "Avdelningsnummer"
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:423
msgid "Department number"
msgstr "Avdelningsnummer"
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee No."
msgstr "Anställningsnummer"
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee number"
msgstr "Anställningsnummer"
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:431
msgid "Employee type"
msgstr "Anställningstyp"
-#: plugins/personal/generic/class_user.inc:568
+#: plugins/personal/generic/class_user.inc:593
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:571
+#: plugins/personal/generic/class_user.inc:596
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:581
+#: plugins/personal/generic/class_user.inc:606
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:595
+#: plugins/personal/generic/class_user.inc:620
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:600
-#: plugins/personal/generic/class_user.inc:604
+#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:629
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:636
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:613
+#: plugins/personal/generic/class_user.inc:638
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:615
+#: plugins/personal/generic/class_user.inc:640
#: ihtml/themes/default/recovery.tpl.c:26
#: ihtml/themes/default/recovery.tpl.c:29
msgid "New password"
msgstr "Nytt lösenord"
-#: plugins/personal/generic/class_user.inc:617
+#: plugins/personal/generic/class_user.inc:642
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:619
+#: plugins/personal/generic/class_user.inc:644
msgid "The password used as new is to short."
msgstr "Det nya lösenordet är för kort."
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:646
msgid "The password contains possibly problematic Unicode characters!"
msgstr "Lösenordet innehåller möjligtvis problematiska Unicode-tecken!"
@@ -2133,13 +2137,13 @@ msgstr "Upp"
msgid "Down"
msgstr "Ner"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
-#: include/simpleplugin/class_attribute.inc:2648
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2648
+#: include/simpleplugin/class_attribute.inc:2649
msgid "Sort up"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
-#: include/simpleplugin/class_attribute.inc:2661
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2661
+#: include/simpleplugin/class_attribute.inc:2662
msgid "Sort down"
msgstr ""
@@ -2147,23 +2151,23 @@ msgstr ""
msgid "Select all"
msgstr "Välj alla"
-#: include/class_listing.inc:537 include/class_management.inc:679
-#: include/class_config.inc:479 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3107
-#: include/functions.inc:3128 include/functions.inc:3158
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198 include/functions.inc:3260
+#: include/class_listing.inc:537 include/class_management.inc:681
+#: include/class_config.inc:373 include/class_config.inc:484
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:682
+#: include/class_msgPool.inc:713 include/class_msgPool.inc:740
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200 include/functions.inc:3262
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/class_plugin.inc:1510 include/class_CopyPasteHandler.inc:278
#: include/simpleplugin/class_attribute.inc:1540
#: include/simpleplugin/class_attribute.inc:1543
#: include/simpleplugin/class_attribute.inc:1546
-#: include/simpleplugin/class_attribute.inc:1784
-#: include/simpleplugin/class_attribute.inc:1887
-#: include/simpleplugin/class_attribute.inc:1889
+#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1888
+#: include/simpleplugin/class_attribute.inc:1890
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: include/password-methods/class_password-methods-sasl.inc:60
@@ -2250,33 +2254,33 @@ msgstr "Skapa ögonblicksbild"
msgid "Create a new snapshot from this object"
msgstr "Skapa ny ögonblicksbild från det här objektet"
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "Filter error"
msgstr "Filterfel"
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "The filter is incomplete!"
msgstr "Filtret är inte komplett!"
-#: include/class_management.inc:412
+#: include/class_management.inc:414
#: include/simpleplugin/class_simpleManagement.inc:716
msgid "Permission error"
msgstr "Rättighetsfel"
-#: include/class_management.inc:488
+#: include/class_management.inc:490
#: include/simpleplugin/class_simpleManagement.inc:749
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr "Du har inte tillåtelse att skapa en ögonblicksbild för %s."
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573
#: include/simpleplugin/class_simpleManagement.inc:799
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr "Du är inte tillåten att återskapa en ögonblicksbild för %s."
-#: include/class_management.inc:679
+#: include/class_management.inc:681
#, php-format
msgid ""
"No tab declaration for '%s' found in your configuration file. Cannot create "
@@ -2301,17 +2305,17 @@ msgstr "Konfigurationsfel"
#: include/class_config.inc:296
#, php-format
msgid ""
-"It seems you are trying to decode something which is not encoded : "
-"%s<br/>\\nPlease check you are not using a fusiondirectory.secrets file "
-"while your passwords are not encrypted."
-msgstr "Det verkar som att du försöker avkoda något som inte är kodat : %s<br/>\\nVänligen kontroller att du inte använder en fusiondirectory.secrets-fil medan dina lösenord inte är krypterade."
+"It seems you are trying to decode something which is not encoded : %s<br/>\n"
+"Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
+msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:918
-#: include/class_ldap.inc:1372 include/functions.inc:526
+#: include/class_config.inc:338 include/class_ldap.inc:895
+#: include/class_ldap.inc:1349 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
-#: include/simpleplugin/class_attribute.inc:2909
+#: include/functions.inc:2986 include/functions.inc:3160
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2910
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
@@ -2322,11 +2326,16 @@ msgstr "Det verkar som att du försöker avkoda något som inte är kodat : %s<b
msgid "LDAP error"
msgstr "LDAP-fel"
-#: include/class_config.inc:337
+#: include/class_config.inc:338
msgid "Cannot bind to LDAP. Please contact the system administrator."
msgstr "Kan inte koppla mot LDAP. Vänligen kontakta systemadministratören"
-#: include/class_config.inc:480
+#: include/class_config.inc:373
+#, php-format
+msgid "Location \"%s\" could not be found in the configuration file"
+msgstr ""
+
+#: include/class_config.inc:485
#, php-format
msgid "The selected mail method (class %s) is not available"
msgstr "Den valda epostmetoden (klassen %s) är inte tillgänglig"
@@ -2362,49 +2371,49 @@ msgstr "Prestandavarning"
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr "LDAP-prestanda är låg: senaste frågan tog runt %.2fs!"
-#: include/class_ldap.inc:869 include/class_ldap.inc:905
+#: include/class_ldap.inc:846 include/class_ldap.inc:882
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
#: include/functions.inc:2346 include/class_session.inc:50
-#: include/class_session.inc:87 include/class_session.inc:125
+#: include/class_session.inc:88 include/class_session.inc:127
#: include/class_log.inc:96 include/class_acl.inc:118
msgid "Internal error"
msgstr "Internt fel"
-#: include/class_ldap.inc:869
+#: include/class_ldap.inc:846
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:905
+#: include/class_ldap.inc:882
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1017
+#: include/class_ldap.inc:994
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr "under operation på '%s' med LDAP-server '%s'"
-#: include/class_ldap.inc:1019
+#: include/class_ldap.inc:996
#, php-format
msgid "while operating on LDAP server %s"
msgstr "under operation på LDAP-server %s"
-#: include/class_ldap.inc:1109
+#: include/class_ldap.inc:1086
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1221
+#: include/class_ldap.inc:1198
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr "Det här är inte ett giltigt DN: '%s'. Ett importblock bör börja med 'dn: ...' på rad %s"
-#: include/class_ldap.inc:1232
+#: include/class_ldap.inc:1209
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2992,7 +3001,7 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr "Allvarligt fel: kan inte instansiera klassen '%s' - försök köra '%s' för att åtgärda detta"
-#: include/functions.inc:496 include/functions.inc:3295
+#: include/functions.inc:496 include/functions.inc:3297
#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
#: include/simpleplugin/class_simplePlugin.inc:269
#: include/simpleplugin/class_simplePlugin.inc:281
@@ -3204,9 +3213,9 @@ msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
#: include/functions.inc:3107 include/functions.inc:3128
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200
msgid "Cannot allocate a free ID:"
msgstr "Kan inte allokera ett fritt ID:"
@@ -3219,33 +3228,29 @@ msgstr "okänd idAllocation-metod!"
msgid "%sPoolMin >= %sPoolMax!"
msgstr "%sPoolMin >= %sPoolMax!"
-#: include/functions.inc:3158
-msgid "Cannot create sambaUnixIdPool entry!"
-msgstr "Kan inte skapa sambaUnixIdPool-post!"
-
-#: include/functions.inc:3166
+#: include/functions.inc:3168
msgid "sambaUnixIdPool is not unique!"
msgstr "sambaUnixIdPool är inte unik!"
-#: include/functions.inc:3178 include/functions.inc:3182
+#: include/functions.inc:3180 include/functions.inc:3184
msgid "no ID available!"
msgstr "inget ID tillgängligt!"
-#: include/functions.inc:3198
+#: include/functions.inc:3200
msgid "maximum tries exceeded!"
msgstr "maximalt antal försök överskridet!"
-#: include/functions.inc:3260
+#: include/functions.inc:3262
msgid "Cannot allocate a free ID!"
msgstr "Kan inte allokera ett fritt ID!"
-#: include/functions.inc:3296
+#: include/functions.inc:3298
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr "Kan inte lokalisera filen '%s' - vänligen kör '%s' för att åtgärda detta"
-#: include/class_session.inc:50 include/class_session.inc:87
-#: include/class_session.inc:125
+#: include/class_session.inc:50 include/class_session.inc:88
+#: include/class_session.inc:127
msgid "Requested channel does not exist! Please contact your Administrator."
msgstr "Begärd kanal finns inte! Vänligen kontakta din administratör"
@@ -3401,7 +3406,7 @@ msgid ""
" be done by others will get lost if you save this entry!"
msgstr ""
-#: include/class_plugin.inc:1467
+#: include/class_plugin.inc:1313
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -3533,7 +3538,7 @@ msgid "days"
msgstr ""
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2171
+#: include/simpleplugin/class_attribute.inc:2172
#, php-format
msgid "%s (required)"
msgstr "%s (krävs)"
@@ -3602,7 +3607,7 @@ msgid "%s (%d bytes)"
msgstr ""
#: include/simpleplugin/class_attribute.inc:1626
-#: include/simpleplugin/class_attribute.inc:1803
+#: include/simpleplugin/class_attribute.inc:1804
msgid "Upload"
msgstr "Ladda upp"
@@ -3611,22 +3616,22 @@ msgstr "Ladda upp"
msgid "Download"
msgstr "Ladda ner"
-#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1786
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr "Kan inte spara användarbild, FusionDirectory kräver att paketet 'php-imagick' är installerat!"
-#: include/simpleplugin/class_attribute.inc:1836
+#: include/simpleplugin/class_attribute.inc:1837
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr "Bas"
-#: include/simpleplugin/class_attribute.inc:1839
+#: include/simpleplugin/class_attribute.inc:1840
msgid "Object base"
msgstr "Objekt-bas"
-#: include/simpleplugin/class_attribute.inc:2769
+#: include/simpleplugin/class_attribute.inc:2770
#, php-format
msgid "Invalid value for %s"
msgstr "Ogiltigt värde för %s"
diff --git a/locale/ug/fusiondirectory.po b/locale/ug/fusiondirectory.po
index 08c2f7d477d4bc826b57e1c346e0640930e50fb3..18c4cea0aeae29e7b3b592636e9d9d095ec9dee8 100644
--- a/locale/ug/fusiondirectory.po
+++ b/locale/ug/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-03-14 12:07+0100\n"
-"PO-Revision-Date: 2016-03-07 12:09+0000\n"
+"POT-Creation-Date: 2016-04-06 11:27+0200\n"
+"PO-Revision-Date: 2016-04-06 09:24+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"
@@ -52,7 +52,7 @@ msgstr ""
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:174
+#: plugins/admin/departments/class_department.inc:176
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -75,7 +75,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:73
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/aclrole/class_aclRole.inc:105
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
msgid "Description"
@@ -281,8 +281,8 @@ msgstr ""
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
#: include/simpleplugin/class_dialogAttributes.inc:632
#: include/simpleplugin/class_dialogAttributes.inc:633
-#: include/simpleplugin/class_attribute.inc:2675
#: include/simpleplugin/class_attribute.inc:2676
+#: include/simpleplugin/class_attribute.inc:2677
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -393,7 +393,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:34
#: plugins/admin/departments/class_department.inc:40
#: plugins/admin/departments/dep-list.xml:21
-#: plugins/personal/generic/class_user.inc:394
+#: plugins/personal/generic/class_user.inc:419
msgid "Department"
msgstr ""
@@ -441,7 +441,7 @@ msgid "Website of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:85
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:435
msgid "Manager"
msgstr ""
@@ -452,12 +452,12 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:91
#: plugins/admin/departments/class_department.inc:97
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:329
msgid "Location"
msgstr ""
#: plugins/admin/departments/class_department.inc:94
-#: plugins/personal/generic/class_user.inc:308
+#: plugins/personal/generic/class_user.inc:333
msgid "State"
msgstr ""
@@ -469,7 +469,7 @@ msgid "Country"
msgstr ""
#: plugins/admin/departments/class_department.inc:103
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Address"
msgstr ""
@@ -479,7 +479,7 @@ msgid "A postal address for this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:107
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Phone"
msgstr ""
@@ -488,7 +488,7 @@ msgid "Telephone number"
msgstr ""
#: plugins/admin/departments/class_department.inc:111
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Fax"
msgstr ""
@@ -541,7 +541,7 @@ msgstr ""
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:415
msgid "Organization"
msgstr ""
@@ -562,7 +562,7 @@ msgid "Given name"
msgstr ""
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
@@ -570,8 +570,8 @@ msgid "Login"
msgstr ""
#: plugins/admin/users/user-list.xml:79
-#: plugins/personal/generic/class_user.inc:246
-#: plugins/personal/generic/class_user.inc:252
+#: plugins/personal/generic/class_user.inc:271
+#: plugins/personal/generic/class_user.inc:277
msgid "User"
msgstr ""
@@ -624,9 +624,9 @@ msgid "Manage user accounts and their properties"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:140
-#: include/class_management.inc:341 include/class_management.inc:488
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571 include/class_CopyPasteHandler.inc:248
+#: include/class_management.inc:343 include/class_management.inc:490
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573 include/class_CopyPasteHandler.inc:248
#: include/simpleplugin/class_simpleManagement.inc:651
#: include/simpleplugin/class_simpleManagement.inc:749
#: include/simpleplugin/class_simpleManagement.inc:799
@@ -653,12 +653,12 @@ msgid "Lock account"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:253
+#: plugins/personal/generic/class_user.inc:278
msgid "User account"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:247
+#: plugins/personal/generic/class_user.inc:272
msgid "User account information"
msgstr ""
@@ -676,8 +676,8 @@ msgid "Edit category ACL"
msgstr ""
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
-#: include/simpleplugin/class_attribute.inc:2686
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2686
+#: include/simpleplugin/class_attribute.inc:2687
#, php-format
msgid "Delete"
msgstr ""
@@ -928,7 +928,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -949,215 +949,219 @@ msgstr ""
msgid "Same password as above, to avoid errors"
msgstr ""
-#: plugins/personal/generic/class_user.inc:274
+#: plugins/personal/generic/class_user.inc:299
msgid "Personal information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
msgid "Last name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
msgid "First name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
msgid "Short description of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "Picture"
msgstr ""
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "The avatar for this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:300
+#: plugins/personal/generic/class_user.inc:325
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Business postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Business phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Mobile"
msgstr ""
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Business mobile number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Pager"
msgstr ""
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:367
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:351
+#: plugins/personal/generic/class_user.inc:376
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr ""
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:387
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Display name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Private phone"
msgstr ""
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Home phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:405
msgid "Organizational information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid "Title"
msgstr ""
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid ""
"Title of a person in their organizational context. Each title is one value "
"of this multi-valued attribute"
msgstr ""
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:419
+msgid "Department to which the user belongs"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:423
msgid "Department No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:423
msgid "Department number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee No."
msgstr ""
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:431
msgid "Employee type"
msgstr ""
-#: plugins/personal/generic/class_user.inc:568
+#: plugins/personal/generic/class_user.inc:593
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:571
+#: plugins/personal/generic/class_user.inc:596
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:581
+#: plugins/personal/generic/class_user.inc:606
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:595
+#: plugins/personal/generic/class_user.inc:620
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:600
-#: plugins/personal/generic/class_user.inc:604
+#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:629
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:636
msgid "You need to specify your current password in order to proceed."
msgstr ""
-#: plugins/personal/generic/class_user.inc:613
+#: plugins/personal/generic/class_user.inc:638
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:615
+#: plugins/personal/generic/class_user.inc:640
#: ihtml/themes/default/recovery.tpl.c:26
#: ihtml/themes/default/recovery.tpl.c:29
msgid "New password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:617
+#: plugins/personal/generic/class_user.inc:642
msgid "The password used as new and current are too similar."
msgstr ""
-#: plugins/personal/generic/class_user.inc:619
+#: plugins/personal/generic/class_user.inc:644
msgid "The password used as new is to short."
msgstr ""
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:646
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
@@ -2133,13 +2137,13 @@ msgstr ""
msgid "Down"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
-#: include/simpleplugin/class_attribute.inc:2648
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2648
+#: include/simpleplugin/class_attribute.inc:2649
msgid "Sort up"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
-#: include/simpleplugin/class_attribute.inc:2661
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2661
+#: include/simpleplugin/class_attribute.inc:2662
msgid "Sort down"
msgstr ""
@@ -2147,23 +2151,23 @@ msgstr ""
msgid "Select all"
msgstr ""
-#: include/class_listing.inc:537 include/class_management.inc:679
-#: include/class_config.inc:479 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3107
-#: include/functions.inc:3128 include/functions.inc:3158
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198 include/functions.inc:3260
+#: include/class_listing.inc:537 include/class_management.inc:681
+#: include/class_config.inc:373 include/class_config.inc:484
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:682
+#: include/class_msgPool.inc:713 include/class_msgPool.inc:740
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200 include/functions.inc:3262
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/class_plugin.inc:1510 include/class_CopyPasteHandler.inc:278
#: include/simpleplugin/class_attribute.inc:1540
#: include/simpleplugin/class_attribute.inc:1543
#: include/simpleplugin/class_attribute.inc:1546
-#: include/simpleplugin/class_attribute.inc:1784
-#: include/simpleplugin/class_attribute.inc:1887
-#: include/simpleplugin/class_attribute.inc:1889
+#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1888
+#: include/simpleplugin/class_attribute.inc:1890
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: include/password-methods/class_password-methods-sasl.inc:60
@@ -2250,33 +2254,33 @@ msgstr ""
msgid "Create a new snapshot from this object"
msgstr ""
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "Filter error"
msgstr ""
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "The filter is incomplete!"
msgstr ""
-#: include/class_management.inc:412
+#: include/class_management.inc:414
#: include/simpleplugin/class_simpleManagement.inc:716
msgid "Permission error"
msgstr ""
-#: include/class_management.inc:488
+#: include/class_management.inc:490
#: include/simpleplugin/class_simpleManagement.inc:749
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr ""
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573
#: include/simpleplugin/class_simpleManagement.inc:799
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr ""
-#: include/class_management.inc:679
+#: include/class_management.inc:681
#, php-format
msgid ""
"No tab declaration for '%s' found in your configuration file. Cannot create "
@@ -2301,17 +2305,17 @@ msgstr ""
#: include/class_config.inc:296
#, php-format
msgid ""
-"It seems you are trying to decode something which is not encoded : "
-"%s<br/>\\nPlease check you are not using a fusiondirectory.secrets file "
-"while your passwords are not encrypted."
+"It seems you are trying to decode something which is not encoded : %s<br/>\n"
+"Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:918
-#: include/class_ldap.inc:1372 include/functions.inc:526
+#: include/class_config.inc:338 include/class_ldap.inc:895
+#: include/class_ldap.inc:1349 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
-#: include/simpleplugin/class_attribute.inc:2909
+#: include/functions.inc:2986 include/functions.inc:3160
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2910
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
@@ -2322,11 +2326,16 @@ msgstr ""
msgid "LDAP error"
msgstr ""
-#: include/class_config.inc:337
+#: include/class_config.inc:338
msgid "Cannot bind to LDAP. Please contact the system administrator."
msgstr ""
-#: include/class_config.inc:480
+#: include/class_config.inc:373
+#, php-format
+msgid "Location \"%s\" could not be found in the configuration file"
+msgstr ""
+
+#: include/class_config.inc:485
#, php-format
msgid "The selected mail method (class %s) is not available"
msgstr ""
@@ -2362,49 +2371,49 @@ msgstr ""
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr ""
-#: include/class_ldap.inc:869 include/class_ldap.inc:905
+#: include/class_ldap.inc:846 include/class_ldap.inc:882
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
#: include/functions.inc:2346 include/class_session.inc:50
-#: include/class_session.inc:87 include/class_session.inc:125
+#: include/class_session.inc:88 include/class_session.inc:127
#: include/class_log.inc:96 include/class_acl.inc:118
msgid "Internal error"
msgstr ""
-#: include/class_ldap.inc:869
+#: include/class_ldap.inc:846
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:905
+#: include/class_ldap.inc:882
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1017
+#: include/class_ldap.inc:994
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr ""
-#: include/class_ldap.inc:1019
+#: include/class_ldap.inc:996
#, php-format
msgid "while operating on LDAP server %s"
msgstr ""
-#: include/class_ldap.inc:1109
+#: include/class_ldap.inc:1086
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1221
+#: include/class_ldap.inc:1198
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr ""
-#: include/class_ldap.inc:1232
+#: include/class_ldap.inc:1209
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2992,7 +3001,7 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr ""
-#: include/functions.inc:496 include/functions.inc:3295
+#: include/functions.inc:496 include/functions.inc:3297
#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
#: include/simpleplugin/class_simplePlugin.inc:269
#: include/simpleplugin/class_simplePlugin.inc:281
@@ -3204,9 +3213,9 @@ msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
#: include/functions.inc:3107 include/functions.inc:3128
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200
msgid "Cannot allocate a free ID:"
msgstr ""
@@ -3219,33 +3228,29 @@ msgstr ""
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3158
-msgid "Cannot create sambaUnixIdPool entry!"
-msgstr ""
-
-#: include/functions.inc:3166
+#: include/functions.inc:3168
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3178 include/functions.inc:3182
+#: include/functions.inc:3180 include/functions.inc:3184
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3198
+#: include/functions.inc:3200
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3260
+#: include/functions.inc:3262
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3296
+#: include/functions.inc:3298
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
-#: include/class_session.inc:50 include/class_session.inc:87
-#: include/class_session.inc:125
+#: include/class_session.inc:50 include/class_session.inc:88
+#: include/class_session.inc:127
msgid "Requested channel does not exist! Please contact your Administrator."
msgstr ""
@@ -3401,7 +3406,7 @@ msgid ""
" be done by others will get lost if you save this entry!"
msgstr ""
-#: include/class_plugin.inc:1467
+#: include/class_plugin.inc:1313
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -3533,7 +3538,7 @@ msgid "days"
msgstr ""
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2171
+#: include/simpleplugin/class_attribute.inc:2172
#, php-format
msgid "%s (required)"
msgstr ""
@@ -3602,7 +3607,7 @@ msgid "%s (%d bytes)"
msgstr ""
#: include/simpleplugin/class_attribute.inc:1626
-#: include/simpleplugin/class_attribute.inc:1803
+#: include/simpleplugin/class_attribute.inc:1804
msgid "Upload"
msgstr ""
@@ -3611,22 +3616,22 @@ msgstr ""
msgid "Download"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1786
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1836
+#: include/simpleplugin/class_attribute.inc:1837
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1839
+#: include/simpleplugin/class_attribute.inc:1840
msgid "Object base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:2769
+#: include/simpleplugin/class_attribute.inc:2770
#, php-format
msgid "Invalid value for %s"
msgstr ""
diff --git a/locale/vi_VN/fusiondirectory.po b/locale/vi_VN/fusiondirectory.po
index 91bc24a1c4b0a043bf13f62323217968653d80b9..bb8c7dfa20cc7d9b7830077ae98bf4eb1cec4b8e 100644
--- a/locale/vi_VN/fusiondirectory.po
+++ b/locale/vi_VN/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-03-14 12:07+0100\n"
-"PO-Revision-Date: 2016-03-07 12:09+0000\n"
+"POT-Creation-Date: 2016-04-06 11:27+0200\n"
+"PO-Revision-Date: 2016-04-06 09:24+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"
@@ -52,7 +52,7 @@ msgstr ""
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:174
+#: plugins/admin/departments/class_department.inc:176
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -75,7 +75,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:73
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/aclrole/class_aclRole.inc:105
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
msgid "Description"
@@ -281,8 +281,8 @@ msgstr "Tạo "
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
#: include/simpleplugin/class_dialogAttributes.inc:632
#: include/simpleplugin/class_dialogAttributes.inc:633
-#: include/simpleplugin/class_attribute.inc:2675
#: include/simpleplugin/class_attribute.inc:2676
+#: include/simpleplugin/class_attribute.inc:2677
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -393,7 +393,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:34
#: plugins/admin/departments/class_department.inc:40
#: plugins/admin/departments/dep-list.xml:21
-#: plugins/personal/generic/class_user.inc:394
+#: plugins/personal/generic/class_user.inc:419
msgid "Department"
msgstr "Bá»™ pháºn"
@@ -441,7 +441,7 @@ msgid "Website of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:85
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:435
msgid "Manager"
msgstr ""
@@ -452,12 +452,12 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:91
#: plugins/admin/departments/class_department.inc:97
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:329
msgid "Location"
msgstr "Vị trÃ"
#: plugins/admin/departments/class_department.inc:94
-#: plugins/personal/generic/class_user.inc:308
+#: plugins/personal/generic/class_user.inc:333
msgid "State"
msgstr "Bang"
@@ -469,7 +469,7 @@ msgid "Country"
msgstr "Quốc Gia"
#: plugins/admin/departments/class_department.inc:103
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Address"
msgstr "Äịa chỉ"
@@ -479,7 +479,7 @@ msgid "A postal address for this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:107
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Phone"
msgstr "Số điện thoại"
@@ -488,7 +488,7 @@ msgid "Telephone number"
msgstr ""
#: plugins/admin/departments/class_department.inc:111
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Fax"
msgstr "Số fax"
@@ -541,7 +541,7 @@ msgstr "Danh sách các bá»™ pháºn"
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:415
msgid "Organization"
msgstr "Tổ chức"
@@ -562,7 +562,7 @@ msgid "Given name"
msgstr "Tên tháºt"
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
@@ -570,8 +570,8 @@ msgid "Login"
msgstr "Äăng nháºp"
#: plugins/admin/users/user-list.xml:79
-#: plugins/personal/generic/class_user.inc:246
-#: plugins/personal/generic/class_user.inc:252
+#: plugins/personal/generic/class_user.inc:271
+#: plugins/personal/generic/class_user.inc:277
msgid "User"
msgstr "NgÆ°á»i dùng"
@@ -624,9 +624,9 @@ msgid "Manage user accounts and their properties"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:140
-#: include/class_management.inc:341 include/class_management.inc:488
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571 include/class_CopyPasteHandler.inc:248
+#: include/class_management.inc:343 include/class_management.inc:490
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573 include/class_CopyPasteHandler.inc:248
#: include/simpleplugin/class_simpleManagement.inc:651
#: include/simpleplugin/class_simpleManagement.inc:749
#: include/simpleplugin/class_simpleManagement.inc:799
@@ -653,12 +653,12 @@ msgid "Lock account"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:253
+#: plugins/personal/generic/class_user.inc:278
msgid "User account"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:247
+#: plugins/personal/generic/class_user.inc:272
msgid "User account information"
msgstr ""
@@ -676,8 +676,8 @@ msgid "Edit category ACL"
msgstr "Hiệu chÃnh mục ACL"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
-#: include/simpleplugin/class_attribute.inc:2686
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2686
+#: include/simpleplugin/class_attribute.inc:2687
#, php-format
msgid "Delete"
msgstr "Xóa"
@@ -928,7 +928,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -949,215 +949,219 @@ msgstr ""
msgid "Same password as above, to avoid errors"
msgstr ""
-#: plugins/personal/generic/class_user.inc:274
+#: plugins/personal/generic/class_user.inc:299
msgid "Personal information"
msgstr "Thông tin cá nhân"
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "Há»"
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
msgid "Last name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "Tên"
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
msgid "First name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
msgid "Short description of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "Picture"
msgstr ""
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "The avatar for this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:300
+#: plugins/personal/generic/class_user.inc:325
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Business postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room No."
msgstr "Số phòng"
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room number"
msgstr "Số phòng"
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Business phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Mobile"
msgstr "Äiện thoại di Ä‘á»™ng"
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Business mobile number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Pager"
msgstr "Máy nhắn tin"
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Homepage"
msgstr "Trang chủ"
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:367
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:351
+#: plugins/personal/generic/class_user.inc:376
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr "Ngôn ngữ muốn sỠdụng"
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:387
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Display name"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home postal address"
msgstr "Äại chỉ nhà theo bÆ°u Ä‘iện"
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Private phone"
msgstr "Số điện thoại riêng"
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Home phone number"
msgstr "Số điện thoại nhà "
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:405
msgid "Organizational information"
msgstr "Thông tin vỠtổ chức"
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid "Title"
msgstr ""
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid ""
"Title of a person in their organizational context. Each title is one value "
"of this multi-valued attribute"
msgstr ""
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:419
+msgid "Department to which the user belongs"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:423
msgid "Department No."
msgstr "Số phòng ban"
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:423
msgid "Department number"
msgstr "Số phòng là m việc"
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee No."
msgstr "Số nhân viên"
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee number"
msgstr "Số nhân viên"
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:431
msgid "Employee type"
msgstr "Loại nhân viên"
-#: plugins/personal/generic/class_user.inc:568
+#: plugins/personal/generic/class_user.inc:593
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:571
+#: plugins/personal/generic/class_user.inc:596
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:581
+#: plugins/personal/generic/class_user.inc:606
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:595
+#: plugins/personal/generic/class_user.inc:620
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:600
-#: plugins/personal/generic/class_user.inc:604
+#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:629
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:636
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:613
+#: plugins/personal/generic/class_user.inc:638
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:615
+#: plugins/personal/generic/class_user.inc:640
#: ihtml/themes/default/recovery.tpl.c:26
#: ihtml/themes/default/recovery.tpl.c:29
msgid "New password"
msgstr "Máºt khẩu má»›i"
-#: plugins/personal/generic/class_user.inc:617
+#: plugins/personal/generic/class_user.inc:642
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:619
+#: plugins/personal/generic/class_user.inc:644
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:621
+#: plugins/personal/generic/class_user.inc:646
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
@@ -2133,13 +2137,13 @@ msgstr "Lên"
msgid "Down"
msgstr "Xuống"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
-#: include/simpleplugin/class_attribute.inc:2648
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2648
+#: include/simpleplugin/class_attribute.inc:2649
msgid "Sort up"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
-#: include/simpleplugin/class_attribute.inc:2661
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2661
+#: include/simpleplugin/class_attribute.inc:2662
msgid "Sort down"
msgstr ""
@@ -2147,23 +2151,23 @@ msgstr ""
msgid "Select all"
msgstr "Chá»n tất"
-#: include/class_listing.inc:537 include/class_management.inc:679
-#: include/class_config.inc:479 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3107
-#: include/functions.inc:3128 include/functions.inc:3158
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198 include/functions.inc:3260
+#: include/class_listing.inc:537 include/class_management.inc:681
+#: include/class_config.inc:373 include/class_config.inc:484
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:682
+#: include/class_msgPool.inc:713 include/class_msgPool.inc:740
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200 include/functions.inc:3262
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/class_plugin.inc:1510 include/class_CopyPasteHandler.inc:278
#: include/simpleplugin/class_attribute.inc:1540
#: include/simpleplugin/class_attribute.inc:1543
#: include/simpleplugin/class_attribute.inc:1546
-#: include/simpleplugin/class_attribute.inc:1784
-#: include/simpleplugin/class_attribute.inc:1887
-#: include/simpleplugin/class_attribute.inc:1889
+#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1888
+#: include/simpleplugin/class_attribute.inc:1890
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: include/password-methods/class_password-methods-sasl.inc:60
@@ -2250,33 +2254,33 @@ msgstr "Tạo ra snapshot"
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_management.inc:164
+#: include/class_management.inc:165
msgid "Filter error"
msgstr ""
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "The filter is incomplete!"
msgstr ""
-#: include/class_management.inc:412
+#: include/class_management.inc:414
#: include/simpleplugin/class_simpleManagement.inc:716
msgid "Permission error"
msgstr "Lỗi vỠcấp phép"
-#: include/class_management.inc:488
+#: include/class_management.inc:490
#: include/simpleplugin/class_simpleManagement.inc:749
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr "Bạn không được phép tạo ra snapshot cho %s."
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573
#: include/simpleplugin/class_simpleManagement.inc:799
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr "Bạn không được phép phục hồi một snapshot cho %s."
-#: include/class_management.inc:679
+#: include/class_management.inc:681
#, php-format
msgid ""
"No tab declaration for '%s' found in your configuration file. Cannot create "
@@ -2301,17 +2305,17 @@ msgstr "Lỗi cấu hình"
#: include/class_config.inc:296
#, php-format
msgid ""
-"It seems you are trying to decode something which is not encoded : "
-"%s<br/>\\nPlease check you are not using a fusiondirectory.secrets file "
-"while your passwords are not encrypted."
+"It seems you are trying to decode something which is not encoded : %s<br/>\n"
+"Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:918
-#: include/class_ldap.inc:1372 include/functions.inc:526
+#: include/class_config.inc:338 include/class_ldap.inc:895
+#: include/class_ldap.inc:1349 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
-#: include/simpleplugin/class_attribute.inc:2909
+#: include/functions.inc:2986 include/functions.inc:3160
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2910
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
@@ -2322,11 +2326,16 @@ msgstr ""
msgid "LDAP error"
msgstr "Lá»—i LDAP"
-#: include/class_config.inc:337
+#: include/class_config.inc:338
msgid "Cannot bind to LDAP. Please contact the system administrator."
msgstr "Không thể nối kết với LDAP. Xin hãy liên lạc với với admin hệ thống."
-#: include/class_config.inc:480
+#: include/class_config.inc:373
+#, php-format
+msgid "Location \"%s\" could not be found in the configuration file"
+msgstr ""
+
+#: include/class_config.inc:485
#, php-format
msgid "The selected mail method (class %s) is not available"
msgstr ""
@@ -2362,49 +2371,49 @@ msgstr "Cảnh báo khả năng hoạt động"
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr "Khả năng hoạt động của LDAP rất thấp: truy vấn lần cuối mất khoảng %.2fs!"
-#: include/class_ldap.inc:869 include/class_ldap.inc:905
+#: include/class_ldap.inc:846 include/class_ldap.inc:882
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
#: include/functions.inc:2346 include/class_session.inc:50
-#: include/class_session.inc:87 include/class_session.inc:125
+#: include/class_session.inc:88 include/class_session.inc:127
#: include/class_log.inc:96 include/class_acl.inc:118
msgid "Internal error"
msgstr "Lá»—i ná»™i bá»™"
-#: include/class_ldap.inc:869
+#: include/class_ldap.inc:846
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:905
+#: include/class_ldap.inc:882
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1017
+#: include/class_ldap.inc:994
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr "Trong khi chạy trên '%s' sỠdụng LDAP server '%s'"
-#: include/class_ldap.inc:1019
+#: include/class_ldap.inc:996
#, php-format
msgid "while operating on LDAP server %s"
msgstr "Trong khi chạy trên LDAP server %s"
-#: include/class_ldap.inc:1109
+#: include/class_ldap.inc:1086
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1221
+#: include/class_ldap.inc:1198
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr "Äây không phải là má»™t DN hợp lệ: '%s'. Khóa để chặn việc nạp thêm phải được bắt đầu vá»›i 'dn:...' trong dòng %s "
-#: include/class_ldap.inc:1232
+#: include/class_ldap.inc:1209
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2992,7 +3001,7 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr "Lá»—i nghiêm trá»ng: không thể tạo ra lá»›p '%s' - hãy thá» chạy '%s' để sá»a lá»—i nà y"
-#: include/functions.inc:496 include/functions.inc:3295
+#: include/functions.inc:496 include/functions.inc:3297
#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
#: include/simpleplugin/class_simplePlugin.inc:269
#: include/simpleplugin/class_simplePlugin.inc:281
@@ -3204,9 +3213,9 @@ msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
#: include/functions.inc:3107 include/functions.inc:3128
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200
msgid "Cannot allocate a free ID:"
msgstr ""
@@ -3219,33 +3228,29 @@ msgstr ""
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3158
-msgid "Cannot create sambaUnixIdPool entry!"
-msgstr ""
-
-#: include/functions.inc:3166
+#: include/functions.inc:3168
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3178 include/functions.inc:3182
+#: include/functions.inc:3180 include/functions.inc:3184
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3198
+#: include/functions.inc:3200
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3260
+#: include/functions.inc:3262
msgid "Cannot allocate a free ID!"
msgstr "Không thể phân phối má»™t ID miá»…n phÃ!"
-#: include/functions.inc:3296
+#: include/functions.inc:3298
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr "Không thể xác định vị trà file '%s'- xin hãy chạy '%s' để sá»a lá»—i nà y!"
-#: include/class_session.inc:50 include/class_session.inc:87
-#: include/class_session.inc:125
+#: include/class_session.inc:50 include/class_session.inc:88
+#: include/class_session.inc:127
msgid "Requested channel does not exist! Please contact your Administrator."
msgstr ""
@@ -3401,7 +3406,7 @@ msgid ""
" be done by others will get lost if you save this entry!"
msgstr ""
-#: include/class_plugin.inc:1467
+#: include/class_plugin.inc:1313
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -3533,7 +3538,7 @@ msgid "days"
msgstr ""
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2171
+#: include/simpleplugin/class_attribute.inc:2172
#, php-format
msgid "%s (required)"
msgstr ""
@@ -3602,7 +3607,7 @@ msgid "%s (%d bytes)"
msgstr ""
#: include/simpleplugin/class_attribute.inc:1626
-#: include/simpleplugin/class_attribute.inc:1803
+#: include/simpleplugin/class_attribute.inc:1804
msgid "Upload"
msgstr ""
@@ -3611,22 +3616,22 @@ msgstr ""
msgid "Download"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1786
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1836
+#: include/simpleplugin/class_attribute.inc:1837
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr "Cơ sở"
-#: include/simpleplugin/class_attribute.inc:1839
+#: include/simpleplugin/class_attribute.inc:1840
msgid "Object base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:2769
+#: include/simpleplugin/class_attribute.inc:2770
#, php-format
msgid "Invalid value for %s"
msgstr ""
diff --git a/locale/zh/fusiondirectory.po b/locale/zh/fusiondirectory.po
index a968e78bea4d5b5f78fa299e149acd0b52cbeba7..d0c2bfea4309444bd5b703ed7be80f2db590b7ad 100644
--- a/locale/zh/fusiondirectory.po
+++ b/locale/zh/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory-110\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-03-14 12:07+0100\n"
-"PO-Revision-Date: 2016-03-07 12:09+0000\n"
+"POT-Creation-Date: 2016-04-06 11:27+0200\n"
+"PO-Revision-Date: 2016-04-06 09:24+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"
@@ -52,7 +52,7 @@ msgstr ""
#: plugins/admin/groups/class_group.inc:61
#: plugins/admin/groups/class_ogroup.inc:187
#: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/departments/class_department.inc:174
+#: plugins/admin/departments/class_department.inc:176
#: plugins/admin/aclrole/class_aclRole.inc:101
#: include/simpleplugin/simple-select-list.xml:32
#: include/simpleplugin/simple-list.xml:32
@@ -75,7 +75,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:73
#: plugins/admin/departments/dep-list.xml:29
#: plugins/admin/aclrole/class_aclRole.inc:105
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
#: include/simpleplugin/simple-select-list.xml:40
#: include/simpleplugin/simple-list.xml:40
msgid "Description"
@@ -281,8 +281,8 @@ msgstr "创建"
#: plugins/admin/aclrole/class_aclEditionDialog.inc:192
#: include/simpleplugin/class_dialogAttributes.inc:632
#: include/simpleplugin/class_dialogAttributes.inc:633
-#: include/simpleplugin/class_attribute.inc:2675
#: include/simpleplugin/class_attribute.inc:2676
+#: include/simpleplugin/class_attribute.inc:2677
#: include/simpleplugin/simple-list.xml:67
#: include/simpleplugin/simple-list.xml:112
msgid "Edit"
@@ -393,7 +393,7 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:34
#: plugins/admin/departments/class_department.inc:40
#: plugins/admin/departments/dep-list.xml:21
-#: plugins/personal/generic/class_user.inc:394
+#: plugins/personal/generic/class_user.inc:419
msgid "Department"
msgstr "部门"
@@ -441,7 +441,7 @@ msgid "Website of this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:85
-#: plugins/personal/generic/class_user.inc:410
+#: plugins/personal/generic/class_user.inc:435
msgid "Manager"
msgstr ""
@@ -452,12 +452,12 @@ msgstr ""
#: plugins/admin/departments/class_department.inc:91
#: plugins/admin/departments/class_department.inc:97
-#: plugins/personal/generic/class_user.inc:304
+#: plugins/personal/generic/class_user.inc:329
msgid "Location"
msgstr "ä½ç½®"
#: plugins/admin/departments/class_department.inc:94
-#: plugins/personal/generic/class_user.inc:308
+#: plugins/personal/generic/class_user.inc:333
msgid "State"
msgstr "å·ž/çœ"
@@ -469,7 +469,7 @@ msgid "Country"
msgstr "国家"
#: plugins/admin/departments/class_department.inc:103
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Address"
msgstr "ä½å€"
@@ -479,7 +479,7 @@ msgid "A postal address for this %s"
msgstr ""
#: plugins/admin/departments/class_department.inc:107
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Phone"
msgstr "电è¯"
@@ -488,7 +488,7 @@ msgid "Telephone number"
msgstr ""
#: plugins/admin/departments/class_department.inc:111
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Fax"
msgstr "ä¼ çœŸ"
@@ -541,7 +541,7 @@ msgstr "部门列表"
#: plugins/admin/departments/class_organization.inc:30
#: plugins/admin/departments/class_organization.inc:31
#: plugins/admin/departments/class_organization.inc:34
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:415
msgid "Organization"
msgstr "组织/å…¬å¸"
@@ -562,7 +562,7 @@ msgid "Given name"
msgstr "å"
#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
#: include/select/userSelect/class_userSelect.inc:32
#: plugins/personal/generic/paste_generic.tpl.c:11
#: ihtml/themes/default/recovery.tpl.c:23
@@ -570,8 +570,8 @@ msgid "Login"
msgstr "登录å"
#: plugins/admin/users/user-list.xml:79
-#: plugins/personal/generic/class_user.inc:246
-#: plugins/personal/generic/class_user.inc:252
+#: plugins/personal/generic/class_user.inc:271
+#: plugins/personal/generic/class_user.inc:277
msgid "User"
msgstr "用户"
@@ -624,9 +624,9 @@ msgid "Manage user accounts and their properties"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:140
-#: include/class_management.inc:341 include/class_management.inc:488
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571 include/class_CopyPasteHandler.inc:248
+#: include/class_management.inc:343 include/class_management.inc:490
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573 include/class_CopyPasteHandler.inc:248
#: include/simpleplugin/class_simpleManagement.inc:651
#: include/simpleplugin/class_simpleManagement.inc:749
#: include/simpleplugin/class_simpleManagement.inc:799
@@ -653,12 +653,12 @@ msgid "Lock account"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:253
+#: plugins/personal/generic/class_user.inc:278
msgid "User account"
msgstr ""
#: plugins/admin/users/class_userManagement.inc:236
-#: plugins/personal/generic/class_user.inc:247
+#: plugins/personal/generic/class_user.inc:272
msgid "User account information"
msgstr ""
@@ -676,8 +676,8 @@ msgid "Edit category ACL"
msgstr ""
#: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2685
-#: include/simpleplugin/class_attribute.inc:2686
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2686
+#: include/simpleplugin/class_attribute.inc:2687
#, php-format
msgid "Delete"
msgstr "åˆ é™¤"
@@ -928,7 +928,7 @@ msgid "Password hash method to use"
msgstr ""
#: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
#: plugins/personal/generic/paste_generic.tpl.c:14
#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
@@ -949,215 +949,219 @@ msgstr ""
msgid "Same password as above, to avoid errors"
msgstr ""
-#: plugins/personal/generic/class_user.inc:274
+#: plugins/personal/generic/class_user.inc:299
msgid "Personal information"
msgstr "个人信æ¯"
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
#: plugins/personal/generic/paste_generic.tpl.c:5
msgid "Last name"
msgstr "姓"
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:304
msgid "Last name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
#: plugins/personal/generic/paste_generic.tpl.c:8
msgid "First name"
msgstr "å"
-#: plugins/personal/generic/class_user.inc:284
+#: plugins/personal/generic/class_user.inc:309
msgid "First name of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:314
msgid "Short description of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "Picture"
msgstr ""
-#: plugins/personal/generic/class_user.inc:293
+#: plugins/personal/generic/class_user.inc:318
msgid "The avatar for this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:300
+#: plugins/personal/generic/class_user.inc:325
msgid "Organizational contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:337
msgid "Business postal address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room No."
msgstr "房间å·"
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:341
msgid "Room number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:320
+#: plugins/personal/generic/class_user.inc:345
msgid "Business phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Mobile"
msgstr "手机"
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:349
msgid "Business mobile number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Pager"
msgstr "呼机"
-#: plugins/personal/generic/class_user.inc:328
+#: plugins/personal/generic/class_user.inc:353
msgid "Business pager number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:357
msgid "Business fax number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Homepage"
msgstr "个人主页"
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:361
msgid "Personal homepage"
msgstr ""
-#: plugins/personal/generic/class_user.inc:342
+#: plugins/personal/generic/class_user.inc:367
msgid "Account information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:347
+#: plugins/personal/generic/class_user.inc:372
msgid "Login of this user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:351
+#: plugins/personal/generic/class_user.inc:376
#: setup/class_setupStep_Language.inc:30
msgid "Preferred language"
msgstr ""
-#: plugins/personal/generic/class_user.inc:356
+#: plugins/personal/generic/class_user.inc:381
msgid "Password of the user"
msgstr ""
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:387
msgid "Personal contact information"
msgstr ""
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Display name"
msgstr "显示å称"
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:391
msgid "Name this user should appear as. Used by Exchange."
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home address"
msgstr ""
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:395
msgid "Home postal address"
msgstr "ä½å®…地å€"
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Private phone"
msgstr "ç§äººç”µè¯"
-#: plugins/personal/generic/class_user.inc:374
+#: plugins/personal/generic/class_user.inc:399
msgid "Home phone number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:405
msgid "Organizational information"
msgstr "组织信æ¯"
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid "Title"
msgstr "称谓"
-#: plugins/personal/generic/class_user.inc:385
+#: plugins/personal/generic/class_user.inc:410
msgid ""
"Title of a person in their organizational context. Each title is one value "
"of this multi-valued attribute"
msgstr ""
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:419
+msgid "Department to which the user belongs"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:423
msgid "Department No."
msgstr "部门编å·"
-#: plugins/personal/generic/class_user.inc:398
+#: plugins/personal/generic/class_user.inc:423
msgid "Department number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee No."
msgstr "员工编å·"
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:427
msgid "Employee number"
msgstr ""
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:431
msgid "Employee type"
msgstr "员工类别"
-#: plugins/personal/generic/class_user.inc:568
+#: plugins/personal/generic/class_user.inc:593
#, php-format
msgid "Ppolicy \"%s\" could not be found in the LDAP!"
msgstr ""
-#: plugins/personal/generic/class_user.inc:571
+#: plugins/personal/generic/class_user.inc:596
msgid "You are not allowed to change your own password"
msgstr ""
-#: plugins/personal/generic/class_user.inc:581
+#: plugins/personal/generic/class_user.inc:606
#, php-format
msgid "You must wait %d seconds before changing your password again"
msgstr ""
-#: plugins/personal/generic/class_user.inc:595
+#: plugins/personal/generic/class_user.inc:620
msgid "Password is in history of old passwords"
msgstr ""
-#: plugins/personal/generic/class_user.inc:600
-#: plugins/personal/generic/class_user.inc:604
+#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:629
msgid "Password is not being changed from existing value"
msgstr ""
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:636
msgid "You need to specify your current password in order to proceed."
msgstr "您需è¦è¾“入当å‰å£ä»¤æ‰èƒ½ç»§ç»ã€‚"
-#: plugins/personal/generic/class_user.inc:613
+#: plugins/personal/generic/class_user.inc:638
msgid ""
"The passwords you've entered as \"New password\" and \"Repeated new "
"password\" do not match."
msgstr ""
-#: plugins/personal/generic/class_user.inc:615
+#: plugins/personal/generic/class_user.inc:640
#: ihtml/themes/default/recovery.tpl.c:26
#: ihtml/themes/default/recovery.tpl.c:29
msgid "New password"
msgstr "æ–°å£ä»¤"
-#: plugins/personal/generic/class_user.inc:617
+#: plugins/personal/generic/class_user.inc:642
msgid "The password used as new and current are too similar."
msgstr "输入的新å£ä»¤å’Œå½“å‰å£ä»¤éžå¸¸ç›¸ä¼¼ã€‚"
-#: plugins/personal/generic/class_user.inc:619
+#: plugins/personal/generic/class_user.inc:644
msgid "The password used as new is to short."
msgstr "输入的新å£ä»¤å¤ªçŸäº†ã€‚"
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:646
msgid "The password contains possibly problematic Unicode characters!"
msgstr ""
@@ -2133,13 +2137,13 @@ msgstr "上"
msgid "Down"
msgstr "å…³é—"
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2647
-#: include/simpleplugin/class_attribute.inc:2648
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2648
+#: include/simpleplugin/class_attribute.inc:2649
msgid "Sort up"
msgstr ""
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2660
-#: include/simpleplugin/class_attribute.inc:2661
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2661
+#: include/simpleplugin/class_attribute.inc:2662
msgid "Sort down"
msgstr ""
@@ -2147,23 +2151,23 @@ msgstr ""
msgid "Select all"
msgstr ""
-#: include/class_listing.inc:537 include/class_management.inc:679
-#: include/class_config.inc:479 include/class_msgPool.inc:215
-#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:682 include/class_msgPool.inc:713
-#: include/class_msgPool.inc:740 include/functions.inc:3107
-#: include/functions.inc:3128 include/functions.inc:3158
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198 include/functions.inc:3260
+#: include/class_listing.inc:537 include/class_management.inc:681
+#: include/class_config.inc:373 include/class_config.inc:484
+#: include/class_msgPool.inc:215 include/class_msgPool.inc:235
+#: include/class_msgPool.inc:265 include/class_msgPool.inc:682
+#: include/class_msgPool.inc:713 include/class_msgPool.inc:740
+#: include/functions.inc:3107 include/functions.inc:3128
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200 include/functions.inc:3262
#: include/class_msg_dialog.inc:128 include/class_xml.inc:58
-#: include/class_plugin.inc:1664 include/class_CopyPasteHandler.inc:278
+#: include/class_plugin.inc:1510 include/class_CopyPasteHandler.inc:278
#: include/simpleplugin/class_attribute.inc:1540
#: include/simpleplugin/class_attribute.inc:1543
#: include/simpleplugin/class_attribute.inc:1546
-#: include/simpleplugin/class_attribute.inc:1784
-#: include/simpleplugin/class_attribute.inc:1887
-#: include/simpleplugin/class_attribute.inc:1889
+#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1888
+#: include/simpleplugin/class_attribute.inc:1890
#: include/simpleplugin/class_simpleTabs.inc:90
#: include/simpleplugin/class_simpleTabs.inc:405
#: include/password-methods/class_password-methods-sasl.inc:60
@@ -2250,33 +2254,33 @@ msgstr ""
msgid "Create a new snapshot from this object"
msgstr ""
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "Filter error"
msgstr ""
-#: include/class_management.inc:164
+#: include/class_management.inc:165
msgid "The filter is incomplete!"
msgstr ""
-#: include/class_management.inc:412
+#: include/class_management.inc:414
#: include/simpleplugin/class_simpleManagement.inc:716
msgid "Permission error"
msgstr ""
-#: include/class_management.inc:488
+#: include/class_management.inc:490
#: include/simpleplugin/class_simpleManagement.inc:749
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr ""
-#: include/class_management.inc:507 include/class_management.inc:524
-#: include/class_management.inc:571
+#: include/class_management.inc:509 include/class_management.inc:526
+#: include/class_management.inc:573
#: include/simpleplugin/class_simpleManagement.inc:799
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr ""
-#: include/class_management.inc:679
+#: include/class_management.inc:681
#, php-format
msgid ""
"No tab declaration for '%s' found in your configuration file. Cannot create "
@@ -2301,17 +2305,17 @@ msgstr ""
#: include/class_config.inc:296
#, php-format
msgid ""
-"It seems you are trying to decode something which is not encoded : "
-"%s<br/>\\nPlease check you are not using a fusiondirectory.secrets file "
-"while your passwords are not encrypted."
+"It seems you are trying to decode something which is not encoded : %s<br/>\n"
+"Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
msgstr ""
-#: include/class_config.inc:337 include/class_ldap.inc:918
-#: include/class_ldap.inc:1372 include/functions.inc:526
+#: include/class_config.inc:338 include/class_ldap.inc:895
+#: include/class_ldap.inc:1349 include/functions.inc:526
#: include/functions.inc:678 include/functions.inc:725
#: include/functions.inc:786 include/functions.inc:841
-#: include/functions.inc:2986 include/simpleplugin/class_simplePlugin.inc:551
-#: include/simpleplugin/class_attribute.inc:2909
+#: include/functions.inc:2986 include/functions.inc:3160
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_attribute.inc:2910
#: include/password-methods/class_password-methods.inc:199
#: include/class_SnapshotHandler.inc:50 include/class_SnapshotHandler.inc:244
#: include/class_SnapshotHandler.inc:277 include/class_SnapshotHandler.inc:292
@@ -2322,11 +2326,16 @@ msgstr ""
msgid "LDAP error"
msgstr "LDAP 错误"
-#: include/class_config.inc:337
+#: include/class_config.inc:338
msgid "Cannot bind to LDAP. Please contact the system administrator."
msgstr ""
-#: include/class_config.inc:480
+#: include/class_config.inc:373
+#, php-format
+msgid "Location \"%s\" could not be found in the configuration file"
+msgstr ""
+
+#: include/class_config.inc:485
#, php-format
msgid "The selected mail method (class %s) is not available"
msgstr ""
@@ -2362,49 +2371,49 @@ msgstr ""
msgid "LDAP performance is poor: last query took about %.2fs!"
msgstr ""
-#: include/class_ldap.inc:869 include/class_ldap.inc:905
+#: include/class_ldap.inc:846 include/class_ldap.inc:882
#: include/functions.inc:568 include/functions.inc:653
#: include/functions.inc:773 include/functions.inc:1192
#: include/functions.inc:2275 include/functions.inc:2317
#: include/functions.inc:2346 include/class_session.inc:50
-#: include/class_session.inc:87 include/class_session.inc:125
+#: include/class_session.inc:88 include/class_session.inc:127
#: include/class_log.inc:96 include/class_acl.inc:118
msgid "Internal error"
msgstr ""
-#: include/class_ldap.inc:869
+#: include/class_ldap.inc:846
#, php-format
msgid ""
"Cannot automatically create subtrees with RDN \"%s\": no object class found!"
msgstr ""
-#: include/class_ldap.inc:905
+#: include/class_ldap.inc:882
#, php-format
msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
msgstr ""
-#: include/class_ldap.inc:1017
+#: include/class_ldap.inc:994
#, php-format
msgid "while operating on '%s' using LDAP server '%s'"
msgstr "当æ“作 '%s' 使用 LDAP æœåŠ¡å™¨ '%s' æ—¶"
-#: include/class_ldap.inc:1019
+#: include/class_ldap.inc:996
#, php-format
msgid "while operating on LDAP server %s"
msgstr "当æ“作 LDAP æœåŠ¡å™¨ '%s' æ—¶"
-#: include/class_ldap.inc:1109
+#: include/class_ldap.inc:1086
msgid "proc_open failed to execute ldapsearch"
msgstr ""
-#: include/class_ldap.inc:1221
+#: include/class_ldap.inc:1198
#, php-format
msgid ""
"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
" in line %s"
msgstr "è¿™ä¸æ˜¯ä¸€æ¡æœ‰æ•ˆçš„ DN: '%s'。导入数æ®åº”该以 'dn:...' 开始于行 %s"
-#: include/class_ldap.inc:1232
+#: include/class_ldap.inc:1209
#, php-format
msgid ""
"Error while importing dn: '%s', please check your LDIF from line %s on!"
@@ -2992,7 +3001,7 @@ msgid ""
"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
msgstr ""
-#: include/functions.inc:496 include/functions.inc:3295
+#: include/functions.inc:496 include/functions.inc:3297
#: include/class_xml.inc:61 include/simpleplugin/class_simplePlugin.inc:264
#: include/simpleplugin/class_simplePlugin.inc:269
#: include/simpleplugin/class_simplePlugin.inc:281
@@ -3204,9 +3213,9 @@ msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
msgstr ""
#: include/functions.inc:3107 include/functions.inc:3128
-#: include/functions.inc:3166 include/functions.inc:3178
-#: include/functions.inc:3182 include/functions.inc:3189
-#: include/functions.inc:3198
+#: include/functions.inc:3168 include/functions.inc:3180
+#: include/functions.inc:3184 include/functions.inc:3191
+#: include/functions.inc:3200
msgid "Cannot allocate a free ID:"
msgstr ""
@@ -3219,33 +3228,29 @@ msgstr ""
msgid "%sPoolMin >= %sPoolMax!"
msgstr ""
-#: include/functions.inc:3158
-msgid "Cannot create sambaUnixIdPool entry!"
-msgstr ""
-
-#: include/functions.inc:3166
+#: include/functions.inc:3168
msgid "sambaUnixIdPool is not unique!"
msgstr ""
-#: include/functions.inc:3178 include/functions.inc:3182
+#: include/functions.inc:3180 include/functions.inc:3184
msgid "no ID available!"
msgstr ""
-#: include/functions.inc:3198
+#: include/functions.inc:3200
msgid "maximum tries exceeded!"
msgstr ""
-#: include/functions.inc:3260
+#: include/functions.inc:3262
msgid "Cannot allocate a free ID!"
msgstr ""
-#: include/functions.inc:3296
+#: include/functions.inc:3298
#, php-format
msgid "Cannot locate file '%s' - please run '%s' to fix this"
msgstr ""
-#: include/class_session.inc:50 include/class_session.inc:87
-#: include/class_session.inc:125
+#: include/class_session.inc:50 include/class_session.inc:88
+#: include/class_session.inc:127
msgid "Requested channel does not exist! Please contact your Administrator."
msgstr ""
@@ -3401,7 +3406,7 @@ msgid ""
" be done by others will get lost if you save this entry!"
msgstr ""
-#: include/class_plugin.inc:1467
+#: include/class_plugin.inc:1313
#, php-format
msgid "Tab \"%s\""
msgstr ""
@@ -3533,7 +3538,7 @@ msgid "days"
msgstr "天"
#: include/simpleplugin/class_attribute.inc:543
-#: include/simpleplugin/class_attribute.inc:2171
+#: include/simpleplugin/class_attribute.inc:2172
#, php-format
msgid "%s (required)"
msgstr ""
@@ -3602,7 +3607,7 @@ msgid "%s (%d bytes)"
msgstr ""
#: include/simpleplugin/class_attribute.inc:1626
-#: include/simpleplugin/class_attribute.inc:1803
+#: include/simpleplugin/class_attribute.inc:1804
msgid "Upload"
msgstr "ä¸Šä¼ "
@@ -3611,22 +3616,22 @@ msgstr "ä¸Šä¼ "
msgid "Download"
msgstr "下载"
-#: include/simpleplugin/class_attribute.inc:1785
+#: include/simpleplugin/class_attribute.inc:1786
msgid ""
"Cannot save user picture, FusionDirectory requires the package "
"'php5-imagick' to be installed!"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:1836
+#: include/simpleplugin/class_attribute.inc:1837
#: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
msgid "Base"
msgstr "ä½ç½®"
-#: include/simpleplugin/class_attribute.inc:1839
+#: include/simpleplugin/class_attribute.inc:1840
msgid "Object base"
msgstr ""
-#: include/simpleplugin/class_attribute.inc:2769
+#: include/simpleplugin/class_attribute.inc:2770
#, php-format
msgid "Invalid value for %s"
msgstr ""
diff --git a/plugins/admin/departments/class_department.inc b/plugins/admin/departments/class_department.inc
index 4467fcaaa6250bdb0d111a23a4ae5e2b07d12f09..5eb0aa8fe9e6622e3f9ecdfe904b7f57cc1e1528 100644
--- a/plugins/admin/departments/class_department.inc
+++ b/plugins/admin/departments/class_department.inc
@@ -179,16 +179,6 @@ class department extends simplePlugin
return $message;
}
- function execute()
- {
- /* Reload departments */
- $this->config->get_departments($this->dn);
- $this->config->make_idepartments();
-
- /* Call parent execute */
- return parent::execute();
- }
-
function get_allowed_bases()
{
/* Hide all departments, that are subtrees of this department */
diff --git a/plugins/admin/departments/tabs_department.inc b/plugins/admin/departments/tabs_department.inc
index 21f76fa7fb223182f8b9577d9219fed1cab78b95..b6328521190eae66a7397d6600ffa6902dc1f39e 100644
--- a/plugins/admin/departments/tabs_department.inc
+++ b/plugins/admin/departments/tabs_department.inc
@@ -28,6 +28,7 @@ class deptabs extends simpleTabs
/* Update department cache */
global $config;
$config->get_departments();
+ $config->make_idepartments();
}
}
?>
diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index 495350b53d1d0376921136ca68fbc76a12202c4d..068c1d3251ccc2e35d7d07b2e2e7947015784bc1 100644
--- a/plugins/personal/generic/class_user.inc
+++ b/plugins/personal/generic/class_user.inc
@@ -416,7 +416,7 @@ class user extends simplePlugin
'o', FALSE
),
new StringAttribute (
- _('Department'), _('Department'),
+ _('Department'), _('Department to which the user belongs'),
'ou', FALSE
),
new StringAttribute (