diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d90213d0328622738d8fabed34af0ea06031e7ba..3fb9676ecce0a6f6cd4e5d9c5f90146dd9182958 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -165,7 +165,7 @@ Where type can be :
Examples:
```
-:sparkles: feat(supann): Make supannRefId multivaluated
+:sparkles: feat(supann): Make supannRefId multivalued
supannRefId on Structure object is too small and mono valued
diff --git a/Changelog.md b/Changelog.md
index 4609da665a4c94ff80bf2f8de70cd34a74ff1daf..25194894676396b789180f52e6e2adc23c8db4cb 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -627,7 +627,7 @@
- fd#5367 We should remove from setup migration step obsolete stuff
- fd#5371 PHP error: Only variables should be passed by reference (/usr/share/fusiondirectory/include/functions.inc, line 2538)
- fd#5372 Small error in breezy/style.css
-- fd#5380 Bad display of multivaluated attributes in listing columns
+- fd#5380 Bad display of multivalued attributes in listing columns
- fd#5381 s modifier have problems with multibyte strings
- fd#5385 Several foreignKeys for the same attribute should work
- fd#5398 Cannot remove a role in groups and roles tabs for a template
@@ -1659,7 +1659,7 @@
#### fusiondirectory-plugins
- fd-plugins#3960 fusiondirectory-shell cannot cat a user
-- fd-plugins#3962 fusiondirectory-shell should handle multivaluated attributes properly
+- fd-plugins#3962 fusiondirectory-shell should handle multivalued attributes properly
## %"FusionDirectory 1.0.8.8" - 2015-07-01
diff --git a/contrib/bin/fusiondirectory-setup b/contrib/bin/fusiondirectory-setup
index 00e0a827ed215a1f08b057f978174bcdf36bb89c..c240f003f2e537694d491f2ae32f98faaa85a9a6 100644
--- a/contrib/bin/fusiondirectory-setup
+++ b/contrib/bin/fusiondirectory-setup
@@ -511,7 +511,7 @@ sub check_rights {
# if the current dir exists
if (-e $dir) {
- print("$dir exists…\n");
+ print("$dir exists...\n");
# retrieve dir's informations
my @lstat = lstat ($dir);
@@ -534,7 +534,7 @@ sub check_rights {
}
} elsif ($create) {
- if ( ask_yn_question("Directory $dir doesn't exists, do you want to create it ?: ") ) {
+ if ( ask_yn_question("Directory $dir doesn't exist, do you want to create it ?: ") ) {
my $conf_dir = dir ($dir);
# create the directory, and change the rights
@@ -574,7 +574,7 @@ sub check_config {
my $apache_group = get_apache_group();
# check config file
- check_rights($fd_config,"root",$apache_group,oct(640),0) or die 'The config file does not exists!';
+ check_rights($fd_config,"root",$apache_group,oct(640),0) or die 'The config file does not exist!';
}
############################################################# Change install directories #################################################################################
@@ -663,13 +663,13 @@ sub add_ldap_admin {
if (($mesg->entries)[0]->exists('fdForcePasswordDefaultHash') && ($mesg->entries)[0]->exists('fdPasswordDefaultHash')) {
if ((($mesg->entries)[0]->get_value('fdForcePasswordDefaultHash') eq 'TRUE') &&
(($mesg->entries)[0]->get_value('fdPasswordDefaultHash') ne 'ssha')) {
- warn "Warning: Administator password will be hashed with ssha instead of forced default ".($mesg->entries)[0]->get_value('fdPasswordDefaultHash')."\n";
+ warn "Warning: Administrator password will be hashed with ssha instead of forced default ".($mesg->entries)[0]->get_value('fdPasswordDefaultHash')."\n";
}
}
}
my $fd_admin_uid = ask_user_input ("Please enter a login for FusionDirectory's admin", "fd-admin");
- # Does this user exists?
+ # Does this user exist?
my $dn = "";
foreach my $entry (@$people_entries) {
my $mesg = $ldap->search(
@@ -981,7 +981,7 @@ sub check_admin {
print ("! There is no admin ACL role\n");
}
foreach my $dn (@dns) {
- print ("! $dn is supposed to be admin but does not exists\n");
+ print ("! $dn is supposed to be admin but does not exist\n");
}
if (ask_yn_question("No valid admin account found, do you want to create it ?")) {
return add_ldap_admin($base, $ldap, \@dns, $people_entries, \@roles);
@@ -1036,7 +1036,7 @@ sub check_ldap {
if ( branch_exists($ldap, "$userrdn,$base") ) {
check_admin($base, $ldap, \@people_entries);
- # if ou=people doesn't exists
+ # if ou=people doesn't exist
} else {
print ( "! $userrdn,$base not found in your LDAP directory\n" );
@@ -1105,7 +1105,7 @@ sub check_ldap {
$unbind->code && warn "! Unable to unbind from LDAP server: ", $unbind->error."\n";
}
-# function that check for duplicated uid or gid numbers
+# function that checks for duplicate uid or gid numbers
sub check_id_numbers {
# initiate the LDAP connexion
my %hash_ldap_param = get_ldap_connexion();
@@ -1151,7 +1151,7 @@ sub check_id_numbers_generic {
}
}
if ($dups == 0) {
- print "There are no duplicated ${attribute}s\n";
+ print "There are no duplicate ${attribute}s\n";
}
}
@@ -1169,7 +1169,7 @@ sub create_and_copy_plugin_dir {
sub install_plugins {
# ask for the plugins archive
my $plugins_archive = ask_user_input ("Where is your plugins archive or folder?");
- die ("! ".$plugins_archive." doesn't exists") if (!-e $plugins_archive);
+ die ("! ".$plugins_archive." doesn't exist") if (!-e $plugins_archive);
my $dir;
if (-d $plugins_archive) {
@@ -1177,7 +1177,7 @@ sub install_plugins {
} else {
# check the archive format
$plugins_archive =~ /^.*\/(.*).tar.gz$/;
- my $name = $1 or die ("! Unkwnow archive $plugins_archive");
+ my $name = $1 or die ("! Unknown archive $plugins_archive");
# where the extract files will go
my $tmp_plugins_dir = "/tmp";
@@ -2046,7 +2046,7 @@ sub show_version {
}
close($vars);
} else {
- print "File $variables_common_path does not exists, can’t find out FusionDirectory version\n";
+ print "File $variables_common_path does not exist, can’t find out FusionDirectory version\n";
}
}
@@ -2088,7 +2088,7 @@ die ("! You have to run this script as root\n") if ($<!=0);
$commands{"--check-directories"} = ["Checking FusionDirectory's directories", \&check_directories];
$commands{"--check-config"} = ["Checking FusionDirectory's config file", \&check_config];
$commands{"--check-ldap"} = ["Checking your LDAP tree", \&check_ldap, 1];
- $commands{"--check-ids"} = ["Checking for duplicated uid or gid numbers", \&check_id_numbers, 1];
+ $commands{"--check-ids"} = ["Checking for duplicate uid or gid numbers", \&check_id_numbers, 1];
$commands{"--migrate-users"} = ["Migrating your users", \&migrate_users, 1];
$commands{"--migrate-phones"} = ["Migrating your phones from FD < 1.1", \&migrate_phones, 1];
$commands{"--migrate-systems"} = ["Migrating your systems from FD < 1.1", \&migrate_systems, 1];
@@ -2187,11 +2187,11 @@ This option perform a check on FusionDirectory's config file.
=item --check-ldap
-This option check your LDAP tree. Looking for admin account, and groups or people branch. If one of those don't exists, the script will ask you what to do.
+This option check your LDAP tree. Looking for admin account, and groups or people branch. If one of those doesn't exist, the script will ask you what to do.
=item --check-ids
-This option check your LDAP tree for duplicated uidNumber or gidNumber among users and groups.
+This option check your LDAP tree for duplicate uidNumber or gidNumber among users and groups.
=item --migrate-users
diff --git a/contrib/man/fusiondirectory.conf.5 b/contrib/man/fusiondirectory.conf.5
index 9544d1f1654d909940cae74a586202cd8d3d85e7..4d647c32a321a13635f2dd14d74f8f3745eb6d79 100644
--- a/contrib/man/fusiondirectory.conf.5
+++ b/contrib/man/fusiondirectory.conf.5
@@ -202,7 +202,7 @@ FusionDirectory will not log anything, if the logging value is empty or set to f
.IP "\fBtemplateCompileDirectory\fR \fIpath\fR" 4
.IX Item "templateCompileDirectory path"
The templateCompileDirectory statements defines the path, where the \s-1PHP\s0 templating engins smarty should store its compiled FusionDirectory templates for improved speed.
-This path needs to be writeable by the user your webserver is running with.
+This path needs to be writeable by the user your web server is running with.
.IP "\fBignoreAcl\fR \fIdn\fR" 4
.IX Item "ignoreAcl dn"
The ignoreAcl value tells FusionDirectory to ignore complete \s-1ACL\s0 sets for the given \s-1DN.\s0 Add your \s-1DN\s0 here and you'll be able to restore accidentally dropped ACLs.
diff --git a/contrib/man/fusiondirectory.conf.pod b/contrib/man/fusiondirectory.conf.pod
index 708b6319ef907d5f62be8facfdde480e7dcf3e43..a1ec7d260a872041869b7dd3f506acaf3cc6da18 100644
--- a/contrib/man/fusiondirectory.conf.pod
+++ b/contrib/man/fusiondirectory.conf.pod
@@ -67,7 +67,7 @@ FusionDirectory will not log anything, if the logging value is empty or set to f
=item B<templateCompileDirectory> I<path>
The templateCompileDirectory statements defines the path, where the PHP templating engins smarty should store its compiled FusionDirectory templates for improved speed.
-This path needs to be writeable by the user your webserver is running with.
+This path needs to be writeable by the user your web server is running with.
=item B<ignoreAcl> I<dn>
diff --git a/ihtml/themes/breezy/islocked.tpl b/ihtml/themes/breezy/islocked.tpl
index 28600e7de365162d8efc69d30cae56e08f0f12b2..aabd1fc7a6c9bb4e99d20dfe3950558da142d636 100644
--- a/ihtml/themes/breezy/islocked.tpl
+++ b/ihtml/themes/breezy/islocked.tpl
@@ -14,7 +14,7 @@
</ul>
</p>
<p>
- {t 1=$action}If this lock detection is false, the other person may have closed the webbrowser during the edit operation. You may want to take over the lock by pressing the "%1" button.{/t}
+ {t 1=$action}If this lock detection is false, the other person may have closed the web browser during the edit operation. You may want to take over the lock by pressing the "%1" button.{/t}
</p>
<p class="plugbottom">
diff --git a/include/class_ldap.inc b/include/class_ldap.inc
index f5c8aae2cd8525f0b7f2de6a6dd32ceb97f340de..53b05aa7c38c526aee6a9c100c06b090a2fe4c18 100644
--- a/include/class_ldap.inc
+++ b/include/class_ldap.inc
@@ -134,7 +134,7 @@ class LDAP
/* Sadly we've no proper return values here. Use the error message instead. */
if (!$ldap->success()) {
- throw new FatalError(htmlescape(sprintf(_('FATAL: Error when connecting the LDAP. Server said "%s".'), $ldap->get_error())));
+ throw new FatalError(htmlescape(sprintf(_('FATAL: Error when connecting to LDAP. Server said "%s".'), $ldap->get_error())));
}
/* Preset connection base to $base and return to caller */
diff --git a/include/class_msgPool.inc b/include/class_msgPool.inc
index 3b54c3387a85fb99cc5fd8fd44c39562c1280780..bdf52f47b7c34c2822443c3d51af1444ec5cf9a0 100644
--- a/include/class_msgPool.inc
+++ b/include/class_msgPool.inc
@@ -235,7 +235,7 @@ class msgPool
if ($dn == NULL) {
return htmlescape(sprintf(_('There is already an entry with this "%s" attribute in the system!'), $name));
} else {
- return htmlescape(sprintf(_('The entry "%s" already use this "%s" attribute!'), $dn, $name));
+ return htmlescape(sprintf(_('The entry "%s" already uses this "%s" attribute!'), $dn, $name));
}
}
diff --git a/include/class_passwordRecovery.inc b/include/class_passwordRecovery.inc
index b142b1d2c28dd0c81c04fd165183e5d961b0a14b..1876a13431cf12596042f412272161bd967fea45 100644
--- a/include/class_passwordRecovery.inc
+++ b/include/class_passwordRecovery.inc
@@ -357,7 +357,7 @@ class passwordRecovery extends standAlonePage
if (mail_utf8($this->email_address, FALSE, $this->from_mail, $this->mail_subject, $body)) {
$this->step = 3;
} else {
- $this->message[] = new FusionDirectoryError(htmlescape(_('Contact your administrator, there was a problem with mail server')));
+ $this->message[] = new FusionDirectoryError(htmlescape(_('Contact your administrator, there was a problem with the mail server')));
}
$smarty = get_smarty();
@@ -434,7 +434,7 @@ class passwordRecovery extends standAlonePage
$this->step = 5;
$smarty->assign('changed', TRUE);
} else {
- $this->message[] = new FusionDirectoryError(htmlescape(_('There was a problem with mail server, confirmation email not sent')));
+ $this->message[] = new FusionDirectoryError(htmlescape(_('There was a problem with the mail server, confirmation email not sent')));
}
}
diff --git a/include/class_userinfo.inc b/include/class_userinfo.inc
index 084ca5897033cab071d512c603c07e3874faaad1..8c5d5136f61570ad58739fb4a8f7285aa8af53fc 100644
--- a/include/class_userinfo.inc
+++ b/include/class_userinfo.inc
@@ -830,7 +830,7 @@ class userinfo
}
}
} catch (NonExistingLdapNodeException $e) {
- /* ppolicy not found in the LDAP */
+ /* ppolicy not found in LDAP */
}
}
diff --git a/include/login/class_LoginCAS.inc b/include/login/class_LoginCAS.inc
index 46fe285a46f49b599b1abc8a2a07e13cdea5d3de..9bae6a85a796bf24ab0bae5cda7a1538950b9376 100644
--- a/include/login/class_LoginCAS.inc
+++ b/include/login/class_LoginCAS.inc
@@ -79,7 +79,7 @@ class LoginCAS extends LoginMethod
if ($ui === FALSE) {
throw new FatalError(
htmlescape(sprintf(
- _('CAS user "%s" could not be found in the LDAP'),
+ _('CAS user "%s" could not be found in LDAP'),
static::$username
))
);
diff --git a/include/login/class_LoginHTTPHeader.inc b/include/login/class_LoginHTTPHeader.inc
index 4d414e56e8467fb549c273c9177624ea3818c775..2fdd8be0a18447a27e463716428ca6a2787c46c7 100644
--- a/include/login/class_LoginHTTPHeader.inc
+++ b/include/login/class_LoginHTTPHeader.inc
@@ -57,7 +57,7 @@ class LoginHTTPHeader extends LoginMethod
if ($ui === FALSE) {
throw new FatalError(
htmlescape(sprintf(
- _('Header user "%s" could not be found in the LDAP'),
+ _('Header user "%s" could not be found in LDAP'),
static::$username
))
);
diff --git a/include/management/class_ManagementConfigurationDialog.inc b/include/management/class_ManagementConfigurationDialog.inc
index b7a3b3263a43de3b55724419e3fe066a0e4f6f69..d0dfa4d89a3a8231e14c07234d16a9199c654a92 100644
--- a/include/management/class_ManagementConfigurationDialog.inc
+++ b/include/management/class_ManagementConfigurationDialog.inc
@@ -68,7 +68,7 @@ class ManagementConfigurationDialog extends ManagementDialog
$types, 'LinkColumn'
),
new StringAttribute(
- _('Attribute'), _('LDAP attributes to display, comma separated. Special values "nameAttr" and "mainAttr" also works.'),
+ _('Attribute'), _('LDAP attributes to display, comma separated. Special values "nameAttr" and "mainAttr" also work.'),
'columnAttribute', FALSE
),
new StringAttribute(
@@ -83,7 +83,7 @@ class ManagementConfigurationDialog extends ManagementDialog
TRUE // edition
),
new BooleanAttribute(
- _('Persitent'), _('Should this configuration be saved in the LDAP as your default configuration for this management page'),
+ _('Persistent'), _('Should this configuration be saved in the LDAP as your default configuration for this management page'),
'saveInLdapUser', FALSE,
FALSE,
'ManagementConfiguration'
diff --git a/include/php_setup.inc b/include/php_setup.inc
index 87ada2efed08ca38cfb305e4627e671e4bb99479..0bfbe243a00f7f9828b45cf671491c95541e2add 100644
--- a/include/php_setup.inc
+++ b/include/php_setup.inc
@@ -246,7 +246,7 @@ function gosaRaiseError ($errno, $errstr, $errfile, $errline)
<td align=right>
<a href="mailto:bugs@fusiondirectory.org?subject=FusionDirectory%20bugreport&body=%BUGBODY%">
<img src="geticon.php?context=applications&icon=internet-mail&size=16" title="'.htmlescape(_('Send bug report to the FusionDirectory Team')).
- '" class="center" alt="'.htmlescape(_('Mail icon')).'"> '.htmlescape(_('Send bugreport')).'
+ '" class="center" alt="'.htmlescape(_('Mail icon')).'"> '.htmlescape(_('Send bug report')).'
</a>
</td>
<td align="right">
diff --git a/include/simpleplugin/class_Attribute.inc b/include/simpleplugin/class_Attribute.inc
index 98d200a9eebbc90bbd85244480674ed5551728d1..9e38dcee736f2dd904a9d5049fdc43ea86c126e4 100644
--- a/include/simpleplugin/class_Attribute.inc
+++ b/include/simpleplugin/class_Attribute.inc
@@ -368,7 +368,7 @@ class Attribute
/*! \brief Return the ldap value in the correct intern format value
*
- * \param $ldapValue The value as found in the LDAP
+ * \param $ldapValue The value as found in LDAP
*/
function inputValue ($ldapValue)
{
diff --git a/include/simpleplugin/class_simplePlugin.inc b/include/simpleplugin/class_simplePlugin.inc
index e5f3a64d4e22beccb1c7d73b9d87456807cc24be..c855326db1441b008449de198905ab0702e6141a 100644
--- a/include/simpleplugin/class_simplePlugin.inc
+++ b/include/simpleplugin/class_simplePlugin.inc
@@ -484,7 +484,7 @@ class simplePlugin implements SimpleTab
if ($infos === FALSE) {
throw new FatalError(
htmlescape(sprintf(
- _('Could not compute dn: could not find objectType infos from tab class "%s"'),
+ _('Could not compute dn: could not find objectType info from tab class "%s"'),
get_class($this->parent)
))
);
@@ -1652,7 +1652,7 @@ class simplePlugin implements SimpleTab
$current_csn = getEntryCSN($this->dn);
if (($current_csn != $this->entryCSN) && !empty($current_csn)) {
$this->entryCSN = $current_csn;
- $messages[] = _('The object has changed since opened in FusionDirectory. All changes that may be done by others will get lost if you save this entry!');
+ $messages[] = _('The object has changed since being opened in FusionDirectory. All changes that may be done by others will get lost if you save this entry!');
}
}
diff --git a/locale/af_ZA/fusiondirectory.po b/locale/af_ZA/fusiondirectory.po
index 068bfd863fde91ad3f159ce234dc69b9eca9799d..706d567f6d7f832ffac5fdab786594b7345c93a7 100644
--- a/locale/af_ZA/fusiondirectory.po
+++ b/locale/af_ZA/fusiondirectory.po
@@ -83,7 +83,7 @@ msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:71
msgid ""
"LDAP attributes to display, comma separated. Special values \"nameAttr\" and"
-" \"mainAttr\" also works."
+" \"mainAttr\" also work."
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:75
@@ -95,7 +95,7 @@ msgid "Column title"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
-msgid "Persitent"
+msgid "Persistent"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
@@ -574,7 +574,7 @@ msgid "Send bug report to the FusionDirectory Team"
msgstr ""
#: include/php_setup.inc:235
-msgid "Send bugreport"
+msgid "Send bug report"
msgstr ""
#: include/php_setup.inc:240
@@ -629,7 +629,7 @@ msgstr ""
#: include/login/class_LoginCAS.inc:68
#, php-format
-msgid "CAS user \"%s\" could not be found in the LDAP"
+msgid "CAS user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginCAS.inc:78 include/login/class_LoginCAS.inc:104
@@ -719,7 +719,7 @@ msgstr ""
#: include/login/class_LoginHTTPHeader.inc:64
#, php-format
-msgid "Header user \"%s\" could not be found in the LDAP"
+msgid "Header user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginHTTPAuth.inc:29
@@ -763,7 +763,7 @@ msgid "The user using email \"%s\" is locked. Please contact your administrator.
msgstr ""
#: include/class_passwordRecovery.inc:352
-msgid "Contact your administrator, there was a problem with mail server"
+msgid "Contact your administrator, there was a problem with the mail server"
msgstr ""
#: include/class_passwordRecovery.inc:365
@@ -771,7 +771,7 @@ msgid "This token is invalid"
msgstr ""
#: include/class_passwordRecovery.inc:429
-msgid "There was a problem with mail server, confirmation email not sent"
+msgid "There was a problem with the mail server, confirmation email not sent"
msgstr ""
#: include/password-methods/class_passwordMethodSasl.inc:66
@@ -836,7 +836,7 @@ msgstr ""
#: include/functions.inc:354
#, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
msgstr ""
#: include/functions.inc:402 include/functions.inc:531
@@ -1151,7 +1151,7 @@ msgstr ""
#: include/class_msgPool.inc:245
#, php-format
-msgid "The entry \"%s\" already use this \"%s\" attribute!"
+msgid "The entry \"%s\" already uses this \"%s\" attribute!"
msgstr ""
#: include/class_msgPool.inc:256
@@ -1597,7 +1597,7 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:380
#, php-format
-msgid "Cannot set \"%s\" value, it contains invalid data: %s"
+msgid "Cannot set value \"%s\", it contains invalid data: %s"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:390
@@ -1643,7 +1643,7 @@ msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:150
#, php-format
-msgid "The value for multivaluated field \"%s\" is not an array"
+msgid "The value for multivalued field \"%s\" is not an array"
msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:250
@@ -1704,7 +1704,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:492
#, php-format
msgid ""
-"Could not compute dn: could not find objectType infos from tab class \"%s\""
+"Could not compute dn: could not find objectType info from tab class \"%s\""
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1363
@@ -1719,7 +1719,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1576
msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may"
+"The object has changed since being opened in FusionDirectory. All changes that may"
" be done by others will get lost if you save this entry!"
msgstr ""
@@ -2424,7 +2424,7 @@ msgid "DN you wish to add assignments for"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:110
-msgid "The dn you entered could not be found in the LDAP"
+msgid "The dn you entered could not be found in LDAP"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:141
@@ -2606,7 +2606,7 @@ msgid "SASL"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
-msgid "Force to ask for password"
+msgid "Force asking for a password"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
@@ -2682,7 +2682,7 @@ msgid "Activate password recovery"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:47
-msgid "Whether to activate or not password recovery feature"
+msgid "Whether to activate the password recovery feature or not"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:52
@@ -2717,7 +2717,7 @@ msgstr ""
#: plugins/config/class_recoveryConfig.inc:74
msgid ""
-"Users will also be able to enter one of theirs alternate addresses to "
+"Users will also be able to enter one of their alternate addresses to "
"recover their password"
msgstr ""
@@ -2957,7 +2957,7 @@ msgid "Snapshot base"
msgstr ""
#: plugins/config/class_configInLdap.inc:109
-msgid "The base where snapshots should be stored inside of the LDAP."
+msgid "The base where snapshots should be stored inside the LDAP directory."
msgstr ""
#: plugins/config/class_configInLdap.inc:114
@@ -3153,7 +3153,7 @@ msgid "People DN attribute"
msgstr ""
#: plugins/config/class_configInLdap.inc:252
-msgid "Attribute to use at the beginning of users dn"
+msgid "Attribute to use at the beginning of the user's dn"
msgstr ""
#: plugins/config/class_configInLdap.inc:257
@@ -3238,7 +3238,7 @@ msgstr ""
#: plugins/config/class_configInLdap.inc:301
msgid ""
"Shows PHP errors in the upper part of the screen. This should be disabled in"
-" productive deployments, because there might be some passwords in it."
+" production deployments, because it may contain passwords."
msgstr ""
#: plugins/config/class_configInLdap.inc:305
@@ -3476,7 +3476,7 @@ msgstr ""
#: plugins/personal/roles/class_userRoles.inc:49
#: plugins/personal/roles/class_userRoles.inc:53
-msgid "Groups membership"
+msgid "Group memberships"
msgstr ""
#: plugins/personal/roles/class_userRoles.inc:60
@@ -3755,7 +3755,7 @@ msgstr ""
#: plugins/personal/generic/class_user.inc:430
#, php-format
-msgid "Ppolicy \"%s\" could not be found in the LDAP!"
+msgid "Ppolicy \"%s\" could not be found in LDAP!"
msgstr ""
#: plugins/personal/generic/class_user.inc:460
@@ -4020,7 +4020,7 @@ msgstr ""
#: setup/class_setupStepChecks.inc:124
msgid ""
-"FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
+"FusionDirectory requires either the 'mhash' or 'sha1' module to make use of "
"SSHA encryption."
msgstr ""
@@ -4208,11 +4208,11 @@ msgid "Checking for POSIX groups outside the groups tree"
msgstr ""
#: setup/class_setupStepMigrate.inc:274
-msgid "Checking for duplicated UID numbers"
+msgid "Checking for duplicate UID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:275
-msgid "Checking for duplicated GID numbers"
+msgid "Checking for duplicate GID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:343 setup/class_setupStepMigrate.inc:502
@@ -4228,7 +4228,7 @@ msgstr ""
#: setup/class_setupStepMigrate.inc:935 setup/class_setupStepMigrate.inc:1041
#: setup/class_setupStepMigrate.inc:1071 setup/class_setupStepMigrate.inc:1322
#: setup/class_setupStepMigrate.inc:1433
-msgid "Possibly the \"root object\" is missing."
+msgid "The \"root object\" is possibly missing."
msgstr ""
#: setup/class_setupStepMigrate.inc:360 setup/class_setupStepMigrate.inc:383
@@ -4299,7 +4299,7 @@ msgid "Roles"
msgstr ""
#: setup/class_setupStepMigrate.inc:836
-msgid "There is no FusionDirectory administrator account inside your LDAP."
+msgid "There is no FusionDirectory administrator account in your LDAP directory."
msgstr ""
#: setup/class_setupStepMigrate.inc:875
@@ -4338,12 +4338,12 @@ msgid "LDAP result parsing failed"
msgstr ""
#: setup/class_setupStepMigrate.inc:1076 setup/class_setupStepMigrate.inc:1327
-msgid "Sizelimit hit"
+msgid "Size limit hit"
msgstr ""
#: setup/class_setupStepMigrate.inc:1077 setup/class_setupStepMigrate.inc:1328
#, php-format
-msgid "Sizelimit of %d hit. Please check this manually"
+msgid "Size limit of %d hit. Please check this manually"
msgstr ""
#: setup/class_setupStepMigrate.inc:1120 setup/class_setupStepMigrate.inc:1134
@@ -4438,7 +4438,7 @@ msgstr ""
#, php-format
msgid ""
"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
"shouldn't."
msgstr ""
@@ -4544,7 +4544,7 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/users_accounts.tpl.c:5
-msgid "There is no expired account"
+msgid "There are no expired accounts"
msgstr ""
#: plugins/addons/dashboard/users_accounts.tpl.c:11
@@ -4594,8 +4594,8 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:5
-msgid "One of them use %1 method"
-msgid_plural "%2 of them use %1 method"
+msgid "One of them uses the %1 method"
+msgid_plural "%2 of them use the %1 method"
msgstr[0] ""
msgstr[1] ""
@@ -4606,7 +4606,7 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:11
-msgid "None of them is locked"
+msgid "None of them are locked"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:5
@@ -4614,7 +4614,7 @@ msgid "There are no users"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:8
-msgid "One of them have a %1 account"
+msgid "One of them has a %1 account"
msgid_plural "%2 of them have a %1 account"
msgstr[0] ""
msgstr[1] ""
@@ -4683,7 +4683,7 @@ msgstr ""
#: setup/setup_welcome.tpl.c:2
msgid ""
-"This seems to be the first time you start FusionDirectory - we didn't find "
+"This seems to be the first time you start FusionDirectory - we cannot find "
"any configuration right now. This simple wizard intends to help you while "
"setting it up."
msgstr ""
@@ -4727,12 +4727,12 @@ msgstr ""
#: setup/setup_welcome.tpl.c:32
msgid ""
"For security reasons you need to authenticate for the installation by "
-"creating the file '%1', containing the current session ID on the servers "
+"creating the file '%1', containing the current session ID on the server's "
"local filesystem. This can be done by executing the following command:"
msgstr ""
#: setup/setup_welcome.tpl.c:35
-msgid "Click the 'Next' button when you've finished."
+msgid "Click the 'Next' button when you are done."
msgstr ""
#: setup/setup_migrate.tpl.c:2
@@ -4995,7 +4995,7 @@ msgstr ""
#: ihtml/themes/breezy/islocked.tpl.c:11
msgid ""
"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
+"web browser during the edit operation. You may want to take over the lock by "
"pressing the \"%1\" button."
msgstr ""
diff --git a/locale/ar/fusiondirectory.po b/locale/ar/fusiondirectory.po
index ef63abb7ddcb2caff0ef2c734446c3a693901fda..6ff87b1045fee3ad67589e670c0ec239e2070bee 100644
--- a/locale/ar/fusiondirectory.po
+++ b/locale/ar/fusiondirectory.po
@@ -87,7 +87,7 @@ msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:71
msgid ""
"LDAP attributes to display, comma separated. Special values \"nameAttr\" and"
-" \"mainAttr\" also works."
+" \"mainAttr\" also work."
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:75
@@ -99,7 +99,7 @@ msgid "Column title"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
-msgid "Persitent"
+msgid "Persistent"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
@@ -578,7 +578,7 @@ msgid "Send bug report to the FusionDirectory Team"
msgstr ""
#: include/php_setup.inc:235
-msgid "Send bugreport"
+msgid "Send bug report"
msgstr ""
#: include/php_setup.inc:240
@@ -633,7 +633,7 @@ msgstr ""
#: include/login/class_LoginCAS.inc:68
#, php-format
-msgid "CAS user \"%s\" could not be found in the LDAP"
+msgid "CAS user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginCAS.inc:78 include/login/class_LoginCAS.inc:104
@@ -723,7 +723,7 @@ msgstr ""
#: include/login/class_LoginHTTPHeader.inc:64
#, php-format
-msgid "Header user \"%s\" could not be found in the LDAP"
+msgid "Header user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginHTTPAuth.inc:29
@@ -767,7 +767,7 @@ msgid "The user using email \"%s\" is locked. Please contact your administrator.
msgstr ""
#: include/class_passwordRecovery.inc:352
-msgid "Contact your administrator, there was a problem with mail server"
+msgid "Contact your administrator, there was a problem with the mail server"
msgstr ""
#: include/class_passwordRecovery.inc:365
@@ -775,7 +775,7 @@ msgid "This token is invalid"
msgstr ""
#: include/class_passwordRecovery.inc:429
-msgid "There was a problem with mail server, confirmation email not sent"
+msgid "There was a problem with the mail server, confirmation email not sent"
msgstr ""
#: include/password-methods/class_passwordMethodSasl.inc:66
@@ -840,7 +840,7 @@ msgstr ""
#: include/functions.inc:354
#, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
msgstr ""
#: include/functions.inc:402 include/functions.inc:531
@@ -1155,7 +1155,7 @@ msgstr ""
#: include/class_msgPool.inc:245
#, php-format
-msgid "The entry \"%s\" already use this \"%s\" attribute!"
+msgid "The entry \"%s\" already uses this \"%s\" attribute!"
msgstr ""
#: include/class_msgPool.inc:256
@@ -1601,7 +1601,7 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:380
#, php-format
-msgid "Cannot set \"%s\" value, it contains invalid data: %s"
+msgid "Cannot set value \"%s\", it contains invalid data: %s"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:390
@@ -1647,7 +1647,7 @@ msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:150
#, php-format
-msgid "The value for multivaluated field \"%s\" is not an array"
+msgid "The value for multivalued field \"%s\" is not an array"
msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:250
@@ -1708,7 +1708,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:492
#, php-format
msgid ""
-"Could not compute dn: could not find objectType infos from tab class \"%s\""
+"Could not compute dn: could not find objectType info from tab class \"%s\""
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1363
@@ -1723,7 +1723,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1576
msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may"
+"The object has changed since being opened in FusionDirectory. All changes that may"
" be done by others will get lost if you save this entry!"
msgstr ""
@@ -2428,7 +2428,7 @@ msgid "DN you wish to add assignments for"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:110
-msgid "The dn you entered could not be found in the LDAP"
+msgid "The dn you entered could not be found in LDAP"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:141
@@ -2610,7 +2610,7 @@ msgid "SASL"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
-msgid "Force to ask for password"
+msgid "Force asking for a password"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
@@ -2686,7 +2686,7 @@ msgid "Activate password recovery"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:47
-msgid "Whether to activate or not password recovery feature"
+msgid "Whether to activate the password recovery feature or not"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:52
@@ -2721,7 +2721,7 @@ msgstr ""
#: plugins/config/class_recoveryConfig.inc:74
msgid ""
-"Users will also be able to enter one of theirs alternate addresses to "
+"Users will also be able to enter one of their alternate addresses to "
"recover their password"
msgstr ""
@@ -2961,7 +2961,7 @@ msgid "Snapshot base"
msgstr ""
#: plugins/config/class_configInLdap.inc:109
-msgid "The base where snapshots should be stored inside of the LDAP."
+msgid "The base where snapshots should be stored inside the LDAP directory."
msgstr ""
#: plugins/config/class_configInLdap.inc:114
@@ -3157,7 +3157,7 @@ msgid "People DN attribute"
msgstr ""
#: plugins/config/class_configInLdap.inc:252
-msgid "Attribute to use at the beginning of users dn"
+msgid "Attribute to use at the beginning of the user's dn"
msgstr ""
#: plugins/config/class_configInLdap.inc:257
@@ -3242,7 +3242,7 @@ msgstr ""
#: plugins/config/class_configInLdap.inc:301
msgid ""
"Shows PHP errors in the upper part of the screen. This should be disabled in"
-" productive deployments, because there might be some passwords in it."
+" production deployments, because it may contain passwords."
msgstr ""
#: plugins/config/class_configInLdap.inc:305
@@ -3480,7 +3480,7 @@ msgstr ""
#: plugins/personal/roles/class_userRoles.inc:49
#: plugins/personal/roles/class_userRoles.inc:53
-msgid "Groups membership"
+msgid "Group memberships"
msgstr ""
#: plugins/personal/roles/class_userRoles.inc:60
@@ -3759,7 +3759,7 @@ msgstr "الرقم البريدي"
#: plugins/personal/generic/class_user.inc:430
#, php-format
-msgid "Ppolicy \"%s\" could not be found in the LDAP!"
+msgid "Ppolicy \"%s\" could not be found in LDAP!"
msgstr ""
#: plugins/personal/generic/class_user.inc:460
@@ -4024,7 +4024,7 @@ msgstr ""
#: setup/class_setupStepChecks.inc:124
msgid ""
-"FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
+"FusionDirectory requires either the 'mhash' or 'sha1' module to make use of "
"SSHA encryption."
msgstr ""
@@ -4212,11 +4212,11 @@ msgid "Checking for POSIX groups outside the groups tree"
msgstr ""
#: setup/class_setupStepMigrate.inc:274
-msgid "Checking for duplicated UID numbers"
+msgid "Checking for duplicate UID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:275
-msgid "Checking for duplicated GID numbers"
+msgid "Checking for duplicate GID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:343 setup/class_setupStepMigrate.inc:502
@@ -4232,7 +4232,7 @@ msgstr ""
#: setup/class_setupStepMigrate.inc:935 setup/class_setupStepMigrate.inc:1041
#: setup/class_setupStepMigrate.inc:1071 setup/class_setupStepMigrate.inc:1322
#: setup/class_setupStepMigrate.inc:1433
-msgid "Possibly the \"root object\" is missing."
+msgid "The \"root object\" is possibly missing."
msgstr ""
#: setup/class_setupStepMigrate.inc:360 setup/class_setupStepMigrate.inc:383
@@ -4303,7 +4303,7 @@ msgid "Roles"
msgstr ""
#: setup/class_setupStepMigrate.inc:836
-msgid "There is no FusionDirectory administrator account inside your LDAP."
+msgid "There is no FusionDirectory administrator account in your LDAP directory."
msgstr ""
#: setup/class_setupStepMigrate.inc:875
@@ -4342,12 +4342,12 @@ msgid "LDAP result parsing failed"
msgstr ""
#: setup/class_setupStepMigrate.inc:1076 setup/class_setupStepMigrate.inc:1327
-msgid "Sizelimit hit"
+msgid "Size limit hit"
msgstr ""
#: setup/class_setupStepMigrate.inc:1077 setup/class_setupStepMigrate.inc:1328
#, php-format
-msgid "Sizelimit of %d hit. Please check this manually"
+msgid "Size limit of %d hit. Please check this manually"
msgstr ""
#: setup/class_setupStepMigrate.inc:1120 setup/class_setupStepMigrate.inc:1134
@@ -4442,7 +4442,7 @@ msgstr ""
#, php-format
msgid ""
"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
"shouldn't."
msgstr ""
@@ -4552,7 +4552,7 @@ msgstr[4] ""
msgstr[5] ""
#: plugins/addons/dashboard/users_accounts.tpl.c:5
-msgid "There is no expired account"
+msgid "There are no expired accounts"
msgstr ""
#: plugins/addons/dashboard/users_accounts.tpl.c:11
@@ -4618,8 +4618,8 @@ msgstr[4] ""
msgstr[5] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:5
-msgid "One of them use %1 method"
-msgid_plural "%2 of them use %1 method"
+msgid "One of them uses the %1 method"
+msgid_plural "%2 of them use the %1 method"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
@@ -4638,7 +4638,7 @@ msgstr[4] ""
msgstr[5] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:11
-msgid "None of them is locked"
+msgid "None of them are locked"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:5
@@ -4646,7 +4646,7 @@ msgid "There are no users"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:8
-msgid "One of them have a %1 account"
+msgid "One of them has a %1 account"
msgid_plural "%2 of them have a %1 account"
msgstr[0] ""
msgstr[1] ""
@@ -4719,7 +4719,7 @@ msgstr ""
#: setup/setup_welcome.tpl.c:2
msgid ""
-"This seems to be the first time you start FusionDirectory - we didn't find "
+"This seems to be the first time you start FusionDirectory - we cannot find "
"any configuration right now. This simple wizard intends to help you while "
"setting it up."
msgstr ""
@@ -4763,12 +4763,12 @@ msgstr ""
#: setup/setup_welcome.tpl.c:32
msgid ""
"For security reasons you need to authenticate for the installation by "
-"creating the file '%1', containing the current session ID on the servers "
+"creating the file '%1', containing the current session ID on the server's "
"local filesystem. This can be done by executing the following command:"
msgstr ""
#: setup/setup_welcome.tpl.c:35
-msgid "Click the 'Next' button when you've finished."
+msgid "Click the 'Next' button when you are done."
msgstr ""
#: setup/setup_migrate.tpl.c:2
@@ -5031,7 +5031,7 @@ msgstr ""
#: ihtml/themes/breezy/islocked.tpl.c:11
msgid ""
"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
+"web browser during the edit operation. You may want to take over the lock by "
"pressing the \"%1\" button."
msgstr ""
diff --git a/locale/ca/fusiondirectory.po b/locale/ca/fusiondirectory.po
index 3f2e952222083b3da277683ee45ad916086130d5..f9298bf98d014d382a95d4e10e7576d9f5d14e6f 100644
--- a/locale/ca/fusiondirectory.po
+++ b/locale/ca/fusiondirectory.po
@@ -87,7 +87,7 @@ msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:71
msgid ""
"LDAP attributes to display, comma separated. Special values \"nameAttr\" and"
-" \"mainAttr\" also works."
+" \"mainAttr\" also work."
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:75
@@ -99,7 +99,7 @@ msgid "Column title"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
-msgid "Persitent"
+msgid "Persistent"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
@@ -578,7 +578,7 @@ msgid "Send bug report to the FusionDirectory Team"
msgstr ""
#: include/php_setup.inc:235
-msgid "Send bugreport"
+msgid "Send bug report"
msgstr ""
#: include/php_setup.inc:240
@@ -633,7 +633,7 @@ msgstr ""
#: include/login/class_LoginCAS.inc:68
#, php-format
-msgid "CAS user \"%s\" could not be found in the LDAP"
+msgid "CAS user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginCAS.inc:78 include/login/class_LoginCAS.inc:104
@@ -725,7 +725,7 @@ msgstr ""
#: include/login/class_LoginHTTPHeader.inc:64
#, php-format
-msgid "Header user \"%s\" could not be found in the LDAP"
+msgid "Header user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginHTTPAuth.inc:29
@@ -769,7 +769,7 @@ msgid "The user using email \"%s\" is locked. Please contact your administrator.
msgstr ""
#: include/class_passwordRecovery.inc:352
-msgid "Contact your administrator, there was a problem with mail server"
+msgid "Contact your administrator, there was a problem with the mail server"
msgstr ""
#: include/class_passwordRecovery.inc:365
@@ -777,7 +777,7 @@ msgid "This token is invalid"
msgstr ""
#: include/class_passwordRecovery.inc:429
-msgid "There was a problem with mail server, confirmation email not sent"
+msgid "There was a problem with the mail server, confirmation email not sent"
msgstr ""
#: include/password-methods/class_passwordMethodSasl.inc:66
@@ -843,7 +843,7 @@ msgstr ""
#: include/functions.inc:354
#, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
msgstr ""
#: include/functions.inc:402 include/functions.inc:531
@@ -1158,7 +1158,7 @@ msgstr ""
#: include/class_msgPool.inc:245
#, php-format
-msgid "The entry \"%s\" already use this \"%s\" attribute!"
+msgid "The entry \"%s\" already uses this \"%s\" attribute!"
msgstr ""
#: include/class_msgPool.inc:256
@@ -1606,7 +1606,7 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:380
#, php-format
-msgid "Cannot set \"%s\" value, it contains invalid data: %s"
+msgid "Cannot set value \"%s\", it contains invalid data: %s"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:390
@@ -1652,7 +1652,7 @@ msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:150
#, php-format
-msgid "The value for multivaluated field \"%s\" is not an array"
+msgid "The value for multivalued field \"%s\" is not an array"
msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:250
@@ -1713,7 +1713,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:492
#, php-format
msgid ""
-"Could not compute dn: could not find objectType infos from tab class \"%s\""
+"Could not compute dn: could not find objectType info from tab class \"%s\""
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1363
@@ -1728,7 +1728,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1576
msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may"
+"The object has changed since being opened in FusionDirectory. All changes that may"
" be done by others will get lost if you save this entry!"
msgstr ""
@@ -2433,7 +2433,7 @@ msgid "DN you wish to add assignments for"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:110
-msgid "The dn you entered could not be found in the LDAP"
+msgid "The dn you entered could not be found in LDAP"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:141
@@ -2615,7 +2615,7 @@ msgid "SASL"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
-msgid "Force to ask for password"
+msgid "Force asking for a password"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
@@ -2691,7 +2691,7 @@ msgid "Activate password recovery"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:47
-msgid "Whether to activate or not password recovery feature"
+msgid "Whether to activate the password recovery feature or not"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:52
@@ -2726,7 +2726,7 @@ msgstr ""
#: plugins/config/class_recoveryConfig.inc:74
msgid ""
-"Users will also be able to enter one of theirs alternate addresses to "
+"Users will also be able to enter one of their alternate addresses to "
"recover their password"
msgstr ""
@@ -2966,7 +2966,7 @@ msgid "Snapshot base"
msgstr ""
#: plugins/config/class_configInLdap.inc:109
-msgid "The base where snapshots should be stored inside of the LDAP."
+msgid "The base where snapshots should be stored inside the LDAP directory."
msgstr ""
#: plugins/config/class_configInLdap.inc:114
@@ -3162,7 +3162,7 @@ msgid "People DN attribute"
msgstr ""
#: plugins/config/class_configInLdap.inc:252
-msgid "Attribute to use at the beginning of users dn"
+msgid "Attribute to use at the beginning of the user's dn"
msgstr ""
#: plugins/config/class_configInLdap.inc:257
@@ -3247,7 +3247,7 @@ msgstr ""
#: plugins/config/class_configInLdap.inc:301
msgid ""
"Shows PHP errors in the upper part of the screen. This should be disabled in"
-" productive deployments, because there might be some passwords in it."
+" production deployments, because it may contain passwords."
msgstr ""
#: plugins/config/class_configInLdap.inc:305
@@ -3485,7 +3485,7 @@ msgstr ""
#: plugins/personal/roles/class_userRoles.inc:49
#: plugins/personal/roles/class_userRoles.inc:53
-msgid "Groups membership"
+msgid "Group memberships"
msgstr ""
#: plugins/personal/roles/class_userRoles.inc:60
@@ -3764,7 +3764,7 @@ msgstr ""
#: plugins/personal/generic/class_user.inc:430
#, php-format
-msgid "Ppolicy \"%s\" could not be found in the LDAP!"
+msgid "Ppolicy \"%s\" could not be found in LDAP!"
msgstr ""
#: plugins/personal/generic/class_user.inc:460
@@ -4029,7 +4029,7 @@ msgstr ""
#: setup/class_setupStepChecks.inc:124
msgid ""
-"FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
+"FusionDirectory requires either the 'mhash' or 'sha1' module to make use of "
"SSHA encryption."
msgstr ""
@@ -4217,11 +4217,11 @@ msgid "Checking for POSIX groups outside the groups tree"
msgstr ""
#: setup/class_setupStepMigrate.inc:274
-msgid "Checking for duplicated UID numbers"
+msgid "Checking for duplicate UID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:275
-msgid "Checking for duplicated GID numbers"
+msgid "Checking for duplicate GID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:343 setup/class_setupStepMigrate.inc:502
@@ -4237,7 +4237,7 @@ msgstr ""
#: setup/class_setupStepMigrate.inc:935 setup/class_setupStepMigrate.inc:1041
#: setup/class_setupStepMigrate.inc:1071 setup/class_setupStepMigrate.inc:1322
#: setup/class_setupStepMigrate.inc:1433
-msgid "Possibly the \"root object\" is missing."
+msgid "The \"root object\" is possibly missing."
msgstr ""
#: setup/class_setupStepMigrate.inc:360 setup/class_setupStepMigrate.inc:383
@@ -4308,7 +4308,7 @@ msgid "Roles"
msgstr ""
#: setup/class_setupStepMigrate.inc:836
-msgid "There is no FusionDirectory administrator account inside your LDAP."
+msgid "There is no FusionDirectory administrator account in your LDAP directory."
msgstr ""
#: setup/class_setupStepMigrate.inc:875
@@ -4347,12 +4347,12 @@ msgid "LDAP result parsing failed"
msgstr ""
#: setup/class_setupStepMigrate.inc:1076 setup/class_setupStepMigrate.inc:1327
-msgid "Sizelimit hit"
+msgid "Size limit hit"
msgstr ""
#: setup/class_setupStepMigrate.inc:1077 setup/class_setupStepMigrate.inc:1328
#, php-format
-msgid "Sizelimit of %d hit. Please check this manually"
+msgid "Size limit of %d hit. Please check this manually"
msgstr ""
#: setup/class_setupStepMigrate.inc:1120 setup/class_setupStepMigrate.inc:1134
@@ -4447,7 +4447,7 @@ msgstr ""
#, php-format
msgid ""
"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
"shouldn't."
msgstr ""
@@ -4553,7 +4553,7 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/users_accounts.tpl.c:5
-msgid "There is no expired account"
+msgid "There are no expired accounts"
msgstr ""
#: plugins/addons/dashboard/users_accounts.tpl.c:11
@@ -4603,8 +4603,8 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:5
-msgid "One of them use %1 method"
-msgid_plural "%2 of them use %1 method"
+msgid "One of them uses the %1 method"
+msgid_plural "%2 of them use the %1 method"
msgstr[0] ""
msgstr[1] ""
@@ -4615,7 +4615,7 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:11
-msgid "None of them is locked"
+msgid "None of them are locked"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:5
@@ -4623,7 +4623,7 @@ msgid "There are no users"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:8
-msgid "One of them have a %1 account"
+msgid "One of them has a %1 account"
msgid_plural "%2 of them have a %1 account"
msgstr[0] ""
msgstr[1] ""
@@ -4692,7 +4692,7 @@ msgstr ""
#: setup/setup_welcome.tpl.c:2
msgid ""
-"This seems to be the first time you start FusionDirectory - we didn't find "
+"This seems to be the first time you start FusionDirectory - we cannot find "
"any configuration right now. This simple wizard intends to help you while "
"setting it up."
msgstr ""
@@ -4736,12 +4736,12 @@ msgstr ""
#: setup/setup_welcome.tpl.c:32
msgid ""
"For security reasons you need to authenticate for the installation by "
-"creating the file '%1', containing the current session ID on the servers "
+"creating the file '%1', containing the current session ID on the server's "
"local filesystem. This can be done by executing the following command:"
msgstr ""
#: setup/setup_welcome.tpl.c:35
-msgid "Click the 'Next' button when you've finished."
+msgid "Click the 'Next' button when you are done."
msgstr ""
#: setup/setup_migrate.tpl.c:2
@@ -5004,7 +5004,7 @@ msgstr ""
#: ihtml/themes/breezy/islocked.tpl.c:11
msgid ""
"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
+"web browser during the edit operation. You may want to take over the lock by "
"pressing the \"%1\" button."
msgstr ""
diff --git a/locale/cs_CZ/fusiondirectory.po b/locale/cs_CZ/fusiondirectory.po
index d945fc497bc17bcf7408db7c30a630447579e535..e8e0338dbc1a228199e68ee2a03548356e1ff760 100644
--- a/locale/cs_CZ/fusiondirectory.po
+++ b/locale/cs_CZ/fusiondirectory.po
@@ -88,7 +88,7 @@ msgstr "Atribut"
#: include/management/class_ManagementConfigurationDialog.inc:71
msgid ""
"LDAP attributes to display, comma separated. Special values \"nameAttr\" and"
-" \"mainAttr\" also works."
+" \"mainAttr\" also work."
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:75
@@ -100,7 +100,7 @@ msgid "Column title"
msgstr "Nadpis sloupce"
#: include/management/class_ManagementConfigurationDialog.inc:86
-msgid "Persitent"
+msgid "Persistent"
msgstr "Trvalé"
#: include/management/class_ManagementConfigurationDialog.inc:86
@@ -586,7 +586,7 @@ msgid "Send bug report to the FusionDirectory Team"
msgstr "zaslat hlášenà o chybě vývojářům FusionDirectory"
#: include/php_setup.inc:235
-msgid "Send bugreport"
+msgid "Send bug report"
msgstr "zaslat hlášenà o chybě"
#: include/php_setup.inc:240
@@ -643,7 +643,7 @@ msgstr "Ústřednà ověřovacà služba (CAS)"
#: include/login/class_LoginCAS.inc:68
#, php-format
-msgid "CAS user \"%s\" could not be found in the LDAP"
+msgid "CAS user \"%s\" could not be found in LDAP"
msgstr "CAS uživatele z hlaviÄky „%s“ se nepodaÅ™ilo v LDAP najÃt"
#: include/login/class_LoginCAS.inc:78 include/login/class_LoginCAS.inc:104
@@ -737,7 +737,7 @@ msgstr "V HTTP hlaviÄce „%s“ nebyla nalezena žádná hodnota"
#: include/login/class_LoginHTTPHeader.inc:64
#, php-format
-msgid "Header user \"%s\" could not be found in the LDAP"
+msgid "Header user \"%s\" could not be found in LDAP"
msgstr "Uživatel z hlaviÄky „%s“ se nepodaÅ™ilo v LDAP najÃt"
#: include/login/class_LoginHTTPAuth.inc:29
@@ -782,7 +782,7 @@ msgstr ""
"Uživatel použÃvajÃcà e-mail „%s“ je uzamÄen. ObraÅ¥te se na svého správce."
#: include/class_passwordRecovery.inc:352
-msgid "Contact your administrator, there was a problem with mail server"
+msgid "Contact your administrator, there was a problem with the mail server"
msgstr ""
"Nastal problém s poÅ¡tovnÃm serverem – obraÅ¥te se prosÃm na svého správce "
"systémů."
@@ -792,7 +792,7 @@ msgid "This token is invalid"
msgstr "tato poukázka (token) je neplatná"
#: include/class_passwordRecovery.inc:429
-msgid "There was a problem with mail server, confirmation email not sent"
+msgid "There was a problem with the mail server, confirmation email not sent"
msgstr ""
"Vyskytl se problém s poÅ¡tovnÃm serverem, potvrzovacà e-mail proto nebyl "
"odeslán"
@@ -868,7 +868,7 @@ msgstr ""
#: include/functions.inc:354
#, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
msgstr "FATÃLNÃ: chyba pÅ™i pÅ™ipojovánà do LDAPu. Server ohlásil '%s'."
#: include/functions.inc:402 include/functions.inc:531
@@ -1202,7 +1202,7 @@ msgstr ""
#: include/class_msgPool.inc:245
#, php-format
-msgid "The entry \"%s\" already use this \"%s\" attribute!"
+msgid "The entry \"%s\" already uses this \"%s\" attribute!"
msgstr ""
#: include/class_msgPool.inc:256
@@ -1661,7 +1661,7 @@ msgstr "staženÃ"
#: include/simpleplugin/attributes/class_FileAttribute.inc:380
#, php-format
-msgid "Cannot set \"%s\" value, it contains invalid data: %s"
+msgid "Cannot set value \"%s\", it contains invalid data: %s"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:390
@@ -1709,7 +1709,7 @@ msgstr "Desetinné ÄÃslo menÅ¡Ã než %f"
#: include/simpleplugin/attributes/class_SetAttribute.inc:150
#, php-format
-msgid "The value for multivaluated field \"%s\" is not an array"
+msgid "The value for multivalued field \"%s\" is not an array"
msgstr "Hodnota pro vÃcehodnotovou kolonku „%s“ nenà pole"
#: include/simpleplugin/attributes/class_SetAttribute.inc:250
@@ -1771,7 +1771,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:492
#, php-format
msgid ""
-"Could not compute dn: could not find objectType infos from tab class \"%s\""
+"Could not compute dn: could not find objectType info from tab class \"%s\""
msgstr ""
"Nedařà se spoÄÃtat dn: nedařà se nalézt objectType informace z panelu tÅ™Ãdy "
"%s"
@@ -1788,7 +1788,7 @@ msgstr "Položka %s neexistuje"
#: include/simpleplugin/class_simplePlugin.inc:1576
msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may"
+"The object has changed since being opened in FusionDirectory. All changes that may"
" be done by others will get lost if you save this entry!"
msgstr ""
"Po jeho otevřenà ve FusionDirectory byl objekt změněn. Pokud tuto položku "
@@ -2511,7 +2511,7 @@ msgid "DN you wish to add assignments for"
msgstr "Rozlišený název kterému chcete přiřadit"
#: plugins/admin/acl/class_aclManagement.inc:110
-msgid "The dn you entered could not be found in the LDAP"
+msgid "The dn you entered could not be found in LDAP"
msgstr "Zadaný rozlišený název nebyl v LDAP nalezen"
#: plugins/admin/acl/class_aclManagement.inc:141
@@ -2696,7 +2696,7 @@ msgid "SASL"
msgstr "SASL"
#: plugins/config/class_mainPluginsConfig.inc:54
-msgid "Force to ask for password"
+msgid "Force asking for a password"
msgstr "Vynutit dotázánà se na heslo"
#: plugins/config/class_mainPluginsConfig.inc:54
@@ -2774,7 +2774,7 @@ msgid "Activate password recovery"
msgstr "Zapnout funkci pro obnovu zapomenutého hesla"
#: plugins/config/class_recoveryConfig.inc:47
-msgid "Whether to activate or not password recovery feature"
+msgid "Whether to activate the password recovery feature or not"
msgstr "Zda zapnout funkci pro obnovovánà zapomenutých hesel"
#: plugins/config/class_recoveryConfig.inc:52
@@ -2811,7 +2811,7 @@ msgstr "Umožnit použÃvánà alternativnÃch adres"
#: plugins/config/class_recoveryConfig.inc:74
msgid ""
-"Users will also be able to enter one of theirs alternate addresses to "
+"Users will also be able to enter one of their alternate addresses to "
"recover their password"
msgstr ""
"Uživatelé budou moci pro obnovenà svých hesel použÃt jednu ze svých "
@@ -3076,7 +3076,7 @@ msgid "Snapshot base"
msgstr "podstrom pro uloženà snÃmků"
#: plugins/config/class_configInLdap.inc:109
-msgid "The base where snapshots should be stored inside of the LDAP."
+msgid "The base where snapshots should be stored inside the LDAP directory."
msgstr "Základ, ve kterém by měly být zachycené stavy ukládány v LDAP."
#: plugins/config/class_configInLdap.inc:114
@@ -3282,7 +3282,7 @@ msgid "People DN attribute"
msgstr "atribut úÄtu uživatele použitý jako DN"
#: plugins/config/class_configInLdap.inc:252
-msgid "Attribute to use at the beginning of users dn"
+msgid "Attribute to use at the beginning of the user's dn"
msgstr "Atribut, který bude použit na zaÄátku rozliÅ¡ených jmen uživatelů"
#: plugins/config/class_configInLdap.inc:257
@@ -3371,7 +3371,7 @@ msgstr "Zobrazit chyby"
#: plugins/config/class_configInLdap.inc:301
msgid ""
"Shows PHP errors in the upper part of the screen. This should be disabled in"
-" productive deployments, because there might be some passwords in it."
+" production deployments, because it may contain passwords."
msgstr ""
"V hornà Äásti obrazovky vypisuje chyby, ke kterým doÅ¡lo v PHP. V produkÄnÃm "
"nasazenà by toto mělo být vypnuto, protože se zde mohou objevovat hesla."
@@ -3629,7 +3629,7 @@ msgstr "Upravit skupiny a role uživatele"
#: plugins/personal/roles/class_userRoles.inc:49
#: plugins/personal/roles/class_userRoles.inc:53
-msgid "Groups membership"
+msgid "Group memberships"
msgstr "Členstvà ve skupinách"
#: plugins/personal/roles/class_userRoles.inc:60
@@ -3911,7 +3911,7 @@ msgstr "PoÅ¡tovnà smÄ›rovacà ÄÃslo (PSÄŒ)"
#: plugins/personal/generic/class_user.inc:430
#, php-format
-msgid "Ppolicy \"%s\" could not be found in the LDAP!"
+msgid "Ppolicy \"%s\" could not be found in LDAP!"
msgstr "Ppolicy %s nebyla nalezena v LDAP!"
#: plugins/personal/generic/class_user.inc:460
@@ -4199,7 +4199,7 @@ msgstr "FusionDirectory potÅ™ebuje tento modul pro zaÄlenÄ›nà Samby."
#: setup/class_setupStepChecks.inc:124
msgid ""
-"FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
+"FusionDirectory requires either the 'mhash' or 'sha1' module to make use of "
"SSHA encryption."
msgstr ""
"Aby bylo možné ve FusionDirectory využÃvat SSHA Å¡ifrovánÃ, musà být "
@@ -4429,13 +4429,13 @@ msgid "Checking for POSIX groups outside the groups tree"
msgstr ""
#: setup/class_setupStepMigrate.inc:274
-msgid "Checking for duplicated UID numbers"
+msgid "Checking for duplicate UID numbers"
msgstr ""
"kontroluje se, zda neexistujà duplicity v ÄÃselných identifikátorech "
"uživatelů (UID)"
#: setup/class_setupStepMigrate.inc:275
-msgid "Checking for duplicated GID numbers"
+msgid "Checking for duplicate GID numbers"
msgstr "Kontrola duplicitnÃch identifikátorů skupin (GID)"
#: setup/class_setupStepMigrate.inc:343 setup/class_setupStepMigrate.inc:502
@@ -4451,7 +4451,7 @@ msgstr "dotaz do LDAPu byl neúspěšný"
#: setup/class_setupStepMigrate.inc:935 setup/class_setupStepMigrate.inc:1041
#: setup/class_setupStepMigrate.inc:1071 setup/class_setupStepMigrate.inc:1322
#: setup/class_setupStepMigrate.inc:1433
-msgid "Possibly the \"root object\" is missing."
+msgid "The \"root object\" is possibly missing."
msgstr "Možná chybà kořenový objekt."
#: setup/class_setupStepMigrate.inc:360 setup/class_setupStepMigrate.inc:383
@@ -4524,7 +4524,7 @@ msgid "Roles"
msgstr "Role"
#: setup/class_setupStepMigrate.inc:836
-msgid "There is no FusionDirectory administrator account inside your LDAP."
+msgid "There is no FusionDirectory administrator account in your LDAP directory."
msgstr "Ve VaÅ¡em LDAPu neexistuje úÄet správce FusionDirectory/GOsa."
#: setup/class_setupStepMigrate.inc:875
@@ -4563,12 +4563,12 @@ msgid "LDAP result parsing failed"
msgstr ""
#: setup/class_setupStepMigrate.inc:1076 setup/class_setupStepMigrate.inc:1327
-msgid "Sizelimit hit"
+msgid "Size limit hit"
msgstr ""
#: setup/class_setupStepMigrate.inc:1077 setup/class_setupStepMigrate.inc:1328
#, php-format
-msgid "Sizelimit of %d hit. Please check this manually"
+msgid "Size limit of %d hit. Please check this manually"
msgstr ""
#: setup/class_setupStepMigrate.inc:1120 setup/class_setupStepMigrate.inc:1134
@@ -4665,7 +4665,7 @@ msgstr "Soubor s nastavenÃmi nenà v tuto chvÃli Äitelný, nebo zcela chybÃ.
#, php-format
msgid ""
"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
"shouldn't."
msgstr ""
"Po staženà a umÃstÄ›nà souboru do %s se prosÃm ujistÄ›te, že %s je oprávnÄ›n "
@@ -4786,7 +4786,7 @@ msgstr[2] ""
msgstr[3] ""
#: plugins/addons/dashboard/users_accounts.tpl.c:5
-msgid "There is no expired account"
+msgid "There are no expired accounts"
msgstr "Nenà zde žádný úÄet, jehož platnost skonÄila"
#: plugins/addons/dashboard/users_accounts.tpl.c:11
@@ -4844,8 +4844,8 @@ msgstr[2] ""
msgstr[3] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:5
-msgid "One of them use %1 method"
-msgid_plural "%2 of them use %1 method"
+msgid "One of them uses the %1 method"
+msgid_plural "%2 of them use the %1 method"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
@@ -4860,7 +4860,7 @@ msgstr[2] ""
msgstr[3] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:11
-msgid "None of them is locked"
+msgid "None of them are locked"
msgstr "Žádný z nich nenà uzamÄen"
#: plugins/addons/dashboard/users_stats.tpl.c:5
@@ -4868,7 +4868,7 @@ msgid "There are no users"
msgstr "Nejsou zde žádnà uživatelé"
#: plugins/addons/dashboard/users_stats.tpl.c:8
-msgid "One of them have a %1 account"
+msgid "One of them has a %1 account"
msgid_plural "%2 of them have a %1 account"
msgstr[0] ""
msgstr[1] ""
@@ -4942,7 +4942,7 @@ msgstr "FusionDirectory bude fungovat i tak."
#: setup/setup_welcome.tpl.c:2
msgid ""
-"This seems to be the first time you start FusionDirectory - we didn't find "
+"This seems to be the first time you start FusionDirectory - we cannot find "
"any configuration right now. This simple wizard intends to help you while "
"setting it up."
msgstr ""
@@ -4993,7 +4993,7 @@ msgstr "Pro pokraÄovánÃ:"
#: setup/setup_welcome.tpl.c:32
msgid ""
"For security reasons you need to authenticate for the installation by "
-"creating the file '%1', containing the current session ID on the servers "
+"creating the file '%1', containing the current session ID on the server's "
"local filesystem. This can be done by executing the following command:"
msgstr ""
"Z bezpeÄnostnÃch důvodů je tÅ™eba, abyste instalaÄnÃmu procesu prokázali své "
@@ -5002,7 +5002,7 @@ msgstr ""
"následujÃcÃho pÅ™Ãkazu (na serveru):"
#: setup/setup_welcome.tpl.c:35
-msgid "Click the 'Next' button when you've finished."
+msgid "Click the 'Next' button when you are done."
msgstr "Až budete hotovÃ, kliknÄ›te na tlaÄÃtko „DalšÓ."
#: setup/setup_migrate.tpl.c:2
@@ -5298,7 +5298,7 @@ msgstr "„%1“ bylo uzamÄeno „%2“ od %3"
#: ihtml/themes/breezy/islocked.tpl.c:11
msgid ""
"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
+"web browser during the edit operation. You may want to take over the lock by "
"pressing the \"%1\" button."
msgstr ""
"Pokud se toto zjiÅ¡Å¥ovánà zámku nezdaÅ™Ã, druhá osoba mohla pÅ™i operaci "
diff --git a/locale/de/fusiondirectory.po b/locale/de/fusiondirectory.po
index c69b5d37670bc7c042a530588958835bf9ce5e1e..ead0eae9a49185c3a7d41864bddbd4ad7ce18e0b 100644
--- a/locale/de/fusiondirectory.po
+++ b/locale/de/fusiondirectory.po
@@ -87,7 +87,7 @@ msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:71
msgid ""
"LDAP attributes to display, comma separated. Special values \"nameAttr\" and"
-" \"mainAttr\" also works."
+" \"mainAttr\" also work."
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:75
@@ -99,7 +99,7 @@ msgid "Column title"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
-msgid "Persitent"
+msgid "Persistent"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
@@ -582,7 +582,7 @@ msgid "Send bug report to the FusionDirectory Team"
msgstr "Bugreport an das FusionDirectory Team senden"
#: include/php_setup.inc:235
-msgid "Send bugreport"
+msgid "Send bug report"
msgstr "Fehlerbericht senden"
#: include/php_setup.inc:240
@@ -637,7 +637,7 @@ msgstr "CAS"
#: include/login/class_LoginCAS.inc:68
#, php-format
-msgid "CAS user \"%s\" could not be found in the LDAP"
+msgid "CAS user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginCAS.inc:78 include/login/class_LoginCAS.inc:104
@@ -729,7 +729,7 @@ msgstr ""
#: include/login/class_LoginHTTPHeader.inc:64
#, php-format
-msgid "Header user \"%s\" could not be found in the LDAP"
+msgid "Header user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginHTTPAuth.inc:29
@@ -773,7 +773,7 @@ msgid "The user using email \"%s\" is locked. Please contact your administrator.
msgstr ""
#: include/class_passwordRecovery.inc:352
-msgid "Contact your administrator, there was a problem with mail server"
+msgid "Contact your administrator, there was a problem with the mail server"
msgstr ""
"Kontaktieren Sie Ihren Administrator, es gab ein Problem mit dem Mailserver"
@@ -782,7 +782,7 @@ msgid "This token is invalid"
msgstr "Das Token ist nicht gültig"
#: include/class_passwordRecovery.inc:429
-msgid "There was a problem with mail server, confirmation email not sent"
+msgid "There was a problem with the mail server, confirmation email not sent"
msgstr ""
"Es gab ein Problem mit dem Mailserver, Bestätigungsmail wurde nicht "
"verschickt"
@@ -857,7 +857,7 @@ msgstr ""
#: include/functions.inc:354
#, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
msgstr ""
"FATAL: Fehler beim Verbinden mit dem LDAP-Server. Die Meldung lautet '%s'."
@@ -1186,7 +1186,7 @@ msgstr ""
#: include/class_msgPool.inc:245
#, php-format
-msgid "The entry \"%s\" already use this \"%s\" attribute!"
+msgid "The entry \"%s\" already uses this \"%s\" attribute!"
msgstr ""
#: include/class_msgPool.inc:256
@@ -1641,7 +1641,7 @@ msgstr "Herunterladen"
#: include/simpleplugin/attributes/class_FileAttribute.inc:380
#, php-format
-msgid "Cannot set \"%s\" value, it contains invalid data: %s"
+msgid "Cannot set value \"%s\", it contains invalid data: %s"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:390
@@ -1687,7 +1687,7 @@ msgstr "Ein Float kleiner als %f"
#: include/simpleplugin/attributes/class_SetAttribute.inc:150
#, php-format
-msgid "The value for multivaluated field \"%s\" is not an array"
+msgid "The value for multivalued field \"%s\" is not an array"
msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:250
@@ -1748,7 +1748,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:492
#, php-format
msgid ""
-"Could not compute dn: could not find objectType infos from tab class \"%s\""
+"Could not compute dn: could not find objectType info from tab class \"%s\""
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1363
@@ -1763,7 +1763,7 @@ msgstr "Der Eintrag %s existiert nicht"
#: include/simpleplugin/class_simplePlugin.inc:1576
msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may"
+"The object has changed since being opened in FusionDirectory. All changes that may"
" be done by others will get lost if you save this entry!"
msgstr ""
@@ -2470,7 +2470,7 @@ msgid "DN you wish to add assignments for"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:110
-msgid "The dn you entered could not be found in the LDAP"
+msgid "The dn you entered could not be found in LDAP"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:141
@@ -2652,7 +2652,7 @@ msgid "SASL"
msgstr "SASL"
#: plugins/config/class_mainPluginsConfig.inc:54
-msgid "Force to ask for password"
+msgid "Force asking for a password"
msgstr "Frage nach Passwort erzwingen"
#: plugins/config/class_mainPluginsConfig.inc:54
@@ -2728,7 +2728,7 @@ msgid "Activate password recovery"
msgstr "Aktivieren der Passwort-Wiederherstellung"
#: plugins/config/class_recoveryConfig.inc:47
-msgid "Whether to activate or not password recovery feature"
+msgid "Whether to activate the password recovery feature or not"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:52
@@ -2765,7 +2765,7 @@ msgstr "Erlaube die Nutzung von alternativen Adressen"
#: plugins/config/class_recoveryConfig.inc:74
msgid ""
-"Users will also be able to enter one of theirs alternate addresses to "
+"Users will also be able to enter one of their alternate addresses to "
"recover their password"
msgstr ""
"Benutzer werden auch in der Lage sein, eine ihrer alternativen Adressen zur "
@@ -3025,7 +3025,7 @@ msgid "Snapshot base"
msgstr "Basis für Snapshots"
#: plugins/config/class_configInLdap.inc:109
-msgid "The base where snapshots should be stored inside of the LDAP."
+msgid "The base where snapshots should be stored inside the LDAP directory."
msgstr "Die Basis wo Snapshots innerhalb des LDAP gespeichert werden sollen."
#: plugins/config/class_configInLdap.inc:114
@@ -3229,7 +3229,7 @@ msgid "People DN attribute"
msgstr "DN-Attribut für Personen"
#: plugins/config/class_configInLdap.inc:252
-msgid "Attribute to use at the beginning of users dn"
+msgid "Attribute to use at the beginning of the user's dn"
msgstr "Zu verwendendes Attribut zu Beginn des Benutzers dn"
#: plugins/config/class_configInLdap.inc:257
@@ -3314,7 +3314,7 @@ msgstr "Fehler anzeigen"
#: plugins/config/class_configInLdap.inc:301
msgid ""
"Shows PHP errors in the upper part of the screen. This should be disabled in"
-" productive deployments, because there might be some passwords in it."
+" production deployments, because it may contain passwords."
msgstr ""
"Zeigt PHP-Fehler in dem oberen Teil des Bildschirms. Dies sollte in "
"produktiven Einrichtungen deaktiviert werden, da einige Passwörter enthalten"
@@ -3562,7 +3562,7 @@ msgstr "Gruppen und Rollen des Benutzers bearbeiten"
#: plugins/personal/roles/class_userRoles.inc:49
#: plugins/personal/roles/class_userRoles.inc:53
-msgid "Groups membership"
+msgid "Group memberships"
msgstr "Gruppenmitgliedschaft"
#: plugins/personal/roles/class_userRoles.inc:60
@@ -3841,7 +3841,7 @@ msgstr "Postleitzahl"
#: plugins/personal/generic/class_user.inc:430
#, php-format
-msgid "Ppolicy \"%s\" could not be found in the LDAP!"
+msgid "Ppolicy \"%s\" could not be found in LDAP!"
msgstr ""
#: plugins/personal/generic/class_user.inc:460
@@ -4115,7 +4115,7 @@ msgstr "FusionDirectory benötigt dieses Modul für die Sambaintegration."
#: setup/class_setupStepChecks.inc:124
msgid ""
-"FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
+"FusionDirectory requires either the 'mhash' or 'sha1' module to make use of "
"SSHA encryption."
msgstr ""
"FusionDirectory benötigt entweder 'mhash' oder das 'sha1' Modul um SSHA-"
@@ -4343,11 +4343,11 @@ msgid "Checking for POSIX groups outside the groups tree"
msgstr ""
#: setup/class_setupStepMigrate.inc:274
-msgid "Checking for duplicated UID numbers"
+msgid "Checking for duplicate UID numbers"
msgstr "Prüfe auf doppelte UID Nummern"
#: setup/class_setupStepMigrate.inc:275
-msgid "Checking for duplicated GID numbers"
+msgid "Checking for duplicate GID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:343 setup/class_setupStepMigrate.inc:502
@@ -4363,7 +4363,7 @@ msgstr "LDAP-Abfrage fehlgeschlagen."
#: setup/class_setupStepMigrate.inc:935 setup/class_setupStepMigrate.inc:1041
#: setup/class_setupStepMigrate.inc:1071 setup/class_setupStepMigrate.inc:1322
#: setup/class_setupStepMigrate.inc:1433
-msgid "Possibly the \"root object\" is missing."
+msgid "The \"root object\" is possibly missing."
msgstr ""
#: setup/class_setupStepMigrate.inc:360 setup/class_setupStepMigrate.inc:383
@@ -4436,7 +4436,7 @@ msgid "Roles"
msgstr "Rollen"
#: setup/class_setupStepMigrate.inc:836
-msgid "There is no FusionDirectory administrator account inside your LDAP."
+msgid "There is no FusionDirectory administrator account in your LDAP directory."
msgstr "Es gibt kein FusionDirectory Administratorkonto innerhalb Ihres LDAP."
#: setup/class_setupStepMigrate.inc:875
@@ -4475,12 +4475,12 @@ msgid "LDAP result parsing failed"
msgstr ""
#: setup/class_setupStepMigrate.inc:1076 setup/class_setupStepMigrate.inc:1327
-msgid "Sizelimit hit"
+msgid "Size limit hit"
msgstr ""
#: setup/class_setupStepMigrate.inc:1077 setup/class_setupStepMigrate.inc:1328
#, php-format
-msgid "Sizelimit of %d hit. Please check this manually"
+msgid "Size limit of %d hit. Please check this manually"
msgstr ""
#: setup/class_setupStepMigrate.inc:1120 setup/class_setupStepMigrate.inc:1134
@@ -4577,7 +4577,7 @@ msgstr "Die Konfiguration ist momentan nicht lesbar oder existiert nicht."
#, php-format
msgid ""
"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
"shouldn't."
msgstr ""
"Nach dem Herunterladen und dem Plazieren der Datei unter %s, bitte "
@@ -4690,7 +4690,7 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/users_accounts.tpl.c:5
-msgid "There is no expired account"
+msgid "There are no expired accounts"
msgstr "Es gibt keinen abgelaufenen Zugang"
#: plugins/addons/dashboard/users_accounts.tpl.c:11
@@ -4740,8 +4740,8 @@ msgstr[0] "Es gibt 1 Benutzer:"
msgstr[1] "Es gibt %1 Benutzer:"
#: plugins/addons/dashboard/pwd_stats.tpl.c:5
-msgid "One of them use %1 method"
-msgid_plural "%2 of them use %1 method"
+msgid "One of them uses the %1 method"
+msgid_plural "%2 of them use the %1 method"
msgstr[0] ""
msgstr[1] ""
@@ -4752,7 +4752,7 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:11
-msgid "None of them is locked"
+msgid "None of them are locked"
msgstr "Keiner von diesen ist gesperrt"
#: plugins/addons/dashboard/users_stats.tpl.c:5
@@ -4760,7 +4760,7 @@ msgid "There are no users"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:8
-msgid "One of them have a %1 account"
+msgid "One of them has a %1 account"
msgid_plural "%2 of them have a %1 account"
msgstr[0] ""
msgstr[1] ""
@@ -4831,7 +4831,7 @@ msgstr "FusionDirectory wird ohne eine entsprechende Änderung laufen."
#: setup/setup_welcome.tpl.c:2
msgid ""
-"This seems to be the first time you start FusionDirectory - we didn't find "
+"This seems to be the first time you start FusionDirectory - we cannot find "
"any configuration right now. This simple wizard intends to help you while "
"setting it up."
msgstr ""
@@ -4881,12 +4881,12 @@ msgstr "Zum Fortsetzen:"
#: setup/setup_welcome.tpl.c:32
msgid ""
"For security reasons you need to authenticate for the installation by "
-"creating the file '%1', containing the current session ID on the servers "
+"creating the file '%1', containing the current session ID on the server's "
"local filesystem. This can be done by executing the following command:"
msgstr ""
#: setup/setup_welcome.tpl.c:35
-msgid "Click the 'Next' button when you've finished."
+msgid "Click the 'Next' button when you are done."
msgstr "Klicken Sie auf die Schaltfläche 'Weiter' wenn Sie fertig sind."
#: setup/setup_migrate.tpl.c:2
@@ -5166,7 +5166,7 @@ msgstr ""
#: ihtml/themes/breezy/islocked.tpl.c:11
msgid ""
"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
+"web browser during the edit operation. You may want to take over the lock by "
"pressing the \"%1\" button."
msgstr ""
diff --git a/locale/el_GR/fusiondirectory.po b/locale/el_GR/fusiondirectory.po
index e01ffd5f9055367c53d6d77ef003f8f1bd7f1000..55aa77c22cbc6e29833c055ab7b0eccbd74225f2 100644
--- a/locale/el_GR/fusiondirectory.po
+++ b/locale/el_GR/fusiondirectory.po
@@ -88,7 +88,7 @@ msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:71
msgid ""
"LDAP attributes to display, comma separated. Special values \"nameAttr\" and"
-" \"mainAttr\" also works."
+" \"mainAttr\" also work."
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:75
@@ -100,7 +100,7 @@ msgid "Column title"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
-msgid "Persitent"
+msgid "Persistent"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
@@ -579,7 +579,7 @@ msgid "Send bug report to the FusionDirectory Team"
msgstr ""
#: include/php_setup.inc:235
-msgid "Send bugreport"
+msgid "Send bug report"
msgstr "Αποστολή αναφοÏάς σφάλματος"
#: include/php_setup.inc:240
@@ -634,7 +634,7 @@ msgstr ""
#: include/login/class_LoginCAS.inc:68
#, php-format
-msgid "CAS user \"%s\" could not be found in the LDAP"
+msgid "CAS user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginCAS.inc:78 include/login/class_LoginCAS.inc:104
@@ -724,7 +724,7 @@ msgstr ""
#: include/login/class_LoginHTTPHeader.inc:64
#, php-format
-msgid "Header user \"%s\" could not be found in the LDAP"
+msgid "Header user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginHTTPAuth.inc:29
@@ -768,7 +768,7 @@ msgid "The user using email \"%s\" is locked. Please contact your administrator.
msgstr ""
#: include/class_passwordRecovery.inc:352
-msgid "Contact your administrator, there was a problem with mail server"
+msgid "Contact your administrator, there was a problem with the mail server"
msgstr ""
#: include/class_passwordRecovery.inc:365
@@ -776,7 +776,7 @@ msgid "This token is invalid"
msgstr ""
#: include/class_passwordRecovery.inc:429
-msgid "There was a problem with mail server, confirmation email not sent"
+msgid "There was a problem with the mail server, confirmation email not sent"
msgstr ""
#: include/password-methods/class_passwordMethodSasl.inc:66
@@ -842,7 +842,7 @@ msgstr ""
#: include/functions.inc:354
#, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
msgstr ""
"ΣΦΑΛΜΑ: Σφάλμα σÏνδεσης στον διακομιστή LDAP. Ο διακομιστής αποκÏίθηκε '%s'."
@@ -1165,7 +1165,7 @@ msgstr ""
#: include/class_msgPool.inc:245
#, php-format
-msgid "The entry \"%s\" already use this \"%s\" attribute!"
+msgid "The entry \"%s\" already uses this \"%s\" attribute!"
msgstr ""
#: include/class_msgPool.inc:256
@@ -1611,7 +1611,7 @@ msgstr "Λήψη"
#: include/simpleplugin/attributes/class_FileAttribute.inc:380
#, php-format
-msgid "Cannot set \"%s\" value, it contains invalid data: %s"
+msgid "Cannot set value \"%s\", it contains invalid data: %s"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:390
@@ -1657,7 +1657,7 @@ msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:150
#, php-format
-msgid "The value for multivaluated field \"%s\" is not an array"
+msgid "The value for multivalued field \"%s\" is not an array"
msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:250
@@ -1718,7 +1718,7 @@ msgstr "Αδυναμία Ï…Ï€Î¿Î»Î¿Î³Î¹ÏƒÎ¼Î¿Ï dn: δεν υπάÏχει γον
#: include/simpleplugin/class_simplePlugin.inc:492
#, php-format
msgid ""
-"Could not compute dn: could not find objectType infos from tab class \"%s\""
+"Could not compute dn: could not find objectType info from tab class \"%s\""
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1363
@@ -1733,7 +1733,7 @@ msgstr "Η καταχώÏιση %s δεν υπάÏχει."
#: include/simpleplugin/class_simplePlugin.inc:1576
msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may"
+"The object has changed since being opened in FusionDirectory. All changes that may"
" be done by others will get lost if you save this entry!"
msgstr ""
@@ -2442,7 +2442,7 @@ msgid "DN you wish to add assignments for"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:110
-msgid "The dn you entered could not be found in the LDAP"
+msgid "The dn you entered could not be found in LDAP"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:141
@@ -2626,7 +2626,7 @@ msgid "SASL"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
-msgid "Force to ask for password"
+msgid "Force asking for a password"
msgstr "Επιβολή εισαγωγής κωδικοÏ"
#: plugins/config/class_mainPluginsConfig.inc:54
@@ -2702,7 +2702,7 @@ msgid "Activate password recovery"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:47
-msgid "Whether to activate or not password recovery feature"
+msgid "Whether to activate the password recovery feature or not"
msgstr "ΕνεÏγοποίηση ή όχι της ανάκτησης του ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï€Ïόσβασης"
#: plugins/config/class_recoveryConfig.inc:52
@@ -2739,7 +2739,7 @@ msgstr "Îα επιτÏÎπεται η χÏήση εναλλακτικών δι
#: plugins/config/class_recoveryConfig.inc:74
msgid ""
-"Users will also be able to enter one of theirs alternate addresses to "
+"Users will also be able to enter one of their alternate addresses to "
"recover their password"
msgstr ""
"Οι χÏήστες θα Îχουν επίσης τη δυνατότητα να εισάγουν μία από τις "
@@ -2989,7 +2989,7 @@ msgid "Snapshot base"
msgstr ""
#: plugins/config/class_configInLdap.inc:109
-msgid "The base where snapshots should be stored inside of the LDAP."
+msgid "The base where snapshots should be stored inside the LDAP directory."
msgstr ""
#: plugins/config/class_configInLdap.inc:114
@@ -3187,7 +3187,7 @@ msgid "People DN attribute"
msgstr ""
#: plugins/config/class_configInLdap.inc:252
-msgid "Attribute to use at the beginning of users dn"
+msgid "Attribute to use at the beginning of the user's dn"
msgstr ""
#: plugins/config/class_configInLdap.inc:257
@@ -3272,7 +3272,7 @@ msgstr "Î Ïοβολή σφαλμάτων"
#: plugins/config/class_configInLdap.inc:301
msgid ""
"Shows PHP errors in the upper part of the screen. This should be disabled in"
-" productive deployments, because there might be some passwords in it."
+" production deployments, because it may contain passwords."
msgstr ""
#: plugins/config/class_configInLdap.inc:305
@@ -3513,7 +3513,7 @@ msgstr "ΕπεξεÏγασία ομάδων και Ïόλων του χÏήστ
#: plugins/personal/roles/class_userRoles.inc:49
#: plugins/personal/roles/class_userRoles.inc:53
-msgid "Groups membership"
+msgid "Group memberships"
msgstr ""
#: plugins/personal/roles/class_userRoles.inc:60
@@ -3796,7 +3796,7 @@ msgstr "ΤαχυδÏομικός κώδικας"
#: plugins/personal/generic/class_user.inc:430
#, php-format
-msgid "Ppolicy \"%s\" could not be found in the LDAP!"
+msgid "Ppolicy \"%s\" could not be found in LDAP!"
msgstr "Δεν ήταν δυνατή η εÏÏεση του Ppolicy \"%s\" στο LDAP!"
#: plugins/personal/generic/class_user.inc:460
@@ -4063,7 +4063,7 @@ msgstr ""
#: setup/class_setupStepChecks.inc:124
msgid ""
-"FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
+"FusionDirectory requires either the 'mhash' or 'sha1' module to make use of "
"SSHA encryption."
msgstr ""
@@ -4251,11 +4251,11 @@ msgid "Checking for POSIX groups outside the groups tree"
msgstr ""
#: setup/class_setupStepMigrate.inc:274
-msgid "Checking for duplicated UID numbers"
+msgid "Checking for duplicate UID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:275
-msgid "Checking for duplicated GID numbers"
+msgid "Checking for duplicate GID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:343 setup/class_setupStepMigrate.inc:502
@@ -4271,7 +4271,7 @@ msgstr ""
#: setup/class_setupStepMigrate.inc:935 setup/class_setupStepMigrate.inc:1041
#: setup/class_setupStepMigrate.inc:1071 setup/class_setupStepMigrate.inc:1322
#: setup/class_setupStepMigrate.inc:1433
-msgid "Possibly the \"root object\" is missing."
+msgid "The \"root object\" is possibly missing."
msgstr ""
#: setup/class_setupStepMigrate.inc:360 setup/class_setupStepMigrate.inc:383
@@ -4342,7 +4342,7 @@ msgid "Roles"
msgstr "Ρόλοι"
#: setup/class_setupStepMigrate.inc:836
-msgid "There is no FusionDirectory administrator account inside your LDAP."
+msgid "There is no FusionDirectory administrator account in your LDAP directory."
msgstr ""
#: setup/class_setupStepMigrate.inc:875
@@ -4381,12 +4381,12 @@ msgid "LDAP result parsing failed"
msgstr ""
#: setup/class_setupStepMigrate.inc:1076 setup/class_setupStepMigrate.inc:1327
-msgid "Sizelimit hit"
+msgid "Size limit hit"
msgstr ""
#: setup/class_setupStepMigrate.inc:1077 setup/class_setupStepMigrate.inc:1328
#, php-format
-msgid "Sizelimit of %d hit. Please check this manually"
+msgid "Size limit of %d hit. Please check this manually"
msgstr ""
#: setup/class_setupStepMigrate.inc:1120 setup/class_setupStepMigrate.inc:1134
@@ -4481,7 +4481,7 @@ msgstr ""
#, php-format
msgid ""
"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
"shouldn't."
msgstr ""
@@ -4587,7 +4587,7 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/users_accounts.tpl.c:5
-msgid "There is no expired account"
+msgid "There are no expired accounts"
msgstr ""
#: plugins/addons/dashboard/users_accounts.tpl.c:11
@@ -4637,8 +4637,8 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:5
-msgid "One of them use %1 method"
-msgid_plural "%2 of them use %1 method"
+msgid "One of them uses the %1 method"
+msgid_plural "%2 of them use the %1 method"
msgstr[0] ""
msgstr[1] ""
@@ -4649,7 +4649,7 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:11
-msgid "None of them is locked"
+msgid "None of them are locked"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:5
@@ -4657,7 +4657,7 @@ msgid "There are no users"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:8
-msgid "One of them have a %1 account"
+msgid "One of them has a %1 account"
msgid_plural "%2 of them have a %1 account"
msgstr[0] ""
msgstr[1] ""
@@ -4726,7 +4726,7 @@ msgstr ""
#: setup/setup_welcome.tpl.c:2
msgid ""
-"This seems to be the first time you start FusionDirectory - we didn't find "
+"This seems to be the first time you start FusionDirectory - we cannot find "
"any configuration right now. This simple wizard intends to help you while "
"setting it up."
msgstr ""
@@ -4770,12 +4770,12 @@ msgstr "Για συνÎχεια:"
#: setup/setup_welcome.tpl.c:32
msgid ""
"For security reasons you need to authenticate for the installation by "
-"creating the file '%1', containing the current session ID on the servers "
+"creating the file '%1', containing the current session ID on the server's "
"local filesystem. This can be done by executing the following command:"
msgstr ""
#: setup/setup_welcome.tpl.c:35
-msgid "Click the 'Next' button when you've finished."
+msgid "Click the 'Next' button when you are done."
msgstr "Πατήστε το κουμπί 'Επόμενο' για να τελειώσετε."
#: setup/setup_migrate.tpl.c:2
@@ -5045,7 +5045,7 @@ msgstr ""
#: ihtml/themes/breezy/islocked.tpl.c:11
msgid ""
"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
+"web browser during the edit operation. You may want to take over the lock by "
"pressing the \"%1\" button."
msgstr ""
diff --git a/locale/en/fusiondirectory.po b/locale/en/fusiondirectory.po
index e5c8a15d923df3fb0a8c0fe23c3a66e44953127e..5fa9458123f347055e59df4e25357c3ddd2fbd74 100644
--- a/locale/en/fusiondirectory.po
+++ b/locale/en/fusiondirectory.po
@@ -113,7 +113,7 @@ msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:150
#, php-format
-msgid "The value for multivaluated field \"%s\" is not an array"
+msgid "The value for multivalued field \"%s\" is not an array"
msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:388
@@ -226,7 +226,7 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:380
#, php-format
-msgid "Cannot set \"%s\" value, it contains invalid data: %s"
+msgid "Cannot set value \"%s\", it contains invalid data: %s"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:390
@@ -377,7 +377,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:492
#, php-format
msgid ""
-"Could not compute dn: could not find objectType infos from tab class \"%s\""
+"Could not compute dn: could not find objectType info from tab class \"%s\""
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1363
@@ -392,7 +392,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1576
msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may "
+"The object has changed since being opened in FusionDirectory. All changes that may "
"be done by others will get lost if you save this entry!"
msgstr ""
@@ -619,7 +619,7 @@ msgid ""
msgstr ""
#: include/class_passwordRecovery.inc:352
-msgid "Contact your administrator, there was a problem with mail server"
+msgid "Contact your administrator, there was a problem with the mail server"
msgstr ""
#: include/class_passwordRecovery.inc:365
@@ -627,7 +627,7 @@ msgid "This token is invalid"
msgstr ""
#: include/class_passwordRecovery.inc:429
-msgid "There was a problem with mail server, confirmation email not sent"
+msgid "There was a problem with the mail server, confirmation email not sent"
msgstr ""
#: include/class_msg_dialog.inc:177
@@ -763,7 +763,7 @@ msgid "Send bug report to the FusionDirectory Team"
msgstr ""
#: include/php_setup.inc:235
-msgid "Send bugreport"
+msgid "Send bug report"
msgstr ""
#: include/php_setup.inc:240
@@ -797,7 +797,7 @@ msgstr ""
#: include/login/class_LoginCAS.inc:68
#, php-format
-msgid "CAS user \"%s\" could not be found in the LDAP"
+msgid "CAS user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginCAS.inc:78 include/login/class_LoginCAS.inc:104
@@ -818,7 +818,7 @@ msgstr ""
#: include/login/class_LoginHTTPHeader.inc:64
#, php-format
-msgid "Header user \"%s\" could not be found in the LDAP"
+msgid "Header user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginPost.inc:32
@@ -1000,7 +1000,7 @@ msgstr ""
#: include/class_msgPool.inc:245
#, php-format
-msgid "The entry \"%s\" already use this \"%s\" attribute!"
+msgid "The entry \"%s\" already uses this \"%s\" attribute!"
msgstr ""
#: include/class_msgPool.inc:256
@@ -1398,7 +1398,7 @@ msgstr ""
#: include/functions.inc:354
#, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
msgstr ""
#: include/functions.inc:402 include/functions.inc:531
@@ -1852,7 +1852,7 @@ msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:71
msgid ""
"LDAP attributes to display, comma separated. Special values \"nameAttr\" and "
-"\"mainAttr\" also works."
+"\"mainAttr\" also work."
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:75
@@ -1864,7 +1864,7 @@ msgid "Column title"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
-msgid "Persitent"
+msgid "Persistent"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
@@ -2206,7 +2206,7 @@ msgid "Snapshot base"
msgstr ""
#: plugins/config/class_configInLdap.inc:109
-msgid "The base where snapshots should be stored inside of the LDAP."
+msgid "The base where snapshots should be stored inside the LDAP directory."
msgstr ""
#: plugins/config/class_configInLdap.inc:114
@@ -2407,7 +2407,7 @@ msgid "People DN attribute"
msgstr ""
#: plugins/config/class_configInLdap.inc:252
-msgid "Attribute to use at the beginning of users dn"
+msgid "Attribute to use at the beginning of the user's dn"
msgstr ""
#: plugins/config/class_configInLdap.inc:257
@@ -2492,7 +2492,7 @@ msgstr ""
#: plugins/config/class_configInLdap.inc:301
msgid ""
"Shows PHP errors in the upper part of the screen. This should be disabled in "
-"productive deployments, because there might be some passwords in it."
+"production deployments, because it may contain passwords."
msgstr ""
#: plugins/config/class_configInLdap.inc:305
@@ -2626,7 +2626,7 @@ msgid "SASL"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
-msgid "Force to ask for password"
+msgid "Force asking for a password"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
@@ -2652,7 +2652,7 @@ msgid "Activate password recovery"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:47
-msgid "Whether to activate or not password recovery feature"
+msgid "Whether to activate the password recovery feature or not"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:52
@@ -2687,7 +2687,7 @@ msgstr ""
#: plugins/config/class_recoveryConfig.inc:74
msgid ""
-"Users will also be able to enter one of theirs alternate addresses to "
+"Users will also be able to enter one of their alternate addresses to "
"recover their password"
msgstr ""
@@ -3122,7 +3122,7 @@ msgid "DN you wish to add assignments for"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:110
-msgid "The dn you entered could not be found in the LDAP"
+msgid "The dn you entered could not be found in LDAP"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:141
@@ -3546,7 +3546,7 @@ msgstr ""
#: plugins/personal/roles/class_userRoles.inc:49
#: plugins/personal/roles/class_userRoles.inc:53
-msgid "Groups membership"
+msgid "Group memberships"
msgstr ""
#: plugins/personal/roles/class_userRoles.inc:60
@@ -3824,7 +3824,7 @@ msgstr ""
#: plugins/personal/generic/class_user.inc:433
#, php-format
-msgid "Ppolicy \"%s\" could not be found in the LDAP!"
+msgid "Ppolicy \"%s\" could not be found in LDAP!"
msgstr ""
#: plugins/personal/generic/class_user.inc:463
@@ -3952,11 +3952,11 @@ msgid "Checking for POSIX groups outside the groups tree"
msgstr ""
#: setup/class_setupStepMigrate.inc:274
-msgid "Checking for duplicated UID numbers"
+msgid "Checking for duplicate UID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:275
-msgid "Checking for duplicated GID numbers"
+msgid "Checking for duplicate GID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:343 setup/class_setupStepMigrate.inc:502
@@ -3972,7 +3972,7 @@ msgstr ""
#: setup/class_setupStepMigrate.inc:935 setup/class_setupStepMigrate.inc:1041
#: setup/class_setupStepMigrate.inc:1071 setup/class_setupStepMigrate.inc:1322
#: setup/class_setupStepMigrate.inc:1433
-msgid "Possibly the \"root object\" is missing."
+msgid "The \"root object\" is possibly missing."
msgstr ""
#: setup/class_setupStepMigrate.inc:360 setup/class_setupStepMigrate.inc:383
@@ -4045,7 +4045,7 @@ msgid "Roles"
msgstr ""
#: setup/class_setupStepMigrate.inc:836
-msgid "There is no FusionDirectory administrator account inside your LDAP."
+msgid "There is no FusionDirectory administrator account in your LDAP directory."
msgstr ""
#: setup/class_setupStepMigrate.inc:875
@@ -4084,12 +4084,12 @@ msgid "LDAP result parsing failed"
msgstr ""
#: setup/class_setupStepMigrate.inc:1076 setup/class_setupStepMigrate.inc:1327
-msgid "Sizelimit hit"
+msgid "Size limit hit"
msgstr ""
#: setup/class_setupStepMigrate.inc:1077 setup/class_setupStepMigrate.inc:1328
#, php-format
-msgid "Sizelimit of %d hit. Please check this manually"
+msgid "Size limit of %d hit. Please check this manually"
msgstr ""
#: setup/class_setupStepMigrate.inc:1120 setup/class_setupStepMigrate.inc:1134
@@ -4316,7 +4316,7 @@ msgstr ""
#, php-format
msgid ""
"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
"shouldn't."
msgstr ""
@@ -4387,7 +4387,7 @@ msgstr ""
#: setup/class_setupStepChecks.inc:124
msgid ""
-"FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
+"FusionDirectory requires either the 'mhash' or 'sha1' module to make use of "
"SSHA encryption."
msgstr ""
@@ -4681,7 +4681,7 @@ msgstr ""
#: ihtml/themes/breezy/islocked.tpl.c:11
msgid ""
"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
+"web browser during the edit operation. You may want to take over the lock by "
"pressing the \"%1\" button."
msgstr ""
@@ -4797,7 +4797,7 @@ msgid "There are no users"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:8
-msgid "One of them have a %1 account"
+msgid "One of them has a %1 account"
msgid_plural "%2 of them have a %1 account"
msgstr[0] ""
msgstr[1] ""
@@ -4807,8 +4807,8 @@ msgid "None of them have a %1 account"
msgstr ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:5
-msgid "One of them use %1 method"
-msgid_plural "%2 of them use %1 method"
+msgid "One of them uses the %1 method"
+msgid_plural "%2 of them use the %1 method"
msgstr[0] ""
msgstr[1] ""
@@ -4819,7 +4819,7 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:11
-msgid "None of them is locked"
+msgid "None of them are locked"
msgstr ""
#: plugins/addons/dashboard/groups_stats.tpl.c:2
@@ -4849,7 +4849,7 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/users_accounts.tpl.c:5
-msgid "There is no expired account"
+msgid "There are no expired accounts"
msgstr ""
#: plugins/addons/dashboard/users_accounts.tpl.c:11
@@ -5007,7 +5007,7 @@ msgstr ""
#: setup/setup_welcome.tpl.c:2
msgid ""
-"This seems to be the first time you start FusionDirectory - we didn't find "
+"This seems to be the first time you start FusionDirectory - we cannot find "
"any configuration right now. This simple wizard intends to help you while "
"setting it up."
msgstr ""
@@ -5051,10 +5051,10 @@ msgstr ""
#: setup/setup_welcome.tpl.c:32
msgid ""
"For security reasons you need to authenticate for the installation by "
-"creating the file '%1', containing the current session ID on the servers "
+"creating the file '%1', containing the current session ID on the server's "
"local filesystem. This can be done by executing the following command:"
msgstr ""
#: setup/setup_welcome.tpl.c:35
-msgid "Click the 'Next' button when you've finished."
+msgid "Click the 'Next' button when you are done."
msgstr ""
diff --git a/locale/es/fusiondirectory.po b/locale/es/fusiondirectory.po
index 7e731790a408a140500348d5909acdd832284252..73b2695e9eac3fc13c8f506af793e98aea0f1a51 100644
--- a/locale/es/fusiondirectory.po
+++ b/locale/es/fusiondirectory.po
@@ -87,7 +87,7 @@ msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:71
msgid ""
"LDAP attributes to display, comma separated. Special values \"nameAttr\" and"
-" \"mainAttr\" also works."
+" \"mainAttr\" also work."
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:75
@@ -99,7 +99,7 @@ msgid "Column title"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
-msgid "Persitent"
+msgid "Persistent"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
@@ -581,7 +581,7 @@ msgid "Send bug report to the FusionDirectory Team"
msgstr "Enviar informe de errores al equipo de FusionDirectory"
#: include/php_setup.inc:235
-msgid "Send bugreport"
+msgid "Send bug report"
msgstr "Enviar informe de errores"
#: include/php_setup.inc:240
@@ -636,7 +636,7 @@ msgstr ""
#: include/login/class_LoginCAS.inc:68
#, php-format
-msgid "CAS user \"%s\" could not be found in the LDAP"
+msgid "CAS user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginCAS.inc:78 include/login/class_LoginCAS.inc:104
@@ -729,7 +729,7 @@ msgstr ""
#: include/login/class_LoginHTTPHeader.inc:64
#, php-format
-msgid "Header user \"%s\" could not be found in the LDAP"
+msgid "Header user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginHTTPAuth.inc:29
@@ -773,7 +773,7 @@ msgid "The user using email \"%s\" is locked. Please contact your administrator.
msgstr ""
#: include/class_passwordRecovery.inc:352
-msgid "Contact your administrator, there was a problem with mail server"
+msgid "Contact your administrator, there was a problem with the mail server"
msgstr ""
"Contacte a su administrador, hubo un problema con el servidor de correo"
@@ -782,7 +782,7 @@ msgid "This token is invalid"
msgstr "Esta prenda es invalida"
#: include/class_passwordRecovery.inc:429
-msgid "There was a problem with mail server, confirmation email not sent"
+msgid "There was a problem with the mail server, confirmation email not sent"
msgstr ""
#: include/password-methods/class_passwordMethodSasl.inc:66
@@ -854,7 +854,7 @@ msgstr ""
#: include/functions.inc:354
#, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
msgstr ""
"FATAL: Ha habido un error conectando a LDAP. El servidor comunicó '%s'."
@@ -1180,7 +1180,7 @@ msgstr ""
#: include/class_msgPool.inc:245
#, php-format
-msgid "The entry \"%s\" already use this \"%s\" attribute!"
+msgid "The entry \"%s\" already uses this \"%s\" attribute!"
msgstr ""
#: include/class_msgPool.inc:256
@@ -1634,7 +1634,7 @@ msgstr "Descargar"
#: include/simpleplugin/attributes/class_FileAttribute.inc:380
#, php-format
-msgid "Cannot set \"%s\" value, it contains invalid data: %s"
+msgid "Cannot set value \"%s\", it contains invalid data: %s"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:390
@@ -1680,7 +1680,7 @@ msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:150
#, php-format
-msgid "The value for multivaluated field \"%s\" is not an array"
+msgid "The value for multivalued field \"%s\" is not an array"
msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:250
@@ -1741,7 +1741,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:492
#, php-format
msgid ""
-"Could not compute dn: could not find objectType infos from tab class \"%s\""
+"Could not compute dn: could not find objectType info from tab class \"%s\""
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1363
@@ -1756,7 +1756,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1576
msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may"
+"The object has changed since being opened in FusionDirectory. All changes that may"
" be done by others will get lost if you save this entry!"
msgstr ""
@@ -2461,7 +2461,7 @@ msgid "DN you wish to add assignments for"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:110
-msgid "The dn you entered could not be found in the LDAP"
+msgid "The dn you entered could not be found in LDAP"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:141
@@ -2643,7 +2643,7 @@ msgid "SASL"
msgstr "SASL"
#: plugins/config/class_mainPluginsConfig.inc:54
-msgid "Force to ask for password"
+msgid "Force asking for a password"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
@@ -2719,7 +2719,7 @@ msgid "Activate password recovery"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:47
-msgid "Whether to activate or not password recovery feature"
+msgid "Whether to activate the password recovery feature or not"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:52
@@ -2754,7 +2754,7 @@ msgstr ""
#: plugins/config/class_recoveryConfig.inc:74
msgid ""
-"Users will also be able to enter one of theirs alternate addresses to "
+"Users will also be able to enter one of their alternate addresses to "
"recover their password"
msgstr ""
@@ -2998,7 +2998,7 @@ msgid "Snapshot base"
msgstr "Base de instantaneas"
#: plugins/config/class_configInLdap.inc:109
-msgid "The base where snapshots should be stored inside of the LDAP."
+msgid "The base where snapshots should be stored inside the LDAP directory."
msgstr ""
#: plugins/config/class_configInLdap.inc:114
@@ -3194,7 +3194,7 @@ msgid "People DN attribute"
msgstr "Atributo 'dn' de los usuarios"
#: plugins/config/class_configInLdap.inc:252
-msgid "Attribute to use at the beginning of users dn"
+msgid "Attribute to use at the beginning of the user's dn"
msgstr ""
#: plugins/config/class_configInLdap.inc:257
@@ -3279,7 +3279,7 @@ msgstr ""
#: plugins/config/class_configInLdap.inc:301
msgid ""
"Shows PHP errors in the upper part of the screen. This should be disabled in"
-" productive deployments, because there might be some passwords in it."
+" production deployments, because it may contain passwords."
msgstr ""
#: plugins/config/class_configInLdap.inc:305
@@ -3517,7 +3517,7 @@ msgstr ""
#: plugins/personal/roles/class_userRoles.inc:49
#: plugins/personal/roles/class_userRoles.inc:53
-msgid "Groups membership"
+msgid "Group memberships"
msgstr ""
#: plugins/personal/roles/class_userRoles.inc:60
@@ -3796,7 +3796,7 @@ msgstr "Código Postal"
#: plugins/personal/generic/class_user.inc:430
#, php-format
-msgid "Ppolicy \"%s\" could not be found in the LDAP!"
+msgid "Ppolicy \"%s\" could not be found in LDAP!"
msgstr ""
#: plugins/personal/generic/class_user.inc:460
@@ -4068,7 +4068,7 @@ msgstr "FusionDirectory requiere este modulo para la integración con Samba"
#: setup/class_setupStepChecks.inc:124
msgid ""
-"FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
+"FusionDirectory requires either the 'mhash' or 'sha1' module to make use of "
"SSHA encryption."
msgstr ""
"FusionDirectory requiere ya sea el modulo 'mhash' o 'sha1' para usar "
@@ -4275,11 +4275,11 @@ msgid "Checking for POSIX groups outside the groups tree"
msgstr ""
#: setup/class_setupStepMigrate.inc:274
-msgid "Checking for duplicated UID numbers"
+msgid "Checking for duplicate UID numbers"
msgstr "Comprobando números UID duplicados"
#: setup/class_setupStepMigrate.inc:275
-msgid "Checking for duplicated GID numbers"
+msgid "Checking for duplicate GID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:343 setup/class_setupStepMigrate.inc:502
@@ -4295,7 +4295,7 @@ msgstr "La consulta LDAP ha fallado"
#: setup/class_setupStepMigrate.inc:935 setup/class_setupStepMigrate.inc:1041
#: setup/class_setupStepMigrate.inc:1071 setup/class_setupStepMigrate.inc:1322
#: setup/class_setupStepMigrate.inc:1433
-msgid "Possibly the \"root object\" is missing."
+msgid "The \"root object\" is possibly missing."
msgstr ""
#: setup/class_setupStepMigrate.inc:360 setup/class_setupStepMigrate.inc:383
@@ -4368,7 +4368,7 @@ msgid "Roles"
msgstr "Roles"
#: setup/class_setupStepMigrate.inc:836
-msgid "There is no FusionDirectory administrator account inside your LDAP."
+msgid "There is no FusionDirectory administrator account in your LDAP directory."
msgstr "No hay una cuenta de administrador FusionDirectory dentro de su LDAP."
#: setup/class_setupStepMigrate.inc:875
@@ -4407,12 +4407,12 @@ msgid "LDAP result parsing failed"
msgstr ""
#: setup/class_setupStepMigrate.inc:1076 setup/class_setupStepMigrate.inc:1327
-msgid "Sizelimit hit"
+msgid "Size limit hit"
msgstr ""
#: setup/class_setupStepMigrate.inc:1077 setup/class_setupStepMigrate.inc:1328
#, php-format
-msgid "Sizelimit of %d hit. Please check this manually"
+msgid "Size limit of %d hit. Please check this manually"
msgstr ""
#: setup/class_setupStepMigrate.inc:1120 setup/class_setupStepMigrate.inc:1134
@@ -4509,7 +4509,7 @@ msgstr "En estos momentos la configuración no es accesible o no existe."
#, php-format
msgid ""
"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
"shouldn't."
msgstr ""
"Después de descargar y colocar el archivo en %s, por favor asegúrese de que "
@@ -4621,7 +4621,7 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/users_accounts.tpl.c:5
-msgid "There is no expired account"
+msgid "There are no expired accounts"
msgstr ""
#: plugins/addons/dashboard/users_accounts.tpl.c:11
@@ -4671,8 +4671,8 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:5
-msgid "One of them use %1 method"
-msgid_plural "%2 of them use %1 method"
+msgid "One of them uses the %1 method"
+msgid_plural "%2 of them use the %1 method"
msgstr[0] ""
msgstr[1] ""
@@ -4683,7 +4683,7 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:11
-msgid "None of them is locked"
+msgid "None of them are locked"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:5
@@ -4691,7 +4691,7 @@ msgid "There are no users"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:8
-msgid "One of them have a %1 account"
+msgid "One of them has a %1 account"
msgid_plural "%2 of them have a %1 account"
msgstr[0] ""
msgstr[1] ""
@@ -4762,7 +4762,7 @@ msgstr "FusionDirectory correrá aun si no se arregla esto."
#: setup/setup_welcome.tpl.c:2
msgid ""
-"This seems to be the first time you start FusionDirectory - we didn't find "
+"This seems to be the first time you start FusionDirectory - we cannot find "
"any configuration right now. This simple wizard intends to help you while "
"setting it up."
msgstr ""
@@ -4811,12 +4811,12 @@ msgstr ""
#: setup/setup_welcome.tpl.c:32
msgid ""
"For security reasons you need to authenticate for the installation by "
-"creating the file '%1', containing the current session ID on the servers "
+"creating the file '%1', containing the current session ID on the server's "
"local filesystem. This can be done by executing the following command:"
msgstr ""
#: setup/setup_welcome.tpl.c:35
-msgid "Click the 'Next' button when you've finished."
+msgid "Click the 'Next' button when you are done."
msgstr ""
#: setup/setup_migrate.tpl.c:2
@@ -5093,7 +5093,7 @@ msgstr ""
#: ihtml/themes/breezy/islocked.tpl.c:11
msgid ""
"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
+"web browser during the edit operation. You may want to take over the lock by "
"pressing the \"%1\" button."
msgstr ""
diff --git a/locale/es_CO/fusiondirectory.po b/locale/es_CO/fusiondirectory.po
index fd5a01d32761f0ca1be0d63a182c254a4aeb2261..fe8c3b09535d707d25a52ff8ed8ad51bfd69a7c8 100644
--- a/locale/es_CO/fusiondirectory.po
+++ b/locale/es_CO/fusiondirectory.po
@@ -87,7 +87,7 @@ msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:71
msgid ""
"LDAP attributes to display, comma separated. Special values \"nameAttr\" and"
-" \"mainAttr\" also works."
+" \"mainAttr\" also work."
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:75
@@ -99,7 +99,7 @@ msgid "Column title"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
-msgid "Persitent"
+msgid "Persistent"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
@@ -580,7 +580,7 @@ msgid "Send bug report to the FusionDirectory Team"
msgstr "Enviar un reporte de fallo al equipo de FusionDirectory"
#: include/php_setup.inc:235
-msgid "Send bugreport"
+msgid "Send bug report"
msgstr "Enviar reporte de errores"
#: include/php_setup.inc:240
@@ -635,7 +635,7 @@ msgstr ""
#: include/login/class_LoginCAS.inc:68
#, php-format
-msgid "CAS user \"%s\" could not be found in the LDAP"
+msgid "CAS user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginCAS.inc:78 include/login/class_LoginCAS.inc:104
@@ -727,7 +727,7 @@ msgstr ""
#: include/login/class_LoginHTTPHeader.inc:64
#, php-format
-msgid "Header user \"%s\" could not be found in the LDAP"
+msgid "Header user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginHTTPAuth.inc:29
@@ -771,7 +771,7 @@ msgid "The user using email \"%s\" is locked. Please contact your administrator.
msgstr ""
#: include/class_passwordRecovery.inc:352
-msgid "Contact your administrator, there was a problem with mail server"
+msgid "Contact your administrator, there was a problem with the mail server"
msgstr ""
"Contacte a su administrador, hubo un problema con el servidor de correo."
@@ -780,7 +780,7 @@ msgid "This token is invalid"
msgstr "Este token es inválido"
#: include/class_passwordRecovery.inc:429
-msgid "There was a problem with mail server, confirmation email not sent"
+msgid "There was a problem with the mail server, confirmation email not sent"
msgstr ""
"Hay un problema con el servidor de correo, la confirmación de email no será "
"enviada."
@@ -853,7 +853,7 @@ msgstr ""
#: include/functions.inc:354
#, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
msgstr "FATAL: Error conectándose a LDAP. El servidor dijo: '%s'"
#: include/functions.inc:402 include/functions.inc:531
@@ -1184,7 +1184,7 @@ msgstr ""
#: include/class_msgPool.inc:245
#, php-format
-msgid "The entry \"%s\" already use this \"%s\" attribute!"
+msgid "The entry \"%s\" already uses this \"%s\" attribute!"
msgstr ""
#: include/class_msgPool.inc:256
@@ -1638,7 +1638,7 @@ msgstr "Descargar"
#: include/simpleplugin/attributes/class_FileAttribute.inc:380
#, php-format
-msgid "Cannot set \"%s\" value, it contains invalid data: %s"
+msgid "Cannot set value \"%s\", it contains invalid data: %s"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:390
@@ -1684,7 +1684,7 @@ msgstr "Un número flotante menor que %f"
#: include/simpleplugin/attributes/class_SetAttribute.inc:150
#, php-format
-msgid "The value for multivaluated field \"%s\" is not an array"
+msgid "The value for multivalued field \"%s\" is not an array"
msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:250
@@ -1745,7 +1745,7 @@ msgstr "No es posible calcular dn: no hay pestaña de clase padre para \"%s\""
#: include/simpleplugin/class_simplePlugin.inc:492
#, php-format
msgid ""
-"Could not compute dn: could not find objectType infos from tab class \"%s\""
+"Could not compute dn: could not find objectType info from tab class \"%s\""
msgstr ""
"No es posible calcular dn: No se encuentra el objectType infos desde la "
"pestaña clase \"%s\""
@@ -1762,7 +1762,7 @@ msgstr "La entrada %s no existe"
#: include/simpleplugin/class_simplePlugin.inc:1576
msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may"
+"The object has changed since being opened in FusionDirectory. All changes that may"
" be done by others will get lost if you save this entry!"
msgstr ""
@@ -2476,7 +2476,7 @@ msgid "DN you wish to add assignments for"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:110
-msgid "The dn you entered could not be found in the LDAP"
+msgid "The dn you entered could not be found in LDAP"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:141
@@ -2660,7 +2660,7 @@ msgid "SASL"
msgstr "SASL"
#: plugins/config/class_mainPluginsConfig.inc:54
-msgid "Force to ask for password"
+msgid "Force asking for a password"
msgstr "Forzar para solicitar la contraseña"
#: plugins/config/class_mainPluginsConfig.inc:54
@@ -2738,7 +2738,7 @@ msgid "Activate password recovery"
msgstr "Habilitar recuperación de contraseña."
#: plugins/config/class_recoveryConfig.inc:47
-msgid "Whether to activate or not password recovery feature"
+msgid "Whether to activate the password recovery feature or not"
msgstr ""
"Elegir cuando activar la caracterÃstica de recuperación de contraseña."
@@ -2776,7 +2776,7 @@ msgstr "Habilitar el uso de correos alternativos"
#: plugins/config/class_recoveryConfig.inc:74
msgid ""
-"Users will also be able to enter one of theirs alternate addresses to "
+"Users will also be able to enter one of their alternate addresses to "
"recover their password"
msgstr ""
"Los usuarios también podrán una dirección alternativa para recuperar su "
@@ -3034,7 +3034,7 @@ msgid "Snapshot base"
msgstr "Base para Snapshot "
#: plugins/config/class_configInLdap.inc:109
-msgid "The base where snapshots should be stored inside of the LDAP."
+msgid "The base where snapshots should be stored inside the LDAP directory."
msgstr "La base donde los snapshots deberÃan ser almacenados dentro de LDAP."
#: plugins/config/class_configInLdap.inc:114
@@ -3244,7 +3244,7 @@ msgid "People DN attribute"
msgstr "Atributo DN para 'Usuarios'"
#: plugins/config/class_configInLdap.inc:252
-msgid "Attribute to use at the beginning of users dn"
+msgid "Attribute to use at the beginning of the user's dn"
msgstr "Atributo al inicio del \"dn\" de los usuarios"
#: plugins/config/class_configInLdap.inc:257
@@ -3329,7 +3329,7 @@ msgstr "Mostrar errores"
#: plugins/config/class_configInLdap.inc:301
msgid ""
"Shows PHP errors in the upper part of the screen. This should be disabled in"
-" productive deployments, because there might be some passwords in it."
+" production deployments, because it may contain passwords."
msgstr ""
"Muesta los errores PHP en la parte superior de la pantalla. esto deberÃa "
"estar deshabilitado en entornos productivos, ya que, en algunos casos "
@@ -3578,7 +3578,7 @@ msgstr "Editar grupos y roles del usuario"
#: plugins/personal/roles/class_userRoles.inc:49
#: plugins/personal/roles/class_userRoles.inc:53
-msgid "Groups membership"
+msgid "Group memberships"
msgstr "Pertenencia a grupos"
#: plugins/personal/roles/class_userRoles.inc:60
@@ -3859,7 +3859,7 @@ msgstr ""
#: plugins/personal/generic/class_user.inc:430
#, php-format
-msgid "Ppolicy \"%s\" could not be found in the LDAP!"
+msgid "Ppolicy \"%s\" could not be found in LDAP!"
msgstr "¡No se pudo encontrar la polÃtica \"%s\" en LDAP!"
#: plugins/personal/generic/class_user.inc:460
@@ -4140,7 +4140,7 @@ msgstr "FusionDirectory necesita éste módulo para la integración con Samba"
#: setup/class_setupStepChecks.inc:124
msgid ""
-"FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
+"FusionDirectory requires either the 'mhash' or 'sha1' module to make use of "
"SSHA encryption."
msgstr ""
"FusionDirectory requiere el módulo 'mhash' o bien 'sha1' para usar "
@@ -4364,11 +4364,11 @@ msgid "Checking for POSIX groups outside the groups tree"
msgstr ""
#: setup/class_setupStepMigrate.inc:274
-msgid "Checking for duplicated UID numbers"
+msgid "Checking for duplicate UID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:275
-msgid "Checking for duplicated GID numbers"
+msgid "Checking for duplicate GID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:343 setup/class_setupStepMigrate.inc:502
@@ -4384,7 +4384,7 @@ msgstr ""
#: setup/class_setupStepMigrate.inc:935 setup/class_setupStepMigrate.inc:1041
#: setup/class_setupStepMigrate.inc:1071 setup/class_setupStepMigrate.inc:1322
#: setup/class_setupStepMigrate.inc:1433
-msgid "Possibly the \"root object\" is missing."
+msgid "The \"root object\" is possibly missing."
msgstr ""
#: setup/class_setupStepMigrate.inc:360 setup/class_setupStepMigrate.inc:383
@@ -4461,7 +4461,7 @@ msgid "Roles"
msgstr ""
#: setup/class_setupStepMigrate.inc:836
-msgid "There is no FusionDirectory administrator account inside your LDAP."
+msgid "There is no FusionDirectory administrator account in your LDAP directory."
msgstr "No hay una cuenta de administrador de FusionDirectory en su LDAP."
#: setup/class_setupStepMigrate.inc:875
@@ -4500,12 +4500,12 @@ msgid "LDAP result parsing failed"
msgstr ""
#: setup/class_setupStepMigrate.inc:1076 setup/class_setupStepMigrate.inc:1327
-msgid "Sizelimit hit"
+msgid "Size limit hit"
msgstr ""
#: setup/class_setupStepMigrate.inc:1077 setup/class_setupStepMigrate.inc:1328
#, php-format
-msgid "Sizelimit of %d hit. Please check this manually"
+msgid "Size limit of %d hit. Please check this manually"
msgstr ""
#: setup/class_setupStepMigrate.inc:1120 setup/class_setupStepMigrate.inc:1134
@@ -4604,7 +4604,7 @@ msgstr ""
#, php-format
msgid ""
"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
"shouldn't."
msgstr ""
"Después de descargar y colocar el archivo en %s, por favor verifique que el "
@@ -4724,7 +4724,7 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/users_accounts.tpl.c:5
-msgid "There is no expired account"
+msgid "There are no expired accounts"
msgstr "No hay una cuenta expirada"
#: plugins/addons/dashboard/users_accounts.tpl.c:11
@@ -4774,8 +4774,8 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:5
-msgid "One of them use %1 method"
-msgid_plural "%2 of them use %1 method"
+msgid "One of them uses the %1 method"
+msgid_plural "%2 of them use the %1 method"
msgstr[0] ""
msgstr[1] ""
@@ -4786,7 +4786,7 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:11
-msgid "None of them is locked"
+msgid "None of them are locked"
msgstr "Ninguno de ellos está bloqueado"
#: plugins/addons/dashboard/users_stats.tpl.c:5
@@ -4794,7 +4794,7 @@ msgid "There are no users"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:8
-msgid "One of them have a %1 account"
+msgid "One of them has a %1 account"
msgid_plural "%2 of them have a %1 account"
msgstr[0] ""
msgstr[1] ""
@@ -4867,7 +4867,7 @@ msgstr "FusionDirectory intentará ejecutarse sin arreglar esto."
#: setup/setup_welcome.tpl.c:2
msgid ""
-"This seems to be the first time you start FusionDirectory - we didn't find "
+"This seems to be the first time you start FusionDirectory - we cannot find "
"any configuration right now. This simple wizard intends to help you while "
"setting it up."
msgstr ""
@@ -4916,7 +4916,7 @@ msgstr "Para continuar:"
#: setup/setup_welcome.tpl.c:32
msgid ""
"For security reasons you need to authenticate for the installation by "
-"creating the file '%1', containing the current session ID on the servers "
+"creating the file '%1', containing the current session ID on the server's "
"local filesystem. This can be done by executing the following command:"
msgstr ""
"Por motivos de seguridad usted necesita autenticarse para esta instalación "
@@ -4924,7 +4924,7 @@ msgstr ""
"Esto se puede hacer ejecutando el siguiente comando:"
#: setup/setup_welcome.tpl.c:35
-msgid "Click the 'Next' button when you've finished."
+msgid "Click the 'Next' button when you are done."
msgstr "Cuando haya terminado haga clic en 'Siguiente'."
#: setup/setup_migrate.tpl.c:2
@@ -5210,7 +5210,7 @@ msgstr ""
#: ihtml/themes/breezy/islocked.tpl.c:11
msgid ""
"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
+"web browser during the edit operation. You may want to take over the lock by "
"pressing the \"%1\" button."
msgstr ""
diff --git a/locale/es_VE/fusiondirectory.po b/locale/es_VE/fusiondirectory.po
index aa2545fa88b819007f1a52fec115f439b5ee0b69..b06ebc9f22b6c3caefaa732cb2645ff28588c757 100644
--- a/locale/es_VE/fusiondirectory.po
+++ b/locale/es_VE/fusiondirectory.po
@@ -87,7 +87,7 @@ msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:71
msgid ""
"LDAP attributes to display, comma separated. Special values \"nameAttr\" and"
-" \"mainAttr\" also works."
+" \"mainAttr\" also work."
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:75
@@ -99,7 +99,7 @@ msgid "Column title"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
-msgid "Persitent"
+msgid "Persistent"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
@@ -581,7 +581,7 @@ msgid "Send bug report to the FusionDirectory Team"
msgstr "Enviar informe de errores al equipo de FusionDirectory"
#: include/php_setup.inc:235
-msgid "Send bugreport"
+msgid "Send bug report"
msgstr "Enviar informe de errores"
#: include/php_setup.inc:240
@@ -636,7 +636,7 @@ msgstr ""
#: include/login/class_LoginCAS.inc:68
#, php-format
-msgid "CAS user \"%s\" could not be found in the LDAP"
+msgid "CAS user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginCAS.inc:78 include/login/class_LoginCAS.inc:104
@@ -729,7 +729,7 @@ msgstr ""
#: include/login/class_LoginHTTPHeader.inc:64
#, php-format
-msgid "Header user \"%s\" could not be found in the LDAP"
+msgid "Header user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginHTTPAuth.inc:29
@@ -773,7 +773,7 @@ msgid "The user using email \"%s\" is locked. Please contact your administrator.
msgstr ""
#: include/class_passwordRecovery.inc:352
-msgid "Contact your administrator, there was a problem with mail server"
+msgid "Contact your administrator, there was a problem with the mail server"
msgstr ""
"Contacte a su administrador, hubo un problema con el servidor de correo"
@@ -782,7 +782,7 @@ msgid "This token is invalid"
msgstr "Esta prenda es invalida"
#: include/class_passwordRecovery.inc:429
-msgid "There was a problem with mail server, confirmation email not sent"
+msgid "There was a problem with the mail server, confirmation email not sent"
msgstr ""
#: include/password-methods/class_passwordMethodSasl.inc:66
@@ -854,7 +854,7 @@ msgstr ""
#: include/functions.inc:354
#, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
msgstr ""
"FATAL: Ha habido un error conectando a LDAP. El servidor comunicó '%s'."
@@ -1180,7 +1180,7 @@ msgstr ""
#: include/class_msgPool.inc:245
#, php-format
-msgid "The entry \"%s\" already use this \"%s\" attribute!"
+msgid "The entry \"%s\" already uses this \"%s\" attribute!"
msgstr ""
#: include/class_msgPool.inc:256
@@ -1634,7 +1634,7 @@ msgstr "Descargar"
#: include/simpleplugin/attributes/class_FileAttribute.inc:380
#, php-format
-msgid "Cannot set \"%s\" value, it contains invalid data: %s"
+msgid "Cannot set value \"%s\", it contains invalid data: %s"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:390
@@ -1680,7 +1680,7 @@ msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:150
#, php-format
-msgid "The value for multivaluated field \"%s\" is not an array"
+msgid "The value for multivalued field \"%s\" is not an array"
msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:250
@@ -1741,7 +1741,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:492
#, php-format
msgid ""
-"Could not compute dn: could not find objectType infos from tab class \"%s\""
+"Could not compute dn: could not find objectType info from tab class \"%s\""
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1363
@@ -1756,7 +1756,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1576
msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may"
+"The object has changed since being opened in FusionDirectory. All changes that may"
" be done by others will get lost if you save this entry!"
msgstr ""
@@ -2461,7 +2461,7 @@ msgid "DN you wish to add assignments for"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:110
-msgid "The dn you entered could not be found in the LDAP"
+msgid "The dn you entered could not be found in LDAP"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:141
@@ -2643,7 +2643,7 @@ msgid "SASL"
msgstr "SASL"
#: plugins/config/class_mainPluginsConfig.inc:54
-msgid "Force to ask for password"
+msgid "Force asking for a password"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
@@ -2719,7 +2719,7 @@ msgid "Activate password recovery"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:47
-msgid "Whether to activate or not password recovery feature"
+msgid "Whether to activate the password recovery feature or not"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:52
@@ -2754,7 +2754,7 @@ msgstr ""
#: plugins/config/class_recoveryConfig.inc:74
msgid ""
-"Users will also be able to enter one of theirs alternate addresses to "
+"Users will also be able to enter one of their alternate addresses to "
"recover their password"
msgstr ""
@@ -2998,7 +2998,7 @@ msgid "Snapshot base"
msgstr "Base de instantaneas"
#: plugins/config/class_configInLdap.inc:109
-msgid "The base where snapshots should be stored inside of the LDAP."
+msgid "The base where snapshots should be stored inside the LDAP directory."
msgstr ""
#: plugins/config/class_configInLdap.inc:114
@@ -3194,7 +3194,7 @@ msgid "People DN attribute"
msgstr "Atributo 'dn' de los usuarios"
#: plugins/config/class_configInLdap.inc:252
-msgid "Attribute to use at the beginning of users dn"
+msgid "Attribute to use at the beginning of the user's dn"
msgstr ""
#: plugins/config/class_configInLdap.inc:257
@@ -3279,7 +3279,7 @@ msgstr ""
#: plugins/config/class_configInLdap.inc:301
msgid ""
"Shows PHP errors in the upper part of the screen. This should be disabled in"
-" productive deployments, because there might be some passwords in it."
+" production deployments, because it may contain passwords."
msgstr ""
#: plugins/config/class_configInLdap.inc:305
@@ -3517,7 +3517,7 @@ msgstr ""
#: plugins/personal/roles/class_userRoles.inc:49
#: plugins/personal/roles/class_userRoles.inc:53
-msgid "Groups membership"
+msgid "Group memberships"
msgstr ""
#: plugins/personal/roles/class_userRoles.inc:60
@@ -3796,7 +3796,7 @@ msgstr "Código Postal"
#: plugins/personal/generic/class_user.inc:430
#, php-format
-msgid "Ppolicy \"%s\" could not be found in the LDAP!"
+msgid "Ppolicy \"%s\" could not be found in LDAP!"
msgstr ""
#: plugins/personal/generic/class_user.inc:460
@@ -4068,7 +4068,7 @@ msgstr "FusionDirectory requiere este modulo para la integración con Samba"
#: setup/class_setupStepChecks.inc:124
msgid ""
-"FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
+"FusionDirectory requires either the 'mhash' or 'sha1' module to make use of "
"SSHA encryption."
msgstr ""
"FusionDirectory requiere ya sea el modulo 'mhash' o 'sha1' para usar "
@@ -4277,11 +4277,11 @@ msgid "Checking for POSIX groups outside the groups tree"
msgstr ""
#: setup/class_setupStepMigrate.inc:274
-msgid "Checking for duplicated UID numbers"
+msgid "Checking for duplicate UID numbers"
msgstr "Comprobando números UID duplicados"
#: setup/class_setupStepMigrate.inc:275
-msgid "Checking for duplicated GID numbers"
+msgid "Checking for duplicate GID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:343 setup/class_setupStepMigrate.inc:502
@@ -4297,7 +4297,7 @@ msgstr "La consulta LDAP ha fallado"
#: setup/class_setupStepMigrate.inc:935 setup/class_setupStepMigrate.inc:1041
#: setup/class_setupStepMigrate.inc:1071 setup/class_setupStepMigrate.inc:1322
#: setup/class_setupStepMigrate.inc:1433
-msgid "Possibly the \"root object\" is missing."
+msgid "The \"root object\" is possibly missing."
msgstr ""
#: setup/class_setupStepMigrate.inc:360 setup/class_setupStepMigrate.inc:383
@@ -4370,7 +4370,7 @@ msgid "Roles"
msgstr "Roles"
#: setup/class_setupStepMigrate.inc:836
-msgid "There is no FusionDirectory administrator account inside your LDAP."
+msgid "There is no FusionDirectory administrator account in your LDAP directory."
msgstr "No hay una cuenta de administrador FusionDirectory dentro de su LDAP."
#: setup/class_setupStepMigrate.inc:875
@@ -4409,12 +4409,12 @@ msgid "LDAP result parsing failed"
msgstr ""
#: setup/class_setupStepMigrate.inc:1076 setup/class_setupStepMigrate.inc:1327
-msgid "Sizelimit hit"
+msgid "Size limit hit"
msgstr ""
#: setup/class_setupStepMigrate.inc:1077 setup/class_setupStepMigrate.inc:1328
#, php-format
-msgid "Sizelimit of %d hit. Please check this manually"
+msgid "Size limit of %d hit. Please check this manually"
msgstr ""
#: setup/class_setupStepMigrate.inc:1120 setup/class_setupStepMigrate.inc:1134
@@ -4511,7 +4511,7 @@ msgstr "En estos momentos la configuración no es accesible o no existe."
#, php-format
msgid ""
"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
"shouldn't."
msgstr ""
"Después de descargar y colocar el archivo en %s, por favor asegúrese de que "
@@ -4623,7 +4623,7 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/users_accounts.tpl.c:5
-msgid "There is no expired account"
+msgid "There are no expired accounts"
msgstr ""
#: plugins/addons/dashboard/users_accounts.tpl.c:11
@@ -4673,8 +4673,8 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:5
-msgid "One of them use %1 method"
-msgid_plural "%2 of them use %1 method"
+msgid "One of them uses the %1 method"
+msgid_plural "%2 of them use the %1 method"
msgstr[0] ""
msgstr[1] ""
@@ -4685,7 +4685,7 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:11
-msgid "None of them is locked"
+msgid "None of them are locked"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:5
@@ -4693,7 +4693,7 @@ msgid "There are no users"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:8
-msgid "One of them have a %1 account"
+msgid "One of them has a %1 account"
msgid_plural "%2 of them have a %1 account"
msgstr[0] ""
msgstr[1] ""
@@ -4764,7 +4764,7 @@ msgstr "FusionDirectory correrá aun si no se arregla esto."
#: setup/setup_welcome.tpl.c:2
msgid ""
-"This seems to be the first time you start FusionDirectory - we didn't find "
+"This seems to be the first time you start FusionDirectory - we cannot find "
"any configuration right now. This simple wizard intends to help you while "
"setting it up."
msgstr ""
@@ -4813,12 +4813,12 @@ msgstr ""
#: setup/setup_welcome.tpl.c:32
msgid ""
"For security reasons you need to authenticate for the installation by "
-"creating the file '%1', containing the current session ID on the servers "
+"creating the file '%1', containing the current session ID on the server's "
"local filesystem. This can be done by executing the following command:"
msgstr ""
#: setup/setup_welcome.tpl.c:35
-msgid "Click the 'Next' button when you've finished."
+msgid "Click the 'Next' button when you are done."
msgstr ""
#: setup/setup_migrate.tpl.c:2
@@ -5097,7 +5097,7 @@ msgstr ""
#: ihtml/themes/breezy/islocked.tpl.c:11
msgid ""
"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
+"web browser during the edit operation. You may want to take over the lock by "
"pressing the \"%1\" button."
msgstr ""
diff --git a/locale/fa_IR/fusiondirectory.po b/locale/fa_IR/fusiondirectory.po
index 73bae136ec9e9f7063ff4f8f66f0b2902dc47bfa..1c751e94d3c9a69afe161e537346edc600bfb616 100644
--- a/locale/fa_IR/fusiondirectory.po
+++ b/locale/fa_IR/fusiondirectory.po
@@ -87,7 +87,7 @@ msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:71
msgid ""
"LDAP attributes to display, comma separated. Special values \"nameAttr\" and"
-" \"mainAttr\" also works."
+" \"mainAttr\" also work."
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:75
@@ -99,7 +99,7 @@ msgid "Column title"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
-msgid "Persitent"
+msgid "Persistent"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
@@ -578,7 +578,7 @@ msgid "Send bug report to the FusionDirectory Team"
msgstr ""
#: include/php_setup.inc:235
-msgid "Send bugreport"
+msgid "Send bug report"
msgstr ""
#: include/php_setup.inc:240
@@ -633,7 +633,7 @@ msgstr ""
#: include/login/class_LoginCAS.inc:68
#, php-format
-msgid "CAS user \"%s\" could not be found in the LDAP"
+msgid "CAS user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginCAS.inc:78 include/login/class_LoginCAS.inc:104
@@ -723,7 +723,7 @@ msgstr ""
#: include/login/class_LoginHTTPHeader.inc:64
#, php-format
-msgid "Header user \"%s\" could not be found in the LDAP"
+msgid "Header user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginHTTPAuth.inc:29
@@ -767,7 +767,7 @@ msgid "The user using email \"%s\" is locked. Please contact your administrator.
msgstr ""
#: include/class_passwordRecovery.inc:352
-msgid "Contact your administrator, there was a problem with mail server"
+msgid "Contact your administrator, there was a problem with the mail server"
msgstr ""
#: include/class_passwordRecovery.inc:365
@@ -775,7 +775,7 @@ msgid "This token is invalid"
msgstr ""
#: include/class_passwordRecovery.inc:429
-msgid "There was a problem with mail server, confirmation email not sent"
+msgid "There was a problem with the mail server, confirmation email not sent"
msgstr ""
#: include/password-methods/class_passwordMethodSasl.inc:66
@@ -840,7 +840,7 @@ msgstr ""
#: include/functions.inc:354
#, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
msgstr ""
#: include/functions.inc:402 include/functions.inc:531
@@ -1155,7 +1155,7 @@ msgstr ""
#: include/class_msgPool.inc:245
#, php-format
-msgid "The entry \"%s\" already use this \"%s\" attribute!"
+msgid "The entry \"%s\" already uses this \"%s\" attribute!"
msgstr ""
#: include/class_msgPool.inc:256
@@ -1601,7 +1601,7 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:380
#, php-format
-msgid "Cannot set \"%s\" value, it contains invalid data: %s"
+msgid "Cannot set value \"%s\", it contains invalid data: %s"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:390
@@ -1647,7 +1647,7 @@ msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:150
#, php-format
-msgid "The value for multivaluated field \"%s\" is not an array"
+msgid "The value for multivalued field \"%s\" is not an array"
msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:250
@@ -1708,7 +1708,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:492
#, php-format
msgid ""
-"Could not compute dn: could not find objectType infos from tab class \"%s\""
+"Could not compute dn: could not find objectType info from tab class \"%s\""
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1363
@@ -1723,7 +1723,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1576
msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may"
+"The object has changed since being opened in FusionDirectory. All changes that may"
" be done by others will get lost if you save this entry!"
msgstr ""
@@ -2428,7 +2428,7 @@ msgid "DN you wish to add assignments for"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:110
-msgid "The dn you entered could not be found in the LDAP"
+msgid "The dn you entered could not be found in LDAP"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:141
@@ -2610,7 +2610,7 @@ msgid "SASL"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
-msgid "Force to ask for password"
+msgid "Force asking for a password"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
@@ -2686,7 +2686,7 @@ msgid "Activate password recovery"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:47
-msgid "Whether to activate or not password recovery feature"
+msgid "Whether to activate the password recovery feature or not"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:52
@@ -2721,7 +2721,7 @@ msgstr ""
#: plugins/config/class_recoveryConfig.inc:74
msgid ""
-"Users will also be able to enter one of theirs alternate addresses to "
+"Users will also be able to enter one of their alternate addresses to "
"recover their password"
msgstr ""
@@ -2961,7 +2961,7 @@ msgid "Snapshot base"
msgstr ""
#: plugins/config/class_configInLdap.inc:109
-msgid "The base where snapshots should be stored inside of the LDAP."
+msgid "The base where snapshots should be stored inside the LDAP directory."
msgstr ""
#: plugins/config/class_configInLdap.inc:114
@@ -3157,7 +3157,7 @@ msgid "People DN attribute"
msgstr ""
#: plugins/config/class_configInLdap.inc:252
-msgid "Attribute to use at the beginning of users dn"
+msgid "Attribute to use at the beginning of the user's dn"
msgstr ""
#: plugins/config/class_configInLdap.inc:257
@@ -3242,7 +3242,7 @@ msgstr ""
#: plugins/config/class_configInLdap.inc:301
msgid ""
"Shows PHP errors in the upper part of the screen. This should be disabled in"
-" productive deployments, because there might be some passwords in it."
+" production deployments, because it may contain passwords."
msgstr ""
#: plugins/config/class_configInLdap.inc:305
@@ -3480,7 +3480,7 @@ msgstr ""
#: plugins/personal/roles/class_userRoles.inc:49
#: plugins/personal/roles/class_userRoles.inc:53
-msgid "Groups membership"
+msgid "Group memberships"
msgstr ""
#: plugins/personal/roles/class_userRoles.inc:60
@@ -3759,7 +3759,7 @@ msgstr "کد پستی"
#: plugins/personal/generic/class_user.inc:430
#, php-format
-msgid "Ppolicy \"%s\" could not be found in the LDAP!"
+msgid "Ppolicy \"%s\" could not be found in LDAP!"
msgstr ""
#: plugins/personal/generic/class_user.inc:460
@@ -4024,7 +4024,7 @@ msgstr ""
#: setup/class_setupStepChecks.inc:124
msgid ""
-"FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
+"FusionDirectory requires either the 'mhash' or 'sha1' module to make use of "
"SSHA encryption."
msgstr ""
@@ -4212,11 +4212,11 @@ msgid "Checking for POSIX groups outside the groups tree"
msgstr ""
#: setup/class_setupStepMigrate.inc:274
-msgid "Checking for duplicated UID numbers"
+msgid "Checking for duplicate UID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:275
-msgid "Checking for duplicated GID numbers"
+msgid "Checking for duplicate GID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:343 setup/class_setupStepMigrate.inc:502
@@ -4232,7 +4232,7 @@ msgstr ""
#: setup/class_setupStepMigrate.inc:935 setup/class_setupStepMigrate.inc:1041
#: setup/class_setupStepMigrate.inc:1071 setup/class_setupStepMigrate.inc:1322
#: setup/class_setupStepMigrate.inc:1433
-msgid "Possibly the \"root object\" is missing."
+msgid "The \"root object\" is possibly missing."
msgstr ""
#: setup/class_setupStepMigrate.inc:360 setup/class_setupStepMigrate.inc:383
@@ -4303,7 +4303,7 @@ msgid "Roles"
msgstr ""
#: setup/class_setupStepMigrate.inc:836
-msgid "There is no FusionDirectory administrator account inside your LDAP."
+msgid "There is no FusionDirectory administrator account in your LDAP directory."
msgstr ""
#: setup/class_setupStepMigrate.inc:875
@@ -4342,12 +4342,12 @@ msgid "LDAP result parsing failed"
msgstr ""
#: setup/class_setupStepMigrate.inc:1076 setup/class_setupStepMigrate.inc:1327
-msgid "Sizelimit hit"
+msgid "Size limit hit"
msgstr ""
#: setup/class_setupStepMigrate.inc:1077 setup/class_setupStepMigrate.inc:1328
#, php-format
-msgid "Sizelimit of %d hit. Please check this manually"
+msgid "Size limit of %d hit. Please check this manually"
msgstr ""
#: setup/class_setupStepMigrate.inc:1120 setup/class_setupStepMigrate.inc:1134
@@ -4442,7 +4442,7 @@ msgstr ""
#, php-format
msgid ""
"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
"shouldn't."
msgstr ""
@@ -4549,7 +4549,7 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/users_accounts.tpl.c:5
-msgid "There is no expired account"
+msgid "There are no expired accounts"
msgstr ""
#: plugins/addons/dashboard/users_accounts.tpl.c:11
@@ -4599,8 +4599,8 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:5
-msgid "One of them use %1 method"
-msgid_plural "%2 of them use %1 method"
+msgid "One of them uses the %1 method"
+msgid_plural "%2 of them use the %1 method"
msgstr[0] ""
msgstr[1] ""
@@ -4611,7 +4611,7 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:11
-msgid "None of them is locked"
+msgid "None of them are locked"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:5
@@ -4619,7 +4619,7 @@ msgid "There are no users"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:8
-msgid "One of them have a %1 account"
+msgid "One of them has a %1 account"
msgid_plural "%2 of them have a %1 account"
msgstr[0] ""
msgstr[1] ""
@@ -4688,7 +4688,7 @@ msgstr ""
#: setup/setup_welcome.tpl.c:2
msgid ""
-"This seems to be the first time you start FusionDirectory - we didn't find "
+"This seems to be the first time you start FusionDirectory - we cannot find "
"any configuration right now. This simple wizard intends to help you while "
"setting it up."
msgstr ""
@@ -4732,12 +4732,12 @@ msgstr ""
#: setup/setup_welcome.tpl.c:32
msgid ""
"For security reasons you need to authenticate for the installation by "
-"creating the file '%1', containing the current session ID on the servers "
+"creating the file '%1', containing the current session ID on the server's "
"local filesystem. This can be done by executing the following command:"
msgstr ""
#: setup/setup_welcome.tpl.c:35
-msgid "Click the 'Next' button when you've finished."
+msgid "Click the 'Next' button when you are done."
msgstr ""
#: setup/setup_migrate.tpl.c:2
@@ -5000,7 +5000,7 @@ msgstr ""
#: ihtml/themes/breezy/islocked.tpl.c:11
msgid ""
"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
+"web browser during the edit operation. You may want to take over the lock by "
"pressing the \"%1\" button."
msgstr ""
diff --git a/locale/fi_FI/fusiondirectory.po b/locale/fi_FI/fusiondirectory.po
index 3e56cd504a0e1d30992f4f799dd2744c69bc7b48..a08907601ac67333a3d3d2bfd71a4d69f57db30a 100644
--- a/locale/fi_FI/fusiondirectory.po
+++ b/locale/fi_FI/fusiondirectory.po
@@ -87,7 +87,7 @@ msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:71
msgid ""
"LDAP attributes to display, comma separated. Special values \"nameAttr\" and"
-" \"mainAttr\" also works."
+" \"mainAttr\" also work."
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:75
@@ -99,7 +99,7 @@ msgid "Column title"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
-msgid "Persitent"
+msgid "Persistent"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
@@ -578,7 +578,7 @@ msgid "Send bug report to the FusionDirectory Team"
msgstr ""
#: include/php_setup.inc:235
-msgid "Send bugreport"
+msgid "Send bug report"
msgstr ""
#: include/php_setup.inc:240
@@ -633,7 +633,7 @@ msgstr ""
#: include/login/class_LoginCAS.inc:68
#, php-format
-msgid "CAS user \"%s\" could not be found in the LDAP"
+msgid "CAS user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginCAS.inc:78 include/login/class_LoginCAS.inc:104
@@ -723,7 +723,7 @@ msgstr ""
#: include/login/class_LoginHTTPHeader.inc:64
#, php-format
-msgid "Header user \"%s\" could not be found in the LDAP"
+msgid "Header user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginHTTPAuth.inc:29
@@ -767,7 +767,7 @@ msgid "The user using email \"%s\" is locked. Please contact your administrator.
msgstr ""
#: include/class_passwordRecovery.inc:352
-msgid "Contact your administrator, there was a problem with mail server"
+msgid "Contact your administrator, there was a problem with the mail server"
msgstr ""
#: include/class_passwordRecovery.inc:365
@@ -775,7 +775,7 @@ msgid "This token is invalid"
msgstr ""
#: include/class_passwordRecovery.inc:429
-msgid "There was a problem with mail server, confirmation email not sent"
+msgid "There was a problem with the mail server, confirmation email not sent"
msgstr ""
#: include/password-methods/class_passwordMethodSasl.inc:66
@@ -840,7 +840,7 @@ msgstr ""
#: include/functions.inc:354
#, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
msgstr ""
#: include/functions.inc:402 include/functions.inc:531
@@ -1155,7 +1155,7 @@ msgstr ""
#: include/class_msgPool.inc:245
#, php-format
-msgid "The entry \"%s\" already use this \"%s\" attribute!"
+msgid "The entry \"%s\" already uses this \"%s\" attribute!"
msgstr ""
#: include/class_msgPool.inc:256
@@ -1601,7 +1601,7 @@ msgstr "Lataa"
#: include/simpleplugin/attributes/class_FileAttribute.inc:380
#, php-format
-msgid "Cannot set \"%s\" value, it contains invalid data: %s"
+msgid "Cannot set value \"%s\", it contains invalid data: %s"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:390
@@ -1647,7 +1647,7 @@ msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:150
#, php-format
-msgid "The value for multivaluated field \"%s\" is not an array"
+msgid "The value for multivalued field \"%s\" is not an array"
msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:250
@@ -1708,7 +1708,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:492
#, php-format
msgid ""
-"Could not compute dn: could not find objectType infos from tab class \"%s\""
+"Could not compute dn: could not find objectType info from tab class \"%s\""
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1363
@@ -1723,7 +1723,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1576
msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may"
+"The object has changed since being opened in FusionDirectory. All changes that may"
" be done by others will get lost if you save this entry!"
msgstr ""
@@ -2428,7 +2428,7 @@ msgid "DN you wish to add assignments for"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:110
-msgid "The dn you entered could not be found in the LDAP"
+msgid "The dn you entered could not be found in LDAP"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:141
@@ -2610,7 +2610,7 @@ msgid "SASL"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
-msgid "Force to ask for password"
+msgid "Force asking for a password"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
@@ -2686,7 +2686,7 @@ msgid "Activate password recovery"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:47
-msgid "Whether to activate or not password recovery feature"
+msgid "Whether to activate the password recovery feature or not"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:52
@@ -2721,7 +2721,7 @@ msgstr ""
#: plugins/config/class_recoveryConfig.inc:74
msgid ""
-"Users will also be able to enter one of theirs alternate addresses to "
+"Users will also be able to enter one of their alternate addresses to "
"recover their password"
msgstr ""
@@ -2961,7 +2961,7 @@ msgid "Snapshot base"
msgstr ""
#: plugins/config/class_configInLdap.inc:109
-msgid "The base where snapshots should be stored inside of the LDAP."
+msgid "The base where snapshots should be stored inside the LDAP directory."
msgstr ""
#: plugins/config/class_configInLdap.inc:114
@@ -3157,7 +3157,7 @@ msgid "People DN attribute"
msgstr ""
#: plugins/config/class_configInLdap.inc:252
-msgid "Attribute to use at the beginning of users dn"
+msgid "Attribute to use at the beginning of the user's dn"
msgstr ""
#: plugins/config/class_configInLdap.inc:257
@@ -3242,7 +3242,7 @@ msgstr ""
#: plugins/config/class_configInLdap.inc:301
msgid ""
"Shows PHP errors in the upper part of the screen. This should be disabled in"
-" productive deployments, because there might be some passwords in it."
+" production deployments, because it may contain passwords."
msgstr ""
#: plugins/config/class_configInLdap.inc:305
@@ -3480,7 +3480,7 @@ msgstr ""
#: plugins/personal/roles/class_userRoles.inc:49
#: plugins/personal/roles/class_userRoles.inc:53
-msgid "Groups membership"
+msgid "Group memberships"
msgstr ""
#: plugins/personal/roles/class_userRoles.inc:60
@@ -3759,7 +3759,7 @@ msgstr ""
#: plugins/personal/generic/class_user.inc:430
#, php-format
-msgid "Ppolicy \"%s\" could not be found in the LDAP!"
+msgid "Ppolicy \"%s\" could not be found in LDAP!"
msgstr ""
#: plugins/personal/generic/class_user.inc:460
@@ -4024,7 +4024,7 @@ msgstr ""
#: setup/class_setupStepChecks.inc:124
msgid ""
-"FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
+"FusionDirectory requires either the 'mhash' or 'sha1' module to make use of "
"SSHA encryption."
msgstr ""
@@ -4212,11 +4212,11 @@ msgid "Checking for POSIX groups outside the groups tree"
msgstr ""
#: setup/class_setupStepMigrate.inc:274
-msgid "Checking for duplicated UID numbers"
+msgid "Checking for duplicate UID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:275
-msgid "Checking for duplicated GID numbers"
+msgid "Checking for duplicate GID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:343 setup/class_setupStepMigrate.inc:502
@@ -4232,7 +4232,7 @@ msgstr ""
#: setup/class_setupStepMigrate.inc:935 setup/class_setupStepMigrate.inc:1041
#: setup/class_setupStepMigrate.inc:1071 setup/class_setupStepMigrate.inc:1322
#: setup/class_setupStepMigrate.inc:1433
-msgid "Possibly the \"root object\" is missing."
+msgid "The \"root object\" is possibly missing."
msgstr ""
#: setup/class_setupStepMigrate.inc:360 setup/class_setupStepMigrate.inc:383
@@ -4303,7 +4303,7 @@ msgid "Roles"
msgstr ""
#: setup/class_setupStepMigrate.inc:836
-msgid "There is no FusionDirectory administrator account inside your LDAP."
+msgid "There is no FusionDirectory administrator account in your LDAP directory."
msgstr ""
#: setup/class_setupStepMigrate.inc:875
@@ -4342,12 +4342,12 @@ msgid "LDAP result parsing failed"
msgstr ""
#: setup/class_setupStepMigrate.inc:1076 setup/class_setupStepMigrate.inc:1327
-msgid "Sizelimit hit"
+msgid "Size limit hit"
msgstr ""
#: setup/class_setupStepMigrate.inc:1077 setup/class_setupStepMigrate.inc:1328
#, php-format
-msgid "Sizelimit of %d hit. Please check this manually"
+msgid "Size limit of %d hit. Please check this manually"
msgstr ""
#: setup/class_setupStepMigrate.inc:1120 setup/class_setupStepMigrate.inc:1134
@@ -4442,7 +4442,7 @@ msgstr ""
#, php-format
msgid ""
"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
"shouldn't."
msgstr ""
@@ -4548,7 +4548,7 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/users_accounts.tpl.c:5
-msgid "There is no expired account"
+msgid "There are no expired accounts"
msgstr ""
#: plugins/addons/dashboard/users_accounts.tpl.c:11
@@ -4598,8 +4598,8 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:5
-msgid "One of them use %1 method"
-msgid_plural "%2 of them use %1 method"
+msgid "One of them uses the %1 method"
+msgid_plural "%2 of them use the %1 method"
msgstr[0] ""
msgstr[1] ""
@@ -4610,7 +4610,7 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:11
-msgid "None of them is locked"
+msgid "None of them are locked"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:5
@@ -4618,7 +4618,7 @@ msgid "There are no users"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:8
-msgid "One of them have a %1 account"
+msgid "One of them has a %1 account"
msgid_plural "%2 of them have a %1 account"
msgstr[0] ""
msgstr[1] ""
@@ -4687,7 +4687,7 @@ msgstr ""
#: setup/setup_welcome.tpl.c:2
msgid ""
-"This seems to be the first time you start FusionDirectory - we didn't find "
+"This seems to be the first time you start FusionDirectory - we cannot find "
"any configuration right now. This simple wizard intends to help you while "
"setting it up."
msgstr ""
@@ -4731,12 +4731,12 @@ msgstr ""
#: setup/setup_welcome.tpl.c:32
msgid ""
"For security reasons you need to authenticate for the installation by "
-"creating the file '%1', containing the current session ID on the servers "
+"creating the file '%1', containing the current session ID on the server's "
"local filesystem. This can be done by executing the following command:"
msgstr ""
#: setup/setup_welcome.tpl.c:35
-msgid "Click the 'Next' button when you've finished."
+msgid "Click the 'Next' button when you are done."
msgstr ""
#: setup/setup_migrate.tpl.c:2
@@ -4999,7 +4999,7 @@ msgstr ""
#: ihtml/themes/breezy/islocked.tpl.c:11
msgid ""
"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
+"web browser during the edit operation. You may want to take over the lock by "
"pressing the \"%1\" button."
msgstr ""
diff --git a/locale/fr/fusiondirectory.po b/locale/fr/fusiondirectory.po
index f14a98de0db03941ef42d6ee5b143864faf6861d..a4111c0d7aefe2140a66210fdeaf2dc535991ffc 100644
--- a/locale/fr/fusiondirectory.po
+++ b/locale/fr/fusiondirectory.po
@@ -89,7 +89,7 @@ msgstr "Attribut"
#: include/management/class_ManagementConfigurationDialog.inc:71
msgid ""
"LDAP attributes to display, comma separated. Special values \"nameAttr\" and"
-" \"mainAttr\" also works."
+" \"mainAttr\" also work."
msgstr ""
"Attributs LDAP à afficher, séparés par des virgules. Les valeurs spéciales "
"\"nameAttr\" et \"mainAttr\" fonctionnent également."
@@ -103,7 +103,7 @@ msgid "Column title"
msgstr "Titre de la colonnes"
#: include/management/class_ManagementConfigurationDialog.inc:86
-msgid "Persitent"
+msgid "Persistent"
msgstr "Persistant"
#: include/management/class_ManagementConfigurationDialog.inc:86
@@ -603,7 +603,7 @@ msgid "Send bug report to the FusionDirectory Team"
msgstr "Envoyer le rapport de bugs à l'équipe FusionDirectory"
#: include/php_setup.inc:235
-msgid "Send bugreport"
+msgid "Send bug report"
msgstr "Envoyer le rapport de bug"
#: include/php_setup.inc:240
@@ -660,7 +660,7 @@ msgstr "CAS"
#: include/login/class_LoginCAS.inc:68
#, php-format
-msgid "CAS user \"%s\" could not be found in the LDAP"
+msgid "CAS user \"%s\" could not be found in LDAP"
msgstr "L'utilisateur CAS «%s» n'existe pas dans l'annuaire LDAP"
#: include/login/class_LoginCAS.inc:78 include/login/class_LoginCAS.inc:104
@@ -756,7 +756,7 @@ msgstr "Aucune valeur trouvée dans l’entête HTTP «%s»"
#: include/login/class_LoginHTTPHeader.inc:64
#, php-format
-msgid "Header user \"%s\" could not be found in the LDAP"
+msgid "Header user \"%s\" could not be found in LDAP"
msgstr ""
"L'utilisateur «%s» mentionné dans l’entête n'existe pas dans l'annuaire LDAP"
@@ -803,7 +803,7 @@ msgstr ""
"contacter votre administrateur système !"
#: include/class_passwordRecovery.inc:352
-msgid "Contact your administrator, there was a problem with mail server"
+msgid "Contact your administrator, there was a problem with the mail server"
msgstr ""
"Contactez votre administrateur système, il y a eu un problème avec le "
"serveur de courriel"
@@ -813,7 +813,7 @@ msgid "This token is invalid"
msgstr "Le jeton n'est pas valide"
#: include/class_passwordRecovery.inc:429
-msgid "There was a problem with mail server, confirmation email not sent"
+msgid "There was a problem with the mail server, confirmation email not sent"
msgstr ""
"Un problème est survenu avec le serveur de courriel, le courriel de "
"confirmation n'a pas été envoyé"
@@ -892,7 +892,7 @@ msgstr ""
#: include/functions.inc:354
#, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
msgstr ""
"FATAL : Erreur lors de la connexion au serveur LDAP. Le serveur a répondu "
"'%s'."
@@ -1233,7 +1233,7 @@ msgstr "Il existe déjà une entrée avec l'attribut %s dans le système !"
#: include/class_msgPool.inc:245
#, php-format
-msgid "The entry \"%s\" already use this \"%s\" attribute!"
+msgid "The entry \"%s\" already uses this \"%s\" attribute!"
msgstr "L’entrée '%s' utilise déjà l'attribut \"%s\" !"
#: include/class_msgPool.inc:256
@@ -1697,7 +1697,7 @@ msgstr "Télécharger"
#: include/simpleplugin/attributes/class_FileAttribute.inc:380
#, php-format
-msgid "Cannot set \"%s\" value, it contains invalid data: %s"
+msgid "Cannot set value \"%s\", it contains invalid data: %s"
msgstr ""
"Impossible de définir la valeur \"%s\", elle contient des données non "
"valides: %s"
@@ -1747,7 +1747,7 @@ msgstr "Un nombre à virgule flottante plus petit que %f"
#: include/simpleplugin/attributes/class_SetAttribute.inc:150
#, php-format
-msgid "The value for multivaluated field \"%s\" is not an array"
+msgid "The value for multivalued field \"%s\" is not an array"
msgstr "La valeur du champ multivalué «%s» n'est pas un tableau"
#: include/simpleplugin/attributes/class_SetAttribute.inc:250
@@ -1811,7 +1811,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:492
#, php-format
msgid ""
-"Could not compute dn: could not find objectType infos from tab class \"%s\""
+"Could not compute dn: could not find objectType info from tab class \"%s\""
msgstr ""
"Impossible de générer le dn : pas d’infos sur le type d’objet pour la classe"
" d’onglet «%s»"
@@ -1828,7 +1828,7 @@ msgstr "L'entrée %s n'existe pas"
#: include/simpleplugin/class_simplePlugin.inc:1576
msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may"
+"The object has changed since being opened in FusionDirectory. All changes that may"
" be done by others will get lost if you save this entry!"
msgstr ""
"L'objet a changé depuis son ouverture dans FusionDirectory. Toutes les "
@@ -2577,7 +2577,7 @@ msgid "DN you wish to add assignments for"
msgstr "DN pour lequel vous souhaitez ajouter des affectations"
#: plugins/admin/acl/class_aclManagement.inc:110
-msgid "The dn you entered could not be found in the LDAP"
+msgid "The dn you entered could not be found in LDAP"
msgstr "Impossible de trouver le dn demandé dans l'annuaire LDAP"
#: plugins/admin/acl/class_aclManagement.inc:141
@@ -2763,7 +2763,7 @@ msgid "SASL"
msgstr "SASL"
#: plugins/config/class_mainPluginsConfig.inc:54
-msgid "Force to ask for password"
+msgid "Force asking for a password"
msgstr "Forcer la demande de mot de passe"
#: plugins/config/class_mainPluginsConfig.inc:54
@@ -2843,7 +2843,7 @@ msgid "Activate password recovery"
msgstr "Activer la récupération de mot de passe"
#: plugins/config/class_recoveryConfig.inc:47
-msgid "Whether to activate or not password recovery feature"
+msgid "Whether to activate the password recovery feature or not"
msgstr "Activer ou non la fonctionnalité de récupération de mot de passe"
#: plugins/config/class_recoveryConfig.inc:52
@@ -2880,7 +2880,7 @@ msgstr "Autoriser l’utilisation des adresses de courriel alternatives"
#: plugins/config/class_recoveryConfig.inc:74
msgid ""
-"Users will also be able to enter one of theirs alternate addresses to "
+"Users will also be able to enter one of their alternate addresses to "
"recover their password"
msgstr ""
"Les utilisateurs pourront entrer une de leurs adresses de courriel "
@@ -3147,7 +3147,7 @@ msgid "Snapshot base"
msgstr "Base des instantanés"
#: plugins/config/class_configInLdap.inc:109
-msgid "The base where snapshots should be stored inside of the LDAP."
+msgid "The base where snapshots should be stored inside the LDAP directory."
msgstr ""
"Branche LDAP à l'intérieur de laquelle les instantanés d'objets seront "
"stockés"
@@ -3366,7 +3366,7 @@ msgid "People DN attribute"
msgstr "Attribut pour le DN utilisateur"
#: plugins/config/class_configInLdap.inc:252
-msgid "Attribute to use at the beginning of users dn"
+msgid "Attribute to use at the beginning of the user's dn"
msgstr "Attribut à utiliser pour le début du DN des utilisateurs"
#: plugins/config/class_configInLdap.inc:257
@@ -3459,7 +3459,7 @@ msgstr "Afficher les erreurs"
#: plugins/config/class_configInLdap.inc:301
msgid ""
"Shows PHP errors in the upper part of the screen. This should be disabled in"
-" productive deployments, because there might be some passwords in it."
+" production deployments, because it may contain passwords."
msgstr ""
"Afficher les erreurs PHP dans la partie haute de l'écran. Cela sera à "
"désactiver en environnement de production, car des mots de passe peuvent "
@@ -3727,7 +3727,7 @@ msgstr "Éditer les groupes et rôles de l’utilisateur"
#: plugins/personal/roles/class_userRoles.inc:49
#: plugins/personal/roles/class_userRoles.inc:53
-msgid "Groups membership"
+msgid "Group memberships"
msgstr "Appartenance aux groupes"
#: plugins/personal/roles/class_userRoles.inc:60
@@ -4020,7 +4020,7 @@ msgstr "Code postal"
#: plugins/personal/generic/class_user.inc:430
#, php-format
-msgid "Ppolicy \"%s\" could not be found in the LDAP!"
+msgid "Ppolicy \"%s\" could not be found in LDAP!"
msgstr "La ppolicy \"%s\" n’a pas été trouvée dans le LDAP !"
#: plugins/personal/generic/class_user.inc:460
@@ -4314,7 +4314,7 @@ msgstr "FusionDirectory a besoin de ce module pour l’intégration Samba."
#: setup/class_setupStepChecks.inc:124
msgid ""
-"FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
+"FusionDirectory requires either the 'mhash' or 'sha1' module to make use of "
"SSHA encryption."
msgstr ""
"FusionDirectory a besoin du module 'mhash' ou 'sha1' pour l’utilisation du "
@@ -4540,11 +4540,11 @@ msgid "Checking for POSIX groups outside the groups tree"
msgstr "Recherche de groupes posix en dehors de la branche des groupes"
#: setup/class_setupStepMigrate.inc:274
-msgid "Checking for duplicated UID numbers"
+msgid "Checking for duplicate UID numbers"
msgstr "Recherche d’UID en double"
#: setup/class_setupStepMigrate.inc:275
-msgid "Checking for duplicated GID numbers"
+msgid "Checking for duplicate GID numbers"
msgstr "Recherche de GID en double"
#: setup/class_setupStepMigrate.inc:343 setup/class_setupStepMigrate.inc:502
@@ -4560,7 +4560,7 @@ msgstr "La requête LDAP a échoué"
#: setup/class_setupStepMigrate.inc:935 setup/class_setupStepMigrate.inc:1041
#: setup/class_setupStepMigrate.inc:1071 setup/class_setupStepMigrate.inc:1322
#: setup/class_setupStepMigrate.inc:1433
-msgid "Possibly the \"root object\" is missing."
+msgid "The \"root object\" is possibly missing."
msgstr "L'objet racine est peut-être manquant."
#: setup/class_setupStepMigrate.inc:360 setup/class_setupStepMigrate.inc:383
@@ -4637,7 +4637,7 @@ msgid "Roles"
msgstr "Rôles"
#: setup/class_setupStepMigrate.inc:836
-msgid "There is no FusionDirectory administrator account inside your LDAP."
+msgid "There is no FusionDirectory administrator account in your LDAP directory."
msgstr ""
"Il n'y a pas d'administrateur FusionDirectory dans votre annuaire LDAP."
@@ -4679,12 +4679,12 @@ msgid "LDAP result parsing failed"
msgstr "L'analyse du résultat LDAP a échoué"
#: setup/class_setupStepMigrate.inc:1076 setup/class_setupStepMigrate.inc:1327
-msgid "Sizelimit hit"
+msgid "Size limit hit"
msgstr "Taille limite atteinte"
#: setup/class_setupStepMigrate.inc:1077 setup/class_setupStepMigrate.inc:1328
#, php-format
-msgid "Sizelimit of %d hit. Please check this manually"
+msgid "Size limit of %d hit. Please check this manually"
msgstr "Taille limite de %datteinte. Veuillez vérifier ceci manuellement"
#: setup/class_setupStepMigrate.inc:1120 setup/class_setupStepMigrate.inc:1134
@@ -4786,7 +4786,7 @@ msgstr "Le fichier de configuration ne peut être lu ou n'existe pas."
#, php-format
msgid ""
"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
"shouldn't."
msgstr ""
"Après avoir placé le fichier dans le répertoire %s, assurez vous que seul le"
@@ -4909,7 +4909,7 @@ msgstr[0] "Il y a un compte expiré"
msgstr[1] "Il y a %1 comptes expirés"
#: plugins/addons/dashboard/users_accounts.tpl.c:5
-msgid "There is no expired account"
+msgid "There are no expired accounts"
msgstr "Il n'y a pas de compte expiré"
#: plugins/addons/dashboard/users_accounts.tpl.c:11
@@ -4959,8 +4959,8 @@ msgstr[0] "Il y a 1 utilisateur :"
msgstr[1] "Il y a %1 utilisateurs :"
#: plugins/addons/dashboard/pwd_stats.tpl.c:5
-msgid "One of them use %1 method"
-msgid_plural "%2 of them use %1 method"
+msgid "One of them uses the %1 method"
+msgid_plural "%2 of them use the %1 method"
msgstr[0] "Un d'entre eux utilise la méthode %1"
msgstr[1] "%2 d’entre eux utilisent la méthode %1"
@@ -4971,7 +4971,7 @@ msgstr[0] "Un est verrouille"
msgstr[1] "%1 d’entre eux sont verrouillés"
#: plugins/addons/dashboard/pwd_stats.tpl.c:11
-msgid "None of them is locked"
+msgid "None of them are locked"
msgstr "Aucun d'entre eux n’est verrouillé"
#: plugins/addons/dashboard/users_stats.tpl.c:5
@@ -4979,7 +4979,7 @@ msgid "There are no users"
msgstr "Il n’y a aucun utilisateurs"
#: plugins/addons/dashboard/users_stats.tpl.c:8
-msgid "One of them have a %1 account"
+msgid "One of them has a %1 account"
msgid_plural "%2 of them have a %1 account"
msgstr[0] "L'un d'entre eux a un compte %1"
msgstr[1] "%2 d’entre eux ont un compte %1"
@@ -5052,7 +5052,7 @@ msgstr "FusionDirectory fonctionnera même si vous ne corrigez pas cela."
#: setup/setup_welcome.tpl.c:2
msgid ""
-"This seems to be the first time you start FusionDirectory - we didn't find "
+"This seems to be the first time you start FusionDirectory - we cannot find "
"any configuration right now. This simple wizard intends to help you while "
"setting it up."
msgstr ""
@@ -5101,7 +5101,7 @@ msgstr "Pour continuer :"
#: setup/setup_welcome.tpl.c:32
msgid ""
"For security reasons you need to authenticate for the installation by "
-"creating the file '%1', containing the current session ID on the servers "
+"creating the file '%1', containing the current session ID on the server's "
"local filesystem. This can be done by executing the following command:"
msgstr ""
"Pour des raisons de sécurité vous devez vous authentifier en créant le "
@@ -5109,7 +5109,7 @@ msgstr ""
"réalisé en exécutant la commande suivante :"
#: setup/setup_welcome.tpl.c:35
-msgid "Click the 'Next' button when you've finished."
+msgid "Click the 'Next' button when you are done."
msgstr "Cliquez sur 'Continuer' quand vous avez fini."
#: setup/setup_migrate.tpl.c:2
@@ -5408,7 +5408,7 @@ msgstr "\"%1\" a été verrouillé par \"%2\" depuis %3"
#: ihtml/themes/breezy/islocked.tpl.c:11
msgid ""
"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
+"web browser during the edit operation. You may want to take over the lock by "
"pressing the \"%1\" button."
msgstr ""
"Si la détection de ce verrou est fausse, une autre personne a manifestement "
diff --git a/locale/hu_HU/fusiondirectory.po b/locale/hu_HU/fusiondirectory.po
index 73fa53d4d1da7c240a80518d0746d548b0145ac0..46e405171d6d851d0bc517cbfbe35bb3e2bfa68d 100644
--- a/locale/hu_HU/fusiondirectory.po
+++ b/locale/hu_HU/fusiondirectory.po
@@ -87,7 +87,7 @@ msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:71
msgid ""
"LDAP attributes to display, comma separated. Special values \"nameAttr\" and"
-" \"mainAttr\" also works."
+" \"mainAttr\" also work."
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:75
@@ -99,7 +99,7 @@ msgid "Column title"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
-msgid "Persitent"
+msgid "Persistent"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
@@ -578,7 +578,7 @@ msgid "Send bug report to the FusionDirectory Team"
msgstr ""
#: include/php_setup.inc:235
-msgid "Send bugreport"
+msgid "Send bug report"
msgstr ""
#: include/php_setup.inc:240
@@ -633,7 +633,7 @@ msgstr ""
#: include/login/class_LoginCAS.inc:68
#, php-format
-msgid "CAS user \"%s\" could not be found in the LDAP"
+msgid "CAS user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginCAS.inc:78 include/login/class_LoginCAS.inc:104
@@ -723,7 +723,7 @@ msgstr ""
#: include/login/class_LoginHTTPHeader.inc:64
#, php-format
-msgid "Header user \"%s\" could not be found in the LDAP"
+msgid "Header user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginHTTPAuth.inc:29
@@ -767,7 +767,7 @@ msgid "The user using email \"%s\" is locked. Please contact your administrator.
msgstr ""
#: include/class_passwordRecovery.inc:352
-msgid "Contact your administrator, there was a problem with mail server"
+msgid "Contact your administrator, there was a problem with the mail server"
msgstr ""
#: include/class_passwordRecovery.inc:365
@@ -775,7 +775,7 @@ msgid "This token is invalid"
msgstr ""
#: include/class_passwordRecovery.inc:429
-msgid "There was a problem with mail server, confirmation email not sent"
+msgid "There was a problem with the mail server, confirmation email not sent"
msgstr ""
#: include/password-methods/class_passwordMethodSasl.inc:66
@@ -840,7 +840,7 @@ msgstr ""
#: include/functions.inc:354
#, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
msgstr ""
#: include/functions.inc:402 include/functions.inc:531
@@ -1155,7 +1155,7 @@ msgstr ""
#: include/class_msgPool.inc:245
#, php-format
-msgid "The entry \"%s\" already use this \"%s\" attribute!"
+msgid "The entry \"%s\" already uses this \"%s\" attribute!"
msgstr ""
#: include/class_msgPool.inc:256
@@ -1601,7 +1601,7 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:380
#, php-format
-msgid "Cannot set \"%s\" value, it contains invalid data: %s"
+msgid "Cannot set value \"%s\", it contains invalid data: %s"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:390
@@ -1647,7 +1647,7 @@ msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:150
#, php-format
-msgid "The value for multivaluated field \"%s\" is not an array"
+msgid "The value for multivalued field \"%s\" is not an array"
msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:250
@@ -1708,7 +1708,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:492
#, php-format
msgid ""
-"Could not compute dn: could not find objectType infos from tab class \"%s\""
+"Could not compute dn: could not find objectType info from tab class \"%s\""
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1363
@@ -1723,7 +1723,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1576
msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may"
+"The object has changed since being opened in FusionDirectory. All changes that may"
" be done by others will get lost if you save this entry!"
msgstr ""
@@ -2428,7 +2428,7 @@ msgid "DN you wish to add assignments for"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:110
-msgid "The dn you entered could not be found in the LDAP"
+msgid "The dn you entered could not be found in LDAP"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:141
@@ -2610,7 +2610,7 @@ msgid "SASL"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
-msgid "Force to ask for password"
+msgid "Force asking for a password"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
@@ -2686,7 +2686,7 @@ msgid "Activate password recovery"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:47
-msgid "Whether to activate or not password recovery feature"
+msgid "Whether to activate the password recovery feature or not"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:52
@@ -2721,7 +2721,7 @@ msgstr ""
#: plugins/config/class_recoveryConfig.inc:74
msgid ""
-"Users will also be able to enter one of theirs alternate addresses to "
+"Users will also be able to enter one of their alternate addresses to "
"recover their password"
msgstr ""
@@ -2961,7 +2961,7 @@ msgid "Snapshot base"
msgstr ""
#: plugins/config/class_configInLdap.inc:109
-msgid "The base where snapshots should be stored inside of the LDAP."
+msgid "The base where snapshots should be stored inside the LDAP directory."
msgstr ""
#: plugins/config/class_configInLdap.inc:114
@@ -3157,7 +3157,7 @@ msgid "People DN attribute"
msgstr ""
#: plugins/config/class_configInLdap.inc:252
-msgid "Attribute to use at the beginning of users dn"
+msgid "Attribute to use at the beginning of the user's dn"
msgstr ""
#: plugins/config/class_configInLdap.inc:257
@@ -3242,7 +3242,7 @@ msgstr ""
#: plugins/config/class_configInLdap.inc:301
msgid ""
"Shows PHP errors in the upper part of the screen. This should be disabled in"
-" productive deployments, because there might be some passwords in it."
+" production deployments, because it may contain passwords."
msgstr ""
#: plugins/config/class_configInLdap.inc:305
@@ -3480,7 +3480,7 @@ msgstr ""
#: plugins/personal/roles/class_userRoles.inc:49
#: plugins/personal/roles/class_userRoles.inc:53
-msgid "Groups membership"
+msgid "Group memberships"
msgstr ""
#: plugins/personal/roles/class_userRoles.inc:60
@@ -3759,7 +3759,7 @@ msgstr ""
#: plugins/personal/generic/class_user.inc:430
#, php-format
-msgid "Ppolicy \"%s\" could not be found in the LDAP!"
+msgid "Ppolicy \"%s\" could not be found in LDAP!"
msgstr ""
#: plugins/personal/generic/class_user.inc:460
@@ -4024,7 +4024,7 @@ msgstr ""
#: setup/class_setupStepChecks.inc:124
msgid ""
-"FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
+"FusionDirectory requires either the 'mhash' or 'sha1' module to make use of "
"SSHA encryption."
msgstr ""
@@ -4212,11 +4212,11 @@ msgid "Checking for POSIX groups outside the groups tree"
msgstr ""
#: setup/class_setupStepMigrate.inc:274
-msgid "Checking for duplicated UID numbers"
+msgid "Checking for duplicate UID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:275
-msgid "Checking for duplicated GID numbers"
+msgid "Checking for duplicate GID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:343 setup/class_setupStepMigrate.inc:502
@@ -4232,7 +4232,7 @@ msgstr ""
#: setup/class_setupStepMigrate.inc:935 setup/class_setupStepMigrate.inc:1041
#: setup/class_setupStepMigrate.inc:1071 setup/class_setupStepMigrate.inc:1322
#: setup/class_setupStepMigrate.inc:1433
-msgid "Possibly the \"root object\" is missing."
+msgid "The \"root object\" is possibly missing."
msgstr ""
#: setup/class_setupStepMigrate.inc:360 setup/class_setupStepMigrate.inc:383
@@ -4303,7 +4303,7 @@ msgid "Roles"
msgstr ""
#: setup/class_setupStepMigrate.inc:836
-msgid "There is no FusionDirectory administrator account inside your LDAP."
+msgid "There is no FusionDirectory administrator account in your LDAP directory."
msgstr ""
#: setup/class_setupStepMigrate.inc:875
@@ -4342,12 +4342,12 @@ msgid "LDAP result parsing failed"
msgstr ""
#: setup/class_setupStepMigrate.inc:1076 setup/class_setupStepMigrate.inc:1327
-msgid "Sizelimit hit"
+msgid "Size limit hit"
msgstr ""
#: setup/class_setupStepMigrate.inc:1077 setup/class_setupStepMigrate.inc:1328
#, php-format
-msgid "Sizelimit of %d hit. Please check this manually"
+msgid "Size limit of %d hit. Please check this manually"
msgstr ""
#: setup/class_setupStepMigrate.inc:1120 setup/class_setupStepMigrate.inc:1134
@@ -4442,7 +4442,7 @@ msgstr ""
#, php-format
msgid ""
"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
"shouldn't."
msgstr ""
@@ -4548,7 +4548,7 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/users_accounts.tpl.c:5
-msgid "There is no expired account"
+msgid "There are no expired accounts"
msgstr ""
#: plugins/addons/dashboard/users_accounts.tpl.c:11
@@ -4598,8 +4598,8 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:5
-msgid "One of them use %1 method"
-msgid_plural "%2 of them use %1 method"
+msgid "One of them uses the %1 method"
+msgid_plural "%2 of them use the %1 method"
msgstr[0] ""
msgstr[1] ""
@@ -4610,7 +4610,7 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:11
-msgid "None of them is locked"
+msgid "None of them are locked"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:5
@@ -4618,7 +4618,7 @@ msgid "There are no users"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:8
-msgid "One of them have a %1 account"
+msgid "One of them has a %1 account"
msgid_plural "%2 of them have a %1 account"
msgstr[0] ""
msgstr[1] ""
@@ -4687,7 +4687,7 @@ msgstr ""
#: setup/setup_welcome.tpl.c:2
msgid ""
-"This seems to be the first time you start FusionDirectory - we didn't find "
+"This seems to be the first time you start FusionDirectory - we cannot find "
"any configuration right now. This simple wizard intends to help you while "
"setting it up."
msgstr ""
@@ -4731,12 +4731,12 @@ msgstr ""
#: setup/setup_welcome.tpl.c:32
msgid ""
"For security reasons you need to authenticate for the installation by "
-"creating the file '%1', containing the current session ID on the servers "
+"creating the file '%1', containing the current session ID on the server's "
"local filesystem. This can be done by executing the following command:"
msgstr ""
#: setup/setup_welcome.tpl.c:35
-msgid "Click the 'Next' button when you've finished."
+msgid "Click the 'Next' button when you are done."
msgstr ""
#: setup/setup_migrate.tpl.c:2
@@ -4999,7 +4999,7 @@ msgstr ""
#: ihtml/themes/breezy/islocked.tpl.c:11
msgid ""
"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
+"web browser during the edit operation. You may want to take over the lock by "
"pressing the \"%1\" button."
msgstr ""
diff --git a/locale/id/fusiondirectory.po b/locale/id/fusiondirectory.po
index 978739ab9b1b0ca109e7e14b0e83dd4f10929ae0..616e40eff3168e38102ee5aca26f718de85bbc77 100644
--- a/locale/id/fusiondirectory.po
+++ b/locale/id/fusiondirectory.po
@@ -83,7 +83,7 @@ msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:71
msgid ""
"LDAP attributes to display, comma separated. Special values \"nameAttr\" and"
-" \"mainAttr\" also works."
+" \"mainAttr\" also work."
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:75
@@ -95,7 +95,7 @@ msgid "Column title"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
-msgid "Persitent"
+msgid "Persistent"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
@@ -574,7 +574,7 @@ msgid "Send bug report to the FusionDirectory Team"
msgstr ""
#: include/php_setup.inc:235
-msgid "Send bugreport"
+msgid "Send bug report"
msgstr ""
#: include/php_setup.inc:240
@@ -629,7 +629,7 @@ msgstr ""
#: include/login/class_LoginCAS.inc:68
#, php-format
-msgid "CAS user \"%s\" could not be found in the LDAP"
+msgid "CAS user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginCAS.inc:78 include/login/class_LoginCAS.inc:104
@@ -719,7 +719,7 @@ msgstr ""
#: include/login/class_LoginHTTPHeader.inc:64
#, php-format
-msgid "Header user \"%s\" could not be found in the LDAP"
+msgid "Header user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginHTTPAuth.inc:29
@@ -763,7 +763,7 @@ msgid "The user using email \"%s\" is locked. Please contact your administrator.
msgstr ""
#: include/class_passwordRecovery.inc:352
-msgid "Contact your administrator, there was a problem with mail server"
+msgid "Contact your administrator, there was a problem with the mail server"
msgstr ""
#: include/class_passwordRecovery.inc:365
@@ -771,7 +771,7 @@ msgid "This token is invalid"
msgstr ""
#: include/class_passwordRecovery.inc:429
-msgid "There was a problem with mail server, confirmation email not sent"
+msgid "There was a problem with the mail server, confirmation email not sent"
msgstr ""
#: include/password-methods/class_passwordMethodSasl.inc:66
@@ -836,7 +836,7 @@ msgstr ""
#: include/functions.inc:354
#, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
msgstr ""
#: include/functions.inc:402 include/functions.inc:531
@@ -1151,7 +1151,7 @@ msgstr ""
#: include/class_msgPool.inc:245
#, php-format
-msgid "The entry \"%s\" already use this \"%s\" attribute!"
+msgid "The entry \"%s\" already uses this \"%s\" attribute!"
msgstr ""
#: include/class_msgPool.inc:256
@@ -1597,7 +1597,7 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:380
#, php-format
-msgid "Cannot set \"%s\" value, it contains invalid data: %s"
+msgid "Cannot set value \"%s\", it contains invalid data: %s"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:390
@@ -1643,7 +1643,7 @@ msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:150
#, php-format
-msgid "The value for multivaluated field \"%s\" is not an array"
+msgid "The value for multivalued field \"%s\" is not an array"
msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:250
@@ -1704,7 +1704,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:492
#, php-format
msgid ""
-"Could not compute dn: could not find objectType infos from tab class \"%s\""
+"Could not compute dn: could not find objectType info from tab class \"%s\""
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1363
@@ -1719,7 +1719,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1576
msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may"
+"The object has changed since being opened in FusionDirectory. All changes that may"
" be done by others will get lost if you save this entry!"
msgstr ""
@@ -2424,7 +2424,7 @@ msgid "DN you wish to add assignments for"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:110
-msgid "The dn you entered could not be found in the LDAP"
+msgid "The dn you entered could not be found in LDAP"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:141
@@ -2606,7 +2606,7 @@ msgid "SASL"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
-msgid "Force to ask for password"
+msgid "Force asking for a password"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
@@ -2682,7 +2682,7 @@ msgid "Activate password recovery"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:47
-msgid "Whether to activate or not password recovery feature"
+msgid "Whether to activate the password recovery feature or not"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:52
@@ -2717,7 +2717,7 @@ msgstr ""
#: plugins/config/class_recoveryConfig.inc:74
msgid ""
-"Users will also be able to enter one of theirs alternate addresses to "
+"Users will also be able to enter one of their alternate addresses to "
"recover their password"
msgstr ""
@@ -2957,7 +2957,7 @@ msgid "Snapshot base"
msgstr ""
#: plugins/config/class_configInLdap.inc:109
-msgid "The base where snapshots should be stored inside of the LDAP."
+msgid "The base where snapshots should be stored inside the LDAP directory."
msgstr ""
#: plugins/config/class_configInLdap.inc:114
@@ -3153,7 +3153,7 @@ msgid "People DN attribute"
msgstr ""
#: plugins/config/class_configInLdap.inc:252
-msgid "Attribute to use at the beginning of users dn"
+msgid "Attribute to use at the beginning of the user's dn"
msgstr ""
#: plugins/config/class_configInLdap.inc:257
@@ -3238,7 +3238,7 @@ msgstr ""
#: plugins/config/class_configInLdap.inc:301
msgid ""
"Shows PHP errors in the upper part of the screen. This should be disabled in"
-" productive deployments, because there might be some passwords in it."
+" production deployments, because it may contain passwords."
msgstr ""
#: plugins/config/class_configInLdap.inc:305
@@ -3476,7 +3476,7 @@ msgstr ""
#: plugins/personal/roles/class_userRoles.inc:49
#: plugins/personal/roles/class_userRoles.inc:53
-msgid "Groups membership"
+msgid "Group memberships"
msgstr ""
#: plugins/personal/roles/class_userRoles.inc:60
@@ -3755,7 +3755,7 @@ msgstr ""
#: plugins/personal/generic/class_user.inc:430
#, php-format
-msgid "Ppolicy \"%s\" could not be found in the LDAP!"
+msgid "Ppolicy \"%s\" could not be found in LDAP!"
msgstr ""
#: plugins/personal/generic/class_user.inc:460
@@ -4020,7 +4020,7 @@ msgstr ""
#: setup/class_setupStepChecks.inc:124
msgid ""
-"FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
+"FusionDirectory requires either the 'mhash' or 'sha1' module to make use of "
"SSHA encryption."
msgstr ""
@@ -4208,11 +4208,11 @@ msgid "Checking for POSIX groups outside the groups tree"
msgstr ""
#: setup/class_setupStepMigrate.inc:274
-msgid "Checking for duplicated UID numbers"
+msgid "Checking for duplicate UID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:275
-msgid "Checking for duplicated GID numbers"
+msgid "Checking for duplicate GID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:343 setup/class_setupStepMigrate.inc:502
@@ -4228,7 +4228,7 @@ msgstr ""
#: setup/class_setupStepMigrate.inc:935 setup/class_setupStepMigrate.inc:1041
#: setup/class_setupStepMigrate.inc:1071 setup/class_setupStepMigrate.inc:1322
#: setup/class_setupStepMigrate.inc:1433
-msgid "Possibly the \"root object\" is missing."
+msgid "The \"root object\" is possibly missing."
msgstr ""
#: setup/class_setupStepMigrate.inc:360 setup/class_setupStepMigrate.inc:383
@@ -4299,7 +4299,7 @@ msgid "Roles"
msgstr ""
#: setup/class_setupStepMigrate.inc:836
-msgid "There is no FusionDirectory administrator account inside your LDAP."
+msgid "There is no FusionDirectory administrator account in your LDAP directory."
msgstr ""
#: setup/class_setupStepMigrate.inc:875
@@ -4338,12 +4338,12 @@ msgid "LDAP result parsing failed"
msgstr ""
#: setup/class_setupStepMigrate.inc:1076 setup/class_setupStepMigrate.inc:1327
-msgid "Sizelimit hit"
+msgid "Size limit hit"
msgstr ""
#: setup/class_setupStepMigrate.inc:1077 setup/class_setupStepMigrate.inc:1328
#, php-format
-msgid "Sizelimit of %d hit. Please check this manually"
+msgid "Size limit of %d hit. Please check this manually"
msgstr ""
#: setup/class_setupStepMigrate.inc:1120 setup/class_setupStepMigrate.inc:1134
@@ -4438,7 +4438,7 @@ msgstr ""
#, php-format
msgid ""
"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
"shouldn't."
msgstr ""
@@ -4543,7 +4543,7 @@ msgid_plural "There are %1 expired accounts"
msgstr[0] ""
#: plugins/addons/dashboard/users_accounts.tpl.c:5
-msgid "There is no expired account"
+msgid "There are no expired accounts"
msgstr ""
#: plugins/addons/dashboard/users_accounts.tpl.c:11
@@ -4589,8 +4589,8 @@ msgid_plural "There are %1 users:"
msgstr[0] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:5
-msgid "One of them use %1 method"
-msgid_plural "%2 of them use %1 method"
+msgid "One of them uses the %1 method"
+msgid_plural "%2 of them use the %1 method"
msgstr[0] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:8
@@ -4599,7 +4599,7 @@ msgid_plural "%1 of them are locked"
msgstr[0] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:11
-msgid "None of them is locked"
+msgid "None of them are locked"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:5
@@ -4607,7 +4607,7 @@ msgid "There are no users"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:8
-msgid "One of them have a %1 account"
+msgid "One of them has a %1 account"
msgid_plural "%2 of them have a %1 account"
msgstr[0] ""
@@ -4675,7 +4675,7 @@ msgstr ""
#: setup/setup_welcome.tpl.c:2
msgid ""
-"This seems to be the first time you start FusionDirectory - we didn't find "
+"This seems to be the first time you start FusionDirectory - we cannot find "
"any configuration right now. This simple wizard intends to help you while "
"setting it up."
msgstr ""
@@ -4719,12 +4719,12 @@ msgstr ""
#: setup/setup_welcome.tpl.c:32
msgid ""
"For security reasons you need to authenticate for the installation by "
-"creating the file '%1', containing the current session ID on the servers "
+"creating the file '%1', containing the current session ID on the server's "
"local filesystem. This can be done by executing the following command:"
msgstr ""
#: setup/setup_welcome.tpl.c:35
-msgid "Click the 'Next' button when you've finished."
+msgid "Click the 'Next' button when you are done."
msgstr ""
#: setup/setup_migrate.tpl.c:2
@@ -4987,7 +4987,7 @@ msgstr ""
#: ihtml/themes/breezy/islocked.tpl.c:11
msgid ""
"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
+"web browser during the edit operation. You may want to take over the lock by "
"pressing the \"%1\" button."
msgstr ""
diff --git a/locale/it_IT/fusiondirectory.po b/locale/it_IT/fusiondirectory.po
index b872ad9ca258a62681a30a87ecb24a52c9cb8d46..9d9bbf58381c2bb797966699539a74cf99c38f26 100644
--- a/locale/it_IT/fusiondirectory.po
+++ b/locale/it_IT/fusiondirectory.po
@@ -89,7 +89,7 @@ msgstr "Attributo"
#: include/management/class_ManagementConfigurationDialog.inc:71
msgid ""
"LDAP attributes to display, comma separated. Special values \"nameAttr\" and"
-" \"mainAttr\" also works."
+" \"mainAttr\" also work."
msgstr ""
"Attributi LDAP da visualizzare, separati da virgola. Funzionano anche i "
"valori speciali \"nameAttr\" e \"mainAttr\"."
@@ -103,7 +103,7 @@ msgid "Column title"
msgstr "Titolo della colonna"
#: include/management/class_ManagementConfigurationDialog.inc:86
-msgid "Persitent"
+msgid "Persistent"
msgstr "Persistente"
#: include/management/class_ManagementConfigurationDialog.inc:86
@@ -603,7 +603,7 @@ msgstr ""
"Invia i tuoi commenti a proposito di un bug al Team di FusionDirectory"
#: include/php_setup.inc:235
-msgid "Send bugreport"
+msgid "Send bug report"
msgstr "Invia un rapporto di bug"
#: include/php_setup.inc:240
@@ -661,7 +661,7 @@ msgstr "CAS"
#: include/login/class_LoginCAS.inc:68
#, php-format
-msgid "CAS user \"%s\" could not be found in the LDAP"
+msgid "CAS user \"%s\" could not be found in LDAP"
msgstr "Impossibile trovare l'utente \"%s\" CAS nell'annuario LDAP"
#: include/login/class_LoginCAS.inc:78 include/login/class_LoginCAS.inc:104
@@ -757,7 +757,7 @@ msgstr "Nessun valore trovato nell'header HTTP \"%s\""
#: include/login/class_LoginHTTPHeader.inc:64
#, php-format
-msgid "Header user \"%s\" could not be found in the LDAP"
+msgid "Header user \"%s\" could not be found in LDAP"
msgstr "L'utente header \"%s\" non è stato trovato nel LDAP"
#: include/login/class_LoginHTTPAuth.inc:29
@@ -803,7 +803,7 @@ msgstr ""
"l'amministratore di sistema."
#: include/class_passwordRecovery.inc:352
-msgid "Contact your administrator, there was a problem with mail server"
+msgid "Contact your administrator, there was a problem with the mail server"
msgstr ""
"Contattare l'amministratore, c'è stato un problema con il server di posta "
"elettronica"
@@ -813,7 +813,7 @@ msgid "This token is invalid"
msgstr "Questo token non è valido"
#: include/class_passwordRecovery.inc:429
-msgid "There was a problem with mail server, confirmation email not sent"
+msgid "There was a problem with the mail server, confirmation email not sent"
msgstr ""
"Si è verificato un problema con il server mail, la email di conferma non è "
"stata inviata"
@@ -890,7 +890,7 @@ msgstr ""
#: include/functions.inc:354
#, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
msgstr ""
"Fatale: Errore durante la connessione al server LDAP. Il server dice: '%s'"
@@ -1224,7 +1224,7 @@ msgstr "C'è già una voce con questo attributo \"%s\" nel sistema!"
#: include/class_msgPool.inc:245
#, php-format
-msgid "The entry \"%s\" already use this \"%s\" attribute!"
+msgid "The entry \"%s\" already uses this \"%s\" attribute!"
msgstr "La voce \"%s\" usa già questo attributo \"%s\"!"
#: include/class_msgPool.inc:256
@@ -1688,7 +1688,7 @@ msgstr "Scarica"
#: include/simpleplugin/attributes/class_FileAttribute.inc:380
#, php-format
-msgid "Cannot set \"%s\" value, it contains invalid data: %s"
+msgid "Cannot set value \"%s\", it contains invalid data: %s"
msgstr "Impossibile impostare il valore \"%s\", contiene dati non validi : %s"
#: include/simpleplugin/attributes/class_FileAttribute.inc:390
@@ -1736,7 +1736,7 @@ msgstr "Un numero con la virgola più piccolo di %f"
#: include/simpleplugin/attributes/class_SetAttribute.inc:150
#, php-format
-msgid "The value for multivaluated field \"%s\" is not an array"
+msgid "The value for multivalued field \"%s\" is not an array"
msgstr "Il valore del campo \"%s\" multivalutato non é un array"
#: include/simpleplugin/attributes/class_SetAttribute.inc:250
@@ -1799,7 +1799,7 @@ msgstr "Non puo' calcolare il dn: nessuna scheda di classe parente per \"%s\""
#: include/simpleplugin/class_simplePlugin.inc:492
#, php-format
msgid ""
-"Could not compute dn: could not find objectType infos from tab class \"%s\""
+"Could not compute dn: could not find objectType info from tab class \"%s\""
msgstr ""
"Impossibile calcolare il dn: impossibile trovare le informazioni di "
"objectType in questa classe scheda \"%s\""
@@ -1816,7 +1816,7 @@ msgstr "La voce %s non esiste"
#: include/simpleplugin/class_simplePlugin.inc:1576
msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may"
+"The object has changed since being opened in FusionDirectory. All changes that may"
" be done by others will get lost if you save this entry!"
msgstr ""
"L'oggetto é cambiato dopo l'apertura in FusionDurectory. Tutte le modifiche "
@@ -2563,7 +2563,7 @@ msgid "DN you wish to add assignments for"
msgstr "DN per il quale si desiderano aggiungere assegnazioni"
#: plugins/admin/acl/class_aclManagement.inc:110
-msgid "The dn you entered could not be found in the LDAP"
+msgid "The dn you entered could not be found in LDAP"
msgstr "Impossibile trovare il dn che avete inserito nell'LDAP"
#: plugins/admin/acl/class_aclManagement.inc:141
@@ -2749,7 +2749,7 @@ msgid "SASL"
msgstr "SASL"
#: plugins/config/class_mainPluginsConfig.inc:54
-msgid "Force to ask for password"
+msgid "Force asking for a password"
msgstr "Obbligare a chiedere la password"
#: plugins/config/class_mainPluginsConfig.inc:54
@@ -2827,7 +2827,7 @@ msgid "Activate password recovery"
msgstr "Attivare il recupero della password"
#: plugins/config/class_recoveryConfig.inc:47
-msgid "Whether to activate or not password recovery feature"
+msgid "Whether to activate the password recovery feature or not"
msgstr "Sia che si attivi o no la funzione di recupero password"
#: plugins/config/class_recoveryConfig.inc:52
@@ -2864,7 +2864,7 @@ msgstr "Consentire l'uso di indirizzi alternativi"
#: plugins/config/class_recoveryConfig.inc:74
msgid ""
-"Users will also be able to enter one of theirs alternate addresses to "
+"Users will also be able to enter one of their alternate addresses to "
"recover their password"
msgstr ""
"Gli utenti possono usare uno dei loro indirizzi email alternativi per il "
@@ -3137,7 +3137,7 @@ msgid "Snapshot base"
msgstr "Base per le copie istantanee"
#: plugins/config/class_configInLdap.inc:109
-msgid "The base where snapshots should be stored inside of the LDAP."
+msgid "The base where snapshots should be stored inside the LDAP directory."
msgstr "La base dove gli snapshot saranno immagazzinati nell'annuario LDAP."
#: plugins/config/class_configInLdap.inc:114
@@ -3352,7 +3352,7 @@ msgid "People DN attribute"
msgstr "Tipo di attributo DN degli utenti"
#: plugins/config/class_configInLdap.inc:252
-msgid "Attribute to use at the beginning of users dn"
+msgid "Attribute to use at the beginning of the user's dn"
msgstr "Attributo da usare all'inizio del dn degli utenti"
#: plugins/config/class_configInLdap.inc:257
@@ -3445,7 +3445,7 @@ msgstr "Mostra gli errori"
#: plugins/config/class_configInLdap.inc:301
msgid ""
"Shows PHP errors in the upper part of the screen. This should be disabled in"
-" productive deployments, because there might be some passwords in it."
+" production deployments, because it may contain passwords."
msgstr ""
"Mosta gli errori PHP nella parte alta della schermata. Questo dovrebbe "
"essere disabilitato nelle installazioni di produzione, a causa di possibili "
@@ -3712,7 +3712,7 @@ msgstr "Modifica gruppi e ruoli degli utenti"
#: plugins/personal/roles/class_userRoles.inc:49
#: plugins/personal/roles/class_userRoles.inc:53
-msgid "Groups membership"
+msgid "Group memberships"
msgstr "Gruppi di appartenenza"
#: plugins/personal/roles/class_userRoles.inc:60
@@ -4002,7 +4002,7 @@ msgstr "CAP"
#: plugins/personal/generic/class_user.inc:430
#, php-format
-msgid "Ppolicy \"%s\" could not be found in the LDAP!"
+msgid "Ppolicy \"%s\" could not be found in LDAP!"
msgstr "Impossibile trovare %s nell'annuario LDAP"
#: plugins/personal/generic/class_user.inc:460
@@ -4293,7 +4293,7 @@ msgstr ""
#: setup/class_setupStepChecks.inc:124
msgid ""
-"FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
+"FusionDirectory requires either the 'mhash' or 'sha1' module to make use of "
"SSHA encryption."
msgstr ""
"FusionDirectory richiede il modulo 'mhash' oppure 'sha1' per poter "
@@ -4522,11 +4522,11 @@ msgid "Checking for POSIX groups outside the groups tree"
msgstr "Verifica dei gruppi POSIX all'esterno dell'albero dei gruppi"
#: setup/class_setupStepMigrate.inc:274
-msgid "Checking for duplicated UID numbers"
+msgid "Checking for duplicate UID numbers"
msgstr "Verifica dei possibili doppioni UID"
#: setup/class_setupStepMigrate.inc:275
-msgid "Checking for duplicated GID numbers"
+msgid "Checking for duplicate GID numbers"
msgstr "Verifica dei possibili doppioni GID"
#: setup/class_setupStepMigrate.inc:343 setup/class_setupStepMigrate.inc:502
@@ -4542,7 +4542,7 @@ msgstr "La richiesta al database LDAP è fallita!"
#: setup/class_setupStepMigrate.inc:935 setup/class_setupStepMigrate.inc:1041
#: setup/class_setupStepMigrate.inc:1071 setup/class_setupStepMigrate.inc:1322
#: setup/class_setupStepMigrate.inc:1433
-msgid "Possibly the \"root object\" is missing."
+msgid "The \"root object\" is possibly missing."
msgstr "Forse l'\"oggetto radice\" é mancante"
#: setup/class_setupStepMigrate.inc:360 setup/class_setupStepMigrate.inc:383
@@ -4619,7 +4619,7 @@ msgid "Roles"
msgstr "Ruoli"
#: setup/class_setupStepMigrate.inc:836
-msgid "There is no FusionDirectory administrator account inside your LDAP."
+msgid "There is no FusionDirectory administrator account in your LDAP directory."
msgstr ""
"Non ho trovato alcun amministratore di FusionDirectory nel tuo annuario "
"LDAP."
@@ -4660,13 +4660,13 @@ msgid "LDAP result parsing failed"
msgstr "Analisi del risultato LDAP non riuscita "
#: setup/class_setupStepMigrate.inc:1076 setup/class_setupStepMigrate.inc:1327
-msgid "Sizelimit hit"
-msgstr "Hit Sizelimit"
+msgid "Size limit hit"
+msgstr "Hit Size limit"
#: setup/class_setupStepMigrate.inc:1077 setup/class_setupStepMigrate.inc:1328
#, php-format
-msgid "Sizelimit of %d hit. Please check this manually"
-msgstr "Sizelimit di hit %d. Si prega di controllare manualmente"
+msgid "Size limit of %d hit. Please check this manually"
+msgstr "Size limit di hit %d. Si prega di controllare manualmente"
#: setup/class_setupStepMigrate.inc:1120 setup/class_setupStepMigrate.inc:1134
msgid "Move users into configured user tree"
@@ -4765,7 +4765,7 @@ msgstr ""
#, php-format
msgid ""
"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
"shouldn't."
msgstr ""
"Dopo aver scaricato e messo il file nella cartella %s, assicurati che sia "
@@ -4887,7 +4887,7 @@ msgstr[0] "C'é un account scaduto"
msgstr[1] "Ci sono %1 account scaduti"
#: plugins/addons/dashboard/users_accounts.tpl.c:5
-msgid "There is no expired account"
+msgid "There are no expired accounts"
msgstr "Non ci sono account scaduti"
#: plugins/addons/dashboard/users_accounts.tpl.c:11
@@ -4937,8 +4937,8 @@ msgstr[0] "C'é 1 utente:"
msgstr[1] "Ci sono %1 utenti:"
#: plugins/addons/dashboard/pwd_stats.tpl.c:5
-msgid "One of them use %1 method"
-msgid_plural "%2 of them use %1 method"
+msgid "One of them uses the %1 method"
+msgid_plural "%2 of them use the %1 method"
msgstr[0] "Uno di essi usa %1 metodo"
msgstr[1] "%2 di essi usano %1 metodo"
@@ -4949,7 +4949,7 @@ msgstr[0] "Uno di essi é bloccato"
msgstr[1] "%1 di essi sono bloccati"
#: plugins/addons/dashboard/pwd_stats.tpl.c:11
-msgid "None of them is locked"
+msgid "None of them are locked"
msgstr "Nessuno di loro è bloccato"
#: plugins/addons/dashboard/users_stats.tpl.c:5
@@ -4957,7 +4957,7 @@ msgid "There are no users"
msgstr "Non ci sono utenti"
#: plugins/addons/dashboard/users_stats.tpl.c:8
-msgid "One of them have a %1 account"
+msgid "One of them has a %1 account"
msgid_plural "%2 of them have a %1 account"
msgstr[0] "Uno di essi ha %1 account"
msgstr[1] "%2 di essi hanno un %1 account"
@@ -5030,7 +5030,7 @@ msgstr "Fusiondirectory funzionerà anche senza aver corretto questo."
#: setup/setup_welcome.tpl.c:2
msgid ""
-"This seems to be the first time you start FusionDirectory - we didn't find "
+"This seems to be the first time you start FusionDirectory - we cannot find "
"any configuration right now. This simple wizard intends to help you while "
"setting it up."
msgstr ""
@@ -5078,7 +5078,7 @@ msgstr "Per continuare:"
#: setup/setup_welcome.tpl.c:32
msgid ""
"For security reasons you need to authenticate for the installation by "
-"creating the file '%1', containing the current session ID on the servers "
+"creating the file '%1', containing the current session ID on the server's "
"local filesystem. This can be done by executing the following command:"
msgstr ""
"Per motivi di sicurezza é necessario autenticarsi per l' installazione "
@@ -5086,7 +5086,7 @@ msgstr ""
"filesystem locale. Questo può essere fatto eseguendo il comando seguente :"
#: setup/setup_welcome.tpl.c:35
-msgid "Click the 'Next' button when you've finished."
+msgid "Click the 'Next' button when you are done."
msgstr "Premi il bottone 'Continua' quando avrai finito."
#: setup/setup_migrate.tpl.c:2
@@ -5384,7 +5384,7 @@ msgstr "\"%1\" é stato bloccato da \"%2\" dalle %3"
#: ihtml/themes/breezy/islocked.tpl.c:11
msgid ""
"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
+"web browser during the edit operation. You may want to take over the lock by "
"pressing the \"%1\" button."
msgstr ""
"Se questo conflitto di chiusura è falso, un'altra persona potrebbe aver "
diff --git a/locale/ja/fusiondirectory.po b/locale/ja/fusiondirectory.po
index 051e596417ff2d620d2019f675bd4d2f1e47ccd3..336d2ef49555267af2a212ed4a6c2c739a31b68d 100644
--- a/locale/ja/fusiondirectory.po
+++ b/locale/ja/fusiondirectory.po
@@ -83,7 +83,7 @@ msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:71
msgid ""
"LDAP attributes to display, comma separated. Special values \"nameAttr\" and"
-" \"mainAttr\" also works."
+" \"mainAttr\" also work."
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:75
@@ -95,7 +95,7 @@ msgid "Column title"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
-msgid "Persitent"
+msgid "Persistent"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
@@ -574,7 +574,7 @@ msgid "Send bug report to the FusionDirectory Team"
msgstr ""
#: include/php_setup.inc:235
-msgid "Send bugreport"
+msgid "Send bug report"
msgstr ""
#: include/php_setup.inc:240
@@ -629,7 +629,7 @@ msgstr ""
#: include/login/class_LoginCAS.inc:68
#, php-format
-msgid "CAS user \"%s\" could not be found in the LDAP"
+msgid "CAS user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginCAS.inc:78 include/login/class_LoginCAS.inc:104
@@ -719,7 +719,7 @@ msgstr ""
#: include/login/class_LoginHTTPHeader.inc:64
#, php-format
-msgid "Header user \"%s\" could not be found in the LDAP"
+msgid "Header user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginHTTPAuth.inc:29
@@ -763,7 +763,7 @@ msgid "The user using email \"%s\" is locked. Please contact your administrator.
msgstr ""
#: include/class_passwordRecovery.inc:352
-msgid "Contact your administrator, there was a problem with mail server"
+msgid "Contact your administrator, there was a problem with the mail server"
msgstr ""
#: include/class_passwordRecovery.inc:365
@@ -771,7 +771,7 @@ msgid "This token is invalid"
msgstr ""
#: include/class_passwordRecovery.inc:429
-msgid "There was a problem with mail server, confirmation email not sent"
+msgid "There was a problem with the mail server, confirmation email not sent"
msgstr ""
#: include/password-methods/class_passwordMethodSasl.inc:66
@@ -836,7 +836,7 @@ msgstr ""
#: include/functions.inc:354
#, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
msgstr ""
#: include/functions.inc:402 include/functions.inc:531
@@ -1151,7 +1151,7 @@ msgstr ""
#: include/class_msgPool.inc:245
#, php-format
-msgid "The entry \"%s\" already use this \"%s\" attribute!"
+msgid "The entry \"%s\" already uses this \"%s\" attribute!"
msgstr ""
#: include/class_msgPool.inc:256
@@ -1597,7 +1597,7 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:380
#, php-format
-msgid "Cannot set \"%s\" value, it contains invalid data: %s"
+msgid "Cannot set value \"%s\", it contains invalid data: %s"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:390
@@ -1643,7 +1643,7 @@ msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:150
#, php-format
-msgid "The value for multivaluated field \"%s\" is not an array"
+msgid "The value for multivalued field \"%s\" is not an array"
msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:250
@@ -1704,7 +1704,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:492
#, php-format
msgid ""
-"Could not compute dn: could not find objectType infos from tab class \"%s\""
+"Could not compute dn: could not find objectType info from tab class \"%s\""
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1363
@@ -1719,7 +1719,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1576
msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may"
+"The object has changed since being opened in FusionDirectory. All changes that may"
" be done by others will get lost if you save this entry!"
msgstr ""
@@ -2424,7 +2424,7 @@ msgid "DN you wish to add assignments for"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:110
-msgid "The dn you entered could not be found in the LDAP"
+msgid "The dn you entered could not be found in LDAP"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:141
@@ -2606,7 +2606,7 @@ msgid "SASL"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
-msgid "Force to ask for password"
+msgid "Force asking for a password"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
@@ -2682,7 +2682,7 @@ msgid "Activate password recovery"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:47
-msgid "Whether to activate or not password recovery feature"
+msgid "Whether to activate the password recovery feature or not"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:52
@@ -2717,7 +2717,7 @@ msgstr ""
#: plugins/config/class_recoveryConfig.inc:74
msgid ""
-"Users will also be able to enter one of theirs alternate addresses to "
+"Users will also be able to enter one of their alternate addresses to "
"recover their password"
msgstr ""
@@ -2957,7 +2957,7 @@ msgid "Snapshot base"
msgstr ""
#: plugins/config/class_configInLdap.inc:109
-msgid "The base where snapshots should be stored inside of the LDAP."
+msgid "The base where snapshots should be stored inside the LDAP directory."
msgstr ""
#: plugins/config/class_configInLdap.inc:114
@@ -3153,7 +3153,7 @@ msgid "People DN attribute"
msgstr ""
#: plugins/config/class_configInLdap.inc:252
-msgid "Attribute to use at the beginning of users dn"
+msgid "Attribute to use at the beginning of the user's dn"
msgstr ""
#: plugins/config/class_configInLdap.inc:257
@@ -3238,7 +3238,7 @@ msgstr ""
#: plugins/config/class_configInLdap.inc:301
msgid ""
"Shows PHP errors in the upper part of the screen. This should be disabled in"
-" productive deployments, because there might be some passwords in it."
+" production deployments, because it may contain passwords."
msgstr ""
#: plugins/config/class_configInLdap.inc:305
@@ -3476,7 +3476,7 @@ msgstr ""
#: plugins/personal/roles/class_userRoles.inc:49
#: plugins/personal/roles/class_userRoles.inc:53
-msgid "Groups membership"
+msgid "Group memberships"
msgstr ""
#: plugins/personal/roles/class_userRoles.inc:60
@@ -3755,7 +3755,7 @@ msgstr ""
#: plugins/personal/generic/class_user.inc:430
#, php-format
-msgid "Ppolicy \"%s\" could not be found in the LDAP!"
+msgid "Ppolicy \"%s\" could not be found in LDAP!"
msgstr ""
#: plugins/personal/generic/class_user.inc:460
@@ -4020,7 +4020,7 @@ msgstr ""
#: setup/class_setupStepChecks.inc:124
msgid ""
-"FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
+"FusionDirectory requires either the 'mhash' or 'sha1' module to make use of "
"SSHA encryption."
msgstr ""
@@ -4208,11 +4208,11 @@ msgid "Checking for POSIX groups outside the groups tree"
msgstr ""
#: setup/class_setupStepMigrate.inc:274
-msgid "Checking for duplicated UID numbers"
+msgid "Checking for duplicate UID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:275
-msgid "Checking for duplicated GID numbers"
+msgid "Checking for duplicate GID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:343 setup/class_setupStepMigrate.inc:502
@@ -4228,7 +4228,7 @@ msgstr ""
#: setup/class_setupStepMigrate.inc:935 setup/class_setupStepMigrate.inc:1041
#: setup/class_setupStepMigrate.inc:1071 setup/class_setupStepMigrate.inc:1322
#: setup/class_setupStepMigrate.inc:1433
-msgid "Possibly the \"root object\" is missing."
+msgid "The \"root object\" is possibly missing."
msgstr ""
#: setup/class_setupStepMigrate.inc:360 setup/class_setupStepMigrate.inc:383
@@ -4299,7 +4299,7 @@ msgid "Roles"
msgstr ""
#: setup/class_setupStepMigrate.inc:836
-msgid "There is no FusionDirectory administrator account inside your LDAP."
+msgid "There is no FusionDirectory administrator account in your LDAP directory."
msgstr ""
#: setup/class_setupStepMigrate.inc:875
@@ -4338,12 +4338,12 @@ msgid "LDAP result parsing failed"
msgstr ""
#: setup/class_setupStepMigrate.inc:1076 setup/class_setupStepMigrate.inc:1327
-msgid "Sizelimit hit"
+msgid "Size limit hit"
msgstr ""
#: setup/class_setupStepMigrate.inc:1077 setup/class_setupStepMigrate.inc:1328
#, php-format
-msgid "Sizelimit of %d hit. Please check this manually"
+msgid "Size limit of %d hit. Please check this manually"
msgstr ""
#: setup/class_setupStepMigrate.inc:1120 setup/class_setupStepMigrate.inc:1134
@@ -4438,7 +4438,7 @@ msgstr ""
#, php-format
msgid ""
"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
"shouldn't."
msgstr ""
@@ -4543,7 +4543,7 @@ msgid_plural "There are %1 expired accounts"
msgstr[0] ""
#: plugins/addons/dashboard/users_accounts.tpl.c:5
-msgid "There is no expired account"
+msgid "There are no expired accounts"
msgstr ""
#: plugins/addons/dashboard/users_accounts.tpl.c:11
@@ -4589,8 +4589,8 @@ msgid_plural "There are %1 users:"
msgstr[0] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:5
-msgid "One of them use %1 method"
-msgid_plural "%2 of them use %1 method"
+msgid "One of them uses the %1 method"
+msgid_plural "%2 of them use the %1 method"
msgstr[0] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:8
@@ -4599,7 +4599,7 @@ msgid_plural "%1 of them are locked"
msgstr[0] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:11
-msgid "None of them is locked"
+msgid "None of them are locked"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:5
@@ -4607,7 +4607,7 @@ msgid "There are no users"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:8
-msgid "One of them have a %1 account"
+msgid "One of them has a %1 account"
msgid_plural "%2 of them have a %1 account"
msgstr[0] ""
@@ -4675,7 +4675,7 @@ msgstr ""
#: setup/setup_welcome.tpl.c:2
msgid ""
-"This seems to be the first time you start FusionDirectory - we didn't find "
+"This seems to be the first time you start FusionDirectory - we cannot find "
"any configuration right now. This simple wizard intends to help you while "
"setting it up."
msgstr ""
@@ -4719,12 +4719,12 @@ msgstr ""
#: setup/setup_welcome.tpl.c:32
msgid ""
"For security reasons you need to authenticate for the installation by "
-"creating the file '%1', containing the current session ID on the servers "
+"creating the file '%1', containing the current session ID on the server's "
"local filesystem. This can be done by executing the following command:"
msgstr ""
#: setup/setup_welcome.tpl.c:35
-msgid "Click the 'Next' button when you've finished."
+msgid "Click the 'Next' button when you are done."
msgstr ""
#: setup/setup_migrate.tpl.c:2
@@ -4987,7 +4987,7 @@ msgstr ""
#: ihtml/themes/breezy/islocked.tpl.c:11
msgid ""
"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
+"web browser during the edit operation. You may want to take over the lock by "
"pressing the \"%1\" button."
msgstr ""
diff --git a/locale/ko/fusiondirectory.po b/locale/ko/fusiondirectory.po
index fc1e6342096f953e48059323a9c4608cb8562254..9f891d1ba703c6d124c236bb816776ed0f13e954 100644
--- a/locale/ko/fusiondirectory.po
+++ b/locale/ko/fusiondirectory.po
@@ -88,7 +88,7 @@ msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:71
msgid ""
"LDAP attributes to display, comma separated. Special values \"nameAttr\" and"
-" \"mainAttr\" also works."
+" \"mainAttr\" also work."
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:75
@@ -100,7 +100,7 @@ msgid "Column title"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
-msgid "Persitent"
+msgid "Persistent"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
@@ -581,7 +581,7 @@ msgid "Send bug report to the FusionDirectory Team"
msgstr "FusionDirectory íŒ€ì— ë²„ê·¸ ë³´ê³ ì„œ 보내기"
#: include/php_setup.inc:235
-msgid "Send bugreport"
+msgid "Send bug report"
msgstr "버그 리í¬íŠ¸ 보내기"
#: include/php_setup.inc:240
@@ -636,7 +636,7 @@ msgstr ""
#: include/login/class_LoginCAS.inc:68
#, php-format
-msgid "CAS user \"%s\" could not be found in the LDAP"
+msgid "CAS user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginCAS.inc:78 include/login/class_LoginCAS.inc:104
@@ -726,7 +726,7 @@ msgstr ""
#: include/login/class_LoginHTTPHeader.inc:64
#, php-format
-msgid "Header user \"%s\" could not be found in the LDAP"
+msgid "Header user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginHTTPAuth.inc:29
@@ -770,7 +770,7 @@ msgid "The user using email \"%s\" is locked. Please contact your administrator.
msgstr ""
#: include/class_passwordRecovery.inc:352
-msgid "Contact your administrator, there was a problem with mail server"
+msgid "Contact your administrator, there was a problem with the mail server"
msgstr "ë©”ì¼ ì„œë²„ì— ë¬¸ì œê°€ ë°œìƒí•¬ìŠµë‹ˆë‹¤. 관리ìžì—게 문ì˜ë°”ëžë‹ˆë‹¤."
#: include/class_passwordRecovery.inc:365
@@ -778,7 +778,7 @@ msgid "This token is invalid"
msgstr "í† í°ì´ ìœ íš¨í•˜ì§€ 않습니다."
#: include/class_passwordRecovery.inc:429
-msgid "There was a problem with mail server, confirmation email not sent"
+msgid "There was a problem with the mail server, confirmation email not sent"
msgstr ""
#: include/password-methods/class_passwordMethodSasl.inc:66
@@ -843,7 +843,7 @@ msgstr "치명ì ì¸ ì˜¤ë¥˜ : í´ëž˜ìŠ¤ '1%s'ì„ (를) ì¸ìŠ¤í„´ìŠ¤í™” í• ìˆ˜
#: include/functions.inc:354
#, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
msgstr "치명ì : LDAP ì—°ê²°ì‹œ 오류가 ë°œìƒí–ˆìŠµë‹ˆë‹¤. 서버 오류 '%s'."
#: include/functions.inc:402 include/functions.inc:531
@@ -1158,7 +1158,7 @@ msgstr ""
#: include/class_msgPool.inc:245
#, php-format
-msgid "The entry \"%s\" already use this \"%s\" attribute!"
+msgid "The entry \"%s\" already uses this \"%s\" attribute!"
msgstr ""
#: include/class_msgPool.inc:256
@@ -1604,7 +1604,7 @@ msgstr "다운로드"
#: include/simpleplugin/attributes/class_FileAttribute.inc:380
#, php-format
-msgid "Cannot set \"%s\" value, it contains invalid data: %s"
+msgid "Cannot set value \"%s\", it contains invalid data: %s"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:390
@@ -1650,7 +1650,7 @@ msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:150
#, php-format
-msgid "The value for multivaluated field \"%s\" is not an array"
+msgid "The value for multivalued field \"%s\" is not an array"
msgstr "ë‹¤ì¤‘í™”ëœ í•„ë“œ \"%s\"ì˜ ê°’ì€ ë°°ì—´ì´ ì•„ë‹™ë‹ˆë‹¤."
#: include/simpleplugin/attributes/class_SetAttribute.inc:250
@@ -1711,7 +1711,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:492
#, php-format
msgid ""
-"Could not compute dn: could not find objectType infos from tab class \"%s\""
+"Could not compute dn: could not find objectType info from tab class \"%s\""
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1363
@@ -1726,7 +1726,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1576
msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may"
+"The object has changed since being opened in FusionDirectory. All changes that may"
" be done by others will get lost if you save this entry!"
msgstr ""
@@ -2431,7 +2431,7 @@ msgid "DN you wish to add assignments for"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:110
-msgid "The dn you entered could not be found in the LDAP"
+msgid "The dn you entered could not be found in LDAP"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:141
@@ -2613,7 +2613,7 @@ msgid "SASL"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
-msgid "Force to ask for password"
+msgid "Force asking for a password"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
@@ -2689,7 +2689,7 @@ msgid "Activate password recovery"
msgstr "비밀번호 복구 활성화"
#: plugins/config/class_recoveryConfig.inc:47
-msgid "Whether to activate or not password recovery feature"
+msgid "Whether to activate the password recovery feature or not"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:52
@@ -2724,7 +2724,7 @@ msgstr ""
#: plugins/config/class_recoveryConfig.inc:74
msgid ""
-"Users will also be able to enter one of theirs alternate addresses to "
+"Users will also be able to enter one of their alternate addresses to "
"recover their password"
msgstr ""
@@ -2964,7 +2964,7 @@ msgid "Snapshot base"
msgstr "스냅샷 ë² ì´ìŠ¤"
#: plugins/config/class_configInLdap.inc:109
-msgid "The base where snapshots should be stored inside of the LDAP."
+msgid "The base where snapshots should be stored inside the LDAP directory."
msgstr ""
#: plugins/config/class_configInLdap.inc:114
@@ -3160,7 +3160,7 @@ msgid "People DN attribute"
msgstr ""
#: plugins/config/class_configInLdap.inc:252
-msgid "Attribute to use at the beginning of users dn"
+msgid "Attribute to use at the beginning of the user's dn"
msgstr ""
#: plugins/config/class_configInLdap.inc:257
@@ -3245,7 +3245,7 @@ msgstr ""
#: plugins/config/class_configInLdap.inc:301
msgid ""
"Shows PHP errors in the upper part of the screen. This should be disabled in"
-" productive deployments, because there might be some passwords in it."
+" production deployments, because it may contain passwords."
msgstr ""
#: plugins/config/class_configInLdap.inc:305
@@ -3483,7 +3483,7 @@ msgstr ""
#: plugins/personal/roles/class_userRoles.inc:49
#: plugins/personal/roles/class_userRoles.inc:53
-msgid "Groups membership"
+msgid "Group memberships"
msgstr ""
#: plugins/personal/roles/class_userRoles.inc:60
@@ -3762,7 +3762,7 @@ msgstr ""
#: plugins/personal/generic/class_user.inc:430
#, php-format
-msgid "Ppolicy \"%s\" could not be found in the LDAP!"
+msgid "Ppolicy \"%s\" could not be found in LDAP!"
msgstr ""
#: plugins/personal/generic/class_user.inc:460
@@ -4027,7 +4027,7 @@ msgstr ""
#: setup/class_setupStepChecks.inc:124
msgid ""
-"FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
+"FusionDirectory requires either the 'mhash' or 'sha1' module to make use of "
"SSHA encryption."
msgstr ""
@@ -4215,11 +4215,11 @@ msgid "Checking for POSIX groups outside the groups tree"
msgstr ""
#: setup/class_setupStepMigrate.inc:274
-msgid "Checking for duplicated UID numbers"
+msgid "Checking for duplicate UID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:275
-msgid "Checking for duplicated GID numbers"
+msgid "Checking for duplicate GID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:343 setup/class_setupStepMigrate.inc:502
@@ -4235,7 +4235,7 @@ msgstr ""
#: setup/class_setupStepMigrate.inc:935 setup/class_setupStepMigrate.inc:1041
#: setup/class_setupStepMigrate.inc:1071 setup/class_setupStepMigrate.inc:1322
#: setup/class_setupStepMigrate.inc:1433
-msgid "Possibly the \"root object\" is missing."
+msgid "The \"root object\" is possibly missing."
msgstr ""
#: setup/class_setupStepMigrate.inc:360 setup/class_setupStepMigrate.inc:383
@@ -4306,7 +4306,7 @@ msgid "Roles"
msgstr "ì—í• "
#: setup/class_setupStepMigrate.inc:836
-msgid "There is no FusionDirectory administrator account inside your LDAP."
+msgid "There is no FusionDirectory administrator account in your LDAP directory."
msgstr ""
#: setup/class_setupStepMigrate.inc:875
@@ -4345,12 +4345,12 @@ msgid "LDAP result parsing failed"
msgstr ""
#: setup/class_setupStepMigrate.inc:1076 setup/class_setupStepMigrate.inc:1327
-msgid "Sizelimit hit"
+msgid "Size limit hit"
msgstr ""
#: setup/class_setupStepMigrate.inc:1077 setup/class_setupStepMigrate.inc:1328
#, php-format
-msgid "Sizelimit of %d hit. Please check this manually"
+msgid "Size limit of %d hit. Please check this manually"
msgstr ""
#: setup/class_setupStepMigrate.inc:1120 setup/class_setupStepMigrate.inc:1134
@@ -4445,7 +4445,7 @@ msgstr ""
#, php-format
msgid ""
"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
"shouldn't."
msgstr ""
@@ -4550,7 +4550,7 @@ msgid_plural "There are %1 expired accounts"
msgstr[0] ""
#: plugins/addons/dashboard/users_accounts.tpl.c:5
-msgid "There is no expired account"
+msgid "There are no expired accounts"
msgstr ""
#: plugins/addons/dashboard/users_accounts.tpl.c:11
@@ -4596,8 +4596,8 @@ msgid_plural "There are %1 users:"
msgstr[0] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:5
-msgid "One of them use %1 method"
-msgid_plural "%2 of them use %1 method"
+msgid "One of them uses the %1 method"
+msgid_plural "%2 of them use the %1 method"
msgstr[0] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:8
@@ -4606,7 +4606,7 @@ msgid_plural "%1 of them are locked"
msgstr[0] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:11
-msgid "None of them is locked"
+msgid "None of them are locked"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:5
@@ -4614,7 +4614,7 @@ msgid "There are no users"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:8
-msgid "One of them have a %1 account"
+msgid "One of them has a %1 account"
msgid_plural "%2 of them have a %1 account"
msgstr[0] ""
@@ -4682,7 +4682,7 @@ msgstr ""
#: setup/setup_welcome.tpl.c:2
msgid ""
-"This seems to be the first time you start FusionDirectory - we didn't find "
+"This seems to be the first time you start FusionDirectory - we cannot find "
"any configuration right now. This simple wizard intends to help you while "
"setting it up."
msgstr ""
@@ -4726,12 +4726,12 @@ msgstr ""
#: setup/setup_welcome.tpl.c:32
msgid ""
"For security reasons you need to authenticate for the installation by "
-"creating the file '%1', containing the current session ID on the servers "
+"creating the file '%1', containing the current session ID on the server's "
"local filesystem. This can be done by executing the following command:"
msgstr ""
#: setup/setup_welcome.tpl.c:35
-msgid "Click the 'Next' button when you've finished."
+msgid "Click the 'Next' button when you are done."
msgstr ""
#: setup/setup_migrate.tpl.c:2
@@ -4994,7 +4994,7 @@ msgstr ""
#: ihtml/themes/breezy/islocked.tpl.c:11
msgid ""
"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
+"web browser during the edit operation. You may want to take over the lock by "
"pressing the \"%1\" button."
msgstr ""
diff --git a/locale/lv/fusiondirectory.po b/locale/lv/fusiondirectory.po
index f2acd19e4c9bfa974b299f9cebff12af1806a260..f84cd20fce9a70c088a043e4c05edb6468291398 100644
--- a/locale/lv/fusiondirectory.po
+++ b/locale/lv/fusiondirectory.po
@@ -87,7 +87,7 @@ msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:71
msgid ""
"LDAP attributes to display, comma separated. Special values \"nameAttr\" and"
-" \"mainAttr\" also works."
+" \"mainAttr\" also work."
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:75
@@ -99,7 +99,7 @@ msgid "Column title"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
-msgid "Persitent"
+msgid "Persistent"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
@@ -578,7 +578,7 @@ msgid "Send bug report to the FusionDirectory Team"
msgstr ""
#: include/php_setup.inc:235
-msgid "Send bugreport"
+msgid "Send bug report"
msgstr ""
#: include/php_setup.inc:240
@@ -633,7 +633,7 @@ msgstr ""
#: include/login/class_LoginCAS.inc:68
#, php-format
-msgid "CAS user \"%s\" could not be found in the LDAP"
+msgid "CAS user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginCAS.inc:78 include/login/class_LoginCAS.inc:104
@@ -723,7 +723,7 @@ msgstr ""
#: include/login/class_LoginHTTPHeader.inc:64
#, php-format
-msgid "Header user \"%s\" could not be found in the LDAP"
+msgid "Header user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginHTTPAuth.inc:29
@@ -767,7 +767,7 @@ msgid "The user using email \"%s\" is locked. Please contact your administrator.
msgstr ""
#: include/class_passwordRecovery.inc:352
-msgid "Contact your administrator, there was a problem with mail server"
+msgid "Contact your administrator, there was a problem with the mail server"
msgstr ""
#: include/class_passwordRecovery.inc:365
@@ -775,7 +775,7 @@ msgid "This token is invalid"
msgstr ""
#: include/class_passwordRecovery.inc:429
-msgid "There was a problem with mail server, confirmation email not sent"
+msgid "There was a problem with the mail server, confirmation email not sent"
msgstr ""
#: include/password-methods/class_passwordMethodSasl.inc:66
@@ -840,7 +840,7 @@ msgstr ""
#: include/functions.inc:354
#, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
msgstr ""
#: include/functions.inc:402 include/functions.inc:531
@@ -1155,7 +1155,7 @@ msgstr ""
#: include/class_msgPool.inc:245
#, php-format
-msgid "The entry \"%s\" already use this \"%s\" attribute!"
+msgid "The entry \"%s\" already uses this \"%s\" attribute!"
msgstr ""
#: include/class_msgPool.inc:256
@@ -1601,7 +1601,7 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:380
#, php-format
-msgid "Cannot set \"%s\" value, it contains invalid data: %s"
+msgid "Cannot set value \"%s\", it contains invalid data: %s"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:390
@@ -1647,7 +1647,7 @@ msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:150
#, php-format
-msgid "The value for multivaluated field \"%s\" is not an array"
+msgid "The value for multivalued field \"%s\" is not an array"
msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:250
@@ -1708,7 +1708,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:492
#, php-format
msgid ""
-"Could not compute dn: could not find objectType infos from tab class \"%s\""
+"Could not compute dn: could not find objectType info from tab class \"%s\""
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1363
@@ -1723,7 +1723,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1576
msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may"
+"The object has changed since being opened in FusionDirectory. All changes that may"
" be done by others will get lost if you save this entry!"
msgstr ""
@@ -2428,7 +2428,7 @@ msgid "DN you wish to add assignments for"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:110
-msgid "The dn you entered could not be found in the LDAP"
+msgid "The dn you entered could not be found in LDAP"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:141
@@ -2610,7 +2610,7 @@ msgid "SASL"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
-msgid "Force to ask for password"
+msgid "Force asking for a password"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
@@ -2686,7 +2686,7 @@ msgid "Activate password recovery"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:47
-msgid "Whether to activate or not password recovery feature"
+msgid "Whether to activate the password recovery feature or not"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:52
@@ -2721,7 +2721,7 @@ msgstr ""
#: plugins/config/class_recoveryConfig.inc:74
msgid ""
-"Users will also be able to enter one of theirs alternate addresses to "
+"Users will also be able to enter one of their alternate addresses to "
"recover their password"
msgstr ""
@@ -2961,7 +2961,7 @@ msgid "Snapshot base"
msgstr ""
#: plugins/config/class_configInLdap.inc:109
-msgid "The base where snapshots should be stored inside of the LDAP."
+msgid "The base where snapshots should be stored inside the LDAP directory."
msgstr ""
#: plugins/config/class_configInLdap.inc:114
@@ -3157,7 +3157,7 @@ msgid "People DN attribute"
msgstr ""
#: plugins/config/class_configInLdap.inc:252
-msgid "Attribute to use at the beginning of users dn"
+msgid "Attribute to use at the beginning of the user's dn"
msgstr ""
#: plugins/config/class_configInLdap.inc:257
@@ -3242,7 +3242,7 @@ msgstr ""
#: plugins/config/class_configInLdap.inc:301
msgid ""
"Shows PHP errors in the upper part of the screen. This should be disabled in"
-" productive deployments, because there might be some passwords in it."
+" production deployments, because it may contain passwords."
msgstr ""
#: plugins/config/class_configInLdap.inc:305
@@ -3480,7 +3480,7 @@ msgstr ""
#: plugins/personal/roles/class_userRoles.inc:49
#: plugins/personal/roles/class_userRoles.inc:53
-msgid "Groups membership"
+msgid "Group memberships"
msgstr ""
#: plugins/personal/roles/class_userRoles.inc:60
@@ -3759,7 +3759,7 @@ msgstr "Pasta indekss"
#: plugins/personal/generic/class_user.inc:430
#, php-format
-msgid "Ppolicy \"%s\" could not be found in the LDAP!"
+msgid "Ppolicy \"%s\" could not be found in LDAP!"
msgstr ""
#: plugins/personal/generic/class_user.inc:460
@@ -4024,7 +4024,7 @@ msgstr ""
#: setup/class_setupStepChecks.inc:124
msgid ""
-"FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
+"FusionDirectory requires either the 'mhash' or 'sha1' module to make use of "
"SSHA encryption."
msgstr ""
@@ -4212,11 +4212,11 @@ msgid "Checking for POSIX groups outside the groups tree"
msgstr ""
#: setup/class_setupStepMigrate.inc:274
-msgid "Checking for duplicated UID numbers"
+msgid "Checking for duplicate UID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:275
-msgid "Checking for duplicated GID numbers"
+msgid "Checking for duplicate GID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:343 setup/class_setupStepMigrate.inc:502
@@ -4232,7 +4232,7 @@ msgstr ""
#: setup/class_setupStepMigrate.inc:935 setup/class_setupStepMigrate.inc:1041
#: setup/class_setupStepMigrate.inc:1071 setup/class_setupStepMigrate.inc:1322
#: setup/class_setupStepMigrate.inc:1433
-msgid "Possibly the \"root object\" is missing."
+msgid "The \"root object\" is possibly missing."
msgstr ""
#: setup/class_setupStepMigrate.inc:360 setup/class_setupStepMigrate.inc:383
@@ -4303,7 +4303,7 @@ msgid "Roles"
msgstr ""
#: setup/class_setupStepMigrate.inc:836
-msgid "There is no FusionDirectory administrator account inside your LDAP."
+msgid "There is no FusionDirectory administrator account in your LDAP directory."
msgstr ""
#: setup/class_setupStepMigrate.inc:875
@@ -4342,12 +4342,12 @@ msgid "LDAP result parsing failed"
msgstr ""
#: setup/class_setupStepMigrate.inc:1076 setup/class_setupStepMigrate.inc:1327
-msgid "Sizelimit hit"
+msgid "Size limit hit"
msgstr ""
#: setup/class_setupStepMigrate.inc:1077 setup/class_setupStepMigrate.inc:1328
#, php-format
-msgid "Sizelimit of %d hit. Please check this manually"
+msgid "Size limit of %d hit. Please check this manually"
msgstr ""
#: setup/class_setupStepMigrate.inc:1120 setup/class_setupStepMigrate.inc:1134
@@ -4442,7 +4442,7 @@ msgstr ""
#, php-format
msgid ""
"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
"shouldn't."
msgstr ""
@@ -4549,7 +4549,7 @@ msgstr[1] ""
msgstr[2] ""
#: plugins/addons/dashboard/users_accounts.tpl.c:5
-msgid "There is no expired account"
+msgid "There are no expired accounts"
msgstr ""
#: plugins/addons/dashboard/users_accounts.tpl.c:11
@@ -4603,8 +4603,8 @@ msgstr[1] ""
msgstr[2] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:5
-msgid "One of them use %1 method"
-msgid_plural "%2 of them use %1 method"
+msgid "One of them uses the %1 method"
+msgid_plural "%2 of them use the %1 method"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
@@ -4617,7 +4617,7 @@ msgstr[1] ""
msgstr[2] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:11
-msgid "None of them is locked"
+msgid "None of them are locked"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:5
@@ -4625,7 +4625,7 @@ msgid "There are no users"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:8
-msgid "One of them have a %1 account"
+msgid "One of them has a %1 account"
msgid_plural "%2 of them have a %1 account"
msgstr[0] ""
msgstr[1] ""
@@ -4695,7 +4695,7 @@ msgstr ""
#: setup/setup_welcome.tpl.c:2
msgid ""
-"This seems to be the first time you start FusionDirectory - we didn't find "
+"This seems to be the first time you start FusionDirectory - we cannot find "
"any configuration right now. This simple wizard intends to help you while "
"setting it up."
msgstr ""
@@ -4739,12 +4739,12 @@ msgstr ""
#: setup/setup_welcome.tpl.c:32
msgid ""
"For security reasons you need to authenticate for the installation by "
-"creating the file '%1', containing the current session ID on the servers "
+"creating the file '%1', containing the current session ID on the server's "
"local filesystem. This can be done by executing the following command:"
msgstr ""
#: setup/setup_welcome.tpl.c:35
-msgid "Click the 'Next' button when you've finished."
+msgid "Click the 'Next' button when you are done."
msgstr ""
#: setup/setup_migrate.tpl.c:2
@@ -5009,7 +5009,7 @@ msgstr ""
#: ihtml/themes/breezy/islocked.tpl.c:11
msgid ""
"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
+"web browser during the edit operation. You may want to take over the lock by "
"pressing the \"%1\" button."
msgstr ""
diff --git a/locale/nb/fusiondirectory.po b/locale/nb/fusiondirectory.po
index dbc0e81052e2a5914dfeb91abff74b8f9b3a9a93..7f8cc788f7faf365dedd10eeccf2b9f5b3b5260a 100644
--- a/locale/nb/fusiondirectory.po
+++ b/locale/nb/fusiondirectory.po
@@ -87,7 +87,7 @@ msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:71
msgid ""
"LDAP attributes to display, comma separated. Special values \"nameAttr\" and"
-" \"mainAttr\" also works."
+" \"mainAttr\" also work."
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:75
@@ -99,7 +99,7 @@ msgid "Column title"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
-msgid "Persitent"
+msgid "Persistent"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
@@ -578,7 +578,7 @@ msgid "Send bug report to the FusionDirectory Team"
msgstr ""
#: include/php_setup.inc:235
-msgid "Send bugreport"
+msgid "Send bug report"
msgstr ""
#: include/php_setup.inc:240
@@ -633,7 +633,7 @@ msgstr ""
#: include/login/class_LoginCAS.inc:68
#, php-format
-msgid "CAS user \"%s\" could not be found in the LDAP"
+msgid "CAS user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginCAS.inc:78 include/login/class_LoginCAS.inc:104
@@ -723,7 +723,7 @@ msgstr ""
#: include/login/class_LoginHTTPHeader.inc:64
#, php-format
-msgid "Header user \"%s\" could not be found in the LDAP"
+msgid "Header user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginHTTPAuth.inc:29
@@ -767,7 +767,7 @@ msgid "The user using email \"%s\" is locked. Please contact your administrator.
msgstr ""
#: include/class_passwordRecovery.inc:352
-msgid "Contact your administrator, there was a problem with mail server"
+msgid "Contact your administrator, there was a problem with the mail server"
msgstr ""
#: include/class_passwordRecovery.inc:365
@@ -775,7 +775,7 @@ msgid "This token is invalid"
msgstr ""
#: include/class_passwordRecovery.inc:429
-msgid "There was a problem with mail server, confirmation email not sent"
+msgid "There was a problem with the mail server, confirmation email not sent"
msgstr ""
#: include/password-methods/class_passwordMethodSasl.inc:66
@@ -840,7 +840,7 @@ msgstr ""
#: include/functions.inc:354
#, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
msgstr ""
#: include/functions.inc:402 include/functions.inc:531
@@ -1155,7 +1155,7 @@ msgstr ""
#: include/class_msgPool.inc:245
#, php-format
-msgid "The entry \"%s\" already use this \"%s\" attribute!"
+msgid "The entry \"%s\" already uses this \"%s\" attribute!"
msgstr ""
#: include/class_msgPool.inc:256
@@ -1601,7 +1601,7 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:380
#, php-format
-msgid "Cannot set \"%s\" value, it contains invalid data: %s"
+msgid "Cannot set value \"%s\", it contains invalid data: %s"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:390
@@ -1647,7 +1647,7 @@ msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:150
#, php-format
-msgid "The value for multivaluated field \"%s\" is not an array"
+msgid "The value for multivalued field \"%s\" is not an array"
msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:250
@@ -1708,7 +1708,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:492
#, php-format
msgid ""
-"Could not compute dn: could not find objectType infos from tab class \"%s\""
+"Could not compute dn: could not find objectType info from tab class \"%s\""
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1363
@@ -1723,7 +1723,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1576
msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may"
+"The object has changed since being opened in FusionDirectory. All changes that may"
" be done by others will get lost if you save this entry!"
msgstr ""
@@ -2428,7 +2428,7 @@ msgid "DN you wish to add assignments for"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:110
-msgid "The dn you entered could not be found in the LDAP"
+msgid "The dn you entered could not be found in LDAP"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:141
@@ -2610,7 +2610,7 @@ msgid "SASL"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
-msgid "Force to ask for password"
+msgid "Force asking for a password"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
@@ -2686,7 +2686,7 @@ msgid "Activate password recovery"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:47
-msgid "Whether to activate or not password recovery feature"
+msgid "Whether to activate the password recovery feature or not"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:52
@@ -2721,7 +2721,7 @@ msgstr ""
#: plugins/config/class_recoveryConfig.inc:74
msgid ""
-"Users will also be able to enter one of theirs alternate addresses to "
+"Users will also be able to enter one of their alternate addresses to "
"recover their password"
msgstr ""
@@ -2961,7 +2961,7 @@ msgid "Snapshot base"
msgstr ""
#: plugins/config/class_configInLdap.inc:109
-msgid "The base where snapshots should be stored inside of the LDAP."
+msgid "The base where snapshots should be stored inside the LDAP directory."
msgstr ""
#: plugins/config/class_configInLdap.inc:114
@@ -3157,7 +3157,7 @@ msgid "People DN attribute"
msgstr ""
#: plugins/config/class_configInLdap.inc:252
-msgid "Attribute to use at the beginning of users dn"
+msgid "Attribute to use at the beginning of the user's dn"
msgstr ""
#: plugins/config/class_configInLdap.inc:257
@@ -3242,7 +3242,7 @@ msgstr ""
#: plugins/config/class_configInLdap.inc:301
msgid ""
"Shows PHP errors in the upper part of the screen. This should be disabled in"
-" productive deployments, because there might be some passwords in it."
+" production deployments, because it may contain passwords."
msgstr ""
#: plugins/config/class_configInLdap.inc:305
@@ -3480,7 +3480,7 @@ msgstr ""
#: plugins/personal/roles/class_userRoles.inc:49
#: plugins/personal/roles/class_userRoles.inc:53
-msgid "Groups membership"
+msgid "Group memberships"
msgstr ""
#: plugins/personal/roles/class_userRoles.inc:60
@@ -3759,7 +3759,7 @@ msgstr ""
#: plugins/personal/generic/class_user.inc:430
#, php-format
-msgid "Ppolicy \"%s\" could not be found in the LDAP!"
+msgid "Ppolicy \"%s\" could not be found in LDAP!"
msgstr ""
#: plugins/personal/generic/class_user.inc:460
@@ -4024,7 +4024,7 @@ msgstr ""
#: setup/class_setupStepChecks.inc:124
msgid ""
-"FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
+"FusionDirectory requires either the 'mhash' or 'sha1' module to make use of "
"SSHA encryption."
msgstr ""
@@ -4212,11 +4212,11 @@ msgid "Checking for POSIX groups outside the groups tree"
msgstr ""
#: setup/class_setupStepMigrate.inc:274
-msgid "Checking for duplicated UID numbers"
+msgid "Checking for duplicate UID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:275
-msgid "Checking for duplicated GID numbers"
+msgid "Checking for duplicate GID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:343 setup/class_setupStepMigrate.inc:502
@@ -4232,7 +4232,7 @@ msgstr ""
#: setup/class_setupStepMigrate.inc:935 setup/class_setupStepMigrate.inc:1041
#: setup/class_setupStepMigrate.inc:1071 setup/class_setupStepMigrate.inc:1322
#: setup/class_setupStepMigrate.inc:1433
-msgid "Possibly the \"root object\" is missing."
+msgid "The \"root object\" is possibly missing."
msgstr ""
#: setup/class_setupStepMigrate.inc:360 setup/class_setupStepMigrate.inc:383
@@ -4303,7 +4303,7 @@ msgid "Roles"
msgstr ""
#: setup/class_setupStepMigrate.inc:836
-msgid "There is no FusionDirectory administrator account inside your LDAP."
+msgid "There is no FusionDirectory administrator account in your LDAP directory."
msgstr ""
#: setup/class_setupStepMigrate.inc:875
@@ -4342,12 +4342,12 @@ msgid "LDAP result parsing failed"
msgstr ""
#: setup/class_setupStepMigrate.inc:1076 setup/class_setupStepMigrate.inc:1327
-msgid "Sizelimit hit"
+msgid "Size limit hit"
msgstr ""
#: setup/class_setupStepMigrate.inc:1077 setup/class_setupStepMigrate.inc:1328
#, php-format
-msgid "Sizelimit of %d hit. Please check this manually"
+msgid "Size limit of %d hit. Please check this manually"
msgstr ""
#: setup/class_setupStepMigrate.inc:1120 setup/class_setupStepMigrate.inc:1134
@@ -4442,7 +4442,7 @@ msgstr ""
#, php-format
msgid ""
"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
"shouldn't."
msgstr ""
@@ -4548,7 +4548,7 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/users_accounts.tpl.c:5
-msgid "There is no expired account"
+msgid "There are no expired accounts"
msgstr ""
#: plugins/addons/dashboard/users_accounts.tpl.c:11
@@ -4598,8 +4598,8 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:5
-msgid "One of them use %1 method"
-msgid_plural "%2 of them use %1 method"
+msgid "One of them uses the %1 method"
+msgid_plural "%2 of them use the %1 method"
msgstr[0] ""
msgstr[1] ""
@@ -4610,7 +4610,7 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:11
-msgid "None of them is locked"
+msgid "None of them are locked"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:5
@@ -4618,7 +4618,7 @@ msgid "There are no users"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:8
-msgid "One of them have a %1 account"
+msgid "One of them has a %1 account"
msgid_plural "%2 of them have a %1 account"
msgstr[0] ""
msgstr[1] ""
@@ -4687,7 +4687,7 @@ msgstr ""
#: setup/setup_welcome.tpl.c:2
msgid ""
-"This seems to be the first time you start FusionDirectory - we didn't find "
+"This seems to be the first time you start FusionDirectory - we cannot find "
"any configuration right now. This simple wizard intends to help you while "
"setting it up."
msgstr ""
@@ -4731,12 +4731,12 @@ msgstr ""
#: setup/setup_welcome.tpl.c:32
msgid ""
"For security reasons you need to authenticate for the installation by "
-"creating the file '%1', containing the current session ID on the servers "
+"creating the file '%1', containing the current session ID on the server's "
"local filesystem. This can be done by executing the following command:"
msgstr ""
#: setup/setup_welcome.tpl.c:35
-msgid "Click the 'Next' button when you've finished."
+msgid "Click the 'Next' button when you are done."
msgstr ""
#: setup/setup_migrate.tpl.c:2
@@ -4999,7 +4999,7 @@ msgstr ""
#: ihtml/themes/breezy/islocked.tpl.c:11
msgid ""
"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
+"web browser during the edit operation. You may want to take over the lock by "
"pressing the \"%1\" button."
msgstr ""
diff --git a/locale/nl/fusiondirectory.po b/locale/nl/fusiondirectory.po
index 847720022f87026cce923da7d2800d0cd182d66b..22a3978c0537381f5adfc011e73026f40e29300b 100644
--- a/locale/nl/fusiondirectory.po
+++ b/locale/nl/fusiondirectory.po
@@ -90,7 +90,7 @@ msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:71
msgid ""
"LDAP attributes to display, comma separated. Special values \"nameAttr\" and"
-" \"mainAttr\" also works."
+" \"mainAttr\" also work."
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:75
@@ -102,7 +102,7 @@ msgid "Column title"
msgstr "Kolomtitel"
#: include/management/class_ManagementConfigurationDialog.inc:86
-msgid "Persitent"
+msgid "Persistent"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
@@ -588,7 +588,7 @@ msgid "Send bug report to the FusionDirectory Team"
msgstr "Stuur probleemrapport naar het FusionDirectory Team"
#: include/php_setup.inc:235
-msgid "Send bugreport"
+msgid "Send bug report"
msgstr "Stuur probleemrapport"
#: include/php_setup.inc:240
@@ -645,7 +645,7 @@ msgstr "CAS"
#: include/login/class_LoginCAS.inc:68
#, php-format
-msgid "CAS user \"%s\" could not be found in the LDAP"
+msgid "CAS user \"%s\" could not be found in LDAP"
msgstr "CAS gebruiker \"%s\" kon niet gevonden worden in de LDAP"
#: include/login/class_LoginCAS.inc:78 include/login/class_LoginCAS.inc:104
@@ -739,7 +739,7 @@ msgstr "Geen waarde gevonden in HTTP header \"%s\""
#: include/login/class_LoginHTTPHeader.inc:64
#, php-format
-msgid "Header user \"%s\" could not be found in the LDAP"
+msgid "Header user \"%s\" could not be found in LDAP"
msgstr "Header gebruiker \"%s\" kan niet gevonden worden in de LDAP"
#: include/login/class_LoginHTTPAuth.inc:29
@@ -785,7 +785,7 @@ msgstr ""
" systeembeheerder."
#: include/class_passwordRecovery.inc:352
-msgid "Contact your administrator, there was a problem with mail server"
+msgid "Contact your administrator, there was a problem with the mail server"
msgstr "Contacteer je systeembeheerder, er was een probleem met de mailserver"
#: include/class_passwordRecovery.inc:365
@@ -793,7 +793,7 @@ msgid "This token is invalid"
msgstr "Deze token is ongeldig"
#: include/class_passwordRecovery.inc:429
-msgid "There was a problem with mail server, confirmation email not sent"
+msgid "There was a problem with the mail server, confirmation email not sent"
msgstr ""
"Er was een probleem met de mail server, de bevestigingse-mail werd niet "
"verstuurd"
@@ -870,7 +870,7 @@ msgstr ""
#: include/functions.inc:354
#, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
msgstr ""
"FATAAL: Fout bij het verbinden van de LDAP server. De server meldt: '%s'."
@@ -1207,7 +1207,7 @@ msgstr ""
#: include/class_msgPool.inc:245
#, php-format
-msgid "The entry \"%s\" already use this \"%s\" attribute!"
+msgid "The entry \"%s\" already uses this \"%s\" attribute!"
msgstr ""
#: include/class_msgPool.inc:256
@@ -1667,7 +1667,7 @@ msgstr "Download"
#: include/simpleplugin/attributes/class_FileAttribute.inc:380
#, php-format
-msgid "Cannot set \"%s\" value, it contains invalid data: %s"
+msgid "Cannot set value \"%s\", it contains invalid data: %s"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:390
@@ -1715,7 +1715,7 @@ msgstr "Een float kleiner dan %f"
#: include/simpleplugin/attributes/class_SetAttribute.inc:150
#, php-format
-msgid "The value for multivaluated field \"%s\" is not an array"
+msgid "The value for multivalued field \"%s\" is not an array"
msgstr "De waarde voor multi-waardevelden \"%s\" is geen array"
#: include/simpleplugin/attributes/class_SetAttribute.inc:250
@@ -1776,7 +1776,7 @@ msgstr "Kan dn niet verwerken: geen parent tabklasse voor \"%s\""
#: include/simpleplugin/class_simplePlugin.inc:492
#, php-format
msgid ""
-"Could not compute dn: could not find objectType infos from tab class \"%s\""
+"Could not compute dn: could not find objectType info from tab class \"%s\""
msgstr ""
"Kan dn niet verwerken: kan objectType infos niet vinden van tabklasse \"%s\""
@@ -1792,7 +1792,7 @@ msgstr "De invoer %s bestaat niet"
#: include/simpleplugin/class_simplePlugin.inc:1576
msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may"
+"The object has changed since being opened in FusionDirectory. All changes that may"
" be done by others will get lost if you save this entry!"
msgstr ""
"Het object is veranderd sinds de opening in Fusiondirectory. Alle "
@@ -2519,7 +2519,7 @@ msgid "DN you wish to add assignments for"
msgstr "DN waarvoor je toewijzingen wil bijvoegen"
#: plugins/admin/acl/class_aclManagement.inc:110
-msgid "The dn you entered could not be found in the LDAP"
+msgid "The dn you entered could not be found in LDAP"
msgstr "De ingegeven dn kon niet in de LDAP worden gevonden"
#: plugins/admin/acl/class_aclManagement.inc:141
@@ -2705,7 +2705,7 @@ msgid "SASL"
msgstr "SASL"
#: plugins/config/class_mainPluginsConfig.inc:54
-msgid "Force to ask for password"
+msgid "Force asking for a password"
msgstr "Verplicht om paswoord te vragen"
#: plugins/config/class_mainPluginsConfig.inc:54
@@ -2783,7 +2783,7 @@ msgid "Activate password recovery"
msgstr "Activeer paswoord herstel"
#: plugins/config/class_recoveryConfig.inc:47
-msgid "Whether to activate or not password recovery feature"
+msgid "Whether to activate the password recovery feature or not"
msgstr "Al dan niet activeren paswoordherstel mogelijkheid"
#: plugins/config/class_recoveryConfig.inc:52
@@ -2820,7 +2820,7 @@ msgstr "Sta gebruik van alternatieve adressen toe "
#: plugins/config/class_recoveryConfig.inc:74
msgid ""
-"Users will also be able to enter one of theirs alternate addresses to "
+"Users will also be able to enter one of their alternate addresses to "
"recover their password"
msgstr ""
"Gebruikers zullen ook in de mogelijkheid zijn om één van hun alternatieve "
@@ -3081,7 +3081,7 @@ msgid "Snapshot base"
msgstr "Snaphosts basis"
#: plugins/config/class_configInLdap.inc:109
-msgid "The base where snapshots should be stored inside of the LDAP."
+msgid "The base where snapshots should be stored inside the LDAP directory."
msgstr "De basis waar snapshots moeten opgeslagen worden binnen LDAP."
#: plugins/config/class_configInLdap.inc:114
@@ -3289,7 +3289,7 @@ msgid "People DN attribute"
msgstr "Personen DN attribuut"
#: plugins/config/class_configInLdap.inc:252
-msgid "Attribute to use at the beginning of users dn"
+msgid "Attribute to use at the beginning of the user's dn"
msgstr "Attribuut te gebruiken in het begin van gebruikers dn"
#: plugins/config/class_configInLdap.inc:257
@@ -3379,7 +3379,7 @@ msgstr "Fouten weergeven"
#: plugins/config/class_configInLdap.inc:301
msgid ""
"Shows PHP errors in the upper part of the screen. This should be disabled in"
-" productive deployments, because there might be some passwords in it."
+" production deployments, because it may contain passwords."
msgstr ""
"Toont PHP fouten in het bovenste deel van het scherm. Dit moet afgezet "
"worden in productieomgevingen omdat het mogelijks paswoorden kan tonen."
@@ -3642,7 +3642,7 @@ msgstr "Bewerk gebruikers groepen en rollen"
#: plugins/personal/roles/class_userRoles.inc:49
#: plugins/personal/roles/class_userRoles.inc:53
-msgid "Groups membership"
+msgid "Group memberships"
msgstr "Groep lidmaatschap"
#: plugins/personal/roles/class_userRoles.inc:60
@@ -3924,7 +3924,7 @@ msgstr "Postcode"
#: plugins/personal/generic/class_user.inc:430
#, php-format
-msgid "Ppolicy \"%s\" could not be found in the LDAP!"
+msgid "Ppolicy \"%s\" could not be found in LDAP!"
msgstr "Ppolicy \"%s\" kon niet gevonden worden in de LDAP!"
#: plugins/personal/generic/class_user.inc:460
@@ -4208,7 +4208,7 @@ msgstr "FusionDirectory heeft deze module nodig voor samba integratie."
#: setup/class_setupStepChecks.inc:124
msgid ""
-"FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
+"FusionDirectory requires either the 'mhash' or 'sha1' module to make use of "
"SSHA encryption."
msgstr ""
"FusionDirectory heeft of de 'mhash' of de 'sha1' module nodig om gebruik te "
@@ -4434,11 +4434,11 @@ msgid "Checking for POSIX groups outside the groups tree"
msgstr ""
#: setup/class_setupStepMigrate.inc:274
-msgid "Checking for duplicated UID numbers"
+msgid "Checking for duplicate UID numbers"
msgstr "Controle op dubbele UID nummers"
#: setup/class_setupStepMigrate.inc:275
-msgid "Checking for duplicated GID numbers"
+msgid "Checking for duplicate GID numbers"
msgstr "Controle op dubbele GID nummers"
#: setup/class_setupStepMigrate.inc:343 setup/class_setupStepMigrate.inc:502
@@ -4454,7 +4454,7 @@ msgstr "LDAP query mislukt"
#: setup/class_setupStepMigrate.inc:935 setup/class_setupStepMigrate.inc:1041
#: setup/class_setupStepMigrate.inc:1071 setup/class_setupStepMigrate.inc:1322
#: setup/class_setupStepMigrate.inc:1433
-msgid "Possibly the \"root object\" is missing."
+msgid "The \"root object\" is possibly missing."
msgstr "Mogelijk ontbreekt het \"root object\"."
#: setup/class_setupStepMigrate.inc:360 setup/class_setupStepMigrate.inc:383
@@ -4531,7 +4531,7 @@ msgid "Roles"
msgstr "Rollen"
#: setup/class_setupStepMigrate.inc:836
-msgid "There is no FusionDirectory administrator account inside your LDAP."
+msgid "There is no FusionDirectory administrator account in your LDAP directory."
msgstr "Er is geen FusionDirectory administrator account in je LDAP."
#: setup/class_setupStepMigrate.inc:875
@@ -4570,12 +4570,12 @@ msgid "LDAP result parsing failed"
msgstr ""
#: setup/class_setupStepMigrate.inc:1076 setup/class_setupStepMigrate.inc:1327
-msgid "Sizelimit hit"
+msgid "Size limit hit"
msgstr ""
#: setup/class_setupStepMigrate.inc:1077 setup/class_setupStepMigrate.inc:1328
#, php-format
-msgid "Sizelimit of %d hit. Please check this manually"
+msgid "Size limit of %d hit. Please check this manually"
msgstr ""
#: setup/class_setupStepMigrate.inc:1120 setup/class_setupStepMigrate.inc:1134
@@ -4672,11 +4672,11 @@ msgstr "De configuratie is momenteel niet leesbaar of bestaat niet."
#, php-format
msgid ""
"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
"shouldn't."
msgstr ""
"Na het downloaden en plaatsen van het bestand onder %s, verifieer a.u.b. dat"
-" de gebruiker die de webserver draait de mogelijkheid heeft om %s te lezen, "
+" de gebruiker die de web server draait de mogelijkheid heeft om %s te lezen, "
"terwijl andere gebruikers dit niet kunnen."
#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
@@ -4792,7 +4792,7 @@ msgstr[0] "Er is %1 vervallen account"
msgstr[1] "Er zijn %1 vervallen accounts"
#: plugins/addons/dashboard/users_accounts.tpl.c:5
-msgid "There is no expired account"
+msgid "There are no expired accounts"
msgstr "Er zijn geen vervallen accounts"
#: plugins/addons/dashboard/users_accounts.tpl.c:11
@@ -4842,8 +4842,8 @@ msgstr[0] "Er is %1 gebruiker:"
msgstr[1] "Er zijn %1 gebruikers:"
#: plugins/addons/dashboard/pwd_stats.tpl.c:5
-msgid "One of them use %1 method"
-msgid_plural "%2 of them use %1 method"
+msgid "One of them uses the %1 method"
+msgid_plural "%2 of them use the %1 method"
msgstr[0] "%2 van hen gebruikt %1 methode"
msgstr[1] "%2 van hen gebruiken %1 methode"
@@ -4854,7 +4854,7 @@ msgstr[0] "%1 van hen is vergrendeld"
msgstr[1] "%1 van hen zijn vergrendeld"
#: plugins/addons/dashboard/pwd_stats.tpl.c:11
-msgid "None of them is locked"
+msgid "None of them are locked"
msgstr "Geen van hen zijn geblokkeerd"
#: plugins/addons/dashboard/users_stats.tpl.c:5
@@ -4862,7 +4862,7 @@ msgid "There are no users"
msgstr "Er zijn geen gebruikers"
#: plugins/addons/dashboard/users_stats.tpl.c:8
-msgid "One of them have a %1 account"
+msgid "One of them has a %1 account"
msgid_plural "%2 of them have a %1 account"
msgstr[0] "%2 van hen heeft een %1 account"
msgstr[1] "%2 van hen hebben een %1 account"
@@ -4935,7 +4935,7 @@ msgstr "FusionDirectory zal werken zonder dit op te lossen."
#: setup/setup_welcome.tpl.c:2
msgid ""
-"This seems to be the first time you start FusionDirectory - we didn't find "
+"This seems to be the first time you start FusionDirectory - we cannot find "
"any configuration right now. This simple wizard intends to help you while "
"setting it up."
msgstr ""
@@ -4983,7 +4983,7 @@ msgstr "Om verder te gaan:"
#: setup/setup_welcome.tpl.c:32
msgid ""
"For security reasons you need to authenticate for the installation by "
-"creating the file '%1', containing the current session ID on the servers "
+"creating the file '%1', containing the current session ID on the server's "
"local filesystem. This can be done by executing the following command:"
msgstr ""
"Veiligheidshalve moet je je authenticeren voor de de installatie door file "
@@ -4991,7 +4991,7 @@ msgstr ""
"van de servers. Dit kan gebeuren door de volgende instructie uit te voeren:"
#: setup/setup_welcome.tpl.c:35
-msgid "Click the 'Next' button when you've finished."
+msgid "Click the 'Next' button when you are done."
msgstr "Klik op de 'Next' knop wanneer je klaar bent."
#: setup/setup_migrate.tpl.c:2
@@ -5290,11 +5290,11 @@ msgstr "\"%1\" is vergrendeld door \"%2\" sinds %3"
#: ihtml/themes/breezy/islocked.tpl.c:11
msgid ""
"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
+"web browser during the edit operation. You may want to take over the lock by "
"pressing the \"%1\" button."
msgstr ""
"Als deze vergrendelingsdetectie fout is dan kan het zijn dat de andere "
-"persoon de webbrowser heeft gesloten tijdens de edit operatie. Je kan de "
+"persoon de web browser heeft gesloten tijdens de edit operatie. Je kan de "
"lock overnemen door de \"%1\" knop te drukken."
#: ihtml/themes/breezy/islocked.tpl.c:14
diff --git a/locale/pl/fusiondirectory.po b/locale/pl/fusiondirectory.po
index 8978cfb4584ceaa839cd15f9e1eb98821302f610..14674b7d7d306fce48d09771c199ece425a51ce0 100644
--- a/locale/pl/fusiondirectory.po
+++ b/locale/pl/fusiondirectory.po
@@ -87,7 +87,7 @@ msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:71
msgid ""
"LDAP attributes to display, comma separated. Special values \"nameAttr\" and"
-" \"mainAttr\" also works."
+" \"mainAttr\" also work."
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:75
@@ -99,7 +99,7 @@ msgid "Column title"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
-msgid "Persitent"
+msgid "Persistent"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
@@ -578,7 +578,7 @@ msgid "Send bug report to the FusionDirectory Team"
msgstr ""
#: include/php_setup.inc:235
-msgid "Send bugreport"
+msgid "Send bug report"
msgstr ""
#: include/php_setup.inc:240
@@ -633,7 +633,7 @@ msgstr ""
#: include/login/class_LoginCAS.inc:68
#, php-format
-msgid "CAS user \"%s\" could not be found in the LDAP"
+msgid "CAS user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginCAS.inc:78 include/login/class_LoginCAS.inc:104
@@ -725,7 +725,7 @@ msgstr ""
#: include/login/class_LoginHTTPHeader.inc:64
#, php-format
-msgid "Header user \"%s\" could not be found in the LDAP"
+msgid "Header user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginHTTPAuth.inc:29
@@ -769,7 +769,7 @@ msgid "The user using email \"%s\" is locked. Please contact your administrator.
msgstr ""
#: include/class_passwordRecovery.inc:352
-msgid "Contact your administrator, there was a problem with mail server"
+msgid "Contact your administrator, there was a problem with the mail server"
msgstr ""
#: include/class_passwordRecovery.inc:365
@@ -777,7 +777,7 @@ msgid "This token is invalid"
msgstr ""
#: include/class_passwordRecovery.inc:429
-msgid "There was a problem with mail server, confirmation email not sent"
+msgid "There was a problem with the mail server, confirmation email not sent"
msgstr ""
#: include/password-methods/class_passwordMethodSasl.inc:66
@@ -844,7 +844,7 @@ msgstr ""
#: include/functions.inc:354
#, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
msgstr "BÅÄ„D: Nie można poÅ‚Ä…czyć siÄ™ z serwerem LDAP. Odpowiedź serwera '%s'."
#: include/functions.inc:402 include/functions.inc:531
@@ -1159,7 +1159,7 @@ msgstr ""
#: include/class_msgPool.inc:245
#, php-format
-msgid "The entry \"%s\" already use this \"%s\" attribute!"
+msgid "The entry \"%s\" already uses this \"%s\" attribute!"
msgstr ""
#: include/class_msgPool.inc:256
@@ -1605,7 +1605,7 @@ msgstr "ÅšciÄ…gnij"
#: include/simpleplugin/attributes/class_FileAttribute.inc:380
#, php-format
-msgid "Cannot set \"%s\" value, it contains invalid data: %s"
+msgid "Cannot set value \"%s\", it contains invalid data: %s"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:390
@@ -1651,7 +1651,7 @@ msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:150
#, php-format
-msgid "The value for multivaluated field \"%s\" is not an array"
+msgid "The value for multivalued field \"%s\" is not an array"
msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:250
@@ -1712,7 +1712,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:492
#, php-format
msgid ""
-"Could not compute dn: could not find objectType infos from tab class \"%s\""
+"Could not compute dn: could not find objectType info from tab class \"%s\""
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1363
@@ -1727,7 +1727,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1576
msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may"
+"The object has changed since being opened in FusionDirectory. All changes that may"
" be done by others will get lost if you save this entry!"
msgstr ""
@@ -2432,7 +2432,7 @@ msgid "DN you wish to add assignments for"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:110
-msgid "The dn you entered could not be found in the LDAP"
+msgid "The dn you entered could not be found in LDAP"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:141
@@ -2614,7 +2614,7 @@ msgid "SASL"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
-msgid "Force to ask for password"
+msgid "Force asking for a password"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
@@ -2690,7 +2690,7 @@ msgid "Activate password recovery"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:47
-msgid "Whether to activate or not password recovery feature"
+msgid "Whether to activate the password recovery feature or not"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:52
@@ -2725,7 +2725,7 @@ msgstr ""
#: plugins/config/class_recoveryConfig.inc:74
msgid ""
-"Users will also be able to enter one of theirs alternate addresses to "
+"Users will also be able to enter one of their alternate addresses to "
"recover their password"
msgstr ""
@@ -2965,7 +2965,7 @@ msgid "Snapshot base"
msgstr ""
#: plugins/config/class_configInLdap.inc:109
-msgid "The base where snapshots should be stored inside of the LDAP."
+msgid "The base where snapshots should be stored inside the LDAP directory."
msgstr ""
#: plugins/config/class_configInLdap.inc:114
@@ -3161,7 +3161,7 @@ msgid "People DN attribute"
msgstr ""
#: plugins/config/class_configInLdap.inc:252
-msgid "Attribute to use at the beginning of users dn"
+msgid "Attribute to use at the beginning of the user's dn"
msgstr ""
#: plugins/config/class_configInLdap.inc:257
@@ -3246,7 +3246,7 @@ msgstr ""
#: plugins/config/class_configInLdap.inc:301
msgid ""
"Shows PHP errors in the upper part of the screen. This should be disabled in"
-" productive deployments, because there might be some passwords in it."
+" production deployments, because it may contain passwords."
msgstr ""
#: plugins/config/class_configInLdap.inc:305
@@ -3484,7 +3484,7 @@ msgstr ""
#: plugins/personal/roles/class_userRoles.inc:49
#: plugins/personal/roles/class_userRoles.inc:53
-msgid "Groups membership"
+msgid "Group memberships"
msgstr ""
#: plugins/personal/roles/class_userRoles.inc:60
@@ -3763,7 +3763,7 @@ msgstr "Kod pocztowy"
#: plugins/personal/generic/class_user.inc:430
#, php-format
-msgid "Ppolicy \"%s\" could not be found in the LDAP!"
+msgid "Ppolicy \"%s\" could not be found in LDAP!"
msgstr ""
#: plugins/personal/generic/class_user.inc:460
@@ -4028,7 +4028,7 @@ msgstr ""
#: setup/class_setupStepChecks.inc:124
msgid ""
-"FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
+"FusionDirectory requires either the 'mhash' or 'sha1' module to make use of "
"SSHA encryption."
msgstr ""
@@ -4216,11 +4216,11 @@ msgid "Checking for POSIX groups outside the groups tree"
msgstr ""
#: setup/class_setupStepMigrate.inc:274
-msgid "Checking for duplicated UID numbers"
+msgid "Checking for duplicate UID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:275
-msgid "Checking for duplicated GID numbers"
+msgid "Checking for duplicate GID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:343 setup/class_setupStepMigrate.inc:502
@@ -4236,7 +4236,7 @@ msgstr ""
#: setup/class_setupStepMigrate.inc:935 setup/class_setupStepMigrate.inc:1041
#: setup/class_setupStepMigrate.inc:1071 setup/class_setupStepMigrate.inc:1322
#: setup/class_setupStepMigrate.inc:1433
-msgid "Possibly the \"root object\" is missing."
+msgid "The \"root object\" is possibly missing."
msgstr ""
#: setup/class_setupStepMigrate.inc:360 setup/class_setupStepMigrate.inc:383
@@ -4307,7 +4307,7 @@ msgid "Roles"
msgstr ""
#: setup/class_setupStepMigrate.inc:836
-msgid "There is no FusionDirectory administrator account inside your LDAP."
+msgid "There is no FusionDirectory administrator account in your LDAP directory."
msgstr ""
#: setup/class_setupStepMigrate.inc:875
@@ -4346,12 +4346,12 @@ msgid "LDAP result parsing failed"
msgstr ""
#: setup/class_setupStepMigrate.inc:1076 setup/class_setupStepMigrate.inc:1327
-msgid "Sizelimit hit"
+msgid "Size limit hit"
msgstr ""
#: setup/class_setupStepMigrate.inc:1077 setup/class_setupStepMigrate.inc:1328
#, php-format
-msgid "Sizelimit of %d hit. Please check this manually"
+msgid "Size limit of %d hit. Please check this manually"
msgstr ""
#: setup/class_setupStepMigrate.inc:1120 setup/class_setupStepMigrate.inc:1134
@@ -4446,7 +4446,7 @@ msgstr ""
#, php-format
msgid ""
"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
"shouldn't."
msgstr ""
@@ -4554,7 +4554,7 @@ msgstr[2] ""
msgstr[3] ""
#: plugins/addons/dashboard/users_accounts.tpl.c:5
-msgid "There is no expired account"
+msgid "There are no expired accounts"
msgstr ""
#: plugins/addons/dashboard/users_accounts.tpl.c:11
@@ -4612,8 +4612,8 @@ msgstr[2] ""
msgstr[3] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:5
-msgid "One of them use %1 method"
-msgid_plural "%2 of them use %1 method"
+msgid "One of them uses the %1 method"
+msgid_plural "%2 of them use the %1 method"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
@@ -4628,7 +4628,7 @@ msgstr[2] ""
msgstr[3] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:11
-msgid "None of them is locked"
+msgid "None of them are locked"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:5
@@ -4636,7 +4636,7 @@ msgid "There are no users"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:8
-msgid "One of them have a %1 account"
+msgid "One of them has a %1 account"
msgid_plural "%2 of them have a %1 account"
msgstr[0] ""
msgstr[1] ""
@@ -4707,7 +4707,7 @@ msgstr ""
#: setup/setup_welcome.tpl.c:2
msgid ""
-"This seems to be the first time you start FusionDirectory - we didn't find "
+"This seems to be the first time you start FusionDirectory - we cannot find "
"any configuration right now. This simple wizard intends to help you while "
"setting it up."
msgstr ""
@@ -4751,12 +4751,12 @@ msgstr ""
#: setup/setup_welcome.tpl.c:32
msgid ""
"For security reasons you need to authenticate for the installation by "
-"creating the file '%1', containing the current session ID on the servers "
+"creating the file '%1', containing the current session ID on the server's "
"local filesystem. This can be done by executing the following command:"
msgstr ""
#: setup/setup_welcome.tpl.c:35
-msgid "Click the 'Next' button when you've finished."
+msgid "Click the 'Next' button when you are done."
msgstr ""
#: setup/setup_migrate.tpl.c:2
@@ -5021,7 +5021,7 @@ msgstr ""
#: ihtml/themes/breezy/islocked.tpl.c:11
msgid ""
"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
+"web browser during the edit operation. You may want to take over the lock by "
"pressing the \"%1\" button."
msgstr ""
diff --git a/locale/pt/fusiondirectory.po b/locale/pt/fusiondirectory.po
index 96f5b929136909f524d9ebbf0edd83543ff64f0f..84a0b8f7eb950d69df3e56e7650a7b4cdb17de85 100644
--- a/locale/pt/fusiondirectory.po
+++ b/locale/pt/fusiondirectory.po
@@ -87,7 +87,7 @@ msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:71
msgid ""
"LDAP attributes to display, comma separated. Special values \"nameAttr\" and"
-" \"mainAttr\" also works."
+" \"mainAttr\" also work."
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:75
@@ -99,7 +99,7 @@ msgid "Column title"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
-msgid "Persitent"
+msgid "Persistent"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
@@ -580,7 +580,7 @@ msgid "Send bug report to the FusionDirectory Team"
msgstr ""
#: include/php_setup.inc:235
-msgid "Send bugreport"
+msgid "Send bug report"
msgstr ""
#: include/php_setup.inc:240
@@ -635,7 +635,7 @@ msgstr ""
#: include/login/class_LoginCAS.inc:68
#, php-format
-msgid "CAS user \"%s\" could not be found in the LDAP"
+msgid "CAS user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginCAS.inc:78 include/login/class_LoginCAS.inc:104
@@ -727,7 +727,7 @@ msgstr ""
#: include/login/class_LoginHTTPHeader.inc:64
#, php-format
-msgid "Header user \"%s\" could not be found in the LDAP"
+msgid "Header user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginHTTPAuth.inc:29
@@ -771,7 +771,7 @@ msgid "The user using email \"%s\" is locked. Please contact your administrator.
msgstr ""
#: include/class_passwordRecovery.inc:352
-msgid "Contact your administrator, there was a problem with mail server"
+msgid "Contact your administrator, there was a problem with the mail server"
msgstr ""
#: include/class_passwordRecovery.inc:365
@@ -779,7 +779,7 @@ msgid "This token is invalid"
msgstr ""
#: include/class_passwordRecovery.inc:429
-msgid "There was a problem with mail server, confirmation email not sent"
+msgid "There was a problem with the mail server, confirmation email not sent"
msgstr ""
#: include/password-methods/class_passwordMethodSasl.inc:66
@@ -844,7 +844,7 @@ msgstr ""
#: include/functions.inc:354
#, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
msgstr ""
#: include/functions.inc:402 include/functions.inc:531
@@ -1159,7 +1159,7 @@ msgstr ""
#: include/class_msgPool.inc:245
#, php-format
-msgid "The entry \"%s\" already use this \"%s\" attribute!"
+msgid "The entry \"%s\" already uses this \"%s\" attribute!"
msgstr ""
#: include/class_msgPool.inc:256
@@ -1605,7 +1605,7 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:380
#, php-format
-msgid "Cannot set \"%s\" value, it contains invalid data: %s"
+msgid "Cannot set value \"%s\", it contains invalid data: %s"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:390
@@ -1651,7 +1651,7 @@ msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:150
#, php-format
-msgid "The value for multivaluated field \"%s\" is not an array"
+msgid "The value for multivalued field \"%s\" is not an array"
msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:250
@@ -1712,7 +1712,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:492
#, php-format
msgid ""
-"Could not compute dn: could not find objectType infos from tab class \"%s\""
+"Could not compute dn: could not find objectType info from tab class \"%s\""
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1363
@@ -1727,7 +1727,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1576
msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may"
+"The object has changed since being opened in FusionDirectory. All changes that may"
" be done by others will get lost if you save this entry!"
msgstr ""
@@ -2433,7 +2433,7 @@ msgid "DN you wish to add assignments for"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:110
-msgid "The dn you entered could not be found in the LDAP"
+msgid "The dn you entered could not be found in LDAP"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:141
@@ -2615,7 +2615,7 @@ msgid "SASL"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
-msgid "Force to ask for password"
+msgid "Force asking for a password"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
@@ -2691,7 +2691,7 @@ msgid "Activate password recovery"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:47
-msgid "Whether to activate or not password recovery feature"
+msgid "Whether to activate the password recovery feature or not"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:52
@@ -2726,7 +2726,7 @@ msgstr ""
#: plugins/config/class_recoveryConfig.inc:74
msgid ""
-"Users will also be able to enter one of theirs alternate addresses to "
+"Users will also be able to enter one of their alternate addresses to "
"recover their password"
msgstr ""
@@ -2966,7 +2966,7 @@ msgid "Snapshot base"
msgstr ""
#: plugins/config/class_configInLdap.inc:109
-msgid "The base where snapshots should be stored inside of the LDAP."
+msgid "The base where snapshots should be stored inside the LDAP directory."
msgstr ""
#: plugins/config/class_configInLdap.inc:114
@@ -3162,7 +3162,7 @@ msgid "People DN attribute"
msgstr ""
#: plugins/config/class_configInLdap.inc:252
-msgid "Attribute to use at the beginning of users dn"
+msgid "Attribute to use at the beginning of the user's dn"
msgstr ""
#: plugins/config/class_configInLdap.inc:257
@@ -3247,7 +3247,7 @@ msgstr ""
#: plugins/config/class_configInLdap.inc:301
msgid ""
"Shows PHP errors in the upper part of the screen. This should be disabled in"
-" productive deployments, because there might be some passwords in it."
+" production deployments, because it may contain passwords."
msgstr ""
#: plugins/config/class_configInLdap.inc:305
@@ -3485,7 +3485,7 @@ msgstr ""
#: plugins/personal/roles/class_userRoles.inc:49
#: plugins/personal/roles/class_userRoles.inc:53
-msgid "Groups membership"
+msgid "Group memberships"
msgstr ""
#: plugins/personal/roles/class_userRoles.inc:60
@@ -3764,7 +3764,7 @@ msgstr "CEP"
#: plugins/personal/generic/class_user.inc:430
#, php-format
-msgid "Ppolicy \"%s\" could not be found in the LDAP!"
+msgid "Ppolicy \"%s\" could not be found in LDAP!"
msgstr ""
#: plugins/personal/generic/class_user.inc:460
@@ -4029,7 +4029,7 @@ msgstr ""
#: setup/class_setupStepChecks.inc:124
msgid ""
-"FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
+"FusionDirectory requires either the 'mhash' or 'sha1' module to make use of "
"SSHA encryption."
msgstr ""
@@ -4217,11 +4217,11 @@ msgid "Checking for POSIX groups outside the groups tree"
msgstr ""
#: setup/class_setupStepMigrate.inc:274
-msgid "Checking for duplicated UID numbers"
+msgid "Checking for duplicate UID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:275
-msgid "Checking for duplicated GID numbers"
+msgid "Checking for duplicate GID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:343 setup/class_setupStepMigrate.inc:502
@@ -4237,7 +4237,7 @@ msgstr ""
#: setup/class_setupStepMigrate.inc:935 setup/class_setupStepMigrate.inc:1041
#: setup/class_setupStepMigrate.inc:1071 setup/class_setupStepMigrate.inc:1322
#: setup/class_setupStepMigrate.inc:1433
-msgid "Possibly the \"root object\" is missing."
+msgid "The \"root object\" is possibly missing."
msgstr ""
#: setup/class_setupStepMigrate.inc:360 setup/class_setupStepMigrate.inc:383
@@ -4308,7 +4308,7 @@ msgid "Roles"
msgstr ""
#: setup/class_setupStepMigrate.inc:836
-msgid "There is no FusionDirectory administrator account inside your LDAP."
+msgid "There is no FusionDirectory administrator account in your LDAP directory."
msgstr ""
#: setup/class_setupStepMigrate.inc:875
@@ -4347,12 +4347,12 @@ msgid "LDAP result parsing failed"
msgstr ""
#: setup/class_setupStepMigrate.inc:1076 setup/class_setupStepMigrate.inc:1327
-msgid "Sizelimit hit"
+msgid "Size limit hit"
msgstr ""
#: setup/class_setupStepMigrate.inc:1077 setup/class_setupStepMigrate.inc:1328
#, php-format
-msgid "Sizelimit of %d hit. Please check this manually"
+msgid "Size limit of %d hit. Please check this manually"
msgstr ""
#: setup/class_setupStepMigrate.inc:1120 setup/class_setupStepMigrate.inc:1134
@@ -4447,7 +4447,7 @@ msgstr ""
#, php-format
msgid ""
"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
"shouldn't."
msgstr ""
@@ -4553,7 +4553,7 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/users_accounts.tpl.c:5
-msgid "There is no expired account"
+msgid "There are no expired accounts"
msgstr ""
#: plugins/addons/dashboard/users_accounts.tpl.c:11
@@ -4603,8 +4603,8 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:5
-msgid "One of them use %1 method"
-msgid_plural "%2 of them use %1 method"
+msgid "One of them uses the %1 method"
+msgid_plural "%2 of them use the %1 method"
msgstr[0] ""
msgstr[1] ""
@@ -4615,7 +4615,7 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:11
-msgid "None of them is locked"
+msgid "None of them are locked"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:5
@@ -4623,7 +4623,7 @@ msgid "There are no users"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:8
-msgid "One of them have a %1 account"
+msgid "One of them has a %1 account"
msgid_plural "%2 of them have a %1 account"
msgstr[0] ""
msgstr[1] ""
@@ -4692,7 +4692,7 @@ msgstr ""
#: setup/setup_welcome.tpl.c:2
msgid ""
-"This seems to be the first time you start FusionDirectory - we didn't find "
+"This seems to be the first time you start FusionDirectory - we cannot find "
"any configuration right now. This simple wizard intends to help you while "
"setting it up."
msgstr ""
@@ -4736,12 +4736,12 @@ msgstr ""
#: setup/setup_welcome.tpl.c:32
msgid ""
"For security reasons you need to authenticate for the installation by "
-"creating the file '%1', containing the current session ID on the servers "
+"creating the file '%1', containing the current session ID on the server's "
"local filesystem. This can be done by executing the following command:"
msgstr ""
#: setup/setup_welcome.tpl.c:35
-msgid "Click the 'Next' button when you've finished."
+msgid "Click the 'Next' button when you are done."
msgstr ""
#: setup/setup_migrate.tpl.c:2
@@ -5006,7 +5006,7 @@ msgstr ""
#: ihtml/themes/breezy/islocked.tpl.c:11
msgid ""
"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
+"web browser during the edit operation. You may want to take over the lock by "
"pressing the \"%1\" button."
msgstr ""
diff --git a/locale/pt_BR/fusiondirectory.po b/locale/pt_BR/fusiondirectory.po
index 51741ae28c2b385c7efeee9b1cb7b135d89fd253..6f999cc7edb11cc1068d5df01cdde24224d02003 100644
--- a/locale/pt_BR/fusiondirectory.po
+++ b/locale/pt_BR/fusiondirectory.po
@@ -87,7 +87,7 @@ msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:71
msgid ""
"LDAP attributes to display, comma separated. Special values \"nameAttr\" and"
-" \"mainAttr\" also works."
+" \"mainAttr\" also work."
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:75
@@ -99,7 +99,7 @@ msgid "Column title"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
-msgid "Persitent"
+msgid "Persistent"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
@@ -578,7 +578,7 @@ msgid "Send bug report to the FusionDirectory Team"
msgstr ""
#: include/php_setup.inc:235
-msgid "Send bugreport"
+msgid "Send bug report"
msgstr ""
#: include/php_setup.inc:240
@@ -633,7 +633,7 @@ msgstr ""
#: include/login/class_LoginCAS.inc:68
#, php-format
-msgid "CAS user \"%s\" could not be found in the LDAP"
+msgid "CAS user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginCAS.inc:78 include/login/class_LoginCAS.inc:104
@@ -725,7 +725,7 @@ msgstr ""
#: include/login/class_LoginHTTPHeader.inc:64
#, php-format
-msgid "Header user \"%s\" could not be found in the LDAP"
+msgid "Header user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginHTTPAuth.inc:29
@@ -769,7 +769,7 @@ msgid "The user using email \"%s\" is locked. Please contact your administrator.
msgstr ""
#: include/class_passwordRecovery.inc:352
-msgid "Contact your administrator, there was a problem with mail server"
+msgid "Contact your administrator, there was a problem with the mail server"
msgstr ""
"Entre em contato com o administrador, houve um problema com o servidor de "
"e-mail."
@@ -779,7 +779,7 @@ msgid "This token is invalid"
msgstr ""
#: include/class_passwordRecovery.inc:429
-msgid "There was a problem with mail server, confirmation email not sent"
+msgid "There was a problem with the mail server, confirmation email not sent"
msgstr ""
#: include/password-methods/class_passwordMethodSasl.inc:66
@@ -845,7 +845,7 @@ msgstr ""
#: include/functions.inc:354
#, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
msgstr ""
#: include/functions.inc:402 include/functions.inc:531
@@ -1164,7 +1164,7 @@ msgstr ""
#: include/class_msgPool.inc:245
#, php-format
-msgid "The entry \"%s\" already use this \"%s\" attribute!"
+msgid "The entry \"%s\" already uses this \"%s\" attribute!"
msgstr ""
#: include/class_msgPool.inc:256
@@ -1610,7 +1610,7 @@ msgstr "Download"
#: include/simpleplugin/attributes/class_FileAttribute.inc:380
#, php-format
-msgid "Cannot set \"%s\" value, it contains invalid data: %s"
+msgid "Cannot set value \"%s\", it contains invalid data: %s"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:390
@@ -1656,7 +1656,7 @@ msgstr "Um float menor que %f"
#: include/simpleplugin/attributes/class_SetAttribute.inc:150
#, php-format
-msgid "The value for multivaluated field \"%s\" is not an array"
+msgid "The value for multivalued field \"%s\" is not an array"
msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:250
@@ -1717,7 +1717,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:492
#, php-format
msgid ""
-"Could not compute dn: could not find objectType infos from tab class \"%s\""
+"Could not compute dn: could not find objectType info from tab class \"%s\""
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1363
@@ -1732,7 +1732,7 @@ msgstr "A entrada %s não é existente"
#: include/simpleplugin/class_simplePlugin.inc:1576
msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may"
+"The object has changed since being opened in FusionDirectory. All changes that may"
" be done by others will get lost if you save this entry!"
msgstr ""
@@ -2437,7 +2437,7 @@ msgid "DN you wish to add assignments for"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:110
-msgid "The dn you entered could not be found in the LDAP"
+msgid "The dn you entered could not be found in LDAP"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:141
@@ -2619,7 +2619,7 @@ msgid "SASL"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
-msgid "Force to ask for password"
+msgid "Force asking for a password"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
@@ -2695,7 +2695,7 @@ msgid "Activate password recovery"
msgstr "Ativar recuperador de senha"
#: plugins/config/class_recoveryConfig.inc:47
-msgid "Whether to activate or not password recovery feature"
+msgid "Whether to activate the password recovery feature or not"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:52
@@ -2732,7 +2732,7 @@ msgstr "Permitir o uso de endereços alternativos"
#: plugins/config/class_recoveryConfig.inc:74
msgid ""
-"Users will also be able to enter one of theirs alternate addresses to "
+"Users will also be able to enter one of their alternate addresses to "
"recover their password"
msgstr ""
"Os usuário também serão capazes de entrar no endereço alternativo para "
@@ -2984,7 +2984,7 @@ msgid "Snapshot base"
msgstr "Base de snapshots"
#: plugins/config/class_configInLdap.inc:109
-msgid "The base where snapshots should be stored inside of the LDAP."
+msgid "The base where snapshots should be stored inside the LDAP directory."
msgstr "A base onde os snapshots devem ser armazenados dentro do LDAP."
#: plugins/config/class_configInLdap.inc:114
@@ -3180,7 +3180,7 @@ msgid "People DN attribute"
msgstr ""
#: plugins/config/class_configInLdap.inc:252
-msgid "Attribute to use at the beginning of users dn"
+msgid "Attribute to use at the beginning of the user's dn"
msgstr ""
#: plugins/config/class_configInLdap.inc:257
@@ -3265,7 +3265,7 @@ msgstr ""
#: plugins/config/class_configInLdap.inc:301
msgid ""
"Shows PHP errors in the upper part of the screen. This should be disabled in"
-" productive deployments, because there might be some passwords in it."
+" production deployments, because it may contain passwords."
msgstr ""
#: plugins/config/class_configInLdap.inc:305
@@ -3503,7 +3503,7 @@ msgstr ""
#: plugins/personal/roles/class_userRoles.inc:49
#: plugins/personal/roles/class_userRoles.inc:53
-msgid "Groups membership"
+msgid "Group memberships"
msgstr ""
#: plugins/personal/roles/class_userRoles.inc:60
@@ -3782,7 +3782,7 @@ msgstr "Código postal"
#: plugins/personal/generic/class_user.inc:430
#, php-format
-msgid "Ppolicy \"%s\" could not be found in the LDAP!"
+msgid "Ppolicy \"%s\" could not be found in LDAP!"
msgstr ""
#: plugins/personal/generic/class_user.inc:460
@@ -4054,7 +4054,7 @@ msgstr "FusionDirectory requer este módulo para integação com o samba."
#: setup/class_setupStepChecks.inc:124
msgid ""
-"FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
+"FusionDirectory requires either the 'mhash' or 'sha1' module to make use of "
"SSHA encryption."
msgstr ""
"FusionDirectory necessita tanto do módulo 'mhash' quanto do módulo 'sha1' "
@@ -4264,11 +4264,11 @@ msgid "Checking for POSIX groups outside the groups tree"
msgstr ""
#: setup/class_setupStepMigrate.inc:274
-msgid "Checking for duplicated UID numbers"
+msgid "Checking for duplicate UID numbers"
msgstr "Checando por números de UID duplicados"
#: setup/class_setupStepMigrate.inc:275
-msgid "Checking for duplicated GID numbers"
+msgid "Checking for duplicate GID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:343 setup/class_setupStepMigrate.inc:502
@@ -4284,7 +4284,7 @@ msgstr "Consulta em LDAP falhou"
#: setup/class_setupStepMigrate.inc:935 setup/class_setupStepMigrate.inc:1041
#: setup/class_setupStepMigrate.inc:1071 setup/class_setupStepMigrate.inc:1322
#: setup/class_setupStepMigrate.inc:1433
-msgid "Possibly the \"root object\" is missing."
+msgid "The \"root object\" is possibly missing."
msgstr ""
#: setup/class_setupStepMigrate.inc:360 setup/class_setupStepMigrate.inc:383
@@ -4355,7 +4355,7 @@ msgid "Roles"
msgstr "Atribuições"
#: setup/class_setupStepMigrate.inc:836
-msgid "There is no FusionDirectory administrator account inside your LDAP."
+msgid "There is no FusionDirectory administrator account in your LDAP directory."
msgstr "Não existe uma conta de administrador do FusioDirectory no seu LDAP."
#: setup/class_setupStepMigrate.inc:875
@@ -4394,12 +4394,12 @@ msgid "LDAP result parsing failed"
msgstr ""
#: setup/class_setupStepMigrate.inc:1076 setup/class_setupStepMigrate.inc:1327
-msgid "Sizelimit hit"
+msgid "Size limit hit"
msgstr ""
#: setup/class_setupStepMigrate.inc:1077 setup/class_setupStepMigrate.inc:1328
#, php-format
-msgid "Sizelimit of %d hit. Please check this manually"
+msgid "Size limit of %d hit. Please check this manually"
msgstr ""
#: setup/class_setupStepMigrate.inc:1120 setup/class_setupStepMigrate.inc:1134
@@ -4494,7 +4494,7 @@ msgstr ""
#, php-format
msgid ""
"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
"shouldn't."
msgstr ""
@@ -4604,7 +4604,7 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/users_accounts.tpl.c:5
-msgid "There is no expired account"
+msgid "There are no expired accounts"
msgstr "Não há contas expiradas"
#: plugins/addons/dashboard/users_accounts.tpl.c:11
@@ -4654,8 +4654,8 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:5
-msgid "One of them use %1 method"
-msgid_plural "%2 of them use %1 method"
+msgid "One of them uses the %1 method"
+msgid_plural "%2 of them use the %1 method"
msgstr[0] ""
msgstr[1] ""
@@ -4666,7 +4666,7 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:11
-msgid "None of them is locked"
+msgid "None of them are locked"
msgstr "Nenhum deles está travado"
#: plugins/addons/dashboard/users_stats.tpl.c:5
@@ -4674,7 +4674,7 @@ msgid "There are no users"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:8
-msgid "One of them have a %1 account"
+msgid "One of them has a %1 account"
msgid_plural "%2 of them have a %1 account"
msgstr[0] ""
msgstr[1] ""
@@ -4743,7 +4743,7 @@ msgstr "O FusionDirectory irá rodar sem a correção disto."
#: setup/setup_welcome.tpl.c:2
msgid ""
-"This seems to be the first time you start FusionDirectory - we didn't find "
+"This seems to be the first time you start FusionDirectory - we cannot find "
"any configuration right now. This simple wizard intends to help you while "
"setting it up."
msgstr ""
@@ -4787,12 +4787,12 @@ msgstr ""
#: setup/setup_welcome.tpl.c:32
msgid ""
"For security reasons you need to authenticate for the installation by "
-"creating the file '%1', containing the current session ID on the servers "
+"creating the file '%1', containing the current session ID on the server's "
"local filesystem. This can be done by executing the following command:"
msgstr ""
#: setup/setup_welcome.tpl.c:35
-msgid "Click the 'Next' button when you've finished."
+msgid "Click the 'Next' button when you are done."
msgstr "Clique no botão 'Próximo' quando tiver terminado."
#: setup/setup_migrate.tpl.c:2
@@ -5065,7 +5065,7 @@ msgstr ""
#: ihtml/themes/breezy/islocked.tpl.c:11
msgid ""
"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
+"web browser during the edit operation. You may want to take over the lock by "
"pressing the \"%1\" button."
msgstr ""
diff --git a/locale/ru/fusiondirectory.po b/locale/ru/fusiondirectory.po
index e874223dca4f0a1528f905b3560e6028b8a8da03..13502762f1734dc96a74d3c8c8394d0a96783491 100644
--- a/locale/ru/fusiondirectory.po
+++ b/locale/ru/fusiondirectory.po
@@ -87,7 +87,7 @@ msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:71
msgid ""
"LDAP attributes to display, comma separated. Special values \"nameAttr\" and"
-" \"mainAttr\" also works."
+" \"mainAttr\" also work."
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:75
@@ -99,7 +99,7 @@ msgid "Column title"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
-msgid "Persitent"
+msgid "Persistent"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
@@ -581,7 +581,7 @@ msgid "Send bug report to the FusionDirectory Team"
msgstr "ПоÑлать отчет об ошибке команде FusionDirectory"
#: include/php_setup.inc:235
-msgid "Send bugreport"
+msgid "Send bug report"
msgstr "Отправить отчет об ошибке"
#: include/php_setup.inc:240
@@ -636,7 +636,7 @@ msgstr "CAS"
#: include/login/class_LoginCAS.inc:68
#, php-format
-msgid "CAS user \"%s\" could not be found in the LDAP"
+msgid "CAS user \"%s\" could not be found in LDAP"
msgstr "CAS пользователь \"%s\" не может быть найден в LDAP"
#: include/login/class_LoginCAS.inc:78 include/login/class_LoginCAS.inc:104
@@ -730,7 +730,7 @@ msgstr ""
#: include/login/class_LoginHTTPHeader.inc:64
#, php-format
-msgid "Header user \"%s\" could not be found in the LDAP"
+msgid "Header user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginHTTPAuth.inc:29
@@ -774,7 +774,7 @@ msgid "The user using email \"%s\" is locked. Please contact your administrator.
msgstr ""
#: include/class_passwordRecovery.inc:352
-msgid "Contact your administrator, there was a problem with mail server"
+msgid "Contact your administrator, there was a problem with the mail server"
msgstr ""
"СвÑжитеÑÑŒ Ñ Ð²Ð°ÑˆÐ¸Ð¼ ÑиÑтемным админиÑтратором, были проблемы Ñ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ð¼ "
"Ñервером"
@@ -784,7 +784,7 @@ msgid "This token is invalid"
msgstr ""
#: include/class_passwordRecovery.inc:429
-msgid "There was a problem with mail server, confirmation email not sent"
+msgid "There was a problem with the mail server, confirmation email not sent"
msgstr "Были проблемы Ñ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ð¼ Ñервером, имÑйл Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ð½Ðµ отправлены"
#: include/password-methods/class_passwordMethodSasl.inc:66
@@ -853,7 +853,7 @@ msgstr ""
#: include/functions.inc:354
#, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
msgstr "FATAL: Ошибка при подключении к LDAP. Сервер Ñообщил '%s'."
#: include/functions.inc:402 include/functions.inc:531
@@ -1177,7 +1177,7 @@ msgstr ""
#: include/class_msgPool.inc:245
#, php-format
-msgid "The entry \"%s\" already use this \"%s\" attribute!"
+msgid "The entry \"%s\" already uses this \"%s\" attribute!"
msgstr ""
#: include/class_msgPool.inc:256
@@ -1631,7 +1631,7 @@ msgstr "Скачать"
#: include/simpleplugin/attributes/class_FileAttribute.inc:380
#, php-format
-msgid "Cannot set \"%s\" value, it contains invalid data: %s"
+msgid "Cannot set value \"%s\", it contains invalid data: %s"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:390
@@ -1677,7 +1677,7 @@ msgstr "ВещеÑтвенное чиÑло меньше %f"
#: include/simpleplugin/attributes/class_SetAttribute.inc:150
#, php-format
-msgid "The value for multivaluated field \"%s\" is not an array"
+msgid "The value for multivalued field \"%s\" is not an array"
msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:250
@@ -1738,7 +1738,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:492
#, php-format
msgid ""
-"Could not compute dn: could not find objectType infos from tab class \"%s\""
+"Could not compute dn: could not find objectType info from tab class \"%s\""
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1363
@@ -1753,7 +1753,7 @@ msgstr "ЗапиÑÑŒ %s не ÑущеÑтвует"
#: include/simpleplugin/class_simplePlugin.inc:1576
msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may"
+"The object has changed since being opened in FusionDirectory. All changes that may"
" be done by others will get lost if you save this entry!"
msgstr ""
@@ -2464,7 +2464,7 @@ msgid "DN you wish to add assignments for"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:110
-msgid "The dn you entered could not be found in the LDAP"
+msgid "The dn you entered could not be found in LDAP"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:141
@@ -2648,7 +2648,7 @@ msgid "SASL"
msgstr "SASL"
#: plugins/config/class_mainPluginsConfig.inc:54
-msgid "Force to ask for password"
+msgid "Force asking for a password"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
@@ -2725,7 +2725,7 @@ msgid "Activate password recovery"
msgstr "Включить воÑÑтановление паролÑ"
#: plugins/config/class_recoveryConfig.inc:47
-msgid "Whether to activate or not password recovery feature"
+msgid "Whether to activate the password recovery feature or not"
msgstr "Включить или нет функцию воÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ"
#: plugins/config/class_recoveryConfig.inc:52
@@ -2763,7 +2763,7 @@ msgstr "Разрешить иÑользование альтернативных
#: plugins/config/class_recoveryConfig.inc:74
msgid ""
-"Users will also be able to enter one of theirs alternate addresses to "
+"Users will also be able to enter one of their alternate addresses to "
"recover their password"
msgstr ""
"ПользователÑм также нужно ввеÑти один из их дополнительных адреÑов Ð´Ð»Ñ "
@@ -3021,7 +3021,7 @@ msgid "Snapshot base"
msgstr "Ð‘Ð°Ð·Ð¾Ð²Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ Ñнапшотов"
#: plugins/config/class_configInLdap.inc:109
-msgid "The base where snapshots should be stored inside of the LDAP."
+msgid "The base where snapshots should be stored inside the LDAP directory."
msgstr "Ð‘Ð°Ð·Ð¾Ð²Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ, где Ñнапшоты должны будут хранитьÑÑ Ð²Ð½ÑƒÑ‚Ñ€Ð¸ LDAP."
#: plugins/config/class_configInLdap.inc:114
@@ -3223,7 +3223,7 @@ msgid "People DN attribute"
msgstr "DN атрибут пользователÑ"
#: plugins/config/class_configInLdap.inc:252
-msgid "Attribute to use at the beginning of users dn"
+msgid "Attribute to use at the beginning of the user's dn"
msgstr "Ðтрибут иÑпользуемый у пользователей в начале dn"
#: plugins/config/class_configInLdap.inc:257
@@ -3308,7 +3308,7 @@ msgstr "Отображение ошибок"
#: plugins/config/class_configInLdap.inc:301
msgid ""
"Shows PHP errors in the upper part of the screen. This should be disabled in"
-" productive deployments, because there might be some passwords in it."
+" production deployments, because it may contain passwords."
msgstr ""
"Показывать PHP ошибки в верхней чаÑти Ñкрана. Следует отключить при рабочем "
"иÑпользовании, потому что там могут быть отображены пароли."
@@ -3553,7 +3553,7 @@ msgstr ""
#: plugins/personal/roles/class_userRoles.inc:49
#: plugins/personal/roles/class_userRoles.inc:53
-msgid "Groups membership"
+msgid "Group memberships"
msgstr "Принадлежит группам"
#: plugins/personal/roles/class_userRoles.inc:60
@@ -3832,7 +3832,7 @@ msgstr "Почтовый индекÑ"
#: plugins/personal/generic/class_user.inc:430
#, php-format
-msgid "Ppolicy \"%s\" could not be found in the LDAP!"
+msgid "Ppolicy \"%s\" could not be found in LDAP!"
msgstr ""
#: plugins/personal/generic/class_user.inc:460
@@ -4101,7 +4101,7 @@ msgstr "FusionDirectory требуетÑÑ Ð¼Ð¾Ð´ÑƒÐ»ÑŒ Ð´Ð»Ñ Ð¸Ð½Ñ‚ÐµÐ³Ñ€Ð°Ñ†
#: setup/class_setupStepChecks.inc:124
msgid ""
-"FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
+"FusionDirectory requires either the 'mhash' or 'sha1' module to make use of "
"SSHA encryption."
msgstr ""
"FusionDirectory требуетÑÑ Ð¾Ð´Ð¸Ð½ из модулей 'mhash или 'sha1', чтобы "
@@ -4310,11 +4310,11 @@ msgid "Checking for POSIX groups outside the groups tree"
msgstr ""
#: setup/class_setupStepMigrate.inc:274
-msgid "Checking for duplicated UID numbers"
+msgid "Checking for duplicate UID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:275
-msgid "Checking for duplicated GID numbers"
+msgid "Checking for duplicate GID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:343 setup/class_setupStepMigrate.inc:502
@@ -4330,7 +4330,7 @@ msgstr "LDAP Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ðµ удалÑÑ"
#: setup/class_setupStepMigrate.inc:935 setup/class_setupStepMigrate.inc:1041
#: setup/class_setupStepMigrate.inc:1071 setup/class_setupStepMigrate.inc:1322
#: setup/class_setupStepMigrate.inc:1433
-msgid "Possibly the \"root object\" is missing."
+msgid "The \"root object\" is possibly missing."
msgstr ""
#: setup/class_setupStepMigrate.inc:360 setup/class_setupStepMigrate.inc:383
@@ -4401,7 +4401,7 @@ msgid "Roles"
msgstr "Роли"
#: setup/class_setupStepMigrate.inc:836
-msgid "There is no FusionDirectory administrator account inside your LDAP."
+msgid "There is no FusionDirectory administrator account in your LDAP directory."
msgstr "Ðет учетной запиÑи админиÑтратора FusionDirectory в вашем LDAP."
#: setup/class_setupStepMigrate.inc:875
@@ -4440,12 +4440,12 @@ msgid "LDAP result parsing failed"
msgstr ""
#: setup/class_setupStepMigrate.inc:1076 setup/class_setupStepMigrate.inc:1327
-msgid "Sizelimit hit"
+msgid "Size limit hit"
msgstr ""
#: setup/class_setupStepMigrate.inc:1077 setup/class_setupStepMigrate.inc:1328
#, php-format
-msgid "Sizelimit of %d hit. Please check this manually"
+msgid "Size limit of %d hit. Please check this manually"
msgstr ""
#: setup/class_setupStepMigrate.inc:1120 setup/class_setupStepMigrate.inc:1134
@@ -4542,7 +4542,7 @@ msgstr "Конфигурационный файл не читаетÑÑ Ð¸Ð»Ð¸
#, php-format
msgid ""
"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
"shouldn't."
msgstr ""
"ПоÑле ÑÐºÐ°Ñ‡Ð¸Ð²Ð°Ð½Ð¸Ñ Ð¸ Ñ€Ð°Ð·Ð¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð° в %s, убедитеÑÑŒ что пользователь из под "
@@ -4661,7 +4661,7 @@ msgstr[2] ""
msgstr[3] ""
#: plugins/addons/dashboard/users_accounts.tpl.c:5
-msgid "There is no expired account"
+msgid "There are no expired accounts"
msgstr "Ðет учетных запиÑей Ñ Ð¸Ñтекшим Ñроком дейÑтвиÑ"
#: plugins/addons/dashboard/users_accounts.tpl.c:11
@@ -4719,8 +4719,8 @@ msgstr[2] ""
msgstr[3] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:5
-msgid "One of them use %1 method"
-msgid_plural "%2 of them use %1 method"
+msgid "One of them uses the %1 method"
+msgid_plural "%2 of them use the %1 method"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
@@ -4735,7 +4735,7 @@ msgstr[2] ""
msgstr[3] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:11
-msgid "None of them is locked"
+msgid "None of them are locked"
msgstr "Ðи один из них не заблокирован"
#: plugins/addons/dashboard/users_stats.tpl.c:5
@@ -4743,7 +4743,7 @@ msgid "There are no users"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:8
-msgid "One of them have a %1 account"
+msgid "One of them has a %1 account"
msgid_plural "%2 of them have a %1 account"
msgstr[0] ""
msgstr[1] ""
@@ -4817,7 +4817,7 @@ msgstr "FusionDirectory Ñможет продолжить работу без и
#: setup/setup_welcome.tpl.c:2
msgid ""
-"This seems to be the first time you start FusionDirectory - we didn't find "
+"This seems to be the first time you start FusionDirectory - we cannot find "
"any configuration right now. This simple wizard intends to help you while "
"setting it up."
msgstr ""
@@ -4865,7 +4865,7 @@ msgstr "Ð”Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ:"
#: setup/setup_welcome.tpl.c:32
msgid ""
"For security reasons you need to authenticate for the installation by "
-"creating the file '%1', containing the current session ID on the servers "
+"creating the file '%1', containing the current session ID on the server's "
"local filesystem. This can be done by executing the following command:"
msgstr ""
"Ð”Ð»Ñ Ð¾Ð±ÐµÑÐ¿ÐµÑ‡ÐµÐ½Ð¸Ñ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑноÑти уÑтановки вам нужно подтвердить подлинноÑÑ‚ÑŒ, "
@@ -4873,7 +4873,7 @@ msgstr ""
"Ñледующую команду: "
#: setup/setup_welcome.tpl.c:35
-msgid "Click the 'Next' button when you've finished."
+msgid "Click the 'Next' button when you are done."
msgstr "По завершении нажмите кнопку \"Далее\""
#: setup/setup_migrate.tpl.c:2
@@ -5155,7 +5155,7 @@ msgstr ""
#: ihtml/themes/breezy/islocked.tpl.c:11
msgid ""
"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
+"web browser during the edit operation. You may want to take over the lock by "
"pressing the \"%1\" button."
msgstr ""
diff --git a/locale/ru@petr1708/fusiondirectory.po b/locale/ru@petr1708/fusiondirectory.po
index c931949bb461fe187dc0207567d7467a5bc44c3b..688647fbb5ec3266ba772710fdf4c6d78917928c 100644
--- a/locale/ru@petr1708/fusiondirectory.po
+++ b/locale/ru@petr1708/fusiondirectory.po
@@ -83,7 +83,7 @@ msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:71
msgid ""
"LDAP attributes to display, comma separated. Special values \"nameAttr\" and"
-" \"mainAttr\" also works."
+" \"mainAttr\" also work."
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:75
@@ -95,7 +95,7 @@ msgid "Column title"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
-msgid "Persitent"
+msgid "Persistent"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
@@ -574,7 +574,7 @@ msgid "Send bug report to the FusionDirectory Team"
msgstr ""
#: include/php_setup.inc:235
-msgid "Send bugreport"
+msgid "Send bug report"
msgstr ""
#: include/php_setup.inc:240
@@ -629,7 +629,7 @@ msgstr ""
#: include/login/class_LoginCAS.inc:68
#, php-format
-msgid "CAS user \"%s\" could not be found in the LDAP"
+msgid "CAS user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginCAS.inc:78 include/login/class_LoginCAS.inc:104
@@ -719,7 +719,7 @@ msgstr ""
#: include/login/class_LoginHTTPHeader.inc:64
#, php-format
-msgid "Header user \"%s\" could not be found in the LDAP"
+msgid "Header user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginHTTPAuth.inc:29
@@ -763,7 +763,7 @@ msgid "The user using email \"%s\" is locked. Please contact your administrator.
msgstr ""
#: include/class_passwordRecovery.inc:352
-msgid "Contact your administrator, there was a problem with mail server"
+msgid "Contact your administrator, there was a problem with the mail server"
msgstr ""
#: include/class_passwordRecovery.inc:365
@@ -771,7 +771,7 @@ msgid "This token is invalid"
msgstr ""
#: include/class_passwordRecovery.inc:429
-msgid "There was a problem with mail server, confirmation email not sent"
+msgid "There was a problem with the mail server, confirmation email not sent"
msgstr ""
#: include/password-methods/class_passwordMethodSasl.inc:66
@@ -836,7 +836,7 @@ msgstr ""
#: include/functions.inc:354
#, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
msgstr ""
#: include/functions.inc:402 include/functions.inc:531
@@ -1151,7 +1151,7 @@ msgstr ""
#: include/class_msgPool.inc:245
#, php-format
-msgid "The entry \"%s\" already use this \"%s\" attribute!"
+msgid "The entry \"%s\" already uses this \"%s\" attribute!"
msgstr ""
#: include/class_msgPool.inc:256
@@ -1597,7 +1597,7 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:380
#, php-format
-msgid "Cannot set \"%s\" value, it contains invalid data: %s"
+msgid "Cannot set value \"%s\", it contains invalid data: %s"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:390
@@ -1643,7 +1643,7 @@ msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:150
#, php-format
-msgid "The value for multivaluated field \"%s\" is not an array"
+msgid "The value for multivalued field \"%s\" is not an array"
msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:250
@@ -1704,7 +1704,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:492
#, php-format
msgid ""
-"Could not compute dn: could not find objectType infos from tab class \"%s\""
+"Could not compute dn: could not find objectType info from tab class \"%s\""
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1363
@@ -1719,7 +1719,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1576
msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may"
+"The object has changed since being opened in FusionDirectory. All changes that may"
" be done by others will get lost if you save this entry!"
msgstr ""
@@ -2424,7 +2424,7 @@ msgid "DN you wish to add assignments for"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:110
-msgid "The dn you entered could not be found in the LDAP"
+msgid "The dn you entered could not be found in LDAP"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:141
@@ -2606,7 +2606,7 @@ msgid "SASL"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
-msgid "Force to ask for password"
+msgid "Force asking for a password"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
@@ -2682,7 +2682,7 @@ msgid "Activate password recovery"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:47
-msgid "Whether to activate or not password recovery feature"
+msgid "Whether to activate the password recovery feature or not"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:52
@@ -2717,7 +2717,7 @@ msgstr ""
#: plugins/config/class_recoveryConfig.inc:74
msgid ""
-"Users will also be able to enter one of theirs alternate addresses to "
+"Users will also be able to enter one of their alternate addresses to "
"recover their password"
msgstr ""
@@ -2957,7 +2957,7 @@ msgid "Snapshot base"
msgstr ""
#: plugins/config/class_configInLdap.inc:109
-msgid "The base where snapshots should be stored inside of the LDAP."
+msgid "The base where snapshots should be stored inside the LDAP directory."
msgstr ""
#: plugins/config/class_configInLdap.inc:114
@@ -3153,7 +3153,7 @@ msgid "People DN attribute"
msgstr ""
#: plugins/config/class_configInLdap.inc:252
-msgid "Attribute to use at the beginning of users dn"
+msgid "Attribute to use at the beginning of the user's dn"
msgstr ""
#: plugins/config/class_configInLdap.inc:257
@@ -3238,7 +3238,7 @@ msgstr ""
#: plugins/config/class_configInLdap.inc:301
msgid ""
"Shows PHP errors in the upper part of the screen. This should be disabled in"
-" productive deployments, because there might be some passwords in it."
+" production deployments, because it may contain passwords."
msgstr ""
#: plugins/config/class_configInLdap.inc:305
@@ -3476,7 +3476,7 @@ msgstr ""
#: plugins/personal/roles/class_userRoles.inc:49
#: plugins/personal/roles/class_userRoles.inc:53
-msgid "Groups membership"
+msgid "Group memberships"
msgstr ""
#: plugins/personal/roles/class_userRoles.inc:60
@@ -3755,7 +3755,7 @@ msgstr ""
#: plugins/personal/generic/class_user.inc:430
#, php-format
-msgid "Ppolicy \"%s\" could not be found in the LDAP!"
+msgid "Ppolicy \"%s\" could not be found in LDAP!"
msgstr ""
#: plugins/personal/generic/class_user.inc:460
@@ -4020,7 +4020,7 @@ msgstr ""
#: setup/class_setupStepChecks.inc:124
msgid ""
-"FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
+"FusionDirectory requires either the 'mhash' or 'sha1' module to make use of "
"SSHA encryption."
msgstr ""
@@ -4208,11 +4208,11 @@ msgid "Checking for POSIX groups outside the groups tree"
msgstr ""
#: setup/class_setupStepMigrate.inc:274
-msgid "Checking for duplicated UID numbers"
+msgid "Checking for duplicate UID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:275
-msgid "Checking for duplicated GID numbers"
+msgid "Checking for duplicate GID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:343 setup/class_setupStepMigrate.inc:502
@@ -4228,7 +4228,7 @@ msgstr ""
#: setup/class_setupStepMigrate.inc:935 setup/class_setupStepMigrate.inc:1041
#: setup/class_setupStepMigrate.inc:1071 setup/class_setupStepMigrate.inc:1322
#: setup/class_setupStepMigrate.inc:1433
-msgid "Possibly the \"root object\" is missing."
+msgid "The \"root object\" is possibly missing."
msgstr ""
#: setup/class_setupStepMigrate.inc:360 setup/class_setupStepMigrate.inc:383
@@ -4299,7 +4299,7 @@ msgid "Roles"
msgstr ""
#: setup/class_setupStepMigrate.inc:836
-msgid "There is no FusionDirectory administrator account inside your LDAP."
+msgid "There is no FusionDirectory administrator account in your LDAP directory."
msgstr ""
#: setup/class_setupStepMigrate.inc:875
@@ -4338,12 +4338,12 @@ msgid "LDAP result parsing failed"
msgstr ""
#: setup/class_setupStepMigrate.inc:1076 setup/class_setupStepMigrate.inc:1327
-msgid "Sizelimit hit"
+msgid "Size limit hit"
msgstr ""
#: setup/class_setupStepMigrate.inc:1077 setup/class_setupStepMigrate.inc:1328
#, php-format
-msgid "Sizelimit of %d hit. Please check this manually"
+msgid "Size limit of %d hit. Please check this manually"
msgstr ""
#: setup/class_setupStepMigrate.inc:1120 setup/class_setupStepMigrate.inc:1134
@@ -4438,7 +4438,7 @@ msgstr ""
#, php-format
msgid ""
"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
"shouldn't."
msgstr ""
@@ -4546,7 +4546,7 @@ msgstr[2] ""
msgstr[3] ""
#: plugins/addons/dashboard/users_accounts.tpl.c:5
-msgid "There is no expired account"
+msgid "There are no expired accounts"
msgstr ""
#: plugins/addons/dashboard/users_accounts.tpl.c:11
@@ -4604,8 +4604,8 @@ msgstr[2] ""
msgstr[3] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:5
-msgid "One of them use %1 method"
-msgid_plural "%2 of them use %1 method"
+msgid "One of them uses the %1 method"
+msgid_plural "%2 of them use the %1 method"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
@@ -4620,7 +4620,7 @@ msgstr[2] ""
msgstr[3] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:11
-msgid "None of them is locked"
+msgid "None of them are locked"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:5
@@ -4628,7 +4628,7 @@ msgid "There are no users"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:8
-msgid "One of them have a %1 account"
+msgid "One of them has a %1 account"
msgid_plural "%2 of them have a %1 account"
msgstr[0] ""
msgstr[1] ""
@@ -4699,7 +4699,7 @@ msgstr ""
#: setup/setup_welcome.tpl.c:2
msgid ""
-"This seems to be the first time you start FusionDirectory - we didn't find "
+"This seems to be the first time you start FusionDirectory - we cannot find "
"any configuration right now. This simple wizard intends to help you while "
"setting it up."
msgstr ""
@@ -4743,12 +4743,12 @@ msgstr ""
#: setup/setup_welcome.tpl.c:32
msgid ""
"For security reasons you need to authenticate for the installation by "
-"creating the file '%1', containing the current session ID on the servers "
+"creating the file '%1', containing the current session ID on the server's "
"local filesystem. This can be done by executing the following command:"
msgstr ""
#: setup/setup_welcome.tpl.c:35
-msgid "Click the 'Next' button when you've finished."
+msgid "Click the 'Next' button when you are done."
msgstr ""
#: setup/setup_migrate.tpl.c:2
@@ -5011,7 +5011,7 @@ msgstr ""
#: ihtml/themes/breezy/islocked.tpl.c:11
msgid ""
"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
+"web browser during the edit operation. You may want to take over the lock by "
"pressing the \"%1\" button."
msgstr ""
diff --git a/locale/sv/fusiondirectory.po b/locale/sv/fusiondirectory.po
index f0fa999133aba36d5e30c52e2fa6d590687ed2d2..1fb33b933a16e97bbfeaef6bf1f42e6d0e73776a 100644
--- a/locale/sv/fusiondirectory.po
+++ b/locale/sv/fusiondirectory.po
@@ -87,7 +87,7 @@ msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:71
msgid ""
"LDAP attributes to display, comma separated. Special values \"nameAttr\" and"
-" \"mainAttr\" also works."
+" \"mainAttr\" also work."
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:75
@@ -99,7 +99,7 @@ msgid "Column title"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
-msgid "Persitent"
+msgid "Persistent"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
@@ -579,7 +579,7 @@ msgid "Send bug report to the FusionDirectory Team"
msgstr "Skicka buggrapport till FusionDirectory-teamet"
#: include/php_setup.inc:235
-msgid "Send bugreport"
+msgid "Send bug report"
msgstr "Skicka buggrapport"
#: include/php_setup.inc:240
@@ -634,7 +634,7 @@ msgstr ""
#: include/login/class_LoginCAS.inc:68
#, php-format
-msgid "CAS user \"%s\" could not be found in the LDAP"
+msgid "CAS user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginCAS.inc:78 include/login/class_LoginCAS.inc:104
@@ -726,7 +726,7 @@ msgstr ""
#: include/login/class_LoginHTTPHeader.inc:64
#, php-format
-msgid "Header user \"%s\" could not be found in the LDAP"
+msgid "Header user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginHTTPAuth.inc:29
@@ -770,7 +770,7 @@ msgid "The user using email \"%s\" is locked. Please contact your administrator.
msgstr ""
#: include/class_passwordRecovery.inc:352
-msgid "Contact your administrator, there was a problem with mail server"
+msgid "Contact your administrator, there was a problem with the mail server"
msgstr "Kontakta din administratör, det uppstod ett problem med epostservern"
#: include/class_passwordRecovery.inc:365
@@ -778,7 +778,7 @@ msgid "This token is invalid"
msgstr ""
#: include/class_passwordRecovery.inc:429
-msgid "There was a problem with mail server, confirmation email not sent"
+msgid "There was a problem with the mail server, confirmation email not sent"
msgstr ""
"Det uppstod ett problem med epostservern, bekräftelsebrevet skickades inte"
@@ -851,7 +851,7 @@ msgstr ""
#: include/functions.inc:354
#, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
msgstr "ALLVARLIGT: Fel vid försöka att koppla mot LDAP. Servern sa '%s'."
#: include/functions.inc:402 include/functions.inc:531
@@ -1177,7 +1177,7 @@ msgstr ""
#: include/class_msgPool.inc:245
#, php-format
-msgid "The entry \"%s\" already use this \"%s\" attribute!"
+msgid "The entry \"%s\" already uses this \"%s\" attribute!"
msgstr ""
#: include/class_msgPool.inc:256
@@ -1633,7 +1633,7 @@ msgstr "Ladda ner"
#: include/simpleplugin/attributes/class_FileAttribute.inc:380
#, php-format
-msgid "Cannot set \"%s\" value, it contains invalid data: %s"
+msgid "Cannot set value \"%s\", it contains invalid data: %s"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:390
@@ -1679,7 +1679,7 @@ msgstr "Ett flyttal mindre än %f"
#: include/simpleplugin/attributes/class_SetAttribute.inc:150
#, php-format
-msgid "The value for multivaluated field \"%s\" is not an array"
+msgid "The value for multivalued field \"%s\" is not an array"
msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:250
@@ -1740,7 +1740,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:492
#, php-format
msgid ""
-"Could not compute dn: could not find objectType infos from tab class \"%s\""
+"Could not compute dn: could not find objectType info from tab class \"%s\""
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1363
@@ -1755,7 +1755,7 @@ msgstr "Posten %s finns inte"
#: include/simpleplugin/class_simplePlugin.inc:1576
msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may"
+"The object has changed since being opened in FusionDirectory. All changes that may"
" be done by others will get lost if you save this entry!"
msgstr ""
@@ -2460,7 +2460,7 @@ msgid "DN you wish to add assignments for"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:110
-msgid "The dn you entered could not be found in the LDAP"
+msgid "The dn you entered could not be found in LDAP"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:141
@@ -2642,7 +2642,7 @@ msgid "SASL"
msgstr "SASL"
#: plugins/config/class_mainPluginsConfig.inc:54
-msgid "Force to ask for password"
+msgid "Force asking for a password"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
@@ -2718,7 +2718,7 @@ msgid "Activate password recovery"
msgstr "Aktivera återställning av lösenord"
#: plugins/config/class_recoveryConfig.inc:47
-msgid "Whether to activate or not password recovery feature"
+msgid "Whether to activate the password recovery feature or not"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:52
@@ -2755,7 +2755,7 @@ msgstr "Tillåt användande av alternativa adresser"
#: plugins/config/class_recoveryConfig.inc:74
msgid ""
-"Users will also be able to enter one of theirs alternate addresses to "
+"Users will also be able to enter one of their alternate addresses to "
"recover their password"
msgstr ""
"Användare kommer också att kunna skriva in en av deras alternativa "
@@ -3013,7 +3013,7 @@ msgid "Snapshot base"
msgstr "Bas för ögonblicksbilder"
#: plugins/config/class_configInLdap.inc:109
-msgid "The base where snapshots should be stored inside of the LDAP."
+msgid "The base where snapshots should be stored inside the LDAP directory."
msgstr "Basen där ögonblicksbilder ska lagras i LDAP-katalogen."
#: plugins/config/class_configInLdap.inc:114
@@ -3214,7 +3214,7 @@ msgid "People DN attribute"
msgstr "Personer DN-attribut"
#: plugins/config/class_configInLdap.inc:252
-msgid "Attribute to use at the beginning of users dn"
+msgid "Attribute to use at the beginning of the user's dn"
msgstr "Attribut att använda i början av användares dn"
#: plugins/config/class_configInLdap.inc:257
@@ -3299,7 +3299,7 @@ msgstr "Visa fel"
#: plugins/config/class_configInLdap.inc:301
msgid ""
"Shows PHP errors in the upper part of the screen. This should be disabled in"
-" productive deployments, because there might be some passwords in it."
+" production deployments, because it may contain passwords."
msgstr ""
"Visa PHP-fel i övre delen av skärmen. Detta bör avaktiveras i "
"produktionsmiljöer, för det kan vara lösenord i felkoden."
@@ -3545,7 +3545,7 @@ msgstr ""
#: plugins/personal/roles/class_userRoles.inc:49
#: plugins/personal/roles/class_userRoles.inc:53
-msgid "Groups membership"
+msgid "Group memberships"
msgstr ""
#: plugins/personal/roles/class_userRoles.inc:60
@@ -3824,7 +3824,7 @@ msgstr "Postnummer"
#: plugins/personal/generic/class_user.inc:430
#, php-format
-msgid "Ppolicy \"%s\" could not be found in the LDAP!"
+msgid "Ppolicy \"%s\" could not be found in LDAP!"
msgstr ""
#: plugins/personal/generic/class_user.inc:460
@@ -4096,7 +4096,7 @@ msgstr "FusionDirectory kräver den här modulen för integrationen med Samba."
#: setup/class_setupStepChecks.inc:124
msgid ""
-"FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
+"FusionDirectory requires either the 'mhash' or 'sha1' module to make use of "
"SSHA encryption."
msgstr ""
"FusionDirectory kräver antingen en modul för antingen 'mhash' eller 'shah' "
@@ -4314,11 +4314,11 @@ msgid "Checking for POSIX groups outside the groups tree"
msgstr ""
#: setup/class_setupStepMigrate.inc:274
-msgid "Checking for duplicated UID numbers"
+msgid "Checking for duplicate UID numbers"
msgstr "Söker efter dubbletter av UID-nummer"
#: setup/class_setupStepMigrate.inc:275
-msgid "Checking for duplicated GID numbers"
+msgid "Checking for duplicate GID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:343 setup/class_setupStepMigrate.inc:502
@@ -4334,7 +4334,7 @@ msgstr "LDAP-fråga misslyckades"
#: setup/class_setupStepMigrate.inc:935 setup/class_setupStepMigrate.inc:1041
#: setup/class_setupStepMigrate.inc:1071 setup/class_setupStepMigrate.inc:1322
#: setup/class_setupStepMigrate.inc:1433
-msgid "Possibly the \"root object\" is missing."
+msgid "The \"root object\" is possibly missing."
msgstr ""
#: setup/class_setupStepMigrate.inc:360 setup/class_setupStepMigrate.inc:383
@@ -4407,7 +4407,7 @@ msgid "Roles"
msgstr ""
#: setup/class_setupStepMigrate.inc:836
-msgid "There is no FusionDirectory administrator account inside your LDAP."
+msgid "There is no FusionDirectory administrator account in your LDAP directory."
msgstr "Det finns inget FusionDirectory-adminkonto i din LDAP-katalog."
#: setup/class_setupStepMigrate.inc:875
@@ -4446,12 +4446,12 @@ msgid "LDAP result parsing failed"
msgstr ""
#: setup/class_setupStepMigrate.inc:1076 setup/class_setupStepMigrate.inc:1327
-msgid "Sizelimit hit"
+msgid "Size limit hit"
msgstr ""
#: setup/class_setupStepMigrate.inc:1077 setup/class_setupStepMigrate.inc:1328
#, php-format
-msgid "Sizelimit of %d hit. Please check this manually"
+msgid "Size limit of %d hit. Please check this manually"
msgstr ""
#: setup/class_setupStepMigrate.inc:1120 setup/class_setupStepMigrate.inc:1134
@@ -4548,7 +4548,7 @@ msgstr "Konfigurationen är just nu inte läsbar eller så finns den inte."
#, php-format
msgid ""
"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
"shouldn't."
msgstr ""
"Efter att ha laddat ner och placerat filen under %s, vänligen säkerställ att"
@@ -4661,7 +4661,7 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/users_accounts.tpl.c:5
-msgid "There is no expired account"
+msgid "There are no expired accounts"
msgstr ""
#: plugins/addons/dashboard/users_accounts.tpl.c:11
@@ -4711,8 +4711,8 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:5
-msgid "One of them use %1 method"
-msgid_plural "%2 of them use %1 method"
+msgid "One of them uses the %1 method"
+msgid_plural "%2 of them use the %1 method"
msgstr[0] ""
msgstr[1] ""
@@ -4723,7 +4723,7 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:11
-msgid "None of them is locked"
+msgid "None of them are locked"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:5
@@ -4731,7 +4731,7 @@ msgid "There are no users"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:8
-msgid "One of them have a %1 account"
+msgid "One of them has a %1 account"
msgid_plural "%2 of them have a %1 account"
msgstr[0] ""
msgstr[1] ""
@@ -4802,7 +4802,7 @@ msgstr "FusionDirectory kommer att kunna köras utan att åtgärda detta."
#: setup/setup_welcome.tpl.c:2
msgid ""
-"This seems to be the first time you start FusionDirectory - we didn't find "
+"This seems to be the first time you start FusionDirectory - we cannot find "
"any configuration right now. This simple wizard intends to help you while "
"setting it up."
msgstr ""
@@ -4853,12 +4853,12 @@ msgstr ""
#: setup/setup_welcome.tpl.c:32
msgid ""
"For security reasons you need to authenticate for the installation by "
-"creating the file '%1', containing the current session ID on the servers "
+"creating the file '%1', containing the current session ID on the server's "
"local filesystem. This can be done by executing the following command:"
msgstr ""
#: setup/setup_welcome.tpl.c:35
-msgid "Click the 'Next' button when you've finished."
+msgid "Click the 'Next' button when you are done."
msgstr "Klicka på 'Nästa'-knappen när du är klar."
#: setup/setup_migrate.tpl.c:2
@@ -5136,7 +5136,7 @@ msgstr ""
#: ihtml/themes/breezy/islocked.tpl.c:11
msgid ""
"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
+"web browser during the edit operation. You may want to take over the lock by "
"pressing the \"%1\" button."
msgstr ""
diff --git a/locale/tr_TR/fusiondirectory.po b/locale/tr_TR/fusiondirectory.po
index ffc05649b1d9510b73bac8bf7c263d02905ed4a1..5e9db447f9ce393a350f0b99db11ff2f80eed1b9 100644
--- a/locale/tr_TR/fusiondirectory.po
+++ b/locale/tr_TR/fusiondirectory.po
@@ -87,7 +87,7 @@ msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:71
msgid ""
"LDAP attributes to display, comma separated. Special values \"nameAttr\" and"
-" \"mainAttr\" also works."
+" \"mainAttr\" also work."
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:75
@@ -99,7 +99,7 @@ msgid "Column title"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
-msgid "Persitent"
+msgid "Persistent"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
@@ -578,7 +578,7 @@ msgid "Send bug report to the FusionDirectory Team"
msgstr ""
#: include/php_setup.inc:235
-msgid "Send bugreport"
+msgid "Send bug report"
msgstr ""
#: include/php_setup.inc:240
@@ -633,7 +633,7 @@ msgstr ""
#: include/login/class_LoginCAS.inc:68
#, php-format
-msgid "CAS user \"%s\" could not be found in the LDAP"
+msgid "CAS user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginCAS.inc:78 include/login/class_LoginCAS.inc:104
@@ -723,7 +723,7 @@ msgstr ""
#: include/login/class_LoginHTTPHeader.inc:64
#, php-format
-msgid "Header user \"%s\" could not be found in the LDAP"
+msgid "Header user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginHTTPAuth.inc:29
@@ -767,7 +767,7 @@ msgid "The user using email \"%s\" is locked. Please contact your administrator.
msgstr ""
#: include/class_passwordRecovery.inc:352
-msgid "Contact your administrator, there was a problem with mail server"
+msgid "Contact your administrator, there was a problem with the mail server"
msgstr ""
#: include/class_passwordRecovery.inc:365
@@ -775,7 +775,7 @@ msgid "This token is invalid"
msgstr ""
#: include/class_passwordRecovery.inc:429
-msgid "There was a problem with mail server, confirmation email not sent"
+msgid "There was a problem with the mail server, confirmation email not sent"
msgstr ""
#: include/password-methods/class_passwordMethodSasl.inc:66
@@ -840,7 +840,7 @@ msgstr ""
#: include/functions.inc:354
#, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
msgstr ""
#: include/functions.inc:402 include/functions.inc:531
@@ -1155,7 +1155,7 @@ msgstr ""
#: include/class_msgPool.inc:245
#, php-format
-msgid "The entry \"%s\" already use this \"%s\" attribute!"
+msgid "The entry \"%s\" already uses this \"%s\" attribute!"
msgstr ""
#: include/class_msgPool.inc:256
@@ -1601,7 +1601,7 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:380
#, php-format
-msgid "Cannot set \"%s\" value, it contains invalid data: %s"
+msgid "Cannot set value \"%s\", it contains invalid data: %s"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:390
@@ -1647,7 +1647,7 @@ msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:150
#, php-format
-msgid "The value for multivaluated field \"%s\" is not an array"
+msgid "The value for multivalued field \"%s\" is not an array"
msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:250
@@ -1708,7 +1708,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:492
#, php-format
msgid ""
-"Could not compute dn: could not find objectType infos from tab class \"%s\""
+"Could not compute dn: could not find objectType info from tab class \"%s\""
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1363
@@ -1723,7 +1723,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1576
msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may"
+"The object has changed since being opened in FusionDirectory. All changes that may"
" be done by others will get lost if you save this entry!"
msgstr ""
@@ -2428,7 +2428,7 @@ msgid "DN you wish to add assignments for"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:110
-msgid "The dn you entered could not be found in the LDAP"
+msgid "The dn you entered could not be found in LDAP"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:141
@@ -2610,7 +2610,7 @@ msgid "SASL"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
-msgid "Force to ask for password"
+msgid "Force asking for a password"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
@@ -2686,7 +2686,7 @@ msgid "Activate password recovery"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:47
-msgid "Whether to activate or not password recovery feature"
+msgid "Whether to activate the password recovery feature or not"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:52
@@ -2721,7 +2721,7 @@ msgstr ""
#: plugins/config/class_recoveryConfig.inc:74
msgid ""
-"Users will also be able to enter one of theirs alternate addresses to "
+"Users will also be able to enter one of their alternate addresses to "
"recover their password"
msgstr ""
@@ -2961,7 +2961,7 @@ msgid "Snapshot base"
msgstr ""
#: plugins/config/class_configInLdap.inc:109
-msgid "The base where snapshots should be stored inside of the LDAP."
+msgid "The base where snapshots should be stored inside the LDAP directory."
msgstr ""
#: plugins/config/class_configInLdap.inc:114
@@ -3157,7 +3157,7 @@ msgid "People DN attribute"
msgstr ""
#: plugins/config/class_configInLdap.inc:252
-msgid "Attribute to use at the beginning of users dn"
+msgid "Attribute to use at the beginning of the user's dn"
msgstr ""
#: plugins/config/class_configInLdap.inc:257
@@ -3242,7 +3242,7 @@ msgstr ""
#: plugins/config/class_configInLdap.inc:301
msgid ""
"Shows PHP errors in the upper part of the screen. This should be disabled in"
-" productive deployments, because there might be some passwords in it."
+" production deployments, because it may contain passwords."
msgstr ""
#: plugins/config/class_configInLdap.inc:305
@@ -3480,7 +3480,7 @@ msgstr ""
#: plugins/personal/roles/class_userRoles.inc:49
#: plugins/personal/roles/class_userRoles.inc:53
-msgid "Groups membership"
+msgid "Group memberships"
msgstr ""
#: plugins/personal/roles/class_userRoles.inc:60
@@ -3759,7 +3759,7 @@ msgstr ""
#: plugins/personal/generic/class_user.inc:430
#, php-format
-msgid "Ppolicy \"%s\" could not be found in the LDAP!"
+msgid "Ppolicy \"%s\" could not be found in LDAP!"
msgstr ""
#: plugins/personal/generic/class_user.inc:460
@@ -4024,7 +4024,7 @@ msgstr ""
#: setup/class_setupStepChecks.inc:124
msgid ""
-"FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
+"FusionDirectory requires either the 'mhash' or 'sha1' module to make use of "
"SSHA encryption."
msgstr ""
@@ -4212,11 +4212,11 @@ msgid "Checking for POSIX groups outside the groups tree"
msgstr ""
#: setup/class_setupStepMigrate.inc:274
-msgid "Checking for duplicated UID numbers"
+msgid "Checking for duplicate UID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:275
-msgid "Checking for duplicated GID numbers"
+msgid "Checking for duplicate GID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:343 setup/class_setupStepMigrate.inc:502
@@ -4232,7 +4232,7 @@ msgstr ""
#: setup/class_setupStepMigrate.inc:935 setup/class_setupStepMigrate.inc:1041
#: setup/class_setupStepMigrate.inc:1071 setup/class_setupStepMigrate.inc:1322
#: setup/class_setupStepMigrate.inc:1433
-msgid "Possibly the \"root object\" is missing."
+msgid "The \"root object\" is possibly missing."
msgstr ""
#: setup/class_setupStepMigrate.inc:360 setup/class_setupStepMigrate.inc:383
@@ -4303,7 +4303,7 @@ msgid "Roles"
msgstr ""
#: setup/class_setupStepMigrate.inc:836
-msgid "There is no FusionDirectory administrator account inside your LDAP."
+msgid "There is no FusionDirectory administrator account in your LDAP directory."
msgstr ""
#: setup/class_setupStepMigrate.inc:875
@@ -4342,12 +4342,12 @@ msgid "LDAP result parsing failed"
msgstr ""
#: setup/class_setupStepMigrate.inc:1076 setup/class_setupStepMigrate.inc:1327
-msgid "Sizelimit hit"
+msgid "Size limit hit"
msgstr ""
#: setup/class_setupStepMigrate.inc:1077 setup/class_setupStepMigrate.inc:1328
#, php-format
-msgid "Sizelimit of %d hit. Please check this manually"
+msgid "Size limit of %d hit. Please check this manually"
msgstr ""
#: setup/class_setupStepMigrate.inc:1120 setup/class_setupStepMigrate.inc:1134
@@ -4442,7 +4442,7 @@ msgstr ""
#, php-format
msgid ""
"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
"shouldn't."
msgstr ""
@@ -4548,7 +4548,7 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/users_accounts.tpl.c:5
-msgid "There is no expired account"
+msgid "There are no expired accounts"
msgstr ""
#: plugins/addons/dashboard/users_accounts.tpl.c:11
@@ -4598,8 +4598,8 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:5
-msgid "One of them use %1 method"
-msgid_plural "%2 of them use %1 method"
+msgid "One of them uses the %1 method"
+msgid_plural "%2 of them use the %1 method"
msgstr[0] ""
msgstr[1] ""
@@ -4610,7 +4610,7 @@ msgstr[0] ""
msgstr[1] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:11
-msgid "None of them is locked"
+msgid "None of them are locked"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:5
@@ -4618,7 +4618,7 @@ msgid "There are no users"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:8
-msgid "One of them have a %1 account"
+msgid "One of them has a %1 account"
msgid_plural "%2 of them have a %1 account"
msgstr[0] ""
msgstr[1] ""
@@ -4687,7 +4687,7 @@ msgstr ""
#: setup/setup_welcome.tpl.c:2
msgid ""
-"This seems to be the first time you start FusionDirectory - we didn't find "
+"This seems to be the first time you start FusionDirectory - we cannot find "
"any configuration right now. This simple wizard intends to help you while "
"setting it up."
msgstr ""
@@ -4731,12 +4731,12 @@ msgstr ""
#: setup/setup_welcome.tpl.c:32
msgid ""
"For security reasons you need to authenticate for the installation by "
-"creating the file '%1', containing the current session ID on the servers "
+"creating the file '%1', containing the current session ID on the server's "
"local filesystem. This can be done by executing the following command:"
msgstr ""
#: setup/setup_welcome.tpl.c:35
-msgid "Click the 'Next' button when you've finished."
+msgid "Click the 'Next' button when you are done."
msgstr ""
#: setup/setup_migrate.tpl.c:2
@@ -4999,7 +4999,7 @@ msgstr ""
#: ihtml/themes/breezy/islocked.tpl.c:11
msgid ""
"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
+"web browser during the edit operation. You may want to take over the lock by "
"pressing the \"%1\" button."
msgstr ""
diff --git a/locale/ug/fusiondirectory.po b/locale/ug/fusiondirectory.po
index 5e591cff8e4d53b6f35a3056602c9b2de48a85ca..5f693adc53a6752e94c96064f13f1d652004af74 100644
--- a/locale/ug/fusiondirectory.po
+++ b/locale/ug/fusiondirectory.po
@@ -83,7 +83,7 @@ msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:71
msgid ""
"LDAP attributes to display, comma separated. Special values \"nameAttr\" and"
-" \"mainAttr\" also works."
+" \"mainAttr\" also work."
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:75
@@ -95,7 +95,7 @@ msgid "Column title"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
-msgid "Persitent"
+msgid "Persistent"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
@@ -574,7 +574,7 @@ msgid "Send bug report to the FusionDirectory Team"
msgstr ""
#: include/php_setup.inc:235
-msgid "Send bugreport"
+msgid "Send bug report"
msgstr ""
#: include/php_setup.inc:240
@@ -629,7 +629,7 @@ msgstr ""
#: include/login/class_LoginCAS.inc:68
#, php-format
-msgid "CAS user \"%s\" could not be found in the LDAP"
+msgid "CAS user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginCAS.inc:78 include/login/class_LoginCAS.inc:104
@@ -719,7 +719,7 @@ msgstr ""
#: include/login/class_LoginHTTPHeader.inc:64
#, php-format
-msgid "Header user \"%s\" could not be found in the LDAP"
+msgid "Header user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginHTTPAuth.inc:29
@@ -763,7 +763,7 @@ msgid "The user using email \"%s\" is locked. Please contact your administrator.
msgstr ""
#: include/class_passwordRecovery.inc:352
-msgid "Contact your administrator, there was a problem with mail server"
+msgid "Contact your administrator, there was a problem with the mail server"
msgstr ""
#: include/class_passwordRecovery.inc:365
@@ -771,7 +771,7 @@ msgid "This token is invalid"
msgstr ""
#: include/class_passwordRecovery.inc:429
-msgid "There was a problem with mail server, confirmation email not sent"
+msgid "There was a problem with the mail server, confirmation email not sent"
msgstr ""
#: include/password-methods/class_passwordMethodSasl.inc:66
@@ -836,7 +836,7 @@ msgstr ""
#: include/functions.inc:354
#, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
msgstr ""
#: include/functions.inc:402 include/functions.inc:531
@@ -1151,7 +1151,7 @@ msgstr ""
#: include/class_msgPool.inc:245
#, php-format
-msgid "The entry \"%s\" already use this \"%s\" attribute!"
+msgid "The entry \"%s\" already uses this \"%s\" attribute!"
msgstr ""
#: include/class_msgPool.inc:256
@@ -1597,7 +1597,7 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:380
#, php-format
-msgid "Cannot set \"%s\" value, it contains invalid data: %s"
+msgid "Cannot set value \"%s\", it contains invalid data: %s"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:390
@@ -1643,7 +1643,7 @@ msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:150
#, php-format
-msgid "The value for multivaluated field \"%s\" is not an array"
+msgid "The value for multivalued field \"%s\" is not an array"
msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:250
@@ -1704,7 +1704,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:492
#, php-format
msgid ""
-"Could not compute dn: could not find objectType infos from tab class \"%s\""
+"Could not compute dn: could not find objectType info from tab class \"%s\""
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1363
@@ -1719,7 +1719,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1576
msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may"
+"The object has changed since being opened in FusionDirectory. All changes that may"
" be done by others will get lost if you save this entry!"
msgstr ""
@@ -2424,7 +2424,7 @@ msgid "DN you wish to add assignments for"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:110
-msgid "The dn you entered could not be found in the LDAP"
+msgid "The dn you entered could not be found in LDAP"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:141
@@ -2606,7 +2606,7 @@ msgid "SASL"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
-msgid "Force to ask for password"
+msgid "Force asking for a password"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
@@ -2682,7 +2682,7 @@ msgid "Activate password recovery"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:47
-msgid "Whether to activate or not password recovery feature"
+msgid "Whether to activate the password recovery feature or not"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:52
@@ -2717,7 +2717,7 @@ msgstr ""
#: plugins/config/class_recoveryConfig.inc:74
msgid ""
-"Users will also be able to enter one of theirs alternate addresses to "
+"Users will also be able to enter one of their alternate addresses to "
"recover their password"
msgstr ""
@@ -2957,7 +2957,7 @@ msgid "Snapshot base"
msgstr ""
#: plugins/config/class_configInLdap.inc:109
-msgid "The base where snapshots should be stored inside of the LDAP."
+msgid "The base where snapshots should be stored inside the LDAP directory."
msgstr ""
#: plugins/config/class_configInLdap.inc:114
@@ -3153,7 +3153,7 @@ msgid "People DN attribute"
msgstr ""
#: plugins/config/class_configInLdap.inc:252
-msgid "Attribute to use at the beginning of users dn"
+msgid "Attribute to use at the beginning of the user's dn"
msgstr ""
#: plugins/config/class_configInLdap.inc:257
@@ -3238,7 +3238,7 @@ msgstr ""
#: plugins/config/class_configInLdap.inc:301
msgid ""
"Shows PHP errors in the upper part of the screen. This should be disabled in"
-" productive deployments, because there might be some passwords in it."
+" production deployments, because it may contain passwords."
msgstr ""
#: plugins/config/class_configInLdap.inc:305
@@ -3476,7 +3476,7 @@ msgstr ""
#: plugins/personal/roles/class_userRoles.inc:49
#: plugins/personal/roles/class_userRoles.inc:53
-msgid "Groups membership"
+msgid "Group memberships"
msgstr ""
#: plugins/personal/roles/class_userRoles.inc:60
@@ -3755,7 +3755,7 @@ msgstr ""
#: plugins/personal/generic/class_user.inc:430
#, php-format
-msgid "Ppolicy \"%s\" could not be found in the LDAP!"
+msgid "Ppolicy \"%s\" could not be found in LDAP!"
msgstr ""
#: plugins/personal/generic/class_user.inc:460
@@ -4020,7 +4020,7 @@ msgstr ""
#: setup/class_setupStepChecks.inc:124
msgid ""
-"FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
+"FusionDirectory requires either the 'mhash' or 'sha1' module to make use of "
"SSHA encryption."
msgstr ""
@@ -4208,11 +4208,11 @@ msgid "Checking for POSIX groups outside the groups tree"
msgstr ""
#: setup/class_setupStepMigrate.inc:274
-msgid "Checking for duplicated UID numbers"
+msgid "Checking for duplicate UID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:275
-msgid "Checking for duplicated GID numbers"
+msgid "Checking for duplicate GID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:343 setup/class_setupStepMigrate.inc:502
@@ -4228,7 +4228,7 @@ msgstr ""
#: setup/class_setupStepMigrate.inc:935 setup/class_setupStepMigrate.inc:1041
#: setup/class_setupStepMigrate.inc:1071 setup/class_setupStepMigrate.inc:1322
#: setup/class_setupStepMigrate.inc:1433
-msgid "Possibly the \"root object\" is missing."
+msgid "The \"root object\" is possibly missing."
msgstr ""
#: setup/class_setupStepMigrate.inc:360 setup/class_setupStepMigrate.inc:383
@@ -4299,7 +4299,7 @@ msgid "Roles"
msgstr ""
#: setup/class_setupStepMigrate.inc:836
-msgid "There is no FusionDirectory administrator account inside your LDAP."
+msgid "There is no FusionDirectory administrator account in your LDAP directory."
msgstr ""
#: setup/class_setupStepMigrate.inc:875
@@ -4338,12 +4338,12 @@ msgid "LDAP result parsing failed"
msgstr ""
#: setup/class_setupStepMigrate.inc:1076 setup/class_setupStepMigrate.inc:1327
-msgid "Sizelimit hit"
+msgid "Size limit hit"
msgstr ""
#: setup/class_setupStepMigrate.inc:1077 setup/class_setupStepMigrate.inc:1328
#, php-format
-msgid "Sizelimit of %d hit. Please check this manually"
+msgid "Size limit of %d hit. Please check this manually"
msgstr ""
#: setup/class_setupStepMigrate.inc:1120 setup/class_setupStepMigrate.inc:1134
@@ -4438,7 +4438,7 @@ msgstr ""
#, php-format
msgid ""
"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
"shouldn't."
msgstr ""
@@ -4543,7 +4543,7 @@ msgid_plural "There are %1 expired accounts"
msgstr[0] ""
#: plugins/addons/dashboard/users_accounts.tpl.c:5
-msgid "There is no expired account"
+msgid "There are no expired accounts"
msgstr ""
#: plugins/addons/dashboard/users_accounts.tpl.c:11
@@ -4589,8 +4589,8 @@ msgid_plural "There are %1 users:"
msgstr[0] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:5
-msgid "One of them use %1 method"
-msgid_plural "%2 of them use %1 method"
+msgid "One of them uses the %1 method"
+msgid_plural "%2 of them use the %1 method"
msgstr[0] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:8
@@ -4599,7 +4599,7 @@ msgid_plural "%1 of them are locked"
msgstr[0] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:11
-msgid "None of them is locked"
+msgid "None of them are locked"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:5
@@ -4607,7 +4607,7 @@ msgid "There are no users"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:8
-msgid "One of them have a %1 account"
+msgid "One of them has a %1 account"
msgid_plural "%2 of them have a %1 account"
msgstr[0] ""
@@ -4675,7 +4675,7 @@ msgstr ""
#: setup/setup_welcome.tpl.c:2
msgid ""
-"This seems to be the first time you start FusionDirectory - we didn't find "
+"This seems to be the first time you start FusionDirectory - we cannot find "
"any configuration right now. This simple wizard intends to help you while "
"setting it up."
msgstr ""
@@ -4719,12 +4719,12 @@ msgstr ""
#: setup/setup_welcome.tpl.c:32
msgid ""
"For security reasons you need to authenticate for the installation by "
-"creating the file '%1', containing the current session ID on the servers "
+"creating the file '%1', containing the current session ID on the server's "
"local filesystem. This can be done by executing the following command:"
msgstr ""
#: setup/setup_welcome.tpl.c:35
-msgid "Click the 'Next' button when you've finished."
+msgid "Click the 'Next' button when you are done."
msgstr ""
#: setup/setup_migrate.tpl.c:2
@@ -4987,7 +4987,7 @@ msgstr ""
#: ihtml/themes/breezy/islocked.tpl.c:11
msgid ""
"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
+"web browser during the edit operation. You may want to take over the lock by "
"pressing the \"%1\" button."
msgstr ""
diff --git a/locale/vi_VN/fusiondirectory.po b/locale/vi_VN/fusiondirectory.po
index 9f23ddb14470e24156e12436f694c41744786b1c..2de4aaac721997311854352a2606abd9c9ce3fbb 100644
--- a/locale/vi_VN/fusiondirectory.po
+++ b/locale/vi_VN/fusiondirectory.po
@@ -87,7 +87,7 @@ msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:71
msgid ""
"LDAP attributes to display, comma separated. Special values \"nameAttr\" and"
-" \"mainAttr\" also works."
+" \"mainAttr\" also work."
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:75
@@ -99,7 +99,7 @@ msgid "Column title"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
-msgid "Persitent"
+msgid "Persistent"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
@@ -578,7 +578,7 @@ msgid "Send bug report to the FusionDirectory Team"
msgstr ""
#: include/php_setup.inc:235
-msgid "Send bugreport"
+msgid "Send bug report"
msgstr "Gá»i thông báo lá»—i"
#: include/php_setup.inc:240
@@ -633,7 +633,7 @@ msgstr ""
#: include/login/class_LoginCAS.inc:68
#, php-format
-msgid "CAS user \"%s\" could not be found in the LDAP"
+msgid "CAS user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginCAS.inc:78 include/login/class_LoginCAS.inc:104
@@ -726,7 +726,7 @@ msgstr ""
#: include/login/class_LoginHTTPHeader.inc:64
#, php-format
-msgid "Header user \"%s\" could not be found in the LDAP"
+msgid "Header user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginHTTPAuth.inc:29
@@ -770,7 +770,7 @@ msgid "The user using email \"%s\" is locked. Please contact your administrator.
msgstr ""
#: include/class_passwordRecovery.inc:352
-msgid "Contact your administrator, there was a problem with mail server"
+msgid "Contact your administrator, there was a problem with the mail server"
msgstr ""
#: include/class_passwordRecovery.inc:365
@@ -778,7 +778,7 @@ msgid "This token is invalid"
msgstr ""
#: include/class_passwordRecovery.inc:429
-msgid "There was a problem with mail server, confirmation email not sent"
+msgid "There was a problem with the mail server, confirmation email not sent"
msgstr ""
#: include/password-methods/class_passwordMethodSasl.inc:66
@@ -850,7 +850,7 @@ msgstr ""
#: include/functions.inc:354
#, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
msgstr ""
"LỖI NGHIÊM TRỌNG: Lỗi khi đang kết nối với LDAP. Server thông báo '%s'."
@@ -1172,7 +1172,7 @@ msgstr ""
#: include/class_msgPool.inc:245
#, php-format
-msgid "The entry \"%s\" already use this \"%s\" attribute!"
+msgid "The entry \"%s\" already uses this \"%s\" attribute!"
msgstr ""
#: include/class_msgPool.inc:256
@@ -1626,7 +1626,7 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:380
#, php-format
-msgid "Cannot set \"%s\" value, it contains invalid data: %s"
+msgid "Cannot set value \"%s\", it contains invalid data: %s"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:390
@@ -1672,7 +1672,7 @@ msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:150
#, php-format
-msgid "The value for multivaluated field \"%s\" is not an array"
+msgid "The value for multivalued field \"%s\" is not an array"
msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:250
@@ -1733,7 +1733,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:492
#, php-format
msgid ""
-"Could not compute dn: could not find objectType infos from tab class \"%s\""
+"Could not compute dn: could not find objectType info from tab class \"%s\""
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1363
@@ -1748,7 +1748,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1576
msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may"
+"The object has changed since being opened in FusionDirectory. All changes that may"
" be done by others will get lost if you save this entry!"
msgstr ""
@@ -2454,7 +2454,7 @@ msgid "DN you wish to add assignments for"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:110
-msgid "The dn you entered could not be found in the LDAP"
+msgid "The dn you entered could not be found in LDAP"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:141
@@ -2636,7 +2636,7 @@ msgid "SASL"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
-msgid "Force to ask for password"
+msgid "Force asking for a password"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
@@ -2712,7 +2712,7 @@ msgid "Activate password recovery"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:47
-msgid "Whether to activate or not password recovery feature"
+msgid "Whether to activate the password recovery feature or not"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:52
@@ -2747,7 +2747,7 @@ msgstr ""
#: plugins/config/class_recoveryConfig.inc:74
msgid ""
-"Users will also be able to enter one of theirs alternate addresses to "
+"Users will also be able to enter one of their alternate addresses to "
"recover their password"
msgstr ""
@@ -2987,7 +2987,7 @@ msgid "Snapshot base"
msgstr "Gốc snapshot"
#: plugins/config/class_configInLdap.inc:109
-msgid "The base where snapshots should be stored inside of the LDAP."
+msgid "The base where snapshots should be stored inside the LDAP directory."
msgstr ""
#: plugins/config/class_configInLdap.inc:114
@@ -3183,7 +3183,7 @@ msgid "People DN attribute"
msgstr "Thuá»™c tÃnh DN ngÆ°á»i"
#: plugins/config/class_configInLdap.inc:252
-msgid "Attribute to use at the beginning of users dn"
+msgid "Attribute to use at the beginning of the user's dn"
msgstr ""
#: plugins/config/class_configInLdap.inc:257
@@ -3268,7 +3268,7 @@ msgstr ""
#: plugins/config/class_configInLdap.inc:301
msgid ""
"Shows PHP errors in the upper part of the screen. This should be disabled in"
-" productive deployments, because there might be some passwords in it."
+" production deployments, because it may contain passwords."
msgstr ""
#: plugins/config/class_configInLdap.inc:305
@@ -3506,7 +3506,7 @@ msgstr ""
#: plugins/personal/roles/class_userRoles.inc:49
#: plugins/personal/roles/class_userRoles.inc:53
-msgid "Groups membership"
+msgid "Group memberships"
msgstr ""
#: plugins/personal/roles/class_userRoles.inc:60
@@ -3785,7 +3785,7 @@ msgstr "Mã bưu điện"
#: plugins/personal/generic/class_user.inc:430
#, php-format
-msgid "Ppolicy \"%s\" could not be found in the LDAP!"
+msgid "Ppolicy \"%s\" could not be found in LDAP!"
msgstr ""
#: plugins/personal/generic/class_user.inc:460
@@ -4050,7 +4050,7 @@ msgstr ""
#: setup/class_setupStepChecks.inc:124
msgid ""
-"FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
+"FusionDirectory requires either the 'mhash' or 'sha1' module to make use of "
"SSHA encryption."
msgstr ""
@@ -4265,11 +4265,11 @@ msgid "Checking for POSIX groups outside the groups tree"
msgstr ""
#: setup/class_setupStepMigrate.inc:274
-msgid "Checking for duplicated UID numbers"
+msgid "Checking for duplicate UID numbers"
msgstr "Kiểm tra các số ID cuả ngÆ°á»i dùng (UID) được nhân bản"
#: setup/class_setupStepMigrate.inc:275
-msgid "Checking for duplicated GID numbers"
+msgid "Checking for duplicate GID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:343 setup/class_setupStepMigrate.inc:502
@@ -4285,7 +4285,7 @@ msgstr "Yêu cầu LDAP thất bại"
#: setup/class_setupStepMigrate.inc:935 setup/class_setupStepMigrate.inc:1041
#: setup/class_setupStepMigrate.inc:1071 setup/class_setupStepMigrate.inc:1322
#: setup/class_setupStepMigrate.inc:1433
-msgid "Possibly the \"root object\" is missing."
+msgid "The \"root object\" is possibly missing."
msgstr ""
#: setup/class_setupStepMigrate.inc:360 setup/class_setupStepMigrate.inc:383
@@ -4356,7 +4356,7 @@ msgid "Roles"
msgstr ""
#: setup/class_setupStepMigrate.inc:836
-msgid "There is no FusionDirectory administrator account inside your LDAP."
+msgid "There is no FusionDirectory administrator account in your LDAP directory."
msgstr ""
#: setup/class_setupStepMigrate.inc:875
@@ -4395,12 +4395,12 @@ msgid "LDAP result parsing failed"
msgstr ""
#: setup/class_setupStepMigrate.inc:1076 setup/class_setupStepMigrate.inc:1327
-msgid "Sizelimit hit"
+msgid "Size limit hit"
msgstr ""
#: setup/class_setupStepMigrate.inc:1077 setup/class_setupStepMigrate.inc:1328
#, php-format
-msgid "Sizelimit of %d hit. Please check this manually"
+msgid "Size limit of %d hit. Please check this manually"
msgstr ""
#: setup/class_setupStepMigrate.inc:1120 setup/class_setupStepMigrate.inc:1134
@@ -4497,7 +4497,7 @@ msgstr "Cấu hình hiện tại không thể Ä‘á»c được hoặc nó không
#, php-format
msgid ""
"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
"shouldn't."
msgstr ""
@@ -4602,7 +4602,7 @@ msgid_plural "There are %1 expired accounts"
msgstr[0] ""
#: plugins/addons/dashboard/users_accounts.tpl.c:5
-msgid "There is no expired account"
+msgid "There are no expired accounts"
msgstr ""
#: plugins/addons/dashboard/users_accounts.tpl.c:11
@@ -4648,8 +4648,8 @@ msgid_plural "There are %1 users:"
msgstr[0] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:5
-msgid "One of them use %1 method"
-msgid_plural "%2 of them use %1 method"
+msgid "One of them uses the %1 method"
+msgid_plural "%2 of them use the %1 method"
msgstr[0] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:8
@@ -4658,7 +4658,7 @@ msgid_plural "%1 of them are locked"
msgstr[0] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:11
-msgid "None of them is locked"
+msgid "None of them are locked"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:5
@@ -4666,7 +4666,7 @@ msgid "There are no users"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:8
-msgid "One of them have a %1 account"
+msgid "One of them has a %1 account"
msgid_plural "%2 of them have a %1 account"
msgstr[0] ""
@@ -4735,7 +4735,7 @@ msgstr ""
#: setup/setup_welcome.tpl.c:2
msgid ""
-"This seems to be the first time you start FusionDirectory - we didn't find "
+"This seems to be the first time you start FusionDirectory - we cannot find "
"any configuration right now. This simple wizard intends to help you while "
"setting it up."
msgstr ""
@@ -4780,12 +4780,12 @@ msgstr ""
#: setup/setup_welcome.tpl.c:32
msgid ""
"For security reasons you need to authenticate for the installation by "
-"creating the file '%1', containing the current session ID on the servers "
+"creating the file '%1', containing the current session ID on the server's "
"local filesystem. This can be done by executing the following command:"
msgstr ""
#: setup/setup_welcome.tpl.c:35
-msgid "Click the 'Next' button when you've finished."
+msgid "Click the 'Next' button when you are done."
msgstr ""
#: setup/setup_migrate.tpl.c:2
@@ -5054,7 +5054,7 @@ msgstr ""
#: ihtml/themes/breezy/islocked.tpl.c:11
msgid ""
"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
+"web browser during the edit operation. You may want to take over the lock by "
"pressing the \"%1\" button."
msgstr ""
diff --git a/locale/zh/fusiondirectory.po b/locale/zh/fusiondirectory.po
index a3eb1142476d9b1fe6d9a28b808ac8d95364f8bc..6d76a124847f6b4b95a6a98079ce3297fcb95452 100644
--- a/locale/zh/fusiondirectory.po
+++ b/locale/zh/fusiondirectory.po
@@ -87,7 +87,7 @@ msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:71
msgid ""
"LDAP attributes to display, comma separated. Special values \"nameAttr\" and"
-" \"mainAttr\" also works."
+" \"mainAttr\" also work."
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:75
@@ -99,7 +99,7 @@ msgid "Column title"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
-msgid "Persitent"
+msgid "Persistent"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
@@ -578,7 +578,7 @@ msgid "Send bug report to the FusionDirectory Team"
msgstr ""
#: include/php_setup.inc:235
-msgid "Send bugreport"
+msgid "Send bug report"
msgstr ""
#: include/php_setup.inc:240
@@ -633,7 +633,7 @@ msgstr ""
#: include/login/class_LoginCAS.inc:68
#, php-format
-msgid "CAS user \"%s\" could not be found in the LDAP"
+msgid "CAS user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginCAS.inc:78 include/login/class_LoginCAS.inc:104
@@ -723,7 +723,7 @@ msgstr ""
#: include/login/class_LoginHTTPHeader.inc:64
#, php-format
-msgid "Header user \"%s\" could not be found in the LDAP"
+msgid "Header user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginHTTPAuth.inc:29
@@ -767,7 +767,7 @@ msgid "The user using email \"%s\" is locked. Please contact your administrator.
msgstr ""
#: include/class_passwordRecovery.inc:352
-msgid "Contact your administrator, there was a problem with mail server"
+msgid "Contact your administrator, there was a problem with the mail server"
msgstr ""
#: include/class_passwordRecovery.inc:365
@@ -775,7 +775,7 @@ msgid "This token is invalid"
msgstr ""
#: include/class_passwordRecovery.inc:429
-msgid "There was a problem with mail server, confirmation email not sent"
+msgid "There was a problem with the mail server, confirmation email not sent"
msgstr ""
#: include/password-methods/class_passwordMethodSasl.inc:66
@@ -840,7 +840,7 @@ msgstr ""
#: include/functions.inc:354
#, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
msgstr "致命错误：连接 LDAP 错误。æœåŠ¡å™¨è¿”回 '%s'。"
#: include/functions.inc:402 include/functions.inc:531
@@ -1155,7 +1155,7 @@ msgstr ""
#: include/class_msgPool.inc:245
#, php-format
-msgid "The entry \"%s\" already use this \"%s\" attribute!"
+msgid "The entry \"%s\" already uses this \"%s\" attribute!"
msgstr ""
#: include/class_msgPool.inc:256
@@ -1601,7 +1601,7 @@ msgstr "下载"
#: include/simpleplugin/attributes/class_FileAttribute.inc:380
#, php-format
-msgid "Cannot set \"%s\" value, it contains invalid data: %s"
+msgid "Cannot set value \"%s\", it contains invalid data: %s"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:390
@@ -1647,7 +1647,7 @@ msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:150
#, php-format
-msgid "The value for multivaluated field \"%s\" is not an array"
+msgid "The value for multivalued field \"%s\" is not an array"
msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:250
@@ -1708,7 +1708,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:492
#, php-format
msgid ""
-"Could not compute dn: could not find objectType infos from tab class \"%s\""
+"Could not compute dn: could not find objectType info from tab class \"%s\""
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1363
@@ -1723,7 +1723,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1576
msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may"
+"The object has changed since being opened in FusionDirectory. All changes that may"
" be done by others will get lost if you save this entry!"
msgstr ""
@@ -2428,7 +2428,7 @@ msgid "DN you wish to add assignments for"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:110
-msgid "The dn you entered could not be found in the LDAP"
+msgid "The dn you entered could not be found in LDAP"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:141
@@ -2610,7 +2610,7 @@ msgid "SASL"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
-msgid "Force to ask for password"
+msgid "Force asking for a password"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
@@ -2686,7 +2686,7 @@ msgid "Activate password recovery"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:47
-msgid "Whether to activate or not password recovery feature"
+msgid "Whether to activate the password recovery feature or not"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:52
@@ -2721,7 +2721,7 @@ msgstr ""
#: plugins/config/class_recoveryConfig.inc:74
msgid ""
-"Users will also be able to enter one of theirs alternate addresses to "
+"Users will also be able to enter one of their alternate addresses to "
"recover their password"
msgstr ""
@@ -2961,7 +2961,7 @@ msgid "Snapshot base"
msgstr ""
#: plugins/config/class_configInLdap.inc:109
-msgid "The base where snapshots should be stored inside of the LDAP."
+msgid "The base where snapshots should be stored inside the LDAP directory."
msgstr ""
#: plugins/config/class_configInLdap.inc:114
@@ -3157,7 +3157,7 @@ msgid "People DN attribute"
msgstr ""
#: plugins/config/class_configInLdap.inc:252
-msgid "Attribute to use at the beginning of users dn"
+msgid "Attribute to use at the beginning of the user's dn"
msgstr ""
#: plugins/config/class_configInLdap.inc:257
@@ -3242,7 +3242,7 @@ msgstr ""
#: plugins/config/class_configInLdap.inc:301
msgid ""
"Shows PHP errors in the upper part of the screen. This should be disabled in"
-" productive deployments, because there might be some passwords in it."
+" production deployments, because it may contain passwords."
msgstr ""
#: plugins/config/class_configInLdap.inc:305
@@ -3480,7 +3480,7 @@ msgstr ""
#: plugins/personal/roles/class_userRoles.inc:49
#: plugins/personal/roles/class_userRoles.inc:53
-msgid "Groups membership"
+msgid "Group memberships"
msgstr ""
#: plugins/personal/roles/class_userRoles.inc:60
@@ -3759,7 +3759,7 @@ msgstr "邮编"
#: plugins/personal/generic/class_user.inc:430
#, php-format
-msgid "Ppolicy \"%s\" could not be found in the LDAP!"
+msgid "Ppolicy \"%s\" could not be found in LDAP!"
msgstr ""
#: plugins/personal/generic/class_user.inc:460
@@ -4024,7 +4024,7 @@ msgstr ""
#: setup/class_setupStepChecks.inc:124
msgid ""
-"FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
+"FusionDirectory requires either the 'mhash' or 'sha1' module to make use of "
"SSHA encryption."
msgstr ""
@@ -4212,11 +4212,11 @@ msgid "Checking for POSIX groups outside the groups tree"
msgstr ""
#: setup/class_setupStepMigrate.inc:274
-msgid "Checking for duplicated UID numbers"
+msgid "Checking for duplicate UID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:275
-msgid "Checking for duplicated GID numbers"
+msgid "Checking for duplicate GID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:343 setup/class_setupStepMigrate.inc:502
@@ -4232,7 +4232,7 @@ msgstr ""
#: setup/class_setupStepMigrate.inc:935 setup/class_setupStepMigrate.inc:1041
#: setup/class_setupStepMigrate.inc:1071 setup/class_setupStepMigrate.inc:1322
#: setup/class_setupStepMigrate.inc:1433
-msgid "Possibly the \"root object\" is missing."
+msgid "The \"root object\" is possibly missing."
msgstr ""
#: setup/class_setupStepMigrate.inc:360 setup/class_setupStepMigrate.inc:383
@@ -4303,7 +4303,7 @@ msgid "Roles"
msgstr ""
#: setup/class_setupStepMigrate.inc:836
-msgid "There is no FusionDirectory administrator account inside your LDAP."
+msgid "There is no FusionDirectory administrator account in your LDAP directory."
msgstr ""
#: setup/class_setupStepMigrate.inc:875
@@ -4342,12 +4342,12 @@ msgid "LDAP result parsing failed"
msgstr ""
#: setup/class_setupStepMigrate.inc:1076 setup/class_setupStepMigrate.inc:1327
-msgid "Sizelimit hit"
+msgid "Size limit hit"
msgstr ""
#: setup/class_setupStepMigrate.inc:1077 setup/class_setupStepMigrate.inc:1328
#, php-format
-msgid "Sizelimit of %d hit. Please check this manually"
+msgid "Size limit of %d hit. Please check this manually"
msgstr ""
#: setup/class_setupStepMigrate.inc:1120 setup/class_setupStepMigrate.inc:1134
@@ -4442,7 +4442,7 @@ msgstr ""
#, php-format
msgid ""
"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
"shouldn't."
msgstr ""
@@ -4547,7 +4547,7 @@ msgid_plural "There are %1 expired accounts"
msgstr[0] ""
#: plugins/addons/dashboard/users_accounts.tpl.c:5
-msgid "There is no expired account"
+msgid "There are no expired accounts"
msgstr ""
#: plugins/addons/dashboard/users_accounts.tpl.c:11
@@ -4593,8 +4593,8 @@ msgid_plural "There are %1 users:"
msgstr[0] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:5
-msgid "One of them use %1 method"
-msgid_plural "%2 of them use %1 method"
+msgid "One of them uses the %1 method"
+msgid_plural "%2 of them use the %1 method"
msgstr[0] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:8
@@ -4603,7 +4603,7 @@ msgid_plural "%1 of them are locked"
msgstr[0] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:11
-msgid "None of them is locked"
+msgid "None of them are locked"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:5
@@ -4611,7 +4611,7 @@ msgid "There are no users"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:8
-msgid "One of them have a %1 account"
+msgid "One of them has a %1 account"
msgid_plural "%2 of them have a %1 account"
msgstr[0] ""
@@ -4679,7 +4679,7 @@ msgstr ""
#: setup/setup_welcome.tpl.c:2
msgid ""
-"This seems to be the first time you start FusionDirectory - we didn't find "
+"This seems to be the first time you start FusionDirectory - we cannot find "
"any configuration right now. This simple wizard intends to help you while "
"setting it up."
msgstr ""
@@ -4723,12 +4723,12 @@ msgstr ""
#: setup/setup_welcome.tpl.c:32
msgid ""
"For security reasons you need to authenticate for the installation by "
-"creating the file '%1', containing the current session ID on the servers "
+"creating the file '%1', containing the current session ID on the server's "
"local filesystem. This can be done by executing the following command:"
msgstr ""
#: setup/setup_welcome.tpl.c:35
-msgid "Click the 'Next' button when you've finished."
+msgid "Click the 'Next' button when you are done."
msgstr ""
#: setup/setup_migrate.tpl.c:2
@@ -4991,7 +4991,7 @@ msgstr ""
#: ihtml/themes/breezy/islocked.tpl.c:11
msgid ""
"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
+"web browser during the edit operation. You may want to take over the lock by "
"pressing the \"%1\" button."
msgstr ""
diff --git a/locale/zh_TW/fusiondirectory.po b/locale/zh_TW/fusiondirectory.po
index 3142fd20007d40fd2e899e090c87a57d57a03ec5..cb4b32af9d3ba22a9efeb28573162b255ccdc6e1 100644
--- a/locale/zh_TW/fusiondirectory.po
+++ b/locale/zh_TW/fusiondirectory.po
@@ -83,7 +83,7 @@ msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:71
msgid ""
"LDAP attributes to display, comma separated. Special values \"nameAttr\" and"
-" \"mainAttr\" also works."
+" \"mainAttr\" also work."
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:75
@@ -95,7 +95,7 @@ msgid "Column title"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
-msgid "Persitent"
+msgid "Persistent"
msgstr ""
#: include/management/class_ManagementConfigurationDialog.inc:86
@@ -574,7 +574,7 @@ msgid "Send bug report to the FusionDirectory Team"
msgstr ""
#: include/php_setup.inc:235
-msgid "Send bugreport"
+msgid "Send bug report"
msgstr ""
#: include/php_setup.inc:240
@@ -629,7 +629,7 @@ msgstr ""
#: include/login/class_LoginCAS.inc:68
#, php-format
-msgid "CAS user \"%s\" could not be found in the LDAP"
+msgid "CAS user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginCAS.inc:78 include/login/class_LoginCAS.inc:104
@@ -719,7 +719,7 @@ msgstr ""
#: include/login/class_LoginHTTPHeader.inc:64
#, php-format
-msgid "Header user \"%s\" could not be found in the LDAP"
+msgid "Header user \"%s\" could not be found in LDAP"
msgstr ""
#: include/login/class_LoginHTTPAuth.inc:29
@@ -763,7 +763,7 @@ msgid "The user using email \"%s\" is locked. Please contact your administrator.
msgstr ""
#: include/class_passwordRecovery.inc:352
-msgid "Contact your administrator, there was a problem with mail server"
+msgid "Contact your administrator, there was a problem with the mail server"
msgstr ""
#: include/class_passwordRecovery.inc:365
@@ -771,7 +771,7 @@ msgid "This token is invalid"
msgstr ""
#: include/class_passwordRecovery.inc:429
-msgid "There was a problem with mail server, confirmation email not sent"
+msgid "There was a problem with the mail server, confirmation email not sent"
msgstr ""
#: include/password-methods/class_passwordMethodSasl.inc:66
@@ -836,7 +836,7 @@ msgstr ""
#: include/functions.inc:354
#, php-format
-msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting to LDAP. Server said '%s'."
msgstr ""
#: include/functions.inc:402 include/functions.inc:531
@@ -1151,7 +1151,7 @@ msgstr ""
#: include/class_msgPool.inc:245
#, php-format
-msgid "The entry \"%s\" already use this \"%s\" attribute!"
+msgid "The entry \"%s\" already uses this \"%s\" attribute!"
msgstr ""
#: include/class_msgPool.inc:256
@@ -1597,7 +1597,7 @@ msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:380
#, php-format
-msgid "Cannot set \"%s\" value, it contains invalid data: %s"
+msgid "Cannot set value \"%s\", it contains invalid data: %s"
msgstr ""
#: include/simpleplugin/attributes/class_FileAttribute.inc:390
@@ -1643,7 +1643,7 @@ msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:150
#, php-format
-msgid "The value for multivaluated field \"%s\" is not an array"
+msgid "The value for multivalued field \"%s\" is not an array"
msgstr ""
#: include/simpleplugin/attributes/class_SetAttribute.inc:250
@@ -1704,7 +1704,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:492
#, php-format
msgid ""
-"Could not compute dn: could not find objectType infos from tab class \"%s\""
+"Could not compute dn: could not find objectType info from tab class \"%s\""
msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1363
@@ -1719,7 +1719,7 @@ msgstr ""
#: include/simpleplugin/class_simplePlugin.inc:1576
msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may"
+"The object has changed since being opened in FusionDirectory. All changes that may"
" be done by others will get lost if you save this entry!"
msgstr ""
@@ -2424,7 +2424,7 @@ msgid "DN you wish to add assignments for"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:110
-msgid "The dn you entered could not be found in the LDAP"
+msgid "The dn you entered could not be found in LDAP"
msgstr ""
#: plugins/admin/acl/class_aclManagement.inc:141
@@ -2606,7 +2606,7 @@ msgid "SASL"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
-msgid "Force to ask for password"
+msgid "Force asking for a password"
msgstr ""
#: plugins/config/class_mainPluginsConfig.inc:54
@@ -2682,7 +2682,7 @@ msgid "Activate password recovery"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:47
-msgid "Whether to activate or not password recovery feature"
+msgid "Whether to activate the password recovery feature or not"
msgstr ""
#: plugins/config/class_recoveryConfig.inc:52
@@ -2717,7 +2717,7 @@ msgstr ""
#: plugins/config/class_recoveryConfig.inc:74
msgid ""
-"Users will also be able to enter one of theirs alternate addresses to "
+"Users will also be able to enter one of their alternate addresses to "
"recover their password"
msgstr ""
@@ -2957,7 +2957,7 @@ msgid "Snapshot base"
msgstr ""
#: plugins/config/class_configInLdap.inc:109
-msgid "The base where snapshots should be stored inside of the LDAP."
+msgid "The base where snapshots should be stored inside the LDAP directory."
msgstr ""
#: plugins/config/class_configInLdap.inc:114
@@ -3153,7 +3153,7 @@ msgid "People DN attribute"
msgstr ""
#: plugins/config/class_configInLdap.inc:252
-msgid "Attribute to use at the beginning of users dn"
+msgid "Attribute to use at the beginning of the user's dn"
msgstr ""
#: plugins/config/class_configInLdap.inc:257
@@ -3238,7 +3238,7 @@ msgstr ""
#: plugins/config/class_configInLdap.inc:301
msgid ""
"Shows PHP errors in the upper part of the screen. This should be disabled in"
-" productive deployments, because there might be some passwords in it."
+" production deployments, because it may contain passwords."
msgstr ""
#: plugins/config/class_configInLdap.inc:305
@@ -3476,7 +3476,7 @@ msgstr ""
#: plugins/personal/roles/class_userRoles.inc:49
#: plugins/personal/roles/class_userRoles.inc:53
-msgid "Groups membership"
+msgid "Group memberships"
msgstr ""
#: plugins/personal/roles/class_userRoles.inc:60
@@ -3755,7 +3755,7 @@ msgstr ""
#: plugins/personal/generic/class_user.inc:430
#, php-format
-msgid "Ppolicy \"%s\" could not be found in the LDAP!"
+msgid "Ppolicy \"%s\" could not be found in LDAP!"
msgstr ""
#: plugins/personal/generic/class_user.inc:460
@@ -4020,7 +4020,7 @@ msgstr ""
#: setup/class_setupStepChecks.inc:124
msgid ""
-"FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
+"FusionDirectory requires either the 'mhash' or 'sha1' module to make use of "
"SSHA encryption."
msgstr ""
@@ -4208,11 +4208,11 @@ msgid "Checking for POSIX groups outside the groups tree"
msgstr ""
#: setup/class_setupStepMigrate.inc:274
-msgid "Checking for duplicated UID numbers"
+msgid "Checking for duplicate UID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:275
-msgid "Checking for duplicated GID numbers"
+msgid "Checking for duplicate GID numbers"
msgstr ""
#: setup/class_setupStepMigrate.inc:343 setup/class_setupStepMigrate.inc:502
@@ -4228,7 +4228,7 @@ msgstr ""
#: setup/class_setupStepMigrate.inc:935 setup/class_setupStepMigrate.inc:1041
#: setup/class_setupStepMigrate.inc:1071 setup/class_setupStepMigrate.inc:1322
#: setup/class_setupStepMigrate.inc:1433
-msgid "Possibly the \"root object\" is missing."
+msgid "The \"root object\" is possibly missing."
msgstr ""
#: setup/class_setupStepMigrate.inc:360 setup/class_setupStepMigrate.inc:383
@@ -4299,7 +4299,7 @@ msgid "Roles"
msgstr ""
#: setup/class_setupStepMigrate.inc:836
-msgid "There is no FusionDirectory administrator account inside your LDAP."
+msgid "There is no FusionDirectory administrator account in your LDAP directory."
msgstr ""
#: setup/class_setupStepMigrate.inc:875
@@ -4338,12 +4338,12 @@ msgid "LDAP result parsing failed"
msgstr ""
#: setup/class_setupStepMigrate.inc:1076 setup/class_setupStepMigrate.inc:1327
-msgid "Sizelimit hit"
+msgid "Size limit hit"
msgstr ""
#: setup/class_setupStepMigrate.inc:1077 setup/class_setupStepMigrate.inc:1328
#, php-format
-msgid "Sizelimit of %d hit. Please check this manually"
+msgid "Size limit of %d hit. Please check this manually"
msgstr ""
#: setup/class_setupStepMigrate.inc:1120 setup/class_setupStepMigrate.inc:1134
@@ -4438,7 +4438,7 @@ msgstr ""
#, php-format
msgid ""
"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
+"user the web server is running with is able to read %s, while other users "
"shouldn't."
msgstr ""
@@ -4543,7 +4543,7 @@ msgid_plural "There are %1 expired accounts"
msgstr[0] ""
#: plugins/addons/dashboard/users_accounts.tpl.c:5
-msgid "There is no expired account"
+msgid "There are no expired accounts"
msgstr ""
#: plugins/addons/dashboard/users_accounts.tpl.c:11
@@ -4589,8 +4589,8 @@ msgid_plural "There are %1 users:"
msgstr[0] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:5
-msgid "One of them use %1 method"
-msgid_plural "%2 of them use %1 method"
+msgid "One of them uses the %1 method"
+msgid_plural "%2 of them use the %1 method"
msgstr[0] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:8
@@ -4599,7 +4599,7 @@ msgid_plural "%1 of them are locked"
msgstr[0] ""
#: plugins/addons/dashboard/pwd_stats.tpl.c:11
-msgid "None of them is locked"
+msgid "None of them are locked"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:5
@@ -4607,7 +4607,7 @@ msgid "There are no users"
msgstr ""
#: plugins/addons/dashboard/users_stats.tpl.c:8
-msgid "One of them have a %1 account"
+msgid "One of them has a %1 account"
msgid_plural "%2 of them have a %1 account"
msgstr[0] ""
@@ -4675,7 +4675,7 @@ msgstr ""
#: setup/setup_welcome.tpl.c:2
msgid ""
-"This seems to be the first time you start FusionDirectory - we didn't find "
+"This seems to be the first time you start FusionDirectory - we cannot find "
"any configuration right now. This simple wizard intends to help you while "
"setting it up."
msgstr ""
@@ -4719,12 +4719,12 @@ msgstr ""
#: setup/setup_welcome.tpl.c:32
msgid ""
"For security reasons you need to authenticate for the installation by "
-"creating the file '%1', containing the current session ID on the servers "
+"creating the file '%1', containing the current session ID on the server's "
"local filesystem. This can be done by executing the following command:"
msgstr ""
#: setup/setup_welcome.tpl.c:35
-msgid "Click the 'Next' button when you've finished."
+msgid "Click the 'Next' button when you are done."
msgstr ""
#: setup/setup_migrate.tpl.c:2
@@ -4987,7 +4987,7 @@ msgstr ""
#: ihtml/themes/breezy/islocked.tpl.c:11
msgid ""
"If this lock detection is false, the other person may have closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
+"web browser during the edit operation. You may want to take over the lock by "
"pressing the \"%1\" button."
msgstr ""
diff --git a/plugins/addons/dashboard/pwd_stats.tpl b/plugins/addons/dashboard/pwd_stats.tpl
index add05c1706a746e6f930c2232b977ebeca8eb438..247333b3fff4c80feb5d94d94f592eead756992e 100644
--- a/plugins/addons/dashboard/pwd_stats.tpl
+++ b/plugins/addons/dashboard/pwd_stats.tpl
@@ -17,7 +17,7 @@
{else}
<li>
{/if}
- {t count=$method.nb 1=$method.name 2=$method.nb plural="%2 of them use %1 method"}One of them use %1 method{/t}
+ {t count=$method.nb 1=$method.name 2=$method.nb plural="%2 of them use the %1 method"}One of them uses %1 method{/t}
</li>
{/if}
{/foreach}
@@ -25,7 +25,7 @@
{if $attributes.pwds_stats.locked_accounts.nb > 0}
{t count=$attributes.pwds_stats.locked_accounts.nb 1=$attributes.pwds_stats.locked_accounts.nb plural="%1 of them are locked"}One of them is locked{/t}
{else}
- {t}None of them is locked{/t}
+ {t}None of them are locked{/t}
{/if}
</li>
</ul>
diff --git a/plugins/addons/dashboard/users_accounts.tpl b/plugins/addons/dashboard/users_accounts.tpl
index ac9b6dfb0fd72bf709c55493de9d5e84a7d455e3..e1cb316e5a9c2c0b3dcc21322a49048b5c45964e 100644
--- a/plugins/addons/dashboard/users_accounts.tpl
+++ b/plugins/addons/dashboard/users_accounts.tpl
@@ -7,7 +7,7 @@
{if $attributes.expired.accounts|@count > 0}
{t count=$attributes.expired.accounts|@count 1=$attributes.expired.accounts|@count plural="There are %1 expired accounts"}There is one expired account{/t}
{else}
- {t}There is no expired account{/t}
+ {t}There are no expired accounts{/t}
{/if}
</h1>
{if $attributes.expired.accounts|@count > 0}
diff --git a/plugins/addons/dashboard/users_stats.tpl b/plugins/addons/dashboard/users_stats.tpl
index f49ba653d3330e53d84bb88eadad5ff2955feafa..570414e058ba63b4aaf05136ecd8470a3d55280f 100644
--- a/plugins/addons/dashboard/users_stats.tpl
+++ b/plugins/addons/dashboard/users_stats.tpl
@@ -13,7 +13,7 @@
{foreach from=$attributes.users_stats.accounts item=acc}
<li style="list-style-image:url({$acc.img|escape})">
{if $acc.nb > 0}
- {t count=$acc.nb 1=$acc.name 2=$acc.nb plural="%2 of them have a %1 account"}One of them have a %1 account{/t}
+ {t count=$acc.nb 1=$acc.name 2=$acc.nb plural="%2 of them have a %1 account"}One of them has a %1 account{/t}
{else}
{t 1=$acc.name}None of them have a %1 account{/t}
{/if}
diff --git a/plugins/admin/acl/class_aclManagement.inc b/plugins/admin/acl/class_aclManagement.inc
index 2dc83ee0fa172175ee395792af5c7c800e5dcbb5..9d8c0c4039a50312eeb6d0a74085a9e6ba119b0b 100644
--- a/plugins/admin/acl/class_aclManagement.inc
+++ b/plugins/admin/acl/class_aclManagement.inc
@@ -107,7 +107,7 @@ class aclAssignmentCreationDialog extends simplePlugin
try {
$this->management->newEntryConfirmed($this->baseDn);
} catch (NonExistingLdapNodeException $e) {
- $error = new FusionDirectoryError(htmlescape(_('The dn you entered could not be found in the LDAP')), 0, $e);
+ $error = new FusionDirectoryError(htmlescape(_('The dn you entered could not be found in LDAP')), 0, $e);
$error->display();
return;
}
diff --git a/plugins/config/class_configInLdap.inc b/plugins/config/class_configInLdap.inc
index bf2028d55ce3fef7275534adefe0e14d9dc55393..7352cb9fde403bcd2fa893e6a3fcbe8bac83954d 100644
--- a/plugins/config/class_configInLdap.inc
+++ b/plugins/config/class_configInLdap.inc
@@ -107,7 +107,7 @@ class configInLdap extends simplePlugin
TRUE
),
new StringAttribute(
- _('Snapshot base'), _('The base where snapshots should be stored inside of the LDAP.'),
+ _('Snapshot base'), _('The base where snapshots should be stored inside the LDAP directory.'),
'fdSnapshotBase', FALSE,
'ou=snapshots,'.$config->current['BASE']
),
@@ -254,7 +254,7 @@ class configInLdap extends simplePlugin
'class' => ['critical'],
'attrs' => [
new SelectAttribute(
- _('People DN attribute'), _('Attribute to use at the beginning of users dn'),
+ _('People DN attribute'), _('Attribute to use at the beginning of the user's dn'),
'fdAccountPrimaryAttribute', TRUE,
['uid', 'cn']
),
@@ -309,7 +309,7 @@ class configInLdap extends simplePlugin
'attrs' => [
new BooleanAttribute(
_('Display PHP errors'),
- _('Shows PHP errors in the upper part of the screen. This should be disabled in productive deployments, because there might be some passwords in it.'),
+ _('Shows PHP errors in the upper part of the screen. This should be disabled in production deployments, because it may contain passwords.'),
'fdDisplayErrors'
),
new IntAttribute(
diff --git a/plugins/config/class_mainPluginsConfig.inc b/plugins/config/class_mainPluginsConfig.inc
index 6bfd4c6eca15d3569e6c2ff8ae1d65f22880baba..47169515c6c1565cc087c260e16dfdb36a3af212 100644
--- a/plugins/config/class_mainPluginsConfig.inc
+++ b/plugins/config/class_mainPluginsConfig.inc
@@ -51,7 +51,7 @@ class mainPluginsConfig extends multiPluginSection
'name' => _('SASL'),
'attrs' => [
new BooleanAttribute(
- _('Force to ask for password'), _('Useful if you add a trigger using password value when SASL user passwords are edited'),
+ _('Force asking for a password'), _('Useful if you add a trigger using password value when SASL user passwords are edited'),
'fdForceSaslPasswordAsk', TRUE,
FALSE
),
diff --git a/plugins/config/class_recoveryConfig.inc b/plugins/config/class_recoveryConfig.inc
index a27371d380558449936cc140e85b61f7617dd9db..aa0303f25a8f273dcb0d610cd969265fc15b431b 100644
--- a/plugins/config/class_recoveryConfig.inc
+++ b/plugins/config/class_recoveryConfig.inc
@@ -44,7 +44,7 @@ class recoveryConfig extends simplePlugin
'attrs' => [
new BooleanAttribute(
_('Activate password recovery'),
- _('Whether to activate or not password recovery feature'),
+ _('Whether to activate the password recovery feature or not'),
'fdPasswordRecoveryActivated',
FALSE
),
@@ -71,7 +71,7 @@ class recoveryConfig extends simplePlugin
),
new BooleanAttribute(
_('Allow the use of alternate addresses'),
- _('Users will also be able to enter one of theirs alternate addresses to recover their password'),
+ _('Users will also be able to enter one of their alternate addresses to recover their password'),
'fdPasswordRecoveryUseAlternate',
FALSE
),
diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index 25e7ea1586e15ecb1aad13b589c7ba23d75c2e5a..35531802a2c968264821b0dfbc2935fc5f7a09d0 100644
--- a/plugins/personal/generic/class_user.inc
+++ b/plugins/personal/generic/class_user.inc
@@ -427,7 +427,7 @@ class user extends simplePlugin
$ldap->cat($ppolicydn, ['pwdAllowUserChange', 'pwdMinLength', 'pwdMinAge', 'pwdSafeModify', 'pwdExpireWarning', 'pwdMaxAge']);
$policy = $ldap->fetch(TRUE);
if (!$policy) {
- throw new NonExistingLdapNodeException($ppolicydn, sprintf(_('Ppolicy "%s" could not be found in the LDAP!'), $ppolicydn));
+ throw new NonExistingLdapNodeException($ppolicydn, sprintf(_('Ppolicy "%s" could not be found in LDAP!'), $ppolicydn));
}
}
diff --git a/plugins/personal/roles/class_userRoles.inc b/plugins/personal/roles/class_userRoles.inc
index cd196a1ab54f3ece9ed753f39397713a1c628a30..60a004e0e02f7cb7aff7a2600367195ea6b4df00 100644
--- a/plugins/personal/roles/class_userRoles.inc
+++ b/plugins/personal/roles/class_userRoles.inc
@@ -46,11 +46,11 @@ class userRoles extends simplePlugin
{
return [
'groups' => [
- 'name' => _('Groups membership'),
+ 'name' => _('Group memberships'),
'attrs' => [
new SetAttribute(
new SelectAttribute(
- '', _('Groups membership'),
+ '', _('Group memberships'),
'groupsMembership', FALSE
)
)
diff --git a/setup/class_setupStepFinish.inc b/setup/class_setupStepFinish.inc
index c359d678f2abbeccfe50149d185fae4562ab3fe8..14d3e81ca7414d240718c4515eab1cafe228c9c2 100644
--- a/setup/class_setupStepFinish.inc
+++ b/setup/class_setupStepFinish.inc
@@ -88,7 +88,7 @@ class setupStepFinish extends setupStep
$smarty = get_smarty();
$smarty->assign('err_msg', $err_msg);
- $smarty->assign('msg2', sprintf(_('After downloading and placing the file under %s, please make sure that the user the webserver is running with is able to read %s, while other users shouldn\'t.'), CONFIG_DIR, CONFIG_FILE));
+ $smarty->assign('msg2', sprintf(_('After downloading and placing the file under %s, please make sure that the user the web server is running with is able to read %s, while other users shouldn\'t.'), CONFIG_DIR, CONFIG_FILE));
return parent::render();
}
diff --git a/setup/class_setupStepMigrate.inc b/setup/class_setupStepMigrate.inc
index 2c7626569a4c1b55250605a78ba322787d29c4dc..59c0d524ee4d7a7ff31db0095abad308e68de2b6 100644
--- a/setup/class_setupStepMigrate.inc
+++ b/setup/class_setupStepMigrate.inc
@@ -286,8 +286,8 @@ class setupStepMigrate extends setupStep
if (class_available('posixAccount')) {
$checks['outsidePosixGroups'] = new StepMigrateCheck($this, 'outsidePosixGroups', _('Checking for POSIX groups outside the groups tree'));
- $checks['uidNumber'] = new StepMigrateCheck($this, 'uidNumber', _('Checking for duplicated UID numbers'));
- $checks['gidNumber'] = new StepMigrateCheck($this, 'gidNumber', _('Checking for duplicated GID numbers'));
+ $checks['uidNumber'] = new StepMigrateCheck($this, 'uidNumber', _('Checking for duplicate UID numbers'));
+ $checks['gidNumber'] = new StepMigrateCheck($this, 'gidNumber', _('Checking for duplicate GID numbers'));
}
$this->checks = $checks;
@@ -853,7 +853,7 @@ class setupStepMigrate extends setupStep
} else {
throw new CheckFailedException(
_('Failed'),
- _('There is no FusionDirectory administrator account inside your LDAP.').' '.
+ _('There is no FusionDirectory administrator account in your LDAP directory.').' '.
$checkobj->submit(_('Create'), 'create')
);
}
@@ -1332,8 +1332,8 @@ class setupStepMigrate extends setupStep
}
if ($ldap->hitSizeLimit()) {
throw new CheckFailedException(
- _('Sizelimit hit'),
- sprintf(_('Sizelimit of %d hit. Please check this manually'), static::$objectNumberLimit)
+ _('Size limit hit'),
+ sprintf(_('Size limit of %d hit. Please check this manually'), static::$objectNumberLimit)
);
}
$sizeLimitHit = FALSE;
diff --git a/setup/setup_welcome.tpl b/setup/setup_welcome.tpl
index 11492f6ecd7ba76c1a66527a9a6af2d2eb6c271b..43fa901202f88d37070305a4a468253da8bc813c 100644
--- a/setup/setup_welcome.tpl
+++ b/setup/setup_welcome.tpl
@@ -1,6 +1,6 @@
<div class="default">
<p>
- {t}This seems to be the first time you start FusionDirectory - we didn't find any configuration right now. This simple wizard intends to help you while setting it up.{/t}
+ {t}This seems to be the first time you start FusionDirectory - we cannot find any configuration right now. This simple wizard intends to help you while setting it up.{/t}
</p>
<hr/>
@@ -26,12 +26,12 @@
<b>{t}To continue:{/t}</b>
</p>
<p>
- {t 1=$path}For security reasons you need to authenticate for the installation by creating the file '%1', containing the current session ID on the servers local filesystem. This can be done by executing the following command:{/t}
+ {t 1=$path}For security reasons you need to authenticate for the installation by creating the file '%1', containing the current session ID on the server's local filesystem. This can be done by executing the following command:{/t}
</p>
<tt>
echo -n <b>{$auth_id}</b> > {$path}
</tt>
<p>
- {t}Click the 'Next' button when you've finished.{/t}
+ {t}Click the 'Next' button when you are done.{/t}
</p>
</div>