Merge branch 'develop' of projects.ceondo.com:indefero into feature.scilab

This commit is contained in:
Thomas Keller
2011-12-03 01:21:57 +01:00
55 changed files with 27745 additions and 17228 deletions

View File

@@ -206,7 +206,7 @@ class IDF_Form_Admin_ProjectCreate 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.'
));
}

View File

@@ -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 them.'),
'help_text' => __('If you give staff rights to a user, you really need to trust him.'),
));
}