diff --git a/contrib/bin/fusiondirectory-setup b/contrib/bin/fusiondirectory-setup index 1e23fd04ef9b11e8ab5513abbbb0e01cfcc132a2..22a515a1dce38ccbe13277c059cbd74a1623a833 100644 --- a/contrib/bin/fusiondirectory-setup +++ b/contrib/bin/fusiondirectory-setup @@ -772,7 +772,7 @@ sub get_ldap_connexion { # if can't find fusiondirectory.conf } else { - if ( ask_yn_question ("Can't find fusiondirectory.conf, do you want to specify LDAP's informations yourself ?: ") ) { + if ( ask_yn_question ("Can't find fusiondirectory.conf, do you want to specify LDAP's information yourself ?: ") ) { $uri = ask_user_input ("LDAP server's URI"); $base = ask_user_input ("Search base"); $hash_result{base} = $base; diff --git a/ihtml/themes/breezy/recovery.tpl b/ihtml/themes/breezy/recovery.tpl index 4ca66dd01615da3c934fd078c5894b21710650c9..e8193d514760dbbcca9042becaaa847c151b3c4e 100644 --- a/ihtml/themes/breezy/recovery.tpl +++ b/ihtml/themes/breezy/recovery.tpl @@ -29,7 +29,7 @@ {if $step==3} <p class="infotext"> - {t 1=$uid 2=$email_address}Informations to reset password for %1 have been sent to email address %2{/t}<br/> + {t 1=$uid 2=$email_address}Information to reset password for %1 has been sent to email address %2{/t}<br/> <span class="warning">{t 1=$delay_allowed}Warning : this email is only valid for %1 minutes.{/t}</span> </p> </div> diff --git a/include/class_msgPool.inc b/include/class_msgPool.inc index 5bbbb9ebfd9c9d010bbd8938bfc2225a1178a490..9ec3bff10cab494e6a7d0df3310c09563a59eebc 100644 --- a/include/class_msgPool.inc +++ b/include/class_msgPool.inc @@ -665,11 +665,11 @@ class msgPool { } /*! - * \brief Display : Click the 'Edit' button below to change informations in this dialog + * \brief Display : Click the 'Edit' button below to change information in this dialog */ public static function clickEditToChange() { - return _("Click the 'Edit' button below to change informations in this dialog"); + return _("Click the 'Edit' button below to change information in this dialog"); } /*! diff --git a/include/simpleplugin/class_simplePlugin.inc b/include/simpleplugin/class_simplePlugin.inc index f33d2e4f7070aa519556900af7267f47f825302e..34a2a0511de7fb1261204422e47c42d980555378 100644 --- a/include/simpleplugin/class_simplePlugin.inc +++ b/include/simpleplugin/class_simplePlugin.inc @@ -521,7 +521,7 @@ class simplePlugin extends plugin $group->renderAttributes(TRUE); $smarty->assign("hiddenPostedInput", get_class($this)."_posted"); - return "<h1>Inherited informations:</h1><div></div>\n".$smarty->fetch($this->templatePath); + return "<h1>Inherited information:</h1><div></div>\n".$smarty->fetch($this->templatePath); } /*! \brief This function allows you to open a dialog diff --git a/plugins/addons/dashboard/class_dashBoard.inc b/plugins/addons/dashboard/class_dashBoard.inc index 56e0eba91fb9b010bdde0eb743252d40a8f3b72e..873e1a1497ab25ca87fe670c9c4f3a18f24229c5 100644 --- a/plugins/addons/dashboard/class_dashBoard.inc +++ b/plugins/addons/dashboard/class_dashBoard.inc @@ -26,7 +26,7 @@ class dashboard extends simplePlugin return array( 'plShortName' => _('Dashboard'), 'plTitle' => _('Dashboard'), - 'plDescription' => _('Statistics and various informations'), + 'plDescription' => _('Statistics and various information'), 'plIcon' => 'geticon.php?context=applications&icon=utilities-system-monitor&size=48', 'plObjectType' => array( 'dashboard' => array( diff --git a/plugins/admin/groups/class_roleGeneric.inc b/plugins/admin/groups/class_roleGeneric.inc index 6af83a62033e9bf74bc52ecc7d63d1c922bc5bce..be0842d332e6e712d51bfdb59e0745469e05229e 100644 --- a/plugins/admin/groups/class_roleGeneric.inc +++ b/plugins/admin/groups/class_roleGeneric.inc @@ -79,7 +79,7 @@ class roleGeneric extends simplePlugin { return array( 'main' => array( - 'name' => _('Informations'), + 'name' => _('Information'), 'attrs' => array( new BaseSelectorAttribute (get_ou('roleRDN')), new StringAttribute( diff --git a/plugins/config/class_recoveryConfig.inc b/plugins/config/class_recoveryConfig.inc index 7ab146a12100e77f894b553818cfda9e60a997cc..d16163f1852a0d547b04f9ec93eb188e0aea264d 100644 --- a/plugins/config/class_recoveryConfig.inc +++ b/plugins/config/class_recoveryConfig.inc @@ -91,7 +91,7 @@ class recoveryConfig extends simplePlugin _('Body of the first email, sent when the user ask for a new password. Use %s for the login and the recovery link.'), 'fdPasswordRecoveryMailBody', TRUE, - _("Hello,\n\nHere are your informations : \n - Login : %s\n - Link : %s\n\nThis link is only valid for 10 minutes.") + _("Hello,\n\nHere is your information: \n - Login : %s\n - Link : %s\n\nThis link is only valid for 10 minutes.") ) ) ), diff --git a/setup/class_setupStep_Migrate.inc b/setup/class_setupStep_Migrate.inc index 82a650e69d7d97afff629375901771a22b9a516f..44bc712846bd30ba5920cfd6055f478b62e9dc6a 100644 --- a/setup/class_setupStep_Migrate.inc +++ b/setup/class_setupStep_Migrate.inc @@ -23,7 +23,7 @@ * FUNCTIONS Step_Migrate - Constructor. -update_strings - Used to update the displayed step informations. +update_strings - Used to update the displayed step information. initialize_checks - Initialize migration steps. check_ldap_permissions - Check if the used admin account has full access to the ldap database. check_gosaAccounts - Check if there are users without the required objectClasses.