Commit d0ae8b6a authored by benoit manager's avatar benoit manager

Merge branch '1.2.2-fixes' into 'master'

Merge 1.2.2 fixes into master

See merge request fusiondirectory/fd!469
parents 06b4a6a8 e5ddd916
## %"FusionDirectory 1.2.3" - 2018-11-15
### Added
#### fusiondirectory
- fd#5890 hash_equals is not available in PHP 5.4
- fd#5901 Add the pdf with the oid of fusiondirectory in the contrib dir of the core
### Fixed
#### fusiondirectory
- fd#5797 cancel button has no effect (apply template)
#### fusiondirectory-plugins
- fd-plugins#5870 Supann should not trigger PHP errors on empty lines in nomenclature files
### Security
#### fusiondirectory
- fd#5918 Password recovery does not escape fields in error messages
## %"FusionDirectory 1.2.2" - 2018-08-16
### Added
......
......@@ -3087,6 +3087,40 @@ apt-get install fusiondirectory
apt-get install fusiondirectory-schema
```
## Migrate FusionDirectory from 1.2.1 to 1.2.2
### Upgrade FusionDirectory first
* Upgrade FusionDirectory core package before other ones to avoid dependencies errors:
```shell
apt-get install fusiondirectory
```
* Upgrade FusionDirectory schema package too.
```shell
apt-get install fusiondirectory-schema
```
## Migrate FusionDirectory from 1.2.2 to 1.2.3
### Upgrade FusionDirectory first
* Upgrade FusionDirectory core package before other ones to avoid dependencies errors:
```shell
apt-get install fusiondirectory
```
* Upgrade FusionDirectory schema package too.
```shell
apt-get install fusiondirectory-schema
```
[php-cas]: http://packages.ubuntu.com/trusty/all/php-cas/download
[repo-urls]: https://documentation.fusiondirectory.org/en/dl_install
......
......@@ -129,7 +129,7 @@
.\" ========================================================================
.\"
.IX Title "FUSIONDIRECTORY-INSERT-SCHEMA 1"
.TH FUSIONDIRECTORY-INSERT-SCHEMA 1 "2018-07-25" "FusionDirectory 1.2.2" "FusionDirectory Documentation"
.TH FUSIONDIRECTORY-INSERT-SCHEMA 1 "2018-10-15" "FusionDirectory 1.2.3" "FusionDirectory Documentation"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
......
......@@ -129,7 +129,7 @@
.\" ========================================================================
.\"
.IX Title "FUSIONDIRECTORY-SETUP 1"
.TH FUSIONDIRECTORY-SETUP 1 "2018-08-16" "FusionDirectory 1.2.2" "FusionDirectory Documentation"
.TH FUSIONDIRECTORY-SETUP 1 "2018-11-23" "FusionDirectory 1.2.3" "FusionDirectory Documentation"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
......
......@@ -129,7 +129,7 @@
.\" ========================================================================
.\"
.IX Title "FUSIONDIRECTORY.CONF 1"
.TH FUSIONDIRECTORY.CONF 1 "2018-08-16" "FusionDirectory 1.2.2" "FusionDirectory Documentation"
.TH FUSIONDIRECTORY.CONF 1 "2018-11-23" "FusionDirectory 1.2.3" "FusionDirectory Documentation"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
......
......@@ -476,10 +476,10 @@ class passwordRecovery extends standAlonePage {
$ldap->search($filter, array('dn'));
if ($ldap->count() < 1) {
$this->message[] = sprintf(_('Did not find an account with login "%s"'), $this->login);
$this->message[] = sprintf(_('Did not find an account with login "%s"'), htmlentities($this->login, ENT_COMPAT, 'UTF-8'));
return;
} elseif ($ldap->count() > 1) {
$this->message[] = sprintf(_('Found multiple accounts with login "%s"'), $this->login);
$this->message[] = sprintf(_('Found multiple accounts with login "%s"'), htmlentities($this->login, ENT_COMPAT, 'UTF-8'));
return;
}
......@@ -512,10 +512,10 @@ class passwordRecovery extends standAlonePage {
/* Only one ldap node should be found */
if ($ldap->count() < 1) {
$this->message[] = sprintf(_('There is no account using email "%s"'), $this->email_address);
$this->message[] = sprintf(_('There is no account using email "%s"'), htmlentities($this->email_address, ENT_COMPAT, 'UTF-8'));
return;
} elseif ($ldap->count() > 1) {
$this->message[] = sprintf(_('There are several accounts using email "%s"'), $this->email_address);
$this->message[] = sprintf(_('There are several accounts using email "%s"'), htmlentities($this->email_address, ENT_COMPAT, 'UTF-8'));
return;
}
......@@ -523,7 +523,7 @@ class passwordRecovery extends standAlonePage {
$method = passwordMethod::get_method($attrs['userPassword'][0], $attrs['dn']);
if (is_object($method) && $method->is_locked($attrs['dn'])) {
$this->message[] = sprintf(_('The user using email "%s" is locked. Please contact your administrator.'), $this->email_address);
$this->message[] = sprintf(_('The user using email "%s" is locked. Please contact your administrator.'), htmlentities($this->email_address, ENT_COMPAT, 'UTF-8'));
return;
}
$this->login = $attrs[$this->loginAttribute][0];
......
......@@ -2674,6 +2674,47 @@ if (!function_exists('random_int')) {
}
}
if (!function_exists('hash_equals')) {
/**
* Timing attack safe string comparison
*
* Fallback for PHP<5.6
*
* Compares two strings using the same time whether they're equal or not.
* This function should be used to mitigate timing attacks; for instance, when testing crypt() password hashes.
*
* @param string $known_string The string of known length to compare against
* @param string $user_string The user-supplied string
* @return boolean Returns TRUE when the two strings are equal, FALSE otherwise.
*/
function hash_equals($known_string, $user_string)
{
if (func_num_args() !== 2) {
trigger_error('hash_equals() expects exactly 2 parameters, '.func_num_args().' given', E_USER_WARNING);
return NULL;
}
if (!is_string($known_string) || !is_string($user_string)) {
trigger_error('hash_equals(): Expected both parameters to be a string, '.gettype($known_string).' and '.gettype($user_string).' given', E_USER_WARNING);
return FALSE;
}
$known_string_len = strlen($known_string);
$user_string_len = strlen($user_string);
if ($known_string_len !== $user_string_len) {
// use $known_string instead of $user_string to handle strings of different length.
$res = $known_string ^ $known_string;
// set $ret to 1 to make sure false is returned
$ret = 1;
} else {
$res = $known_string ^ $user_string;
$ret = 0;
}
for ($i = strlen($res) - 1; $i >= 0; $i--) {
$ret |= ord($res[$i]);
}
return ($ret === 0);
}
}
function ldap_escape_f($str, $ignore = '')
{
return ldap_escape($str, $ignore, LDAP_ESCAPE_FILTER);
......
......@@ -48,14 +48,15 @@ class templateDialog
function save_object ()
{
if ($this->target === NULL) {
if (isset($_POST[$this->post_cancel])) {
return $this->handle_cancel();
}
if ((isset($_POST[$this->post_finish]) || isset($_GET[$this->post_finish])) && is_object($this->template)) {
$this->template->save_object();
return $this->handle_finish();
}
if (isset($_POST[$this->post_cancel])) {
return $this->handle_cancel();
}
if (($this->target === NULL) &&
(isset($_POST[$this->post_finish]) || isset($_GET[$this->post_finish])) &&
is_object($this->template)) {
$this->template->save_object();
return $this->handle_finish();
}
if (
......@@ -109,6 +110,7 @@ class templateDialog
function handle_cancel ()
{
$this->simpleManagement->remove_lock();
$this->simpleManagement->closeDialogs();
return FALSE;
}
......
......@@ -63,7 +63,7 @@ define("FPDF_FONTPATH", "/usr/share/php/fpdf/font/"); /*! Define fpdf font path
/*!
* \brief FusionDirectory Version
*/
define ("FD_VERSION", "1.2.2"); /*! Define FusionDirectory version */
define ("FD_VERSION", "1.2.3"); /*! Define FusionDirectory version */
/*!
* \brief FusionDirectory config object RDN
......
......@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory VERSION\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
"POT-Creation-Date: 2018-08-14 13:30+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"POT-Creation-Date: 2018-11-15 11:33+0000\n"
"PO-Revision-Date: 2017-11-03 10:16+0000\n"
"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
......@@ -300,8 +300,8 @@ msgid "There was a problem uncompressing snapshot data"
msgstr ""
#: include/class_template.inc:41
#: include/simpleplugin/class_simpleManagement.inc:282
#: include/simpleplugin/class_simpleManagement.inc:518
#: include/simpleplugin/class_simpleManagement.inc:284
#: include/simpleplugin/class_simpleManagement.inc:520
#: plugins/admin/groups/class_groupManagement.inc:351
#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
msgid "Template"
......@@ -611,11 +611,11 @@ msgid "Login"
msgstr ""
#: include/class_CopyPasteHandler.inc:208
#: include/simpleplugin/class_simpleManagement.inc:1023
#: include/simpleplugin/class_simpleManagement.inc:1122
#: include/simpleplugin/class_simpleManagement.inc:1173
#: include/simpleplugin/class_simpleManagement.inc:1253
#: include/simpleplugin/class_simpleManagement.inc:1271
#: include/simpleplugin/class_simpleManagement.inc:1025
#: include/simpleplugin/class_simpleManagement.inc:1124
#: include/simpleplugin/class_simpleManagement.inc:1175
#: include/simpleplugin/class_simpleManagement.inc:1255
#: include/simpleplugin/class_simpleManagement.inc:1273
#: plugins/admin/users/class_userManagement.inc:153
msgid "Permission"
msgstr ""
......@@ -1542,43 +1542,43 @@ msgstr ""
msgid "Unknown"
msgstr ""
#: include/simpleplugin/class_simpleManagement.inc:288
#: include/simpleplugin/class_simpleManagement.inc:290
#: plugins/admin/users/user-list.xml:87
msgid "From template"
msgstr ""
#: include/simpleplugin/class_simpleManagement.inc:316
#: include/simpleplugin/class_simpleManagement.inc:318
#, php-format
msgid "%s template"
msgstr ""
#: include/simpleplugin/class_simpleManagement.inc:512
#: include/simpleplugin/class_simpleManagement.inc:518
#: include/simpleplugin/class_simpleManagement.inc:514
#: include/simpleplugin/class_simpleManagement.inc:520
#: plugins/admin/groups/class_groupManagement.inc:351
#, php-format
msgid "Show %s"
msgstr ""
#: include/simpleplugin/class_simpleManagement.inc:549
#: include/simpleplugin/class_simpleManagement.inc:551
msgid "Filter error"
msgstr ""
#: include/simpleplugin/class_simpleManagement.inc:549
#: include/simpleplugin/class_simpleManagement.inc:551
msgid "The filter is incomplete!"
msgstr ""
#: include/simpleplugin/class_simpleManagement.inc:1088
#: include/simpleplugin/class_simpleManagement.inc:1090
msgid "Permission error"
msgstr ""
#: include/simpleplugin/class_simpleManagement.inc:1122
#: include/simpleplugin/class_simpleManagement.inc:1124
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr ""
#: include/simpleplugin/class_simpleManagement.inc:1173
#: include/simpleplugin/class_simpleManagement.inc:1253
#: include/simpleplugin/class_simpleManagement.inc:1271
#: include/simpleplugin/class_simpleManagement.inc:1175
#: include/simpleplugin/class_simpleManagement.inc:1255
#: include/simpleplugin/class_simpleManagement.inc:1273
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr ""
......
......@@ -3,13 +3,16 @@
# This file is distributed under the same license as the FusionDirectory package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
# fusiondirectory <contact@fusiondirectory.org>, 2017
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory VERSION\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
"POT-Creation-Date: 2018-08-14 13:30+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"POT-Creation-Date: 2018-11-15 11:33+0000\n"
"PO-Revision-Date: 2017-11-03 10:16+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
"MIME-Version: 1.0\n"
......@@ -301,8 +304,8 @@ msgid "There was a problem uncompressing snapshot data"
msgstr ""
#: include/class_template.inc:41
#: include/simpleplugin/class_simpleManagement.inc:282
#: include/simpleplugin/class_simpleManagement.inc:518
#: include/simpleplugin/class_simpleManagement.inc:284
#: include/simpleplugin/class_simpleManagement.inc:520
#: plugins/admin/groups/class_groupManagement.inc:351
#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
msgid "Template"
......@@ -612,11 +615,11 @@ msgid "Login"
msgstr ""
#: include/class_CopyPasteHandler.inc:208
#: include/simpleplugin/class_simpleManagement.inc:1023
#: include/simpleplugin/class_simpleManagement.inc:1122
#: include/simpleplugin/class_simpleManagement.inc:1173
#: include/simpleplugin/class_simpleManagement.inc:1253
#: include/simpleplugin/class_simpleManagement.inc:1271
#: include/simpleplugin/class_simpleManagement.inc:1025
#: include/simpleplugin/class_simpleManagement.inc:1124
#: include/simpleplugin/class_simpleManagement.inc:1175
#: include/simpleplugin/class_simpleManagement.inc:1255
#: include/simpleplugin/class_simpleManagement.inc:1273
#: plugins/admin/users/class_userManagement.inc:153
msgid "Permission"
msgstr ""
......@@ -1543,43 +1546,43 @@ msgstr ""
msgid "Unknown"
msgstr ""
#: include/simpleplugin/class_simpleManagement.inc:288
#: include/simpleplugin/class_simpleManagement.inc:290
#: plugins/admin/users/user-list.xml:87
msgid "From template"
msgstr ""
#: include/simpleplugin/class_simpleManagement.inc:316
#: include/simpleplugin/class_simpleManagement.inc:318
#, php-format
msgid "%s template"
msgstr ""
#: include/simpleplugin/class_simpleManagement.inc:512
#: include/simpleplugin/class_simpleManagement.inc:518
#: include/simpleplugin/class_simpleManagement.inc:514
#: include/simpleplugin/class_simpleManagement.inc:520
#: plugins/admin/groups/class_groupManagement.inc:351
#, php-format
msgid "Show %s"
msgstr ""
#: include/simpleplugin/class_simpleManagement.inc:549
#: include/simpleplugin/class_simpleManagement.inc:551
msgid "Filter error"
msgstr ""
#: include/simpleplugin/class_simpleManagement.inc:549
#: include/simpleplugin/class_simpleManagement.inc:551
msgid "The filter is incomplete!"
msgstr ""
#: include/simpleplugin/class_simpleManagement.inc:1088
#: include/simpleplugin/class_simpleManagement.inc:1090
msgid "Permission error"
msgstr ""
#: include/simpleplugin/class_simpleManagement.inc:1122
#: include/simpleplugin/class_simpleManagement.inc:1124
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr ""
#: include/simpleplugin/class_simpleManagement.inc:1173
#: include/simpleplugin/class_simpleManagement.inc:1253
#: include/simpleplugin/class_simpleManagement.inc:1271
#: include/simpleplugin/class_simpleManagement.inc:1175
#: include/simpleplugin/class_simpleManagement.inc:1255
#: include/simpleplugin/class_simpleManagement.inc:1273
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr ""
......
......@@ -3,13 +3,16 @@
# This file is distributed under the same license as the FusionDirectory package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
# fusiondirectory <contact@fusiondirectory.org>, 2017
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory VERSION\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
"POT-Creation-Date: 2018-08-14 13:30+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"POT-Creation-Date: 2018-11-15 11:33+0000\n"
"PO-Revision-Date: 2017-11-03 10:16+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
"MIME-Version: 1.0\n"
......@@ -301,8 +304,8 @@ msgid "There was a problem uncompressing snapshot data"
msgstr ""
#: include/class_template.inc:41
#: include/simpleplugin/class_simpleManagement.inc:282
#: include/simpleplugin/class_simpleManagement.inc:518
#: include/simpleplugin/class_simpleManagement.inc:284
#: include/simpleplugin/class_simpleManagement.inc:520
#: plugins/admin/groups/class_groupManagement.inc:351
#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
msgid "Template"
......@@ -612,11 +615,11 @@ msgid "Login"
msgstr "Entrada"
#: include/class_CopyPasteHandler.inc:208
#: include/simpleplugin/class_simpleManagement.inc:1023
#: include/simpleplugin/class_simpleManagement.inc:1122
#: include/simpleplugin/class_simpleManagement.inc:1173
#: include/simpleplugin/class_simpleManagement.inc:1253
#: include/simpleplugin/class_simpleManagement.inc:1271
#: include/simpleplugin/class_simpleManagement.inc:1025
#: include/simpleplugin/class_simpleManagement.inc:1124
#: include/simpleplugin/class_simpleManagement.inc:1175
#: include/simpleplugin/class_simpleManagement.inc:1255
#: include/simpleplugin/class_simpleManagement.inc:1273
#: plugins/admin/users/class_userManagement.inc:153
msgid "Permission"
msgstr ""
......@@ -1545,43 +1548,43 @@ msgstr "Grup de l'usuari"
msgid "Unknown"
msgstr ""
#: include/simpleplugin/class_simpleManagement.inc:288
#: include/simpleplugin/class_simpleManagement.inc:290
#: plugins/admin/users/user-list.xml:87
msgid "From template"
msgstr ""
#: include/simpleplugin/class_simpleManagement.inc:316
#: include/simpleplugin/class_simpleManagement.inc:318
#, php-format
msgid "%s template"
msgstr ""
#: include/simpleplugin/class_simpleManagement.inc:512
#: include/simpleplugin/class_simpleManagement.inc:518
#: include/simpleplugin/class_simpleManagement.inc:514
#: include/simpleplugin/class_simpleManagement.inc:520
#: plugins/admin/groups/class_groupManagement.inc:351
#, php-format
msgid "Show %s"
msgstr ""
#: include/simpleplugin/class_simpleManagement.inc:549
#: include/simpleplugin/class_simpleManagement.inc:551
msgid "Filter error"
msgstr ""
#: include/simpleplugin/class_simpleManagement.inc:549
#: include/simpleplugin/class_simpleManagement.inc:551
msgid "The filter is incomplete!"
msgstr ""
#: include/simpleplugin/class_simpleManagement.inc:1088
#: include/simpleplugin/class_simpleManagement.inc:1090
msgid "Permission error"
msgstr ""
#: include/simpleplugin/class_simpleManagement.inc:1122
#: include/simpleplugin/class_simpleManagement.inc:1124
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr ""
#: include/simpleplugin/class_simpleManagement.inc:1173
#: include/simpleplugin/class_simpleManagement.inc:1253
#: include/simpleplugin/class_simpleManagement.inc:1271
#: include/simpleplugin/class_simpleManagement.inc:1175
#: include/simpleplugin/class_simpleManagement.inc:1255
#: include/simpleplugin/class_simpleManagement.inc:1273
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr ""
......
......@@ -3,13 +3,17 @@
# This file is distributed under the same license as the FusionDirectory package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
# fusiondirectory <contact@fusiondirectory.org>, 2017
# Pavel Borecki <pavel.borecki@gmail.com>, 2018
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory VERSION\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
"POT-Creation-Date: 2018-08-14 13:30+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"POT-Creation-Date: 2018-11-15 11:33+0000\n"
"PO-Revision-Date: 2017-11-03 10:16+0000\n"
"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2018\n"
"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
"MIME-Version: 1.0\n"
......@@ -308,8 +312,8 @@ msgid "There was a problem uncompressing snapshot data"
msgstr "Došlo k problému s rozbalováním dat zachyceného stavu"
#: include/class_template.inc:41
#: include/simpleplugin/class_simpleManagement.inc:282
#: include/simpleplugin/class_simpleManagement.inc:518
#: include/simpleplugin/class_simpleManagement.inc:284
#: include/simpleplugin/class_simpleManagement.inc:520
#: plugins/admin/groups/class_groupManagement.inc:351
#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
msgid "Template"
......@@ -649,11 +653,11 @@ msgid "Login"
msgstr "uživatelské jméno"
#: include/class_CopyPasteHandler.inc:208
#: include/simpleplugin/class_simpleManagement.inc:1023
#: include/simpleplugin/class_simpleManagement.inc:1122
#: include/simpleplugin/class_simpleManagement.inc:1173
#: include/simpleplugin/class_simpleManagement.inc:1253
#: include/simpleplugin/class_simpleManagement.inc:1271
#: include/simpleplugin/class_simpleManagement.inc:1025
#: include/simpleplugin/class_simpleManagement.inc:1124
#: include/simpleplugin/class_simpleManagement.inc:1175
#: include/simpleplugin/class_simpleManagement.inc:1255
#: include/simpleplugin/class_simpleManagement.inc:1273
#: plugins/admin/users/class_userManagement.inc:153
msgid "Permission"
msgstr "oprávnění"
......@@ -1608,43 +1612,43 @@ msgstr "skupina uživatelů"
msgid "Unknown"
msgstr "neznámé"
#: include/simpleplugin/class_simpleManagement.inc:288
#: include/simpleplugin/class_simpleManagement.inc:290
#: plugins/admin/users/user-list.xml:87
msgid "From template"
msgstr "Ze šablony"
#: include/simpleplugin/class_simpleManagement.inc:316
#: include/simpleplugin/class_simpleManagement.inc:318
#, php-format
msgid "%s template"
msgstr "%s šablona"
#: include/simpleplugin/class_simpleManagement.inc:512
#: include/simpleplugin/class_simpleManagement.inc:518
#: include/simpleplugin/class_simpleManagement.inc:514
#: include/simpleplugin/class_simpleManagement.inc:520
#: plugins/admin/groups/class_groupManagement.inc:351
#, php-format
msgid "Show %s"
msgstr "Zobrazit %s"
#: include/simpleplugin/class_simpleManagement.inc:549
#: include/simpleplugin/class_simpleManagement.inc:551
msgid "Filter error"
msgstr "chyba filtru"
#: include/simpleplugin/class_simpleManagement.inc:549
#: include/simpleplugin/class_simpleManagement.inc:551
msgid "The filter is incomplete!"
msgstr "Tento filtr je neúplný!"
#: include/simpleplugin/class_simpleManagement.inc:1088
#: include/simpleplugin/class_simpleManagement.inc:1090
msgid "Permission error"
msgstr "chyba oprávnění"
#: include/simpleplugin/class_simpleManagement.inc:1122
#: include/simpleplugin/class_simpleManagement.inc:1124
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr "Nejste oprávněn(a) vytvořit snímek %s."
#: include/simpleplugin/class_simpleManagement.inc:1173
#: include/simpleplugin/class_simpleManagement.inc:1253
#: include/simpleplugin/class_simpleManagement.inc:1271
#: include/simpleplugin/class_simpleManagement.inc:1175
#: include/simpleplugin/class_simpleManagement.inc:1255
#: include/simpleplugin/class_simpleManagement.inc:1273
#, php-format
msgid "You are not allowed to restore a snapshot for %s."
msgstr "Nejste oprávněn(a) obnovit ze snímku %s."
......
......@@ -3,13 +3,16 @@
# This file is distributed under the same license as the FusionDirectory package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
# fusiondirectory <contact@fusiondirectory.org>, 2017
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: FusionDirectory VERSION\n"
"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
"POT-Creation-Date: 2018-08-14 13:30+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"POT-Creation-Date: 2018-11-15 11:33+0000\n"
"PO-Revision-Date: 2017-11-03 10:16+0000\n"
"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
"MIME-Version: 1.0\n"
......@@ -305,8 +308,8 @@ msgid "There was a problem uncompressing snapshot data"
msgstr ""
#: include/class_template.inc:41
#: include/simpleplugin/class_simpleManagement.inc:282
#: include/simpleplugin/class_simpleManagement.inc:518
#: include/simpleplugin/class_simpleManagement.inc:284
#: include/simpleplugin/class_simpleManagement.inc:520
#: plugins/admin/groups/class_groupManagement.inc:351
#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
msgid "Template"
......@@ -634,11 +637,11 @@ msgid "Login"
msgstr "Kennung"
#: include/class_CopyPasteHandler.inc:208
#: include/simpleplugin/class_simpleManagement.inc:1023
#: include/simpleplugin/class_simpleManagement.inc:1122
#: include/simpleplugin/class_simpleManagement.inc:1173
#: include/simpleplugin/class_simpleManagement.inc:1253
#: include/simpleplugin/class_simpleManagement.inc:1271
#: include/simpleplugin/class_simpleManagement.inc:1025
#: include/simpleplugin/class_simpleManagement.inc:1124
#: include/simpleplugin/class_simpleManagement.inc:1175
#: include/simpleplugin/class_simpleManagement.inc:1255
#: include/simpleplugin/class_simpleManagement.inc:1273
#: plugins/admin/users/class_userManagement.inc:153
msgid "Permission"
msgstr "Berechtigung"
......@@ -1579,43 +1582,43 @@ msgstr "Gruppe des Benutzers"
msgid "Unknown"
msgstr "Unbekannt"
#: include/simpleplugin/class_simpleManagement.inc:288
#: include/simpleplugin/class_simpleManagement.inc:290
#: plugins/admin/users/user-list.xml:87
msgid "From template"
msgstr "Aus Vorlage"
#: include/simpleplugin/class_simpleManagement.inc:316
#: include/simpleplugin/class_simpleManagement.inc:318
#, php-format
msgid "%s template"
msgstr "%s Vorlage"
#: include/simpleplugin/class_simpleManagement.inc:512
#: include/simpleplugin/class_simpleManagement.inc:518
#: include/simpleplugin/class_simpleManagement.inc:514
#: include/simpleplugin/class_simpleManagement.inc:520
#: plugins/admin/groups/class_groupManagement.inc:351
#, php-format
msgid "Show %s"
msgstr "Zeigen %s"
#: include/simpleplugin/class_simpleManagement.inc:549
#: include/simpleplugin/class_simpleManagement.inc:551
msgid "Filter error"
msgstr "Filter Fehler"
#: include/simpleplugin/class_simpleManagement.inc:549
#: include/simpleplugin/class_simpleManagement.inc:551
msgid "The filter is incomplete!"
msgstr "Der Filter ist unvollständig!"
#: include/simpleplugin/class_simpleManagement.inc:1088
#: include/simpleplugin/class_simpleManagement.inc:1090
msgid "Permission error"
msgstr "Berechtigungsfehler"
#: include/simpleplugin/class_simpleManagement.inc:1122
#: include/simpleplugin/class_simpleManagement.inc:1124
#, php-format
msgid "You are not allowed to create a snapshot for %s."
msgstr "Ihnen ist es nicht erlaubt, einen Snapshot für %s zu erstellen."
#: include/simpleplugin/class_simpleManagement.inc:1173
#: include/simpleplugin/class_simpleManagement.inc:1253
#: include/simpleplugin/class_simpleManagement.inc:1271
#: include/simpleplugin/class_simpleManagement.inc:1175
#: include/simpleplugin/class_simpleManagement.inc:1255
#: include/simpleplugin/class_simpleManagement.inc:1273
#, 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."
......
......@@ -3,13 +3,16 @@
# This file is distributed under the same license as the FusionDirectory package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
# fusiondirectory <contact@fusiondirectory.org>, 2017
#
#, fuzzy
msgid ""
<