[Fusionforge-commits] FusionForge branch master updated. v6.0.1-145-g814c9a8

Sylvain Beucler beuc-inria at libremir.placard.fr.eu.org
Fri Jul 24 15:33:13 CEST 2015


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  814c9a80e093ab03d11b62e1c3daa544f4e61c72 (commit)
      from  a091ba7a1c1074673160cdf6416e29cfebf747db (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=814c9a80e093ab03d11b62e1c3daa544f4e61c72

commit 814c9a80e093ab03d11b62e1c3daa544f4e61c72
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Fri Jul 24 15:32:47 2015 +0200

    Spelling [#789]

diff --git a/src/CHANGES b/src/CHANGES
index fc9a93d..6066629 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,3 +1,6 @@
+FusionForge 6.X:
+* Spellcheck (Anders Jonsson)
+
 FusionForge 6.0.2:
 * Accounts: fix elliptic curve ssh keys support (Inria)
 * Mailing lists: fix description encoding depending on Mailman version (Inria & Thorsten Glaser)
diff --git a/src/common/docman/views/help.php b/src/common/docman/views/help.php
index 2bbb390..68126f9 100644
--- a/src/common/docman/views/help.php
+++ b/src/common/docman/views/help.php
@@ -35,7 +35,7 @@ if (!forge_check_perm('docman', $group_id, 'read')) {
 echo html_ao('div', array('class' => 'docmanDivIncluded'));
 plugin_hook('blocks', 'doc help');
 if (forge_get_config('use_webdav') && $g->useWebdav()) {
-	echo html_e('p', array(), _('Documents parsing is also available thru webdav. Only for registred users.'), false);
+	echo html_e('p', array(), _('Documents parsing is also available through webdav. Only for registered users.'), false);
 	echo html_e('p', array(), util_make_link('/docman/view.php/'.$group_id.'/webdav',_('Direct Webdav URL')), false);
 }
 echo html_ac(html_ap() - 1);
diff --git a/src/common/frs/actions/monitor.php b/src/common/frs/actions/monitor.php
index 69a8418..bbed85e 100644
--- a/src/common/frs/actions/monitor.php
+++ b/src/common/frs/actions/monitor.php
@@ -73,7 +73,7 @@ if ($package_id) {
 		if ($frsp->setMonitor()) {
 			if ($ajax) {
 				$url .= '&status=0';
-				$result['html'] = $HTML->feedback(_('Monitoring started successfuly'));
+				$result['html'] = $HTML->feedback(_('Monitoring started successfully'));
 				$result['action'] = 'javascript:controllerFRS.doAction({action:\''.$url.'\', id:\'pkgid'.$package_id.'\'})';
 				$result['property'] = 'onclick';
 				$result['img'] = $HTML->getStopMonitoringPic($frsp->getName().' - '._('Stop monitoring this package'));
@@ -96,7 +96,7 @@ if ($package_id) {
 		if ($frsp->stopMonitor()) {
 			if ($ajax) {
 				$url .= '&status=1';
-				$result['html'] = $HTML->feedback(_('Monitoring stopped successfuly'));
+				$result['html'] = $HTML->feedback(_('Monitoring stopped successfully'));
 				$result['action'] = 'javascript:controllerFRS.doAction({action:\''.$url.'\', id:\'pkgid'.$package_id.'\'})';
 				$result['property'] = 'onclick';
 				$result['img'] = $HTML->getStartMonitoringPic($frsp->getName().' - '._('Start monitoring this package'));
diff --git a/src/common/tracker/ArtifactExtraField.class.php b/src/common/tracker/ArtifactExtraField.class.php
index 124f9da..313548a 100644
--- a/src/common/tracker/ArtifactExtraField.class.php
+++ b/src/common/tracker/ArtifactExtraField.class.php
@@ -525,7 +525,7 @@ class ArtifactExtraField extends Error {
 
 		// invalid chars?
 		if (preg_match("/[^[:alnum:]_@\\-]/", $alias)) {
-			$this->setError(_('The alias contains invalid characters. Only letters, numbers, hypens (-), at sign (@) and underscores (_) allowed.'));
+			$this->setError(_('The alias contains invalid characters. Only letters, numbers, hyphens (-), at sign (@) and underscores (_) allowed.'));
 			return false;
 		} elseif (in_array($alias, $reserved_alias)) {	// alias is reserved?
 			$this->setError(sprintf(_('“%s” is a reserved alias. Please provide another name.'), $alias));
diff --git a/src/common/tracker/views/form-clonetracker.php b/src/common/tracker/views/form-clonetracker.php
index ae1af43..847a769 100644
--- a/src/common/tracker/views/form-clonetracker.php
+++ b/src/common/tracker/views/form-clonetracker.php
@@ -51,7 +51,7 @@ if (!$g || !is_object($g)) {
 		$ath->adminHeader(array ('title'=>_('Clone Tracker')));
 
 		if (empty($ata)) {
-			echo $HTML->warning_msg(_('The site administrator must first set up template trackers in the template projet with default values and set permissions propertly so you can access them.'));
+			echo $HTML->warning_msg(_('The site administrator must first set up template trackers in the template project with default values and set permissions properly so you can access them.'));
 		} else {
 			?>
 			<p><?php echo _('Choose the template tracker to clone.') ?></p>
diff --git a/src/common/widget/Widget_MyArtifacts.class.php b/src/common/widget/Widget_MyArtifacts.class.php
index 56dd681..3e9b700 100644
--- a/src/common/widget/Widget_MyArtifacts.class.php
+++ b/src/common/widget/Widget_MyArtifacts.class.php
@@ -256,7 +256,7 @@ class Widget_MyArtifacts extends Widget {
 					if($AS_flag !='N') {
 						$cells = array();
 						$cells[] = array($trackers_array->getPriority(), 'class' => 'priority'.$trackers_array->getPriority());
-						$cells[][] = util_make_link('/tracker/?func=detail&group_id='.$group_id.'&aid='.$aid.'&atid='.$atid, stripslashes($summary), array('title' => _('Browse this artefact')));
+						$cells[][] = util_make_link('/tracker/?func=detail&group_id='.$group_id.'&aid='.$aid.'&atid='.$atid, stripslashes($summary), array('title' => _('Browse this artifact')));
 						$cells[] = array($AS_flag, 'title' => $AS_title, 'class' => 'small');
 						$html .= $HTML->multiTableRow(array('class' => $HTML->boxGetAltRowStyle($count_aids, true)), $cells);
 					}
diff --git a/src/plugins/forumml/www/message.php b/src/plugins/forumml/www/message.php
index c1523de..9b96879 100644
--- a/src/plugins/forumml/www/message.php
+++ b/src/plugins/forumml/www/message.php
@@ -114,7 +114,7 @@ if ($p && $plugin_manager->isPluginAvailable($p) && $p->isAllowed()) {
 		// process the mail
 		$ret = plugin_forumml_process_mail($p,true);
 		if ($ret) {
-			$feedback .=_('Email succefully sent. It can take some time before being displayed');
+			$feedback .=_('Email successfully sent. It can take some time before being displayed');
 			//session_redirect('/plugins/forumml/message.php?'. http_build_query(array(
 			//    'group_id' => $group_id,
 			//    'list'     => $list_id,
diff --git a/src/plugins/headermenu/common/headermenuPlugin.class.php b/src/plugins/headermenu/common/headermenuPlugin.class.php
index 5daab1c..d5886e3 100644
--- a/src/plugins/headermenu/common/headermenuPlugin.class.php
+++ b/src/plugins/headermenu/common/headermenuPlugin.class.php
@@ -68,7 +68,7 @@ in the main menu (outermenu) or in the project menu (groupmenu).");
 				$project = group_get_object($group_id);
 				if ($project->usesPlugin($this->name)) {
 					echo html_e('p', array(), util_make_link('/plugins/'.$this->name.'/?type=projectadmin&group_id='.$group_id,
-					     _('Menu Tabs Manager Admin'), array('title' => _('Add/Remove/Activate/Desactivate tabs'))));
+					     _('Menu Tabs Manager Admin'), array('title' => _('Add/Remove/Activate/Deactivate tabs'))));
 				}
 				break;
 			}
diff --git a/src/plugins/hudson/include/hudson_Widget_JobTestTrend.class.php b/src/plugins/hudson/include/hudson_Widget_JobTestTrend.class.php
index 87d8b2d..c59a6d1 100644
--- a/src/plugins/hudson/include/hudson_Widget_JobTestTrend.class.php
+++ b/src/plugins/hudson/include/hudson_Widget_JobTestTrend.class.php
@@ -62,7 +62,7 @@ class hudson_Widget_JobTestTrend extends HudsonJobWidget {
 	}
 
 	function getDescription() {
-		return _("Show the test result trend for the selected job. To display something, your job needs to have tests. The graph will show the number of tests (failed and successfull) along  time. The number of tests is increasing while the number of build and commits are increasing too.");
+		return _("Show the test result trend for the selected job. To display something, your job needs to have tests. The graph will show the number of tests (failed and successful) along  time. The number of tests is increasing while the number of build and commits are increasing too.");
 	}
 
 	function loadContent($id) {
diff --git a/src/plugins/projects-hierarchy/common/projects-hierarchyPlugin.class.php b/src/plugins/projects-hierarchy/common/projects-hierarchyPlugin.class.php
index 0708548..5190065 100644
--- a/src/plugins/projects-hierarchy/common/projects-hierarchyPlugin.class.php
+++ b/src/plugins/projects-hierarchy/common/projects-hierarchyPlugin.class.php
@@ -30,7 +30,7 @@ class projects_hierarchyPlugin extends Plugin {
 		$this->name = 'projects-hierarchy';
 		$this->text = _('Project Hierarchy'); // To show in the tabs, use...
 		$this->pkg_desc =
-_('Organise projects hierarchicaly, relation type 1-n');
+_('Organise projects hierarchically, relation type 1-n');
 		$this->_addHook('groupisactivecheckbox'); // The "use ..." checkbox in editgroupinfo
 		$this->_addHook('groupisactivecheckboxpost');
 		$this->_addHook('hierarchy_views'); // include specific views
@@ -593,7 +593,7 @@ _('Organise projects hierarchicaly, relation type 1-n');
 	 * @access	public
 	 */
 	function getAdminOptionLink() {
-		return util_make_link('/plugins/'.$this->name.'/?type=globaladmin',_('Global Hierarchy admin'), array('title'=>_('Configure the projets-hierarchy plugin (docman, tree, delegate, globalconf features)')));
+		return util_make_link('/plugins/'.$this->name.'/?type=globaladmin',_('Global Hierarchy admin'), array('title'=>_('Configure the projects-hierarchy plugin (docman, tree, delegate, globalconf features)')));
 	}
 
 	/**
diff --git a/src/plugins/projects-hierarchy/view/admin/viewGlobalConfiguration.php b/src/plugins/projects-hierarchy/view/admin/viewGlobalConfiguration.php
index d70e107..cb22946 100644
--- a/src/plugins/projects-hierarchy/view/admin/viewGlobalConfiguration.php
+++ b/src/plugins/projects-hierarchy/view/admin/viewGlobalConfiguration.php
@@ -35,7 +35,7 @@ if (!$projectsHierarchyGlobalConf) {
 	echo $HTML->listTableTop();
 
 	$cells = array();
-	$cells[][] = html_e('label', array('id' => 'projectsHierarchy-tree', 'title' => _('Enable visibily in hierarchy tree.')), _('Enable Tree'));
+	$cells[][] = html_e('label', array('id' => 'projectsHierarchy-tree', 'title' => _('Enable visibility in hierarchy tree.')), _('Enable Tree'));
 	$inputAttrs = array('type' => 'checkbox', 'name' => 'tree', 'value' => 1);
 	if ($projectsHierarchyGlobalConf['tree'])
 		$inputAttrs['checked'] = 'checked';
diff --git a/src/plugins/projects-hierarchy/view/admin/viewProjectConfiguration.php b/src/plugins/projects-hierarchy/view/admin/viewProjectConfiguration.php
index 3e58d6e..56b7e32 100644
--- a/src/plugins/projects-hierarchy/view/admin/viewProjectConfiguration.php
+++ b/src/plugins/projects-hierarchy/view/admin/viewProjectConfiguration.php
@@ -35,7 +35,7 @@ if (!$projectsHierarchyProjectConf) {
 	echo $HTML->openForm(array('method' => 'post', 'action' => '/plugins/'.$projectsHierarchy->name.'/?type=admin&group_id='.$group_id.'&pluginname='.$projectsHierarchy->name.'&action=updateProjectConf'));
 	echo $HTML->listTableTop();
 	$cells = array();
-	$cells[][] = html_e('label', array('id' => 'projectsHierarchy-tree', 'title' => _('Enable visibily in hierarchy tree.')), _('Enable Tree'));
+	$cells[][] = html_e('label', array('id' => 'projectsHierarchy-tree', 'title' => _('Enable visibility in hierarchy tree.')), _('Enable Tree'));
 	$inputAttrs = array('type' => 'checkbox', 'name' => 'tree', 'value' => 1);
 	if ($projectsHierarchyProjectConf['tree'])
 		$inputAttrs['checked'] = 'checked';
diff --git a/src/plugins/scmcpold/common/CpoldPlugin.class.php b/src/plugins/scmcpold/common/CpoldPlugin.class.php
index 924430e..3979bc5 100644
--- a/src/plugins/scmcpold/common/CpoldPlugin.class.php
+++ b/src/plugins/scmcpold/common/CpoldPlugin.class.php
@@ -60,7 +60,7 @@ class CpoldPlugin extends SCMPlugin {
 		$b .=  _('Anonymous CPOLD Access');
 		$b = '</h2>';
 		$b .= '<p>';
-		$b =  sprintf (_('This project\'s CPOLD repository can be accessep anonymously at %s.'),
+		$b =  sprintf (_('This project\'s CPOLD repository can be accessed anonymously at %s.'),
 			       util_make_link ('/anonscm/cpold/'.$project->getUnixName().'/',
 				   util_make_url ('/anonscm/cpold/'.$project->getUnixName().'/'))) ;
 		$b .= '</p>';
diff --git a/src/plugins/taskboard/common/TaskBoardPlugin.class.php b/src/plugins/taskboard/common/TaskBoardPlugin.class.php
index 1ee047f..24c5390 100644
--- a/src/plugins/taskboard/common/TaskBoardPlugin.class.php
+++ b/src/plugins/taskboard/common/TaskBoardPlugin.class.php
@@ -56,7 +56,7 @@ _('Agile TaskBoard: Supports Scrum and Kanban methodologies.');
 			if($group->usesPlugin($this->name)) {
 				$params['TITLES'][] = $this->text;
 				$params['DIRS'][] = '/plugins/'.$this->name.'/index.php?group_id='.$group_id;
-				$params['TOOLTIPS'][] = _('Agile Scrum and Kanban display of existing artefacts.');
+				$params['TOOLTIPS'][] = _('Agile Scrum and Kanban display of existing artifacts.');
 				if (session_loggedin()) {
 					$user = session_get_user();
 					$userperm = $group->getPermission();
diff --git a/src/plugins/taskboard/common/views/admin/columns.php b/src/plugins/taskboard/common/views/admin/columns.php
index bb8f7fa..2e1b837 100644
--- a/src/plugins/taskboard/common/views/admin/columns.php
+++ b/src/plugins/taskboard/common/views/admin/columns.php
@@ -70,7 +70,7 @@ if (count($taskboard->getUsedTrackersIds()) == 0) {
 	$cells[][] = html_e('input', array('type' => 'text', 'name' => 'column_title', 'required' => 'required'));
 	echo $HTML->multiTableRow(array(), $cells);
 	$cells = array();
-	$cells[][] = html_e('strong', array(), _('Title backgound color')._(':'));
+	$cells[][] = html_e('strong', array(), _('Title background color')._(':'));
 	$cells[][] = $taskboard->colorBgChooser('title_bg_color');
 	echo $HTML->multiTableRow(array(), $cells);
 	$cells = array();
diff --git a/src/plugins/taskboard/common/views/admin/edit_column.php b/src/plugins/taskboard/common/views/admin/edit_column.php
index 2f89bb2..abdd15d 100644
--- a/src/plugins/taskboard/common/views/admin/edit_column.php
+++ b/src/plugins/taskboard/common/views/admin/edit_column.php
@@ -54,7 +54,7 @@ if ($column_id) {
 		$cells[][] = html_e('input', array('type' => 'text', 'name' => 'column_title', 'value' => htmlspecialchars($column->getTitle())));
 		echo $HTML->multiTableRow(array(), $cells);
 		$cells = array();
-		$cells[][] = html_e('strong', array(), _('Title backgound color'));
+		$cells[][] = html_e('strong', array(), _('Title background color'));
 		$cells[][] = $taskboard->colorBgChooser('title_bg_color', $column->getTitleBackgroundColor());
 		echo $HTML->multiTableRow(array(), $cells);
 		$cells = array();
diff --git a/src/www/include/user_home.php b/src/www/include/user_home.php
index fc10145..e4e3b1d 100644
--- a/src/www/include/user_home.php
+++ b/src/www/include/user_home.php
@@ -161,7 +161,7 @@ if (forge_get_config('use_ratings')) {
 
 <?php
 		print "<p>";
-		print _('The Peer rating box shows all rating averages (and response levels) for each individual criteria. Due to the math and processing required to do otherwise, these numbers incoporate responses from both “trusted” and “non-trusted” users.');
+		print _('The Peer rating box shows all rating averages (and response levels) for each individual criteria. Due to the math and processing required to do otherwise, these numbers incorporate responses from both “trusted” and “non-trusted” users.');
 		print "</p>";
 
 		print "<ul>";

-----------------------------------------------------------------------

Summary of changes:
 src/CHANGES                                                           | 3 +++
 src/common/docman/views/help.php                                      | 2 +-
 src/common/frs/actions/monitor.php                                    | 4 ++--
 src/common/tracker/ArtifactExtraField.class.php                       | 2 +-
 src/common/tracker/views/form-clonetracker.php                        | 2 +-
 src/common/widget/Widget_MyArtifacts.class.php                        | 2 +-
 src/plugins/forumml/www/message.php                                   | 2 +-
 src/plugins/headermenu/common/headermenuPlugin.class.php              | 2 +-
 src/plugins/hudson/include/hudson_Widget_JobTestTrend.class.php       | 2 +-
 .../projects-hierarchy/common/projects-hierarchyPlugin.class.php      | 4 ++--
 src/plugins/projects-hierarchy/view/admin/viewGlobalConfiguration.php | 2 +-
 .../projects-hierarchy/view/admin/viewProjectConfiguration.php        | 2 +-
 src/plugins/scmcpold/common/CpoldPlugin.class.php                     | 2 +-
 src/plugins/taskboard/common/TaskBoardPlugin.class.php                | 2 +-
 src/plugins/taskboard/common/views/admin/columns.php                  | 2 +-
 src/plugins/taskboard/common/views/admin/edit_column.php              | 2 +-
 src/www/include/user_home.php                                         | 2 +-
 17 files changed, 21 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list