diff --git a/src/IDF/Form/Admin/ProjectCreate.php b/src/IDF/Form/Admin/ProjectCreate.php
index 5b823db..262aaee 100644
--- a/src/IDF/Form/Admin/ProjectCreate.php
+++ b/src/IDF/Form/Admin/ProjectCreate.php
@@ -182,7 +182,7 @@ class IDF_Form_Admin_ProjectCreate extends Pluf_Form
// we accept only starting with http(s):// to avoid people
// trying to access the local filesystem.
if (!preg_match('#^(http|https)://#', $url)) {
- throw new Pluf_Form_Invalid(__('Only a remote repository available throught http or https are allowed. For example "http://somewhere.com/svn/trunk".'));
+ throw new Pluf_Form_Invalid(__('Only a remote repository available through HTTP or HTTPS is allowed. For example "http://somewhere.com/svn/trunk".'));
}
return $url;
}
diff --git a/src/IDF/Form/Admin/ProjectUpdate.php b/src/IDF/Form/Admin/ProjectUpdate.php
index e15e029..3fd9156 100644
--- a/src/IDF/Form/Admin/ProjectUpdate.php
+++ b/src/IDF/Form/Admin/ProjectUpdate.php
@@ -88,7 +88,7 @@ class IDF_Form_Admin_ProjectUpdate extends Pluf_Form
$mtn_master_branch)) {
throw new Pluf_Form_Invalid(__(
'The master branch is empty or contains illegal characters, '.
- 'please use only letters, digits, dashs and dots as separators.'
+ 'please use only letters, digits, dashes and dots as separators.'
));
}
diff --git a/src/IDF/Form/Admin/UserCreate.php b/src/IDF/Form/Admin/UserCreate.php
index e39ceb7..8a20d70 100644
--- a/src/IDF/Form/Admin/UserCreate.php
+++ b/src/IDF/Form/Admin/UserCreate.php
@@ -68,7 +68,7 @@ class IDF_Form_Admin_UserCreate extends Pluf_Form
array('required' => true,
'label' => __('Email'),
'initial' => '',
- 'help_text' => __('Double check the email address as the password is directly sent to the user.'),
+ 'help_text' => __('Double check the email address as the password is sent directly to the user.'),
));
$this->fields['language'] = new Pluf_Form_Field_Varchar(
diff --git a/src/IDF/Form/Admin/UserUpdate.php b/src/IDF/Form/Admin/UserUpdate.php
index d9111ae..a962ca2 100644
--- a/src/IDF/Form/Admin/UserUpdate.php
+++ b/src/IDF/Form/Admin/UserUpdate.php
@@ -78,7 +78,7 @@ class IDF_Form_Admin_UserUpdate extends Pluf_Form
'label' => __('Password'),
'initial' => '',
'widget' => 'Pluf_Form_Widget_PasswordInput',
- 'help_text' => Pluf_Template::markSafe(__('Leave blank if you do not want to change the password.').'
'.__('The password must be hard for other people to find it, but easy for the user to remember.')),
+ 'help_text' => Pluf_Template::markSafe(__('Leave blank if you do not want to change the password.').'
'.__('The password must be hard for other people to guess, but easy for the user to remember.')),
'widget_attrs' => array(
'maxlength' => 50,
'size' => 15,
@@ -161,7 +161,7 @@ class IDF_Form_Admin_UserUpdate extends Pluf_Form
'label' => __('Staff'),
'initial' => $this->user->staff,
'widget' => 'Pluf_Form_Widget_CheckboxInput',
- 'help_text' => __('If you give staff rights to a user, you really need to trust him.'),
+ 'help_text' => __('If you give staff rights to a user, you really need to trust them.'),
));
}
@@ -173,7 +173,7 @@ class IDF_Form_Admin_UserUpdate extends Pluf_Form
'initial' => $this->user->active,
'widget' => 'Pluf_Form_Widget_CheckboxInput',
'widget_attrs' => $attrs,
- 'help_text' => __('If the user is not getting the confirmation email or is abusing the system, you can directly enable or disable his account here.'),
+ 'help_text' => __('If the user is not getting the confirmation email or is abusing the system, you can directly enable or disable their account here.'),
));
}
diff --git a/src/IDF/Form/IssueTrackingConf.php b/src/IDF/Form/IssueTrackingConf.php
index cb0d17b..b2aef76 100644
--- a/src/IDF/Form/IssueTrackingConf.php
+++ b/src/IDF/Form/IssueTrackingConf.php
@@ -77,7 +77,7 @@ Maintainability = Hinders future changes';
{
$this->fields['labels_issue_template'] = new Pluf_Form_Field_Varchar(
array('required' => false,
- 'label' => __('Define an issue template to hint the reporter to provide certain information'),
+ 'label' => __('Define an issue template to hint to the reporter to provide certain information'),
'initial' => self::init_template,
'widget_attrs' => array('rows' => 7,
'cols' => 75),
diff --git a/src/IDF/Form/Register.php b/src/IDF/Form/Register.php
index 449d776..a2df09c 100644
--- a/src/IDF/Form/Register.php
+++ b/src/IDF/Form/Register.php
@@ -42,7 +42,7 @@ class IDF_Form_Register extends Pluf_Form
'max_length' => 15,
'min_length' => 3,
'initial' => $login,
- 'help_text' => __('The login must be between 3 and 15 characters long and contains only letters and digits.'),
+ 'help_text' => __('The login must be between 3 and 15 characters long and contain only letters and digits.'),
'widget_attrs' => array(
'maxlength' => 15,
'size' => 10,
@@ -52,7 +52,7 @@ class IDF_Form_Register extends Pluf_Form
array('required' => true,
'label' => __('Your email'),
'initial' => '',
- 'help_text' => __('We will never send you any unsolicited emails. We hate spams too!'),
+ 'help_text' => __('We will never send you any unsolicited emails. We hate spam too!'),
));
$this->fields['terms'] = new Pluf_Form_Field_Boolean(
@@ -94,7 +94,7 @@ class IDF_Form_Register extends Pluf_Form
{
$this->cleaned_data['email'] = mb_strtolower(trim($this->cleaned_data['email']));
if (Pluf::factory('IDF_EmailAddress')->get_user_for_email_address($this->cleaned_data['email']) != null) {
- throw new Pluf_Form_Invalid(sprintf(__('The email "%s" is already used. If you need, click on the help link to recover your password.'), $this->cleaned_data['email']));
+ throw new Pluf_Form_Invalid(sprintf(__('The email "%s" is already used. If you need to, click on the help link to recover your password.'), $this->cleaned_data['email']));
}
return $this->cleaned_data['email'];
}
diff --git a/src/IDF/Form/RegisterConfirmation.php b/src/IDF/Form/RegisterConfirmation.php
index f9a616b..e8aad6d 100644
--- a/src/IDF/Form/RegisterConfirmation.php
+++ b/src/IDF/Form/RegisterConfirmation.php
@@ -69,7 +69,7 @@ class IDF_Form_RegisterConfirmation extends Pluf_Form
'label' => __('Your password'),
'initial' => '',
'widget' => 'Pluf_Form_Widget_PasswordInput',
- 'help_text' => __('Your password must be hard for other people to find it, but easy for you to remember.'),
+ 'help_text' => __('Your password must be hard for other people to guess, but easy for you to remember.'),
'widget_attrs' => array(
'maxlength' => 50,
'size' => 15,
diff --git a/src/IDF/Form/Upload.php b/src/IDF/Form/Upload.php
index 241fd08..8ce8595 100644
--- a/src/IDF/Form/Upload.php
+++ b/src/IDF/Form/Upload.php
@@ -83,7 +83,7 @@ class IDF_Form_Upload extends Pluf_Form
if (strlen($extra)) $extra .= '|';
if (!preg_match('/\.('.$extra.'png|jpg|jpeg|gif|bmp|psd|tif|aiff|asf|avi|bz2|css|doc|eps|gz|jar|mdtext|mid|mov|mp3|mpg|ogg|pdf|ppt|ps|qt|ra|ram|rm|rtf|sdd|sdw|sit|sxi|sxw|swf|tgz|txt|wav|xls|xml|war|wmv|zip)$/i', $this->cleaned_data['file'])) {
@unlink(Pluf::f('upload_path').'/'.$this->project->shortname.'/files/'.$this->cleaned_data['file']);
- throw new Pluf_Form_Invalid(__('For security reason, you cannot upload a file with this extension.'));
+ throw new Pluf_Form_Invalid(__('For security reasons, you cannot upload a file with this extension.'));
}
return $this->cleaned_data['file'];
}
diff --git a/src/IDF/Form/UserAccount.php b/src/IDF/Form/UserAccount.php
index 75867b4..6226c3a 100644
--- a/src/IDF/Form/UserAccount.php
+++ b/src/IDF/Form/UserAccount.php
@@ -163,7 +163,7 @@ class IDF_Form_UserAccount extends Pluf_Form
'widget_attrs' => array('rows' => 3,
'cols' => 40),
'widget' => 'Pluf_Form_Widget_TextareaInput',
- 'help_text' => __('Paste a SSH or monotone public key. Be careful to not provide your private key here!')
+ 'help_text' => __('Paste an SSH or monotone public key. Be careful to not provide your private key here!')
));
$this->fields['secondary_mail'] = new Pluf_Form_Field_Email(
@@ -359,7 +359,7 @@ class IDF_Form_UserAccount extends Pluf_Form
}
else {
throw new Pluf_Form_Invalid(
- __('Public key looks neither like a SSH '.
+ __('Public key looks like neither an SSH '.
'nor monotone public key.'));
}