From b35cb753f93fb11353b07c2ecd628f70148c3aa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Mon, 12 Dec 2016 03:48:59 +0100
Subject: [PATCH] Fixes #5278 Information is a "mass noun" and have no plural
---
contrib/bin/fusiondirectory-setup | 2 +-
ihtml/themes/breezy/recovery.tpl | 2 +-
include/class_msgPool.inc | 4 ++--
include/simpleplugin/class_simplePlugin.inc | 2 +-
plugins/addons/dashboard/class_dashBoard.inc | 2 +-
plugins/admin/groups/class_roleGeneric.inc | 2 +-
plugins/config/class_recoveryConfig.inc | 2 +-
setup/class_setupStep_Migrate.inc | 2 +-
8 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/contrib/bin/fusiondirectory-setup b/contrib/bin/fusiondirectory-setup
index 91770059b..0bc72710c 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 4ca66dd01..e8193d514 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 f506ca7f0..1890b689a 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 21d241713..43bbe955c 100644
--- a/include/simpleplugin/class_simplePlugin.inc
+++ b/include/simpleplugin/class_simplePlugin.inc
@@ -718,7 +718,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 cb2db457f..cb9ec8c49 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 6af83a620..be0842d33 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 4b87c2037..59f503dce 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 17670beb4..7347c6e03 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.
--
GitLab