[evolvis-commits] r17935: update to tip of integration branch

mirabilos at evolvis.org mirabilos at evolvis.org
Fri Dec 23 18:24:05 CET 2011


Author: mirabilos
Date: 2011-12-23 18:24:04 +0100 (Fri, 23 Dec 2011)
New Revision: 17935

Added:
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/cEv-hook/B20lintian
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/include/descriptive.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/lib/vendor/jquery-tipsy/docs/src/images
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/lib/vendor/jquery-tipsy/docs/src/javascripts
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/lib/vendor/jquery-tipsy/docs/src/stylesheets
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/images/tipsy.gif
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/include/help.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/include/helppage.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/tools/tests/
Removed:
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/cEv-hook/B00lintian
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/include/showmess.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/lib/vendor/jquery-tipsy/docs/src/images
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/lib/vendor/jquery-tipsy/docs/src/javascripts
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/lib/vendor/jquery-tipsy/docs/src/stylesheets
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/include/note.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/pm/add_task.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/pm/detail_task.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/pm/mod_task.php
Modified:
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/advanced_search/ASFusionForgeParser.class.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/advanced_search/AdvancedSearch.class.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/docman/include/DocumentGroupHTML.class.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/forum/ForumHTML.class.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/include/Group.class.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/include/config-vars.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/include/pre.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/include/session.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/include/utils.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/pm/ProjectController.class.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/pm/ProjectTask.class.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/tracker/Artifact.class.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/tracker/ArtifactFactory.class.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/widget/Widget_MyArtifacts.class.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/widget/Widget_MyProjects.class.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/widget/Widget_MyTasks.class.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/widget/Widget_ProjectLatestFileReleases.class.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/widget/Widget_Rss.class.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/debian/changelog
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/debian/control
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/debian/dsf-in/web-apache2.postinst.dsfh-in
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/debian/evolvis.postinst
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/debian/patches/use-jquery-from-distro.patch
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/docs/README.html:elements
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/docs/README.html:utils
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/packaging/control/020common
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/packaging/control/030web-apache2
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/packaging/links/web-apache2
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/plugins/scmgit/common/GitPlugin.class.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/plugins/scmgit/packaging/dirs/plugin-scmgit
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/plugins/scmgit/packaging/links/plugin-scmgit
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/translations/de.po
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/translations/fusionforge.pot
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/univention/ldap2psql.sh
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/admin/groupedit.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/admin/pending-news.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/frs/index.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/include/Layout.class.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/include/html.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/js/common.js
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/js/tooltips.js
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/my/index.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/news/admin/index.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/news/submit.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/notepad.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/pm/browse_task.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/pm/include/ProjectGroupHTML.class.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/pm/include/ProjectTaskHTML.class.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/pm/include/ProjectView.class.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/pm/include/pm_columns.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/pm/pm_task.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/pm/select_columns.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/pm/task.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/pm/templates/detail_template.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/project/admin/massfinish.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/project/admin/project_admin_utils.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/project/admin/users.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/project/stats/index.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/survey/include/SurveyHTML.class.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/themes/css/fusionforge.css
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/themes/evolvis/Theme.class.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/browse.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/deleteartifact.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/include/ArtifactHtml.class.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/include/ArtifactTypeHtml.class.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/index.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/item.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/query.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/taskmgr.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/tracker.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/tools/tests/fmtmess.php
   branches/QA-2011Q4:evolvis-qs.lan.tarent.de/tools/tests/minijson-decode.php
Log:
update to tip of integration branch


Property changes on: branches/QA-2011Q4:evolvis-qs.lan.tarent.de
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/gforge_base/evolvisforge-5.1:7226,17132-17168,17573-17576,17584,17592,17595,17631,17646-17652
/branches/messer-51:17836,17838

   + /trunk/gforge_base/evolvisforge-5.1:7226,17132-17168,17573-17576,17584,17592,17595,17631,17646-17652,17928-17931,17933
/branches/messer-51:17836,17838

Modified: svk:merge
   - 8ed69402-faa4-4b47-986e-66d49b2a90d8:/branches/messer-51:17838
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17168
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17584
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17592
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17595
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17631
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17652
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:7226

   + 8ed69402-faa4-4b47-986e-66d49b2a90d8:/branches/messer-51:17838
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17168
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17584
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17592
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17595
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17631
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17652
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17933
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:7226


Copied: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/cEv-hook/B20lintian (from rev 17861, branches/QA-2011Q4:evolvis-qs.lan.tarent.de/cEv-hook/B00lintian)
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/cEv-hook/B20lintian	                        (rev 0)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/cEv-hook/B20lintian	2011-12-23 17:24:04 UTC (rev 17935)
@@ -0,0 +1,37 @@
+#!/bin/sh
+# $MirOS: contrib/hosted/tg/deb/hookdir/B20lintian,v 1.2 2011/12/17 22:33:34 tg Exp $
+#-
+# Not complicated enough for copyright.
+
+unset LANGUAGE
+LC_ALL=C; export LC_ALL
+
+ir=--install-recommends
+# arrrrrgh!
+apt-get install $ir -s apt >/dev/null 2>&1 || ir=
+apt-get --purge -y install $ir lintian
+
+argE=
+argP=
+if lintian -h 2>&1 | grep -F -- --display-experimental >/dev/null 2>&1; then
+	argE=--display-experimental
+fi
+if lintian -h 2>&1 | grep -F -- --pedantic >/dev/null 2>&1; then
+	argP=--pedantic
+fi
+echo
+echo ==================================================================
+echo Running lintian...
+echo
+extraargs=
+for f in /tmp/buildd/*.changes; do
+	case $f in
+	(*snapshot.*)
+		extraargs='-X nmu'
+		;;
+	esac
+done
+lintian -vIi $argE $argP $extraargs --allow-root /tmp/buildd/*.changes 2>&1
+echo
+echo ==================================================================
+echo

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/advanced_search/ASFusionForgeParser.class.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/advanced_search/ASFusionForgeParser.class.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/advanced_search/ASFusionForgeParser.class.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -179,10 +179,17 @@
 								$wheresql .= ' AND aefd'.$extraFieldCounter.'.field_data = $'.$paramcount++;
 								$params[] = '100';
 							} else {
+								// Get the id
+								$sql = 'SELECT element_id FROM artifact_extra_field_elements WHERE extra_field_id='.$field_id.
+								    ' AND element_name=$1';
+
+								$res = db_query_params($sql, array($curToken->getData()));
+								$real_data_id = db_fetch_array($res);
+								$real_data_id = $real_data_id['element_id'];
+
 								$wheresql .= ' AND aefd'.$extraFieldCounter.
-								             '.field_data = (SELECT element_id FROM artifact_extra_field_elements WHERE extra_field_id='.$field_id.
-								             ' AND element_name=$'.$paramcount++.')';
-								$params[] = $curToken->getData();
+								             '.field_data = $'.$paramcount++.'';
+								$params[] = $real_data_id;
 							}
 						}
 						else if($curType === EASToken::AS_OP_NOT) {
@@ -195,10 +202,17 @@
 								$wheresql .= ' AND aefd'.$extraFieldCounter.'.field_data != $'.$paramcount++;
 								$params[] = '100';
 							} else {
+								// Get the id
+								$sql = 'SELECT element_id FROM artifact_extra_field_elements WHERE extra_field_id='.$field_id.
+								    ' AND element_name=$1';
+
+								$res = db_query_params($sql, array($curToken->getData()));
+								$real_data_id = db_fetch_array($res);
+								$real_data_id = $real_data_id['element_id'];
+
 								$wheresql .= ' AND aefd'.$extraFieldCounter.
-								             '.field_data = (SELECT element_id FROM artifact_extra_field_elements WHERE extra_field_id='.$field_id.
-								             ' AND element_name=$'.$paramcount++.')';
-								$params[] = $curToken->getData();
+								             '.field_data != $'.$paramcount++.'';
+								$params[] = $real_data_id;
 							}
 						}
 						else if($curType === EASToken::AS_OP_GREATER) {
@@ -243,13 +257,21 @@
 								$wheresql .= ' AND aefd'.$extraFieldCounter.'.field_data LIKE $'.$paramcount++;
 								$params[] = '100';
 							} else {
+								// Get the id
+								$sql = 'SELECT element_id FROM artifact_extra_field_elements WHERE extra_field_id='.$field_id.
+								    ' AND element_name LIKE $1';
+
+								$res = db_query_params($sql, array($curToken->getData()));
+								$real_data_id = db_fetch_array($res);
+								$real_data_id = $real_data_id['element_id'];
+
 								$wheresql .= ' AND aefd'.$extraFieldCounter.
-								             '.field_data = (SELECT element_id FROM artifact_extra_field_elements WHERE extra_field_id='.$field_id.
-								             ' AND element_name=$'.$paramcount++.')';
-								$params[] = $curToken->getData();
+								             '.field_data = $'.$paramcount++.'';
+								$params[] = $real_data_id;
 							}
 						} else {
 							//Invalid input. Return invalid syntax error.
+							return "Invalid Syntax";
 						}
 					}
 					$wheresql .= ' AND aefd'.$extraFieldCounter.'.artifact_id=artifact_vw.artifact_id)';
@@ -284,6 +306,7 @@
 		$artifacts = array();
 
 		if (db_error()) {
+			echo db_error();
 			return false;
 		} else {
 			while ($arr = db_fetch_array($result)) {
@@ -309,7 +332,9 @@
 	protected function _generateStdFieldWhereSQL($fieldName, $curType, &$curTokenPointer, &$paramcount, &$params) {
 		$wheresql    = '';
 		$field_alias = '';
+		$field_alias2 = '';
 		$is_date     = false;
+		$is_name      = false;
 
 		//NOTE: We have to thread dates as a special type.
 		//      We have to convert it to a string with an like operation
@@ -319,9 +344,13 @@
 		if ($fieldName == 'ID') {
 			$field_alias = 'artifact_id';
 		} else if ($fieldName == 'Submitted by') {
+			$is_name = true;
 			$field_alias = 'submitted_realname';
+			$field_alias2 = 'submitted_unixname';
 		} else if ($fieldName == 'Assigned to') {
+			$is_name = true;
 			$field_alias = 'assigned_realname';
+			$field_alias2 = 'assigned_unixname';
 		} else if ($fieldName == 'Open Date') {
 			$is_date = true;
 			$field_alias = 'open_date';
@@ -340,11 +369,16 @@
 			$curToken = $this->tokens[$curTokenPointer];
 			$curType = $curToken->getType();
 
-			$wheresql .= ' '.$field_alias.' = $' . $paramcount ++;
-
-			if($is_date) {
-				$params[] = strtotime($curToken->getData());
+			if ($is_date) {
+				$curToken->setData($curToken->getData().'%');
+				$wheresql .= ' to_char((SELECT TIMESTAMP \'epoch\' + '.$field_alias.' * INTERVAL \'1 second\'), \'YYYY-MM-DD HH24:MI\') LIKE $' . $paramcount++;
+				$params[] = $curToken->getData();
+			} else if ($is_name) {
+				$wheresql .= '( '.$field_alias.' = $' . $paramcount++ .' OR '.$field_alias2.' = $'.$paramcount++.' )';
+				$params[] = $curToken->getData();
+				$params[] = $curToken->getData();
 			} else {
+				$wheresql .= ' '.$field_alias.' = $' . $paramcount++;
 				$params[] = $curToken->getData();
 			}
 		} else if ($curType === EASToken::AS_OP_NOT) {
@@ -353,11 +387,16 @@
 			$curToken = $this->tokens[$curTokenPointer];
 			$curType = $curToken->getType();
 
-			$wheresql .= ' '.$field_alias.' != $' . $paramcount ++;
-
-			if($is_date) {
-				$params[] = strtotime($curToken->getData());
+			if ($is_date) {
+				$curToken->setData($curToken->getData().'%');
+				$wheresql .= ' to_char((SELECT TIMESTAMP \'epoch\' + '.$field_alias.' * INTERVAL \'1 second\'), \'YYYY-MM-DD HH24:MI\') NOT LIKE $' . $paramcount++;
+				$params[] = $curToken->getData();
+			} else if ($is_name) {
+				$wheresql .= '( '.$field_alias.' NOT LIKE $' . $paramcount++ .' AND '.$field_alias2.' NOT LIKE $'.$paramcount++.' )';
+				$params[] = $curToken->getData();
+				$params[] = $curToken->getData();
 			} else {
+				$wheresql .= ' '.$field_alias.' != $' . $paramcount++;
 				$params[] = $curToken->getData();
 			}
 
@@ -369,8 +408,13 @@
 
 			$wheresql .= ' '.$field_alias.' > $' . $paramcount ++;
 
-			if($is_date) {
-				$params[] = strtotime($curToken->getData());
+			if ($is_date) {
+				// Check if the user included a time format
+				if (preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/', $curToken->getData())) {
+					$params[] = strtotime($curToken->getData()) + 86400;
+				} else {
+					$params[] = strtotime($curToken->getData());
+				}
 			} else {
 				$params[] = $curToken->getData();
 			}
@@ -396,12 +440,17 @@
 			if($is_date) {
 				//Convert unix timestamp to postgres date and then to string.
 				$wheresql .= ' to_char((SELECT TIMESTAMP \'epoch\' + '.$field_alias.' * INTERVAL \'1 second\'), \'YYYY-MM-DD HH24:MI\') LIKE $' . $paramcount ++;
-
+				$params[] = $curToken->getData();
+			} else if ($is_name) {
+				$wheresql .= '( '.$field_alias.' LIKE $' . $paramcount++ .' OR '.$field_alias2.' LIKE $'.$paramcount++.' )';
+				$params[] = $curToken->getData();
+				$params[] = $curToken->getData();
 			} else {
 				$wheresql .= ' '.$field_alias.' LIKE $' . $paramcount ++;
+				$params[] = $curToken->getData();
 			}
 
-			$params[] = $curToken->getData();
+
 		} else {
 			return false;
 		}

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/advanced_search/AdvancedSearch.class.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/advanced_search/AdvancedSearch.class.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/advanced_search/AdvancedSearch.class.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -23,6 +23,19 @@
  */
 
 class AdvancedSearch {
+	public static function deleteUserQuery($userID, $queryID, $trackerID) {
+		$sql = "DELETE FROM user_has_query WHERE user_id = $1 AND query_id = $2 AND group_artifact_id = $3";
+		$res = db_query_params($sql, array($userID, $queryID, $trackerID));
+		if (db_affected_rows($res) === 0) {
+			return false;
+		}
+
+		$sql = "DELETE FROM AdvancedQuery WHERE id = $1";
+		db_query_params($sql, array($queryID));
+
+		return true;
+	}
+
 	public static function renderSearchBar($searchActionUrl, $ajaxRequestUrl, $searchValue, $queryName) {
 ?>
 <script language="JavaScript" type="text/javascript">//<![CDATA[

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/docman/include/DocumentGroupHTML.class.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/docman/include/DocumentGroupHTML.class.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/docman/include/DocumentGroupHTML.class.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -23,7 +23,6 @@
  */
 
 require_once $gfcommon.'include/pre.php';
-require_once $gfwww.'include/note.php';
 
 /**
  * Wrap many group display related functions

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/forum/ForumHTML.class.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/forum/ForumHTML.class.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/forum/ForumHTML.class.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -24,7 +24,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-require_once $gfwww.'include/note.php';
 require_once $gfwww.'include/trove.php';
 require_once $gfwww.'news/news_utils.php';
 require_once $gfcommon.'forum/ForumAdmin.class.php';
@@ -135,18 +134,21 @@
 	if (session_loggedin() ) {
 		if ($f) {
 			if ($f->isMonitoring()) {
-				echo util_make_link ('/forum/monitor.php?forum_id='.$forum_id.'&group_id='.$group_id.'&stop=1',
-						     html_image('ic/xmail16w.png','20','20').' '._('Stop Monitoring')).' | ';
+				echo util_make_link('/forum/monitor.php?forum_id='.$forum_id.'&group_id='.$group_id.'&stop=1',
+				    $HTML->getMonitorOPic(false) . ' ' .
+				    _('Stop Monitoring')) . ' | ';
 			} else {
-				echo util_make_link ('/forum/monitor.php?forum_id='.$forum_id.'&group_id='.$group_id.'&start=1',
-						     html_image('ic/mail16w.png','20','20').' '._('Monitor Forum')).' | ';
+				echo util_make_link('/forum/monitor.php?forum_id='.$forum_id.'&group_id='.$group_id.'&start=1',
+				    $HTML->getMonitorOPic(true) . ' ' .
+				    _('Monitor Forum')) . ' | ';
 			}
 			echo util_make_link ('/forum/save.php?forum_id='.$forum_id.'&group_id='.$group_id,
 					     html_image('ic/save.png','24','24') .' '._('Save Place')).' | ';
 		}
 	} elseif ($f) {
 		echo '<a href="/forum/monitor.php?forum_id='.$forum_id.'&group_id='.$group_id.'&start=1">' .
-			html_image('ic/mail16w.png','20','20').' '._('Monitor Forum').'</a> | ';		
+		    $HTML->getMonitorOPic(true) . ' ' .
+		    _('Monitor Forum') . '</a> | ';		
 	}
 
 	if ($f && $forum_id) {
@@ -489,9 +491,9 @@
 		$g =& $this->Forum->getGroup();
 		$group_id = $g->getID();
 
-		if (forge_check_perm ('forum', $this->Forum->getID(), 'post')) { // minor control, but anyways it should be an admin at this point
-			echo notepad_func();
-			?>
+		if (forge_check_perm ('forum', $this->Forum->getID(), 'post')) {
+			// minor control, but anyways it should be an admin at this point
+?>
 <div align="center">
 	 <form id="ForumEditForm" enctype="multipart/form-data" action="<?php echo util_make_url ('/forum/admin/index.php') ?>" method="post">
 	<?php $objid = $this->Forum->getID();?>
@@ -560,7 +562,6 @@
 				$subject = 'Re: ' . $subject;
 			}
 		}
-		echo notepad_func();
 		?>
 <div align="center">
 <form id="ForumPostForm" enctype="multipart/form-data" action="<?php echo util_make_url ('/forum/forum.php?forum_id='.$this->Forum->getID().'&group_id='.$group_id); ?>" method="post">

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/include/Group.class.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/include/Group.class.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/include/Group.class.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -2659,6 +2659,12 @@
 		session_set_internal ($saved_session->getID()) ;
 		setup_gettext_from_context();
 
+		if (USE_PFO_RBAC) {
+			foreach (get_group_join_requests($this) as $gjr) {
+				$gjr->delete(true);
+			}
+		}
+
 		db_commit();
 
 		$this->sendApprovalEmail();

Copied: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/include/descriptive.php (from rev 17861, branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/include/showmess.php)
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/include/descriptive.php	                        (rev 0)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/include/descriptive.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -0,0 +1,617 @@
+<?php
+/*-
+ * Factored-out code for handling descriptive item elements
+ *
+ * Copyright © 2011
+ *	Thorsten “mirabilos” Glaser <t.glaser at tarent.de>
+ * All rights reserved.
+ *
+ * This file is part of FusionForge. FusionForge is free software;
+ * you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the Licence, or (at your option)
+ * any later version.
+ *
+ * FusionForge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with FusionForge; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *-
+ * This code attempts to handle descriptive item elements (Summary,
+ * Details, Comments/Followups) in a manner compatible to the old
+ * GForge database encoding, but with new rules.
+ *
+ * In the database, everything is passed through htmlspecialchars()
+ * before storing, so we must call htmlspecialchars_decode() on any
+ * database content before using it. This will even decode partial
+ * entities, so when handling the unencoded string we need to be
+ * careful as usual. We decide to only pass around unencoded strings
+ * except once formatted for display, and the accessor and database
+ * functions for compatibility.
+ *
+ * Details and Comments further can have formatting attributes and
+ * links. The format for that is:
+ * - lines consisting only of "{{{" and "}}}" delimit preformatted
+ *   blocks; if a comment contains none of them and no ">>>" it’s
+ *   wrapped into a preformatted block if the heuristic (contains
+ *   three spaces in a row or a horizontal tab) thinks it is
+ * - any [#123] [T123] [forum:123] [wiki:Page_Name] are parsed into
+ *   links in preformatted and running blocks
+ * - running blocks have "<<<kw:" ... ">>>" parsed into wrapping
+ *   the in-between content into <kw>...</kw> tags, for a given
+ *   set of keywords
+ * - running blocks have lines wrapped into non-empty paragraphs
+ */
+
+require_once $gfcommon.'include/EvolvisTable.class.php';
+require_once $gfcommon.'pm/ProjectTaskSqlQueries.php';
+
+/**
+ * showmess() - display messages
+ *
+ * @param	string	$label
+ *			localised label for the block
+ * @param	string	$loc
+ *			hyperlink of “this” page, without commentsort
+ * @param	object	$inst
+ *			must provide the getMessages(ascending) method
+ *			and the getMessagesKeys() method
+ * @param	string	$nomsg
+ *			localised label for when no messages
+ * @param	bool	$inform
+ *		optional(false) inside <form>, allowed to emit hidden fields
+ */
+function showmess($label, $loc, $inst, $nomsg, $inform=false) {
+	$spos = html_ap();
+	echo html_ao('div', array('class' => 'showmess'));
+	$loc = util_unconvert_htmlspecialchars($loc);
+	if (!($t = getStringFromRequest('commentsort'))) {
+		$t = getStringFromRequest('commentsort_inherited');
+	}
+	$commentsort_chrono = $t != 'anti';
+	if ($commentsort_chrono) {
+		$tgt = $loc . '&commentsort=anti';
+		$txt = _('Sort comments antichronologically');
+	} else {
+		$tgt = $loc . '&commentsort=chrono';
+		$txt = _('Sort comments chronologically');
+	}
+	echo html_e('h3', array(), $label . ': ' . html_e('a', array(
+		'href' => $tgt,
+	    ), $txt)) . "\n";
+	if ($inform) {
+		echo html_e('input', array(
+			'type' => 'hidden',
+			'name' => 'commentsort_inherited',
+			'value' => ($commentsort_chrono ? 'chrono' : 'anti'),
+		    ));
+	}
+
+	if (!($keys = $inst->getMessagesKeys()) ||
+	    !($res = $inst->getMessages($commentsort_chrono)) ||
+	    (($rows = db_numrows($res)) < 1)) {
+		echo html_e('p', array(), $nomsg) . html_ac($spos) . "\n";
+		return;
+	}
+	echo html_ao('div', array(
+		'style' => array(
+			'height:30em;',
+			'overflow:scroll;',
+		    ),
+	    ));
+	$t = new EvolvisTable(array(false));
+	while ($row = db_fetch_array($res)) {
+		$uid = $row[$keys['user_id']];
+		$uname = $row[$keys['user_name']];
+		$rname = $row[$keys['realname']];
+		$mdate = $row[$keys['msgdate']];
+		$mbody = $row[$keys['msgbody']];
+
+		/* I hate FusionForge plugin hooks */
+		ob_start();
+		plugin_hook("user_logo", array(
+			'user_id' => $uid,
+			'size' => 's',
+		    ));
+		$userlogo = ob_get_contents();
+		ob_end_clean();
+
+		if ($uid == 100) {
+			$firstlines = util_html_secure($rname);
+		} else {
+			$firstlines = util_make_link_u($uname, $uid,
+			    util_html_secure($rname));
+		}
+		$firstlines = html_e('tt', array(), _('Date') . ': ' .
+		    date(_('Y-m-d H:i'), $mdate) . "<br />\n" .
+		    _('Sender') . ': ' . $firstlines);
+
+		if ($userlogo) {
+			$firstlines = html_e('table', array(
+				'border' => 0,
+				'cellpadding' => 0,
+				'cellspacing' => 2,
+			    ), html_e('tr', array(),
+			    html_e('td', array(), $userlogo) .
+			    html_e('td', array(), $firstlines)));
+		}
+
+		$t->tr()->td()->setraw($firstlines .
+		    showmess_fmt(htmlspecialchars_decode($mbody)));
+	}
+	echo $t->emit() . html_ac($spos) . "\n";
+}
+
+/**
+ * emit_summary() - render item summary as text
+ *
+ * @param	object	$inst
+ *			must provide the getSummary() method
+ * @return	string
+ *		XHTML encoded item summary text (no tag)
+ */
+function emit_summary($inst) {
+	$txt = htmlspecialchars_decode($inst->getSummary());
+	return util_html_encode($txt);
+}
+
+/**
+ * emit_summary_field() - render item summary as input field
+ *
+ * @param	object	$inst (or NULL)
+ *			must provide the getSummary() method
+ * @param	string	$name
+ * @param	string	$id
+ * @param	string	$class (optional)
+ * @param	string	$title (optional)
+ * @return	string
+ *		XHTML form field
+ */
+function emit_summary_field($inst, $name, $id, $class=false, $title=false) {
+	$txt = $inst ? htmlspecialchars_decode($inst->getSummary()) : "";
+	return html_e('input', array(
+		'type' => 'text',
+		'name' => $name,
+		'size' => 60,
+		'maxlength' => 255,
+		'id' => $id,
+		'title' => $title,
+		'class' => $class,
+		'value' => $txt,
+	    ));
+}
+
+/**
+ * emit_details() - render item detailed description as text
+ *
+ * @param	object	$inst
+ *			must provide the getDetails() method
+ * @param	string	$headline
+ *		(optional) headline to show
+ * @param	bool	$editable
+ *		(optional) editable? (default: false)
+ * @return	string
+ *		XHTML encoded item details text <div>
+ * @todo add formatting
+ */
+function emit_details($inst, $headline="", $editable=false) {
+	$txt = htmlspecialchars_decode($inst->getDetails());
+
+	$ftx = html_e('div', array(
+		'class' => array(
+			'item_details',
+		    ),
+		'style' => array(
+			'clear:both;',
+		    ),
+	    ), showmess_fmt($txt));
+
+	if ($editable) {
+		$headline = html_e('div', array(
+			'style' => array(
+				'width:100%;',
+			    ),
+		    ), html_e('div', array(
+			'style' => array(
+				'float:left;',
+				'font-weight:bold;',
+			    ),
+		    ), $headline . ":") . html_e('div', array(
+			'style' => array(
+				'float:right',
+			    ),
+		    ), html_image('ic/forum_edit.gif', '37', '15', array(
+			'title' => _('Click to edit'),
+			'alt' => _('Click to edit'),
+			'onclick' => "switch2edit(this, 'show', 'edit');",
+		    ))));
+	} else if (!$headline) {
+		return $ftx;
+	} else {
+		$headline = html_e('strong', array(), $headline . ":");
+	}
+
+	return html_e('div', array(
+		'id' => 'show',
+		'style' => array(
+			'display:block;',
+		    ),
+	    ), $headline . "\n" . $ftx) . "\n";
+}
+
+/**
+ * emit_details_field() - render item detailed description as textarea
+ *
+ * @param	object	$inst (or NULL)
+ *			must provide the getSummary() method
+ * @param	string	$name
+ * @param	string	$id (optional)
+ * @param	string	$title (optional)
+ * @return	string
+ *		XHTML form field
+ */
+function emit_details_field($inst, $name, $id=false, $title=false) {
+	$txt = $inst ? htmlspecialchars_decode($inst->getDetails()) : "";
+	return html_e('textarea', array(
+		'class' => array(
+			'small',
+		    ),
+		'rows' => 24,
+		'cols' => 60,
+		'name' => $name,
+		'id' => $id,
+		'title' => $title,
+	    ), util_html_encode($txt), false);
+}
+
+/**
+ * emit_comment_box() - render write a comment box
+ *
+ * @param	string	$formname
+ *			DOM name attribute of the form we live in
+ * @param	string	$fieldname
+ *			DOM name attribute of the field to generate
+ * @param	string	$id (optional)
+ * @param	string	$title (optional)
+ * @return	string
+ *		XHTML code to insert into a form
+ */
+function emit_comment_box($formname, $fieldname, $id=false, $title=false) {
+	return html_e('h3', array(), _('Write a comment') . ': ' .
+	    notepad_button('document.forms.' . $formname . '.' . $fieldname,
+	    "messformat")) . "\n" . html_e('div', array(
+	    ), html_e('textarea', array(
+		'class' => array(
+			'small',
+		    ),
+		'rows' => 7,
+		'cols' => 60,
+		'name' => $fieldname,
+		'id' => $id,
+		'title' => $title,
+	    ), "", false)) . "\n";
+}
+
+/**
+ * showmess_fmt() - render message body for display
+ *
+ * @param	string	$mess
+ *			already htmlspecialchars_decode()d text body
+ * @return	string
+ *		XHTML rendition of the message body
+ */
+define("SHOWMESS_FMT_INITIAL", 0);
+define("SHOWMESS_FMT_WANTPRE", 1);
+define("SHOWMESS_FMT_INPRE", 2);
+define("SHOWMESS_FMT_INPARA", 3);
+function showmess_fmt($mess) {
+	global $group_id;
+
+	$state = SHOWMESS_FMT_INITIAL;
+	$spos = html_ap();
+	$sarr = array();
+
+	/* pcre patterns */
+	$p_uri = '([a-zA-Z][a-zA-Z0-9+.-]*):([#0-9a-zA-Z;/?:@&=+$,_.!~*\'()%-]+)';
+	$p_bexp = preg_quote('[') . '(?|(#|T|forum:)([1-9][0-9]*)';
+	if (util_ifsetor($group_id) && ($grp = group_get_object($group_id)) &&
+	    ($prj = $grp->getUnixName())) {
+		/* we can only match wiki pages if we know the current group */
+		$p_bexp .= '|(wiki:)([ -"$-;=?-Z\\^-z~]+)';
+	}
+	$p_bexp .= ')' . preg_quote(']');
+	$p_fbeg = preg_quote('<<<') .
+	    /* valid keywords */
+	    '(b|i|tt|ins|del)' .
+	    preg_quote(':');
+	$p_fend = preg_quote('>>>');
+
+	/* strip leading/trailing blank lines and UNIXify newlines */
+	$mess = trim(str_replace("\r", "", $mess), "\n");
+	/* get message as array of lines */
+	$marr = explode("\n", $mess);
+
+	/* heuristics {{{ <<< */
+	if (strpos($mess, ">>>") === false &&
+	    array_search("}}}", $marr) === false) {
+		/* no formatting in the text */
+		if (strpos($mess, "\t") !== false ||
+		    strpos($mess, "   ") !== false) {
+			/* but tab or three spaces in a row */
+			$state = SHOWMESS_FMT_WANTPRE;
+		}
+	}
+
+	$s = "";
+	/* main parse loop */
+	foreach ($marr as $t) {
+		if ($state == SHOWMESS_FMT_WANTPRE) {
+			$s .= "<pre>";
+			$state = SHOWMESS_FMT_INPRE;
+		} else if ($state == SHOWMESS_FMT_INPRE && $t != /*{{{*/ "}}}") {
+			$s .= "\n";
+		}
+		if ($state == SHOWMESS_FMT_INPRE) {
+			if ($t == /*{{{*/ "}}}") {
+				$s .= "</pre>\n";
+				$state = SHOWMESS_FMT_INITIAL;
+				continue;
+			}
+			/* fall through to main line formatter */
+		} else if ($state == SHOWMESS_FMT_INPARA) {
+			if (!$t) {
+				$sarr = html_a_copy($spos);
+				$s .= html_ac($spos) . "</p>\n";
+				$state = SHOWMESS_FMT_INITIAL;
+				continue;
+			}
+			if ($t == "{{{" /*}}}*/) {
+				$sarr = array();
+				$s .= html_ac($spos) . "</p>\n";
+				$state = SHOWMESS_FMT_WANTPRE;
+				continue;
+			}
+			$s .= "<br />\n";
+		} else {
+			/* SHOWMESS_FMT_INITIAL */
+			if (!$t) {
+				/* collapse empty lines */
+				continue;
+			}
+			if ($t == "{{{" /*}}}*/) {
+				$sarr = array();
+				$state = SHOWMESS_FMT_WANTPRE;
+				continue;
+			}
+			$s .= "<p>" . html_a_apply($sarr);
+			$state = SHOWMESS_FMT_INPARA;
+		}
+
+		/* main text conversion loop, per-line */
+		while ($t) {
+			$curpos = html_ap();
+
+			/* cobble together PCRE looking for special stuff */
+			$mypcre = "\x01(?";
+			/* look for bracket-expression */
+			$mypcre .= "|" . $p_bexp;
+			if ($state != SHOWMESS_FMT_INPRE) {
+				/* look for formatting-begin */
+				$mypcre .= "|" . $p_fbeg;
+				if ($curpos > $spos) {
+					/* also look for formatting-end */
+					$mypcre .= "|" . $p_fend;
+				}
+			}
+			$mypcre .= ")\x01";
+
+			/* check if, and where, we have special stuff */
+			$matches = array();
+			$matched = preg_match($mypcre, $t, $matches,
+			    PREG_OFFSET_CAPTURE);
+			if ($matched === false) {
+				throw new Exception("PCRE Error: " .
+				    preg_last_error());
+			}
+
+			$mtype = 0;
+			if ($matched) {
+				$os = $matches[0][0];
+				$bs = substr($t, 0, $matches[0][1]);
+				switch ($os[0]) {
+				case '[':
+					$mtype = 1;
+					break;
+				case '<':
+					$mtype = 2;
+					break;
+				case '>':
+					$mtype = 3;
+					break;
+				default:
+					throw new Exception("Invalid match: " .
+					    $os);
+				}
+				$t = substr($t, $matches[0][1] + strlen($os));
+			} else {
+				$os = "";
+				$bs = $t;
+				$t = "";
+			}
+
+			/* handle the prefix (before) string */
+
+			/* wrap URIs in \r for later processing */
+			$bs = preg_replace("|".$p_uri."|", "\r\\0\r", $bs);
+			if ($bs === NULL) {
+				throw new Exception("PCRE Error: " .
+				    preg_last_error());
+			}
+
+			/* HTML-encode the string */
+			$bs = util_html_encode($bs);
+
+			/* convert wrapped URIs into hyperlinks */
+			$bs = preg_replace("|\r([^\r]+)\r|",
+			    '<a href="$1">$1</a>', $bs);
+
+			/* append the before-the-match part to running string */
+			$s .= $bs;
+
+			/* handle the match, if any */
+
+			switch ($mtype) {
+			/* bracketed expression */
+			case 1:
+				$lnk = "";
+				$ttip = false;
+				$doselect = true;
+				switch ($matches[1][0]) {
+				case "wiki:":
+					/* no need for complexity */
+					$lnk = "/plugins/mediawiki/wiki/" .
+					    $prj . "/index.php/" .
+					    urlencode(strtr($matches[2][0], ' ', '_'));
+					break;
+
+				case "#":
+					if (($r = tasktracker_gettype($matches[2][0]))) {
+						/* we know what we need */
+						$doselect = false;
+						break;
+					}
+					/* prepare for a database call */
+					$sname = "summary";
+					$tname = "artifact";
+					$iname = "artifact_id";
+					$r = array("is_a" => "aid");
+					break;
+
+				case "T":
+					$sname = "summary";
+					$tname = "project_task";
+					$iname = "project_task_id";
+					$r = array("is_a" => "tid");
+					break;
+
+				case "forum:":
+					$sname = "subject";
+					$tname = "forum";
+					$iname = "msg_id";
+					$r = array("is_a" => "msgid");
+					break;
+
+				default:
+					/* error: unknown type */
+					$lnk = false;
+				}
+				if ($lnk === "" && $doselect &&
+				    !($mid = (int)$matches[2][0])) {
+					/* error: not numeric */
+					$lnk = false;
+				}
+				/* query database if necessary */
+				if ($lnk === "" && $doselect) {
+					/*
+					 * I think we cannot avoid the string
+					 * concatenation here because substi-
+					 * tution only affects arguments
+					 */
+					$res = db_query_params("SELECT " .
+					    $sname . " FROM " . $tname .
+					    " WHERE " . $iname . '=$1;',
+					    array($mid));
+					if (db_numrows($res) == 1) {
+						$row = db_fetch_array($res);
+						$r["summary"] = $row[$sname];
+					} else {
+						$lnk = false;	
+					}
+				}
+				/* convert tt/sql result into link */
+				if ($lnk === "") {
+					switch ($r["is_a"]) {
+					case "aid":
+						$linkf = "/tracker/t_follow.php/%d";
+						$textf = _("%s (Task)");
+						break;
+
+					case "tid":
+						$linkf = "/pm/t_follow.php/%d";
+						$textf = _("%s (Bug/FR)");
+						break;
+
+					case "msgid":
+						$linkf = "/forum/message.php?msg_id=%d";
+						$textf = _("%s (Forum Message)");
+						break;
+
+					default:
+						/* error: unknown type */	
+						$lnk = false;
+					}
+					if ($lnk === "") {
+						$lnk = sprintf($linkf,
+						    $matches[2][0]);
+						$ttip = sprintf($textf,
+						    $r["summary"]);
+					}
+				}
+				if (!$lnk) {
+					$s .= util_html_encode($os);
+				} else {
+					$s .= "[" . html_e("a", array(
+						"href" => util_make_url($lnk),
+						"title" => $ttip,
+					    ), util_html_encode($matches[1][0] .
+					    $matches[2][0])) . "]";
+				}
+				break;
+
+			/* formatting begin */
+			case 2:
+				$s .= html_ao($matches[1][0]);
+				break;
+
+			/* formatting end */
+			case 3:
+				/* bounds checked earlier */
+				$s .= html_ac($curpos - 1);
+				break;
+
+			/* none */
+			case 0:
+			default:
+				$s .= util_html_encode($os);
+				break;
+			}
+
+			/* rinse, repeat */
+		}
+	}
+	/* handle closing all elements */
+	switch ($state) {
+	case SHOWMESS_FMT_INITIAL:
+	case SHOWMESS_FMT_WANTPRE:
+		break;
+
+	case SHOWMESS_FMT_INPRE:
+		$s .= "</pre>\n";
+		break;
+
+	case SHOWMESS_FMT_INPARA:
+		$s .= html_ac($spos) . "</p>\n";
+		break;
+	}
+
+	/* return the worm */
+	return html_e('div', array(
+		'class' => array(
+			'showmess_fmt',
+		    ),
+	    ), "\n" . $s);
+}

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/include/pre.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/include/pre.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/include/pre.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -119,6 +119,15 @@
 	}
 }
 
+if (strlen(forge_get_config('host_uuid')) < 12 ||
+    /* also catch MD5(empty string) */
+    forge_get_config('host_uuid') == 'd41d8cd98f00') {
+	if (php_sapi_name() != 'cli') {
+		exit_error('ATTN sysadmin: upgrade your host_uuid');
+	}
+	fwrite(STDERR, "ATTN sysadmin: upgrade your host_uuid\n");
+}
+
 forge_define_config_item ('installation_environment', 'core', 'production') ;
 $installation_environment = forge_get_config ('installation_environment') ;
 if ($installation_environment == 'development' || $installation_environment == 'integration')

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/include/session.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/include/session.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/include/session.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -45,9 +45,18 @@
  *	@return cookie value
  */
 function session_build_session_cookie($user_id) {
-	$session_serial = $user_id.'-*-'.time().'-*-'.getStringFromServer('REMOTE_ADDR').'-*-'.getStringFromServer('HTTP_USER_AGENT');
-	$session_serial_hash = md5($session_serial.forge_get_config('session_key'));
-	$session_serial_cookie = base64_encode($session_serial).'-*-'.$session_serial_hash;
+	if (strlen(forge_get_config('host_uuid')) < 12 ||
+	    /* also catch MD5(empty string) */
+	    forge_get_config('host_uuid') == 'd41d8cd98f00') {
+		exit_error('ATTN sysadmin: upgrade your host_uuid');
+	}
+	$session_serial = $user_id . '-*-' . time() . '-*-' .
+	    getStringFromServer('REMOTE_ADDR') . '-*-' .
+	    getStringFromServer('HTTP_USER_AGENT');
+	$session_serial_hash = md5(forge_get_config('host_uuid') .
+	    $session_serial . forge_get_config('session_key'));
+	$session_serial_cookie = base64_encode($session_serial) . '-*-' .
+	    $session_serial_hash;
 	return $session_serial_cookie;
 }
 
@@ -74,7 +83,8 @@
 
 	list ($session_serial, $hash) = explode('-*-', $session_cookie);
 	$session_serial = base64_decode($session_serial);
-	$new_hash = md5($session_serial.forge_get_config('session_key'));
+	$new_hash = md5(forge_get_config('host_uuid') .
+	    $session_serial . forge_get_config('session_key'));
 
 	if ($hash != $new_hash) {
 		return false;
@@ -362,13 +372,18 @@
  *	@return true/false
  */
 function session_cookie($name ,$value, $domain = '', $expiration = 0) {
-	if (php_sapi_name() != 'cli') {
-		if ( $expiration != 0){
-			setcookie($name, $value, time() + $expiration, '/', $domain, 0);
-		} else {
-			setcookie($name, $value, $expiration, '/', $domain, 0);
-		}
+	if (php_sapi_name() == 'cli') {
+		return;
 	}
+	if ($expiration != 0) {
+		$expiration = time() + $expiration;
+	}
+	/* evolvis: force secure (SSL-only) session cookies */
+	$force_secure = true;
+	if ($force_secure && !session_issecure()) {
+		return;
+	}
+	setcookie($name, $value, $expiration, '/', $domain, $force_secure);
 }
 
 /**
@@ -572,6 +587,15 @@
 	global $G_SESSION;
 	global $session_ser;
 
+	/* force HTTPS for Evolvis. Always. */
+	if (!session_issecure()) {
+		$dst = 'https://' . getStringFromServer('HTTP_HOST') .
+		    getStringFromServer('REQUEST_URI');
+		sysdebug_off('Location: ' . $dst);
+		echo 'Go to: ' . $dst;
+		exit;
+	}
+
 	// assume bad session_hash and session. If all checks work, then allow
 	// otherwise make new session
 	$id_is_good = false;

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/include/utils.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/include/utils.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/include/utils.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -1574,48 +1574,13 @@
 	    ))) . "</tt></".$tag.">"));
 }
 
-/* takes a string and returns it HTML encoded, URIs made to hrefs */
-function util_uri_grabber($unencoded_string, $tryaidtid=false) {
-	/* escape all ^A and ^B as ^BX^B and ^BY^B, respectively */
-	$s = str_replace("\x01", "\x02X\x02", str_replace("\x02", "\x02Y\x02",
-	    $unencoded_string));
-	/* replace all URIs with ^AURI^A */
-	$s = preg_replace_callback(
-	    '|(.?)([a-zA-Z][a-zA-Z0-9+.-]*):([#0-9a-zA-Z;/?:@&=+$,_.!~*\'()%-]+)(.?)|',
-	    create_function('$matches', '
-		if ($matches[1] == "[" && $matches[4] == "]") {
-			/* but not forum/wiki internal links */
-			if ($matches[2] == "forum" ||
-			    $matches[2] == "wiki") {
-				return $matches[0];
-			}
-		}
-		return $matches[1] . "\x01" . $matches[2] . ":" . $matches[3] .
-		    "\x01" . $matches[4];
-	    '), $s);
-	if (!$s)
-		return htmlspecialchars($unencoded_string, ENT_QUOTES, "UTF-8");
-	/* encode the string */
-	$s = htmlspecialchars($s, ENT_QUOTES, "UTF-8");
-	/* convert 「^Afoo^A」 to 「<a href="foo">foo</a>」 */
-	$s = preg_replace('|\x01([^\x01]+)\x01|',
-	    '<a href="$1">$1</a>', $s);
-	if (!$s)
-		return htmlspecialchars($unencoded_string, ENT_QUOTES, "UTF-8");
-	/* convert [#123] to links if found */
-	if ($tryaidtid)
-		$s = util_tasktracker_links($s);
-	/* convert ^BX^B and ^BY^B back to ^A and ^B, respectively */
-	$s = str_replace("\x02Y\x02", "\x02", str_replace("\x02X\x02", "\x01",
-	    $s));
-	/* return the final result */
-	return $s;
+function util_html_encode($s) {
+	return htmlspecialchars($s, ENT_QUOTES, "UTF-8");
 }
 
 /* secure a (possibly already HTML encoded) string */
 function util_html_secure($s) {
-	return htmlspecialchars(html_entity_decode($s, ENT_QUOTES, "UTF-8"),
-	    ENT_QUOTES, "UTF-8");
+	return util_html_encode(util_unconvert_htmlspecialchars($s));
 }
 
 /* return integral value (ℕ₀) of passed string if it matches, or false */
@@ -1660,13 +1625,12 @@
 		    create_function('$matches', '
 			$p = ' . "'$prj'" . ';
 			$w = $matches[1];
-			$w = html_entity_decode($w, ENT_QUOTES, "UTF-8");
+			$w = util_unconvert_htmlspecialchars($w);
 			$l = util_make_url("/plugins/mediawiki/wiki/" .
-			    $p . "/index.php/" . urlencode($w));
+			    $p . "/index.php/" . urlencode(strtr($w, " ", "_")));
 			return "[" . html_e("a", array(
-				"href" => util_html_secure($l),
-			    ), "wiki:" . htmlspecialchars($w, ENT_QUOTES,
-			    "UTF-8")) . "]";
+				"href" => $l,
+			    ), "wiki:" . util_html_encode($w)) . "]";
 		    '), $s);
 		if ($t) {
 			$s = $t;
@@ -1733,7 +1697,7 @@
 		}
 		return "[" . html_e("a", array(
 			"href" => util_make_url(sprintf($linkf, $mid)),
-			"title" => util_html_secure($r["summary"]),
+			"title" => sprintf($textf, $r["summary"]),
 		    ), $matches[1] . $mid) . "]";
 	    '), $s);
 	if ($t)

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/pm/ProjectController.class.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/pm/ProjectController.class.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/pm/ProjectController.class.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -68,41 +68,6 @@
 	}
 }
 
-if (getStringFromRequest('CopySubproject')) {
-	$copy_group_project_id = getIntFromRequest('copy_group_project_id');
-	$summary = getStringFromRequest('summary');
-	$details = getStringFromRequest('details');
-	$status_id = 1; // always open for new copied tasks.
-	$category_id = getIntFromRequest('category_id');
-	$priority = getIntFromRequest('priority');
-	$percent_complete = getIntFromRequest('percent_complete');
-	$hours = getIntFromRequest('hours');
-	$duration = getIntFromRequest('duration');
-	$parent_id = getIntFromRequest('parent_id');
-
-	$result = db_query_params('INSERT INTO project_task (group_project_id,created_by,summary,details,status_id,category_id,priority,percent_complete,hours,duration,parent_id) VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11)',
-				    array(
-					$copy_group_project_id,
-					user_getid(),
-					$summary,
-					$details,
-					$status_id,
-					$category_id,
-					$priority,
-					$percent_complete,
-					$hours,
-					$duration,
-					$parent_id,
-				    ));
-	if (!$result || db_affected_rows($result) < 1) {
-		$this->setError('projectTaskHTML::create() Posting Failed '.db_error().$sql);
-		db_rollback();
-		return false; //no return here. Needs a walkaround
-	} else {
-		$feedback .= '<br />' . _('Successfully Copied');
-	}
-}
-
 /*
  * This file gets includes from pm_task.php. The pm_tasks.php constructs
  * the object ProjectController and can overgive the variables created
@@ -225,6 +190,9 @@
 		case 'postaddtask':
 			$pmView->setTemplateFile('detail_template');
 			break;
+		case 'copytask':
+			$pmView->setTemplateFile('detail_template');
+			break;
 		default:
 			$pmView->setTemplateFile('detail_template');
 			break;

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/pm/ProjectTask.class.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/pm/ProjectTask.class.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/pm/ProjectTask.class.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -753,10 +753,6 @@
 	 * @returns	boolean	success.
 	 */
 	function setDependentOn(&$arr_) {
-//printr($arr_,'setDependentOn entry');
-//
-//	IMPORTANT - MUST VERIFY NO CIRCULAR DEPENDENCY!! 
-//
 		if (!$arr_ || empty($arr_)) {
 			$arr_=array('100'=>PM_LINK_DEFAULT);
 		}
@@ -766,9 +762,7 @@
 
 		if (count($arr) || count($arr2)) {
 			$add_arr = array_values (array_diff ($arr, $arr2));
-//echo "add arr: ".print_r($add_arr);
 			$del_arr = array_values (array_diff ($arr2, $arr));
-//echo "del arr: ".print_r($del_arr);
 			for ($i=0; $i<count($del_arr); $i++) {
 				db_query_params ('DELETE FROM project_dependencies 
 					WHERE project_task_id=$1
@@ -933,7 +927,7 @@
 	 */
 	function update($summary,$details,$priority,$hours,$start_date,$end_date,
 		$status_id,$category_id,$percent_complete,&$assigned_arr,&$depend_arr,
-		$new_group_project_id,$duration=0,$parent_id=0, $comment='') {
+		$new_group_project_id,$duration=0,$parent_id=0, $comment='', $massupdate=false) {
 		$has_changes = false; // if any of the values passed is different from
 		
 		$arrChangedAndInNotice = array("details"=>"","summary"=>"",
@@ -943,7 +937,6 @@
 
 		$v = new Validator();
 		$v->check($summary, "summary");
-		$v->check($details, "details");
 		$v->check($priority, "priority");
 		$v->check($hours, "hours");
 		$v->check($start_date, "start date");
@@ -972,16 +965,6 @@
 			return false;
 		}
 
-		/*if ( ($this->getSummary() != $summary) || ($this->getDetails() != $details) ||
-			 ($this->getPriority() != $priority) || ($this->getHours() != $hours) ||
-			 ($this->getStartDate() != $start_date) || ($this->getEndDate() != $end_date) ||
-			 ($this->getStatusID() != $status_id) || ($this->getCategoryID() != $category_id) ||
-			 ($this->getPercentComplete() != $percent_complete) ) {
-			 
-			 $has_changes = true;
-		}*/
-		
-		
 		db_begin();
 
 		//
@@ -1046,6 +1029,12 @@
 			$arrChangedAndInNotice['summary'] = ">";
 		}
 
+		if ($this->getDetails() != htmlspecialchars($details)) {
+			$this->addHistory('details',$this->getDetails());
+			$has_changes = true;
+			$arrChangedAndInNotice['details'] = ">";
+		}
+
 		if ($this->getPercentComplete() != $percent_complete) {
 			$this->addHistory ('percent_complete',$this->getPercentComplete());
 			$has_changes = true;
@@ -1094,7 +1083,7 @@
 			db_rollback();
 			return false;
 		} else {
-			$res = db_query_params ('UPDATE project_task SET
+			$sqlQuery = 'UPDATE project_task SET
 				summary=$1,
 				priority=$2,
 				hours=$3,
@@ -1105,24 +1094,33 @@
 				category_id=$8,
 				group_project_id=$9,
 				duration=$10,
-				parent_id=$11,
-				details=$12
-				WHERE group_project_id=$13
-				AND project_task_id=$14',
-						array (htmlspecialchars($summary),
-						       $priority,
-						       $hours,
-						       $start_date,
-						       $end_date,
-						       $status_id,
-						       $percent_complete,
-						       $category_id,
-						       $new_group_project_id,
-						       $duration,
-						       $parent_id,
-						       $details,
-						       $group_project_id,
-						       $this->getID())) ;
+				parent_id=$11';
+				
+			$sqlQueryParams = array();
+			$sqlQueryParams[0] = htmlspecialchars($summary);
+			$sqlQueryParams[1] = $priority;
+			$sqlQueryParams[2] = $hours;
+			$sqlQueryParams[3] = $start_date;
+			$sqlQueryParams[4] = $end_date;
+			$sqlQueryParams[5] = $status_id;
+			$sqlQueryParams[6] = $percent_complete;
+			$sqlQueryParams[7] = $category_id;
+			$sqlQueryParams[8] = $new_group_project_id;
+			$sqlQueryParams[9] = $duration;
+			$sqlQueryParams[10] = $parent_id;
+			
+			if (!$massupdate) {
+				$sqlQuery .= ' ,details=$12 WHERE group_project_id=$13 AND project_task_id=$14';
+				$sqlQueryParams[11] = htmlspecialchars($details);
+				$sqlQueryParams[12] = $group_project_id;
+				$sqlQueryParams[13] = $this->getID();
+			} else {
+				$sqlQuery .= ' WHERE group_project_id=$12 AND project_task_id=$13';
+				$sqlQueryParams[11] = $group_project_id;
+				$sqlQueryParams[12] = $this->getID();
+			}
+
+			$res = db_query_params($sqlQuery, $sqlQueryParams);
 			if (!$res) {
 				$this->setError('Error On ProjectTask::update-5: '.db_error());
 				db_rollback();
@@ -1224,5 +1222,3 @@
 // mode: php
 // c-file-style: "bsd"
 // End:
-
-?>

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/tracker/Artifact.class.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/tracker/Artifact.class.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/tracker/Artifact.class.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -189,23 +189,7 @@
 	 *  @return id on success / false on failure.
 	 */
 	function create( $summary, $details, $assigned_to=100, $priority=3, $extra_fields=array(), $importData = array()) {
-		//
-		//	make sure this person has permission to add artifacts
-		//
-		
-		if (!$this->ArtifactType->isPublic()) {
-			//
-			//	Only admins can post/modify private artifacts
-			//
 
-//
-// ape: Disabled, private means only restricted to members. So, no special rules #2503.
-//			if (!forge_check_perm ('tracker_admin', $this->ArtifactType->Group->getID()) {
-//				$this->setError(_('Artifact: Only Artifact Admins Can Modify Private ArtifactTypes'));
-//				return false;
-//			}
-		}
-
 		//
 		//	get the user_id
 		//
@@ -1007,7 +991,7 @@
 			
 			// Special case if moving to a tracker with custom status (previous has not).
 			$custom_status_id = $newArtifactType->getCustomStatusField();
-			if ($custom_status_id && !$new_extra_fields[$custom_status_id]) {
+			if ($custom_status_id && !util_ifsetor($new_extra_fields[$custom_status_id])) {
 				$atw = new ArtifactWorkflow($newArtifactType, $custom_status_id);
 				$nodes = $atw->getNextNodes(100);
 				if ($nodes) {
@@ -1558,7 +1542,7 @@
 		$efd = $this->getExtraFieldDataText();
 		foreach ($efd as $efid => $ef) {
 			$body .= $this->marker('extra_fields', $changes, $efid);
-			$body .= $ef["name"].": ".$ef["value"]."\n";
+			$body .= $ef["name"].": ".util_unconvert_htmlspecialchars($ef["value"])."\n";
 		}
 			
 		$subject='['. $this->ArtifactType->Group->getUnixName() . '-' . $this->ArtifactType->getName() . '][' . $this->getID() .'] '. util_unconvert_htmlspecialchars( $this->getSummary() );
@@ -1814,5 +1798,3 @@
 // mode: php
 // c-file-style: "bsd"
 // End:
-
-?>

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/tracker/ArtifactFactory.class.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/tracker/ArtifactFactory.class.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/tracker/ArtifactFactory.class.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -220,8 +220,8 @@
 					   'summary',
 					   'open_date',
 					   'close_date',
-					   'assigned_to',
-					   'submitted_by',
+					   'assigned_unixname',
+					   'submitted_unixname',
 					   'priority') ;
 		$efarr = $this->ArtifactType->getExtraFields(array(ARTIFACT_EXTRAFIELDTYPE_TEXT,
 						    ARTIFACT_EXTRAFIELDTYPE_TEXTAREA,
@@ -479,18 +479,18 @@
 							    'summary',
 							    'open_date',
 							    'close_date',
-							    'assigned_to',
-							    'submitted_by',
+							    'assigned_unixname',
+							    'submitted_unixname',
 							    'priority'));
 
 		if ($sortcol != 'extra') {
-			$ordersql = " ORDER BY Artifacts.group_artifact_id $sortorder, Artifacts.$sortcol $sortorder" ;
+			$ordersql = " ORDER BY Artifacts.group_artifact_id $sortorder, Artifacts.$sortcol $sortorder";
 		} else {
 			$ordersql = ''  ;
 		}
 			
-		$result = db_query_params ('SELECT * FROM (' . $selectsql . $wheresql . ') AS Artifacts' . $ordersql,
-					   $params) ;
+		$sql = 'SELECT * FROM (' . $selectsql . $wheresql . ') AS Artifacts' . $ordersql;
+		$result = db_query_params($sql, $params);
 		$rows = db_numrows($result);
 		$this->fetched_rows=$rows;
 		if (db_error()) {

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/widget/Widget_MyArtifacts.class.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/widget/Widget_MyArtifacts.class.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/widget/Widget_MyArtifacts.class.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -79,9 +79,9 @@
 	function getPreferences() {
 		$prefs  = '';
 		$prefs .= _("Display artifacts:").' <select name="show">';
-		$prefs .= '<option value="A"  '.($this->_artifact_show === 'A'?'selected="selected"':'').'>'._("assigned to me [A]");
-		$prefs .= '<option value="S"  '.($this->_artifact_show === 'S'?'selected="selected"':'').'>'._("submitted by me [S]");
-		$prefs .= '<option value="AS" '.($this->_artifact_show === 'AS'?'selected="selected"':'').'>'._("assigned to or submitted by me [AS]");
+		$prefs .= '<option value="A"  '.($this->_artifact_show === 'A'?'selected="selected"':'').'>'._("assigned to me [A]") . "</option>\n";
+		$prefs .= '<option value="S"  '.($this->_artifact_show === 'S'?'selected="selected"':'').'>'._("submitted by me [S]") . "</option>\n";
+		$prefs .= '<option value="AS" '.($this->_artifact_show === 'AS'?'selected="selected"':'').'>'._("assigned to or submitted by me [AS]") . "</option>\n";
 		$prefs .= '</select>';
 		return $prefs;
 
@@ -233,7 +233,7 @@
 							'<td class="priority'.$trackers_array->getPriority().'">'.$trackers_array->getPriority().'</td>'.
 							'<td><a href="/tracker/?func=detail&group_id='.
 							$group_id.'&aid='.$aid.'&atid='.$atid.
-							'">'. stripslashes($summary).'</a></td>'.
+							'">'. "[#" . $aid . "] " . stripslashes($summary).'</a></td>'.
 							'<td class="small">';
 						$html .= ' '.$AS_flag.'</td></tr>';
 
@@ -267,7 +267,7 @@
 			$request =& HTTPRequest::instance();
 			$ajax_url = parent::getAjaxUrl($owner_id, $owner_type);
 			if ($request->exist('hide_item_id') || $request->exist('hide_artifact')) {
-				$ajax_url .= '&hide_item_id=' . $request->get('hide_item_id') . '&hide_artifact=' . $request->get('hide_artifact');
+				$ajax_url .= '&hide_item_id=' . $request->get('hide_item_id') . '&hide_artifact=' . $request->get('hide_artifact');
 			}
 			return $ajax_url;
 		}

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/widget/Widget_MyProjects.class.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/widget/Widget_MyProjects.class.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/widget/Widget_MyProjects.class.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -87,7 +87,7 @@
 				$html_my_projects .= '</td>'.
 					'<td><a href="rmproject.php?group_id='. $g->getID().
 					'" onclick="return confirm(\''._("Quit this project?").'\')">'.
-					'<img src="'.$GLOBALS['HTML']->imgroot.'ic/trash.png" height="16" width="16" border="0" /></a></td></tr>';
+					'<img src="'.$GLOBALS['HTML']->imgroot.'ic/trash.png" height="16" width="16" border="0" alt="[Trash]" /></a></td></tr>';
 			} else {
 				$html_my_projects .= '</td><td> </td></tr>';
 			}

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/widget/Widget_MyTasks.class.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/widget/Widget_MyTasks.class.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/widget/Widget_MyTasks.class.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -88,7 +88,7 @@
 
                 list($hide_now,$count_diff,$hide_url) = my_hide_url('pm',$group_project_id,$hide_item_id,$rows2,$hide_pm);
         
-                $html_hdr = ($j ? '<tr class="boxitem"><td colspan="3">' : '').
+                $html_hdr = '<tr class="boxitem"><td colspan="3">' .
                     $hide_url.'<a href="/pm/task.php?group_id='.$group_id.
                     '&group_project_id='.$group_project_id.'">'.
                     db_result($result,$j,'group_name').' - '.
@@ -100,11 +100,11 @@
                     if (!$hide_now) {
         
                     $html .= '
-                    <tr class=priority"'.db_result($result2,$i,'priority').
+                    <tr class="priority'.db_result($result2,$i,'priority').
                         '"><td class="small"><a href="/pm/task.php/?func=detailtask&project_task_id='.
                         db_result($result2, $i, 'project_task_id').'&group_id='.
                         $group_id.'&group_project_id='.$group_project_id.
-                        '">'.stripslashes(db_result($result2,$i,'summary')).'</a></td>'.
+                        '">'. "[#" . db_result($result2, $i, 'project_task_id') . "] " . stripslashes(db_result($result2,$i,'summary')).'</a></td>'.
                         '<td class="small">'.(db_result($result2,$i,'percent_complete')).'%</td></tr>';
         
                     }

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/widget/Widget_ProjectLatestFileReleases.class.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/widget/Widget_ProjectLatestFileReleases.class.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/widget/Widget_ProjectLatestFileReleases.class.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -134,7 +134,7 @@
 					// -> monitor
 					$tmp_alt = $package_name . " - " . _('Monitor this package');
 					$link = '/frs/monitor.php?filemodule_id=' .  db_result($res_files,$f,'package_id') . '&group_id='.$group_id.'&start=1';
-					$link_content = $HTML->getMonitorPic($tmp_alt, $tmp_alt);
+					$link_content = $HTML->getMonitorOPic(true, $tmp_alt, $tmp_alt);
 					echo util_make_link ($link, $link_content);
 					echo '</td>
 						<td class="align-center">';

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/widget/Widget_Rss.class.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/widget/Widget_Rss.class.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/common/widget/Widget_Rss.class.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -46,10 +46,10 @@
 				}
 			}
 			require_once('/usr/share/php/simplepie/simplepie.inc');
-			if (!is_dir(forge_get_config('sys_var_path') .'/rss')) {
-				mkdir(forge_get_config('sys_var_path') .'/rss');
+			if (!is_dir(forge_get_config('data_path') .'/rss')) {
+				mkdir(forge_get_config('data_path') .'/rss');
 			}
-			$rss = new SimplePie($this->rss_url, forge_get_config('sys_var_path') .'/rss', null, forge_get_config('sys_proxy'));
+			$rss = new SimplePie($this->rss_url, forge_get_config('data_path') .'/rss', null, forge_get_config('sys_proxy'));
 			$max_items = 10;
 			$items = array_slice($rss->get_items(), 0, $max_items);
 			$content .= '<table width="100%">';
@@ -64,7 +64,7 @@
 
 				$i=$i+1;
 
-				$content .= '<tr class="'. $class .'"><td WIDTH="99%">';
+				$content .= '<tr class="'. $class .'"><td width="99%">';
 				if ($image = $item->get_link(0, 'image')) {
 					//hack to display twitter avatar
 					$content .= '<img src="'.  $hp->purify($image, CODENDI_PURIFIER_CONVERT_HTML)  .'" style="float:left; margin-right:1em;" />';
@@ -129,10 +129,10 @@
 			$vTitle->required();
 			if (!$request->validInArray('rss', $vTitle)) {
 				require_once('/usr/share/php/simplepie/simplepie.inc');
-				if (!is_dir(forge_get_config('sys_var_path') .'/rss')) {
-					mkdir(forge_get_config('sys_var_path') .'/rss');
+				if (!is_dir(forge_get_config('data_path') .'/rss')) {
+					mkdir(forge_get_config('data_path') .'/rss');
 				}
-				$rss_reader = new SimplePie($rss['url'], forge_get_config('sys_var_path') .'/rss', null, forge_get_config('sys_proxy'));
+				$rss_reader = new SimplePie($rss['url'], forge_get_config('data_path') .'/rss', null, forge_get_config('sys_proxy'));
 				$rss['title'] = $rss_reader->get_title();
 			}
 			$sql = 'INSERT INTO widget_rss (owner_id, owner_type, title, url) VALUES ($1,$2,$3,$4)';

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/debian/changelog
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/debian/changelog	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/debian/changelog	2011-12-23 17:24:04 UTC (rev 17935)
@@ -1,3 +1,48 @@
+fusionforge (5.1.1+evolvis5) unstable; urgency=low
+
+  [ Patrick Apel ]
+  * [#2321] Tasks: Massen-Update funktioniert nicht
+  * [#2305] My Page: fix collapsing Artifacts widget
+  * [#2314] Tasks: switch to “To Test” upon reaching 100%
+  * [#1909] [#2302] Tasks: use datepicker
+  * [#2326] Fix Task cloning (Copy+Close)
+
+  [ Mike Esser ]
+  * [#2323] Fix Suche
+  * Add delete functionality for saved queries
+
+  [ Denis Ilday ]
+  * Update German translations
+
+  [ Thorsten Glaser ]
+  * Several widget fixes, among them [#2306]
+  * Fix several UIs and code warnings and XHTML
+  * [#2322] make Submitter/Assignee sort use unixname not user_id
+  * [#2320] when changing Data Type track that upon jumpback to details
+  * [#2317] go back to users/permissions page after add-from-list
+  * [#1902] more instructions on how to make a public group
+  * [#1899] drop the pending membership after initial approval
+  * [#2313] restore UI to delete an ArtifactFile
+  * To prevent password theft and session hijacking,
+    – enforce HTTPS
+    – enforce a valid host_uuid
+    – enforce secure cookies for session cookie
+    Inspired by FvS
+  * Merge help texts by Claudia Nuessle into tracker tooltips
+  * [#2328] FRS: if monitoring use stop-monitoring icon
+  * [#2334] Tasks: correctly handle HTML special chars in Summary
+  * Tracker: make tooltips less obtrusive; display only when the
+    form field has the focus, if possible
+  * Employ some code cleanup
+  * [#2316] store details changes in the history
+  * [#2333] restore current Evolvis 4.8 select_columns logic
+  * As in 4.8, newly synced LDAP users have English language
+  * [#2334] [#2337] Unification of Tasks/Tracker Summary/Details/Comments
+    handling; fix htmlspecialchars; add basic formatting possibilities
+  * Tasks: Estimated Hours now default to 1 to avoid needing to fill it in
+
+ -- Thorsten Glaser <t.glaser at tarent.de>  Fri, 23 Dec 2011 18:21:27 +0100
+
 fusionforge (5.1.1+evolvis4) unstable; urgency=low
 
   * More PHP/XHTML and translation fixes

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/debian/control
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/debian/control	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/debian/control	2011-12-23 17:24:04 UTC (rev 17935)
@@ -82,7 +82,7 @@
 
 Package: gforge-common
 Architecture: all
-Depends: debconf (>= 1.0.32) | debconf-2.0, ucf, cpio, lockfile-progs, adduser, php5-cli, php-htmlpurifier (>= 4.0), libphp-simplepie, python, mksh, xz-utils, sudo, w3c-dtd-xhtml, xmlstarlet, ${misc:Depends}
+Depends: debconf (>= 1.0.32) | debconf-2.0, ucf, cpio, lockfile-progs, adduser, php5-cli, php-htmlpurifier (>= 4.0), libphp-simplepie (>= 1.2-2+tarent1), libphp-simplepie (<< 1.2-3~~), python, mksh, xz-utils, sudo, w3c-dtd-xhtml, xmlstarlet, ${misc:Depends}
 Recommends: php5-perl (>= 1.0.0-2~), libauthen-passphrase-perl
 Conflicts: sourceforge, gforge-plugin-scmcvs (<< 4.1), gforge-plugin-scmsvn (<< 4.1), gforge-plugin-scmccase (<< 4.1), gforge-theme-starterpack (<< 4.0)
 Description: collaborative development tool - shared files
@@ -97,7 +97,7 @@
 
 Package: gforge-web-apache2
 Architecture: all
-Depends: gforge-common, gforge-db-postgresql | gforge-db, libapache2-mod-php5, php5-cgi, php5-pgsql, php5-gd, perl, libdbi-perl, libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, cronolog, python, ssl-cert, libnusoap-php, php-htmlpurifier (>= 4.0), libphp-simplepie, libjs-yui (>= 2.8.2r1~squeeze-1.1~), libjs-prototype (>= 1.7.0-2.1~), libjs-scriptaculous (>= 1.9.0-2~), libjs-jquery (>= 1.6.4-1~), libjs-jquery-tipsy (>= 4-1~), libjs-jquery-ui (>= 1.8.ooops.16+dfsg-1~), libphp-jpgraph, tango-icon-theme, toilet, ${misc:Depends}
+Depends: gforge-common, gforge-db-postgresql | gforge-db, libapache2-mod-php5, php5-cgi, php5-pgsql, php5-gd, perl, libdbi-perl, libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, cronolog, python, ssl-cert, libnusoap-php, php-htmlpurifier (>= 4.0), libjs-yui (>= 2.8.2r1~squeeze-1.1~), libjs-prototype (>= 1.7.0-2.1~), libjs-scriptaculous (>= 1.9.0-2~), libjs-jquery (>= 1.6.4-1~), libjs-jquery-ui (>= 1.8.ooops.16+dfsg-1~), libphp-jpgraph, tango-icon-theme, toilet, ${misc:Depends}
 Recommends: locales | locales-all
 Provides: gforge-web
 Conflicts: gforge-web

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/debian/dsf-in/web-apache2.postinst.dsfh-in
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/debian/dsf-in/web-apache2.postinst.dsfh-in	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/debian/dsf-in/web-apache2.postinst.dsfh-in	2011-12-23 17:24:04 UTC (rev 17935)
@@ -79,6 +79,11 @@
         # Setup our FRS
 	chown www-data:www-data /var/lib/@OLDPACKAGE@/download
 
+	# Setup cache dir for RSS widget
+	mkdir -p /var/lib/@OLDPACKAGE@/rss
+	chmod 2775 /var/lib/@OLDPACKAGE@/rss
+	chgrp www-data /var/lib/@OLDPACKAGE@/rss
+
 	# Enable required modules
 	DEBIAN_FRONTEND=noninteractive a2enmod php5 || true
 	DEBIAN_FRONTEND=noninteractive a2enmod ssl || true
@@ -107,11 +112,10 @@
 	
 	[ -e $config_path ] || mkdir -p $config_path
 
-	if ! [ -e $config_path/uuid.ini ] ; then
-	    { 
-		echo [core]
-		dd if=/dev/urandom count=1 bs=8 2> /dev/null | md5sum | cut -b1-8
-	    } > $config_path/uuid.ini
+	if ! grep host_uuid $config_path/uuid.ini >/dev/null 2>&1; then
+		printf '[core]\nhost_uuid=%s\n' \
+		    $(dd if=/dev/urandom count=1 bs=8 2>/dev/null | md5sum | cut -b1-12) \
+		    >$config_path/uuid.ini
 	fi
 	
 	# Make Apache see these new changes

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/debian/evolvis.postinst
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/debian/evolvis.postinst	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/debian/evolvis.postinst	2011-12-23 17:24:04 UTC (rev 17935)
@@ -36,9 +36,6 @@
 		enable_mwext SpecialInterwiki.php
 		enable_mwext SyntaxHighlight_GeSHi.php
 	fi
-
-	perl -pi -e 's/^#extension=idn.so/extension=idn.so/' \
-	    /etc/php5/conf.d/idn.ini
 	;;
 
 abort-upgrade|abort-remove|abort-deconfigure)

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/debian/patches/use-jquery-from-distro.patch
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/debian/patches/use-jquery-from-distro.patch	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/debian/patches/use-jquery-from-distro.patch	2011-12-23 17:24:04 UTC (rev 17935)
@@ -2,7 +2,7 @@
 Description: Use JQuery as provided by the libjs-jquery Debian package
 --- src.orig/www/include/html.php
 +++ src/www/include/html.php
-@@ -358,14 +358,14 @@
+@@ -358,7 +358,7 @@
  }
  
  function html_use_jquery() {
@@ -11,12 +11,3 @@
  }
  
  function html_use_tooltips() {
- 	html_use_jquery();
--	use_javascript('/scripts/jquery-tipsy/src/javascripts/jquery.tipsy.js');
-+	use_javascript('/scripts/jquery-tipsy/jquery.tipsy.js');
- 	use_javascript('/js/tooltips.js');
--	use_stylesheet('/scripts/jquery-tipsy/src/stylesheets/tipsy.css');
-+	use_stylesheet('/scripts/jquery-tipsy/stylesheets/tipsy.css');
- }
- 
- /**

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/docs/README.html:elements
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/docs/README.html:elements	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/docs/README.html:elements	2011-12-23 17:24:04 UTC (rev 17935)
@@ -111,3 +111,32 @@
   This function can easily be used to open an enclosing element
   with mandatory inner elements, such as a table, only once except
   if no table row were to be generated.
+
+‣ Autoclose stack copy functions
+
+	$spos = html_ap();
+	echo html_ao('tr', array('bgcolor' => '#FF0000'));
+	echo html_ao('td');
+	echo "content 1";
+	$scopy = html_a_copy($spos);
+	echo html_ac($spos);
+	echo html_e('tr', array(), html_e('td', array(), "intermediate"));
+	echo html_a_apply($scopy);
+	echo "content 2";
+	echo html_ac($spos);
+	echo html_a_apply($scopy);
+	echo "content 3";
+	echo html_ac($spos);
+
+	⇒ <tr bgcolor="#FF0000"><td>content 1</td></tr>
+	  <tr><td>intermediate</td></tr>
+	  <tr bgcolor="#FF0000"><td>content 2</td></tr>
+	  <tr bgcolor="#FF0000"><td>content 3</td></tr>
+
+• opaque html_a_copy(integer $spos)
+• string html_a_apply(opaque $scopy)
+
+  Before autoclosing the stack down to a level $spos, you can
+  retrieve a copy of the stack in an opaque format, which can
+  later be used to (re-)open the same elements, with the same
+  attributes, even in a different nesting state.

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/docs/README.html:utils
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/docs/README.html:utils	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/docs/README.html:utils	2011-12-23 17:24:04 UTC (rev 17935)
@@ -4,6 +4,16 @@
 Functions defined in src/common/include/utils.php → available: always.
 
 
+• string util_html_encode(string $s)
+
+	util_html_secure('a=1&b=2')
+	⇒ 'a=1&b=2'        // HTML-encoded
+
+	util_html_secure('a=1&b=2')
+	⇒ 'a=1&amp;b=2'    // changed!
+
+  Encode a string for use in XHTML even if it is already encoded.
+
 • string util_html_secure(string $s)
 
 	util_html_secure('a=1&b=2')
@@ -17,6 +27,17 @@
   performance penalty no harm is done if the output was already
   sane.)
 
+• string util_unconvert_htmlspecialchars(string $s)
+
+	util_unconvert_htmlspecialchars('a=1&b=2')
+	⇒ 'a=1&b=2'    // unchanged
+
+	util_unconvert_htmlspecialchars('a=1&b=2')
+	⇒ 'a=1&b=2'    // HTML-decoded
+
+  Undo util_html_encode; be careful, this can decode partially.
+
+
 • string util_make_url(string $path)
 
 	util_make_url('/foo.php?a=1&b=2')
@@ -25,13 +46,6 @@
   Return an absolute URI for the path in question, containing the
   system-defined protocol, hostname and (if defined) webroot prefix.
 
-• string util_uri_grabber(string $unencoded_string,
-    optional(false) bool $tryaidtid)
-
-  HTML-encode the first argument, but convert everything that looks
-  like a hyperlink as per the RFC standard into <a href=…> tags.
-  If $tryaidtid, also pass the string through util_tasktracker_links().
-
 • string util_tasktracker_links(string $s)
 
   Convert references of the form [#123], [T456], [forum:789], [wiki:Foo]

Copied: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/lib/vendor/jquery-tipsy/docs/src/images (from rev 17933, trunk/gforge_base/evolvisforge-5.1/src/lib/vendor/jquery-tipsy/docs/src/images)
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/lib/vendor/jquery-tipsy/docs/src/images	                        (rev 0)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/lib/vendor/jquery-tipsy/docs/src/images	2011-12-23 17:24:04 UTC (rev 17935)
@@ -0,0 +1 @@
+link ../../src/images
\ No newline at end of file


Property changes on: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/lib/vendor/jquery-tipsy/docs/src/images
___________________________________________________________________
Added: svn:special
   + *

Copied: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/lib/vendor/jquery-tipsy/docs/src/javascripts (from rev 17933, trunk/gforge_base/evolvisforge-5.1/src/lib/vendor/jquery-tipsy/docs/src/javascripts)
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/lib/vendor/jquery-tipsy/docs/src/javascripts	                        (rev 0)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/lib/vendor/jquery-tipsy/docs/src/javascripts	2011-12-23 17:24:04 UTC (rev 17935)
@@ -0,0 +1 @@
+link ../../src/javascripts
\ No newline at end of file


Property changes on: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/lib/vendor/jquery-tipsy/docs/src/javascripts
___________________________________________________________________
Added: svn:special
   + *

Copied: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/lib/vendor/jquery-tipsy/docs/src/stylesheets (from rev 17933, trunk/gforge_base/evolvisforge-5.1/src/lib/vendor/jquery-tipsy/docs/src/stylesheets)
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/lib/vendor/jquery-tipsy/docs/src/stylesheets	                        (rev 0)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/lib/vendor/jquery-tipsy/docs/src/stylesheets	2011-12-23 17:24:04 UTC (rev 17935)
@@ -0,0 +1 @@
+link ../../src/stylesheets
\ No newline at end of file


Property changes on: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/lib/vendor/jquery-tipsy/docs/src/stylesheets
___________________________________________________________________
Added: svn:special
   + *

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/packaging/control/020common
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/packaging/control/020common	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/packaging/control/020common	2011-12-23 17:24:04 UTC (rev 17935)
@@ -1,6 +1,6 @@
 Package: @OLDPACKAGE at -common
 Architecture: all
-Depends: debconf (>= 1.0.32) | debconf-2.0, ucf, cpio, lockfile-progs, adduser, php5-cli, php-htmlpurifier (>= 4.0), libphp-simplepie, python, mksh, xz-utils, sudo, w3c-dtd-xhtml, xmlstarlet, ${misc:Depends}
+Depends: debconf (>= 1.0.32) | debconf-2.0, ucf, cpio, lockfile-progs, adduser, php5-cli, php-htmlpurifier (>= 4.0), libphp-simplepie (>= 1.2-2+tarent1), libphp-simplepie (<< 1.2-3~~), python, mksh, xz-utils, sudo, w3c-dtd-xhtml, xmlstarlet, ${misc:Depends}
 Recommends: php5-perl (>= 1.0.0-2~), libauthen-passphrase-perl
 Conflicts: sourceforge, @OLDPACKAGE at -plugin-scmcvs (<< 4.1), @OLDPACKAGE at -plugin-scmsvn (<< 4.1), @OLDPACKAGE at -plugin-scmccase (<< 4.1), @OLDPACKAGE at -theme-starterpack (<< 4.0)
 Description: collaborative development tool - shared files

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/packaging/control/030web-apache2
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/packaging/control/030web-apache2	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/packaging/control/030web-apache2	2011-12-23 17:24:04 UTC (rev 17935)
@@ -1,6 +1,6 @@
 Package: @OLDPACKAGE at -web-apache2
 Architecture: all
-Depends: @OLDPACKAGE at -common, @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -db, libapache2-mod-php5, php5-cgi, php5-pgsql, php5-gd, perl, libdbi-perl, libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, cronolog, python, ssl-cert, libnusoap-php, php-htmlpurifier (>= 4.0), libphp-simplepie, libjs-yui (>= 2.8.2r1~squeeze-1.1~), libjs-prototype (>= 1.7.0-2.1~), libjs-scriptaculous (>= 1.9.0-2~), libjs-jquery (>= 1.6.4-1~), libjs-jquery-tipsy (>= 4-1~), libjs-jquery-ui (>= 1.8.ooops.16+dfsg-1~), libphp-jpgraph, tango-icon-theme, toilet, ${misc:Depends}
+Depends: @OLDPACKAGE at -common, @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -db, libapache2-mod-php5, php5-cgi, php5-pgsql, php5-gd, perl, libdbi-perl, libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, cronolog, python, ssl-cert, libnusoap-php, php-htmlpurifier (>= 4.0), libjs-yui (>= 2.8.2r1~squeeze-1.1~), libjs-prototype (>= 1.7.0-2.1~), libjs-scriptaculous (>= 1.9.0-2~), libjs-jquery (>= 1.6.4-1~), libjs-jquery-ui (>= 1.8.ooops.16+dfsg-1~), libphp-jpgraph, tango-icon-theme, toilet, ${misc:Depends}
 Recommends: locales | locales-all
 Provides: @OLDPACKAGE at -web
 Conflicts: @OLDPACKAGE at -web

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/packaging/links/web-apache2
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/packaging/links/web-apache2	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/packaging/links/web-apache2	2011-12-23 17:24:04 UTC (rev 17935)
@@ -3,6 +3,5 @@
 usr/share/javascript/prototype usr/share/@OLDPACKAGE@/www/scripts/prototype
 usr/share/javascript/scriptaculous usr/share/@OLDPACKAGE@/www/scripts/scriptaculous
 usr/share/javascript/jquery usr/share/@OLDPACKAGE@/www/scripts/jquery
-usr/share/javascript/jquery-tipsy usr/share/@OLDPACKAGE@/www/scripts/jquery-tipsy
 usr/share/javascript/jquery-ui usr/share/@OLDPACKAGE@/www/scripts/jquery-ui
 usr/share/icons/Tango/16x16/apps/office-calendar.png usr/share/@OLDPACKAGE@/www/images/office-calendar.png

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/plugins/scmgit/common/GitPlugin.class.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/plugins/scmgit/common/GitPlugin.class.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/plugins/scmgit/common/GitPlugin.class.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -172,7 +172,7 @@
 							$b .= '</p>';
 							$b .= '<p>';
 							$b .= sprintf (_('<a href="%s">Request a personal repository</a>.'),
-								       util_make_url ('/plugins/scmgit/index.php?func=request-personal-repo&group_id='.$project->getID()));
+								       util_make_url ('/plugins/scmgit/index.php?func=request-personal-repo&group_id='.$project->getID()));
 							$b .= '</p>';
 						}
 					}
@@ -207,7 +207,7 @@
 		
 		if ($project->usesPlugin ($this->name)) {
 			if ($this->browserDisplayable ($project)) {
-				print '<iframe src="'.util_make_url ("/plugins/scmgit/cgi-bin/gitweb.cgi?p=".$project->getUnixName().'/'.$project->getUnixName().'.git').'" frameborder="0" width=100% height=700></iframe>' ;
+				print '<iframe src="'.util_make_url("/plugins/scmgit/cgi-bin/gitweb.cgi?p=".$project->getUnixName().'/'.$project->getUnixName().'.git').'" frameborder="0" width="100%" height="700"></iframe>';
 			}
 		}
 	}

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/plugins/scmgit/packaging/dirs/plugin-scmgit
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/plugins/scmgit/packaging/dirs/plugin-scmgit	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/plugins/scmgit/packaging/dirs/plugin-scmgit	2011-12-23 17:24:04 UTC (rev 17935)
@@ -4,4 +4,5 @@
 usr/share/gforge/plugins/scmgit/common
 usr/share/gforge/plugins/scmgit/www
 usr/share/gforge/www/plugins
+usr/share/gforge/www/plugins/scmgit
 var/lib/gforge/chroot/scmrepos/git

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/plugins/scmgit/packaging/links/plugin-scmgit
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/plugins/scmgit/packaging/links/plugin-scmgit	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/plugins/scmgit/packaging/links/plugin-scmgit	2011-12-23 17:24:04 UTC (rev 17935)
@@ -1,3 +1,7 @@
 /usr/lib/cgi-bin/gitweb.cgi /usr/share/@OLDPACKAGE@/plugins/scmgit/cgi-bin/gitweb.cgi
-/usr/share/gitweb /usr/share/@OLDPACKAGE@/www/plugins/scmgit
-/usr/share/@OLDPACKAGE@/plugins/scmgit/www /usr/share/@OLDPACKAGE@/www/plugins/scmgit
+/usr/share/@OLDPACKAGE@/plugins/scmgit/www/index.php /usr/share/@OLDPACKAGE@/www/plugins/scmgit/index.php
+/usr/share/gitweb/git-favicon.png /usr/share/@OLDPACKAGE@/www/plugins/scmgit/git-favicon.png
+/usr/share/gitweb/git-logo.png /usr/share/@OLDPACKAGE@/www/plugins/scmgit/git-logo.png
+/usr/share/gitweb/gitweb.css /usr/share/@OLDPACKAGE@/www/plugins/scmgit/gitweb.css
+/usr/share/gitweb/gitweb.js /usr/share/@OLDPACKAGE@/www/plugins/scmgit/gitweb.js
+/usr/share/gitweb/index.cgi /usr/share/@OLDPACKAGE@/www/plugins/scmgit/index.cgi

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/translations/de.po
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/translations/de.po	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/translations/de.po	2011-12-23 17:24:04 UTC (rev 17935)
@@ -1,10 +1,10 @@
 # German translations for Evolvis.
 msgid ""
 msgstr ""
-"Project-Id-Version: EvolvisForge 5.1+evolvis3\n"
+"Project-Id-Version: EvolvisForge 5.1+evolvis5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-07 21:54+0100\n"
-"PO-Revision-Date: 2011-12-07 21:55+0100\n"
+"POT-Creation-Date: 2011-12-23 14:46+0100\n"
+"PO-Revision-Date: 2011-12-23 14:47+0100\n"
 "Last-Translator: Thorsten Glaser <t.glaser at tarent.de>\n"
 "Language-Team: german\n"
 "Language: de\n"
@@ -13,19 +13,19 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: common/advanced_search/AdvancedSearch.class.php:79
-#: common/advanced_search/AdvancedSearch.class.php:84
+#: common/advanced_search/AdvancedSearch.class.php:92
+#: common/advanced_search/AdvancedSearch.class.php:97
 #: common/docman/views/search.php:51 common/include/Navigation.class.php:143
 #: common/include/Navigation.class.php:410
 #: plugins/globalsearch/common/globalsearch_stats_boxes.php:48
-#: www/pm/browse_task.php:332
+#: www/pm/browse_task.php:300
 #: www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php:330
 #: www/search/include/renderers/HtmlGroupSearchRenderer.class.php:65
 #: www/search/include/renderers/SkillHtmlSearchRenderer.class.php:57
 msgid "Search"
 msgstr "Suche"
 
-#: common/advanced_search/AdvancedSearch.class.php:86
+#: common/advanced_search/AdvancedSearch.class.php:99
 msgid "Save Query as "
 msgstr "Suchanfrage speichern als "
 
@@ -48,7 +48,7 @@
 
 #: common/docman/Document.class.php:126 common/docman/Document.class.php:687
 msgid "Document already published in this directory"
-msgstr ""
+msgstr "Dokument bereits in diesem Verzeichnis veröffentlicht"
 
 #: common/docman/Document.class.php:175 common/docman/Document.class.php:187
 #, fuzzy
@@ -70,13 +70,12 @@
 msgstr "Dokument: Ungültige Dokumenten-ID (docid)"
 
 #: common/docman/Document.class.php:539
-#, fuzzy
 msgid "Unable To Remove Monitor"
-msgstr "Konnte Überwachung nicht hinzufügen"
+msgstr "Konnte Beobachtung nicht entfernen"
 
 #: common/docman/Document.class.php:560 common/forum/Forum.class.php:463
 msgid "Unable To Add Monitor"
-msgstr "Konnte Überwachung nicht hinzufügen"
+msgstr "Konnte Beobachtung nicht hinzufügen"
 
 #: common/docman/Document.class.php:612
 #, fuzzy
@@ -90,7 +89,7 @@
 
 #: common/docman/Document.class.php:760
 msgid "No Storage API"
-msgstr ""
+msgstr "Keine Ablage API"
 
 #: common/docman/Document.class.php:782
 #, fuzzy
@@ -130,7 +129,7 @@
 
 #: common/docman/Document.class.php:793
 msgid "For more info, visit:"
-msgstr ""
+msgstr "Für mehr Informationen, besuchen sie:"
 
 #: common/docman/Document.class.php:817
 #, fuzzy
@@ -221,11 +220,11 @@
 
 #: common/docman/actions/addfile.php:125
 msgid "Manual uploads disabled."
-msgstr ""
+msgstr "Manuelle Uploads deaktiviert"
 
 #: common/docman/actions/addfile.php:150
 msgid "Unknown type submission."
-msgstr ""
+msgstr "Unbekannte Typeingabe."
 
 #: common/docman/actions/addfile.php:168
 #, fuzzy
@@ -299,26 +298,26 @@
 
 #: common/docman/actions/forcereindexenginesearch.php:30
 msgid "Docman Action Denied"
-msgstr ""
+msgstr "Docman Aktion verweigert"
 
 #: common/docman/actions/forcereindexenginesearch.php:35
 msgid ""
 "Search Engine Reindex Forced : search results will be available within 24h."
 msgstr ""
+"Suchumgebung Reindex Forced: Das Suchresultat wird in 24 Stunden verfügbar "
+"sein."
 
 #: common/docman/actions/monitorfile.php:46
-#, fuzzy
 msgid "Monitoring started."
-msgstr "Überwachung gestartet"
+msgstr "Beobachtung gestartet."
 
 #: common/docman/actions/monitorfile.php:54
-#, fuzzy
 msgid "Monitoring stopped."
-msgstr "Überwachung gestoppt"
+msgstr "Beobachtung gestoppt."
 
 #: common/docman/actions/monitorfile.php:59
 msgid "Docman : monitoring action unknown."
-msgstr ""
+msgstr "Docman: Unbekannte Beobachtungsaktion."
 
 #: common/docman/actions/releasefile.php:43
 #, fuzzy
@@ -382,13 +381,13 @@
 
 #: common/docman/include/utils.php:196 common/docman/include/utils.php:197
 #: common/docman/views/listfile.php:204 common/docman/views/listfile.php:206
-#: common/forum/ForumHTML.class.php:66 common/forum/ForumHTML.class.php:218
-#: common/forum/ForumHTML.class.php:459 common/include/showmess.php:92
-#: common/pm/ProjectTask.class.php:1195 common/tracker/Artifact.class.php:1527
-#: common/tracker/Artifact.class.php:1529
-#: common/tracker/Artifact.class.php:1533
-#: common/tracker/Artifact.class.php:1535
-#: common/tracker/Artifact.class.php:1631
+#: common/forum/ForumHTML.class.php:66 common/forum/ForumHTML.class.php:221
+#: common/forum/ForumHTML.class.php:462 common/include/descriptive.php:130
+#: common/pm/ProjectTask.class.php:1197 common/tracker/Artifact.class.php:1511
+#: common/tracker/Artifact.class.php:1513
+#: common/tracker/Artifact.class.php:1517
+#: common/tracker/Artifact.class.php:1519
+#: common/tracker/Artifact.class.php:1615
 #: common/widget/Widget_MyLatestSvnCommits.class.php:65
 #: common/widget/Widget_ProjectInfo.class.php:66
 #: common/widget/Widget_Rss.class.php:74
@@ -408,11 +407,10 @@
 #: www/include/user_home.php:144 www/my/diary.php:216
 #: www/news/news_utils.php:153 www/news/news_utils.php:165
 #: www/news/news_utils.php:273 www/people/people_utils.php:422
-#: www/people/viewjob.php:81 www/pm/browse_task.php:534
-#: www/pm/browse_task.php:537 www/pm/include/ProjectTaskHTML.class.php:133
-#: www/pm/include/ProjectTaskHTML.class.php:181
-#: www/pm/include/ProjectTaskHTML.class.php:239 www/pm/mod_task.php:388
-#: www/project/admin/project_admin_utils.php:170
+#: www/people/viewjob.php:81 www/pm/browse_task.php:475
+#: www/pm/browse_task.php:478 www/pm/include/ProjectTaskHTML.class.php:133
+#: www/pm/include/ProjectTaskHTML.class.php:186
+#: www/project/admin/project_admin_utils.php:165
 #: www/reporting/usersummary.php:127
 #: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:71
 #: www/search/include/renderers/DocsHtmlSearchRenderer.class.php:63
@@ -425,15 +423,15 @@
 #: www/snippet/detail.php:80 www/snippet/detail.php:169
 #: www/soap/tracker/tracker.php:1131 www/softwaremap/full_list.php:169
 #: www/softwaremap/tag_cloud.php:176 www/softwaremap/trove_list.php:311
-#: www/stats/lastlogins.php:61 www/tracker/browse.php:674
-#: www/tracker/browse.php:689 www/tracker/downloadcsv.php:63
+#: www/stats/lastlogins.php:61 www/tracker/browse.php:693
+#: www/tracker/browse.php:708 www/tracker/downloadcsv.php:63
 #: www/tracker/downloadcsv.php:64 www/tracker/downloadcsv.php:65
-#: www/tracker/include/ArtifactHtml.class.php:100
-#: www/tracker/include/ArtifactHtml.class.php:109
-#: www/tracker/include/ArtifactTypeHtml.class.php:432
-#: www/tracker/include/ArtifactTypeHtml.class.php:433
-#: www/tracker/include/ArtifactTypeHtml.class.php:489 www/tracker/item.php:196
-#: www/tracker/item.php:201
+#: www/tracker/include/ArtifactHtml.class.php:60
+#: www/tracker/include/ArtifactHtml.class.php:69
+#: www/tracker/include/ArtifactTypeHtml.class.php:160
+#: www/tracker/include/ArtifactTypeHtml.class.php:161
+#: www/tracker/include/ArtifactTypeHtml.class.php:223 www/tracker/item.php:203
+#: www/tracker/item.php:208
 msgid "Y-m-d H:i"
 msgstr "d.m.Y H:i"
 
@@ -449,6 +447,8 @@
 "Refers to the relatively brief title of the document (e.g. How to use the "
 "download server)."
 msgstr ""
+"Bezieht sich auf die relativ kurzen Titel der Dokumente (z.B. Wie benutzt "
+"man den Download-Server)."
 
 #: common/docman/include/utils.php:237 common/docman/views/addfile.php:83
 #: common/docman/views/editfile.php:51 common/docman/views/editfile.php:71
@@ -464,7 +464,7 @@
 #: common/docman/include/utils.php:239 common/docman/views/addfile.php:83
 #: common/docman/views/editfile.php:52
 msgid "A brief description to be placed just under the title."
-msgstr ""
+msgstr "eine Kurzbeschreibung gleich unter dem Titel"
 
 #: common/docman/include/utils.php:243 common/docman/views/addfile.php:86
 #: common/docman/views/editfile.php:56
@@ -493,14 +493,14 @@
 #: www/forum/admin/index.php:174 www/forum/index.php:72 www/mail/index.php:77
 #: www/people/editjob.php:52 www/people/editjob.php:74
 #: www/pm/admin/index.php:295 www/pm/admin/index.php:342 www/pm/index.php:101
-#: www/pm/templates/detail_template.php:109
+#: www/pm/templates/detail_template.php:96
 #: www/project/admin/editimages.php:228 www/project/admin/editimages.php:255
 #: www/project/admin/editimages.php:271
 #: www/search/include/renderers/DocsHtmlSearchRenderer.class.php:51
 #: www/search/include/renderers/ProjectHtmlSearchRenderer.class.php:45
 #: www/snippet/submit.php:110 www/tracker/admin/form-updatetracker.php:52
 #: www/tracker/admin/ind.php:113 www/tracker/admin/ind.php:142
-#: www/tracker/browse.php:626 www/tracker/ind.php:63
+#: www/tracker/browse.php:645 www/tracker/ind.php:63
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -522,10 +522,10 @@
 msgstr "Gruppiere die Dokument-Zugehörigkeit in:"
 
 #: common/docman/include/utils.php:326 common/docman/views/editfile.php:132
-#: www/pm/browse_task.php:666 www/project/admin/database.php:208
-#: www/tracker/admin/form-customizelist.php:44 www/tracker/browse.php:477
-#: www/tracker/browse.php:632 www/tracker/browse.php:826
-#: www/tracker/query.php:341
+#: www/pm/browse_task.php:585 www/project/admin/database.php:208
+#: www/tracker/admin/form-customizelist.php:44 www/tracker/browse.php:496
+#: www/tracker/browse.php:651 www/tracker/browse.php:845
+#: www/tracker/query.php:344
 msgid "State"
 msgstr "Status"
 
@@ -544,11 +544,13 @@
 #: common/docman/include/webdav.php:233 common/docman/include/webdav.php:244
 #: common/docman/include/webdav.php:305
 msgid "webdav db error:"
-msgstr ""
+msgstr "Webdav DB Fehler:"
 
 #: common/docman/views/addfile.php:46
 msgid "You MUST first create at least one directory to store your document."
 msgstr ""
+"Sie müssen mindestens ein Verzeichnis erstellen, um Dokumente lagern zu "
+"können."
 
 #: common/docman/views/addfile.php:111
 #, fuzzy
@@ -599,11 +601,11 @@
 
 #: common/docman/views/addsubdocgroup.php:43
 msgid "Name of the document subfolder to create:"
-msgstr ""
+msgstr "Name des zu erstellenden Unterordners für Dokumente:"
 
 #: common/docman/views/addsubdocgroup.php:45
 msgid "Name of the document folder to create:"
-msgstr ""
+msgstr "Name des zu erstellenden Ordners für Dokumente:"
 
 #: common/docman/views/addsubdocgroup.php:48 www/admin/responses_admin.php:132
 #: www/project/admin/database.php:184 www/project/admin/vhost.php:122
@@ -612,7 +614,7 @@
 
 #: common/docman/views/admin.php:34
 msgid "Docman Admin Page Access Denied"
-msgstr ""
+msgstr "Docman Adminseiten Zugang verweigert"
 
 #: common/docman/views/admin.php:62
 #, fuzzy
@@ -631,15 +633,15 @@
 
 #: common/docman/views/admin.php:80
 msgid "Extract documents and directories as an archive"
-msgstr ""
+msgstr "Auswahl von Dokumenten und Verzeichnissen als Archiv"
 
 #: common/docman/views/admin.php:89
 msgid "Enable Create Online Documents"
-msgstr ""
+msgstr "Online Dokumentenerstellung aktivieren"
 
 #: common/docman/views/admin.php:92
 msgid "Disable Create Online Documents"
-msgstr ""
+msgstr "Online Dokumentenerstellung deaktivieren"
 
 #: common/docman/views/admin.php:103
 #, fuzzy
@@ -658,11 +660,11 @@
 
 #: common/docman/views/admin.php:127
 msgid "Enable Webdav Interface"
-msgstr ""
+msgstr "Webdav-Interface einschalten"
 
 #: common/docman/views/admin.php:130
 msgid "Disable Webdav Interface"
-msgstr ""
+msgstr "Webdav-Interface ausschalten"
 
 #: common/docman/views/editdocgroup.php:47
 #, fuzzy
@@ -685,9 +687,8 @@
 #: www/admin/admin_table.php:314 www/admin/responses_admin.php:45
 #: www/admin/responses_admin.php:92 www/admin/trove/trove_cat_list.php:53
 #: www/frs/admin/showreleases.php:111 www/people/skills_utils.php:45
-#: www/people/skills_utils.php:103 www/pm/mod_task.php:427
-#: www/pm/templates/time_tracking.php:76 www/project/admin/editimages.php:264
-#: www/project/admin/editimages.php:295
+#: www/people/skills_utils.php:103 www/pm/templates/time_tracking.php:78
+#: www/project/admin/editimages.php:264 www/project/admin/editimages.php:295
 #: www/survey/include/SurveyHTML.class.php:321
 #: www/survey/include/SurveyHTML.class.php:369
 #: www/survey/include/SurveyHTML.class.php:430
@@ -718,7 +719,7 @@
 
 #: common/docman/views/help.php:33
 msgid "Direct Webdav URL"
-msgstr ""
+msgstr "Zur Webdav-URL"
 
 #: common/docman/views/listfile.php:93
 #, fuzzy
@@ -803,22 +804,20 @@
 #: www/frs/admin/index.php:155 www/my/dashboard.php:67
 #: www/news/admin/index.php:139 www/people/editjob.php:74
 #: www/people/editjob.php:166 www/people/viewjob.php:75
-#: www/pm/browse_task.php:328 www/pm/browse_task.php:473
-#: www/pm/detail_task.php:150 www/pm/ganttpage.php:156
-#: www/pm/include/ProjectTaskHTML.class.php:117
-#: www/pm/include/pm_columns.php:38 www/pm/mod_task.php:168
-#: www/pm/mod_task.php:281 www/pm/templates/detail_template.php:20
+#: www/pm/browse_task.php:296 www/pm/browse_task.php:414
+#: www/pm/ganttpage.php:156 www/pm/include/ProjectTaskHTML.class.php:117
+#: www/pm/include/pm_columns.php:38 www/pm/templates/detail_template.php:15
 #: www/reporting/usersummary.php:103
 #: www/tracker/admin/form-addextrafield.php:132
 #: www/tracker/admin/form-addextrafieldoption.php:101
 #: www/tracker/admin/form-updateextrafieldelement.php:60
-#: www/tracker/include/ArtifactTypeHtml.class.php:419 www/tracker/item.php:143
+#: www/tracker/include/ArtifactTypeHtml.class.php:147 www/tracker/item.php:150
 msgid "Status"
 msgstr "Status"
 
 #: common/docman/views/listfile.php:121 www/frs/index.php:183
 #: www/pm/ganttpage.php:160 www/project/admin/editimages.php:269
-#: www/tracker/include/ArtifactTypeHtml.class.php:474
+#: www/tracker/include/ArtifactTypeHtml.class.php:203
 msgid "Size"
 msgstr "Größe"
 
@@ -852,7 +851,7 @@
 
 #: common/docman/views/listfile.php:242
 msgid "Reserve this document for later edition"
-msgstr ""
+msgstr "Dokument zur Späteren bearbeitung vormerken"
 
 #: common/docman/views/listfile.php:246
 #, fuzzy
@@ -876,7 +875,7 @@
 
 #: common/docman/views/listfile.php:268
 msgid "Created or updated since less than 7 days"
-msgstr ""
+msgstr "Erstellt oder upgedatet vor weniger als 7 Tagen"
 
 #: common/docman/views/listpendingfile.php:36
 #, fuzzy
@@ -885,15 +884,15 @@
 
 #: common/docman/views/listtrashfile.php:36
 msgid "Trash is empty"
-msgstr ""
+msgstr "Mülleimer ist leer"
 
 #: common/docman/views/listtrashfile.php:51
 msgid "Delete permanently all documents with deleted status."
-msgstr ""
+msgstr "Alle Dokumente mit \"Löschen\" Status unwiderruflich löschen"
 
 #: common/docman/views/listtrashfile.php:55
 msgid "Select documents to be resurrected from deleted status."
-msgstr ""
+msgstr "Dokumente auswählen, die wiederhergestellt werden sollen."
 
 #: common/docman/views/menu.php:40
 msgid "Submit new documentation"
@@ -926,9 +925,9 @@
 #: common/include/rbac_texts.php:215 common/include/rbac_texts.php:217
 #: common/include/rbac_texts.php:219
 #: common/widget/Widget_MyProjects.class.php:79
-#: plugins/mantisbt/www/index.php:49 www/include/Layout.class.php:686
-#: www/tracker/admin/ind.php:90 www/tracker/item.php:176
-#: www/tracker/item.php:393
+#: plugins/mantisbt/www/index.php:49 www/include/Layout.class.php:691
+#: www/tracker/admin/ind.php:90 www/tracker/item.php:183
+#: www/tracker/item.php:384
 msgid "Admin"
 msgstr "Verwalten"
 
@@ -987,8 +986,9 @@
 #: www/tracker/admin/form-addextrafield.php:82
 #: www/tracker/admin/form-deleteextrafield.php:41
 #: www/tracker/admin/form-deletetracker.php:34
-#: www/tracker/admin/tracker.php:66 www/tracker/deleteartifact.php:36
-#: www/tracker/item.php:261
+#: www/tracker/admin/tracker.php:66 www/tracker/browse.php:180
+#: www/tracker/browse.php:472 www/tracker/deleteartifact.php:38
+#: www/tracker/item.php:266
 msgid "Delete"
 msgstr "Löschen"
 
@@ -997,8 +997,8 @@
 #: common/widget/WidgetLayoutManager.class.php:520
 #: www/admin/admin_table.php:54 www/admin/database.php:170
 #: www/admin/trove/trove_cat_add.php:123 www/admin/trove/trove_cat_list.php:51
-#: www/admin/trove/trove_cat_list.php:54 www/pm/mod_task.php:365
-#: www/pm/templates/time_tracking.php:37 www/reporting/timeadd.php:177
+#: www/admin/trove/trove_cat_list.php:54 www/pm/select_columns.php:79
+#: www/pm/templates/time_tracking.php:39 www/reporting/timeadd.php:177
 #: www/reporting/timecategory.php:100 www/trove/admin/trove_cat_add.php:101
 #: www/trove/admin/trove_cat_list.php:43
 msgid "Add"
@@ -1045,11 +1045,11 @@
 
 #: common/forum/Forum.class.php:150 common/forum/Forum.class.php:561
 msgid "Forum Name Must Be At Least 3 Characters"
-msgstr "Der Forenname muss mindestens 3 Buchstaben lang sein"
+msgstr "Der Forenname muß mindestens 3 Buchstaben lang sein"
 
 #: common/forum/Forum.class.php:154 common/forum/Forum.class.php:565
 msgid "Forum Description Must Be At Least 10 Characters"
-msgstr "Die Foren-Beschreibung muss mindestens 10 Buchstaben lang sein"
+msgstr "Die Foren-Beschreibung muß mindestens 10 Buchstaben lang sein"
 
 #: common/forum/Forum.class.php:158 common/forum/Forum.class.php:569
 msgid "Illegal Characters in Forum Name"
@@ -1098,7 +1098,7 @@
 #: common/forum/Forum.class.php:620 common/frs/FRSPackage.class.php:447
 #: common/frs/FRSRelease.class.php:356 common/include/Group.class.php:1652
 #: common/mail/MailingList.class.php:388 common/pm/ProjectGroup.class.php:376
-#: common/pm/ProjectTask.class.php:513 common/tracker/Artifact.class.php:505
+#: common/pm/ProjectTask.class.php:513 common/tracker/Artifact.class.php:489
 #: common/tracker/ArtifactExtraField.class.php:429
 #: common/tracker/ArtifactType.class.php:816
 msgid "Please tick all checkboxes."
@@ -1161,7 +1161,7 @@
 
 #: common/forum/ForumAdmin.class.php:297
 msgid "Proceed? Actions are permanent!"
-msgstr ""
+msgstr "Fortsetzen? Auswahl ist dauerhaft!"
 
 #: common/forum/ForumAdmin.class.php:317 www/forum/admin/index.php:100
 #: www/forum/admin/index.php:166
@@ -1183,13 +1183,13 @@
 msgid "Release"
 msgstr "Versionen"
 
-#: common/forum/ForumAdmin.class.php:357 common/forum/ForumHTML.class.php:327
-#: common/forum/ForumHTML.class.php:540
+#: common/forum/ForumAdmin.class.php:357 common/forum/ForumHTML.class.php:330
+#: common/forum/ForumHTML.class.php:543
 #: plugins/mailman/www/admin/index.php:186 plugins/mailman/www/index.php:67
 #: plugins/mailman/www/mailman_utils.php:74
 #: plugins/mailman/www/mailman_utils.php:181 www/account/editsshkeys.php:85
 #: www/account/index.php:315 www/account/lostlogin.php:100
-#: www/admin/groupedit.php:229 www/admin/trove/trove_cat_edit.php:152
+#: www/admin/groupedit.php:242 www/admin/trove/trove_cat_edit.php:152
 #: www/admin/useredit.php:204 www/admin/vhost.php:189
 #: www/forum/admin/index.php:178 www/frs/admin/index.php:178
 #: www/mail/admin/index.php:229 www/mail/admin/index.php:280
@@ -1273,7 +1273,7 @@
 msgid "Posted by"
 msgstr "Geposted von"
 
-#: common/forum/ForumHTML.class.php:66 common/include/showmess.php:91
+#: common/forum/ForumHTML.class.php:66 common/include/descriptive.php:129
 #: common/widget/Widget_ProjectLatestFileReleases.class.php:58
 #: plugins/contribtracker/common/ContribTrackerPlugin.class.php:109
 #: plugins/cvstracker/common/cvstrackerPlugin.class.php:109
@@ -1282,31 +1282,30 @@
 #: www/developer/diary.php:76 www/forum/forum.php:254
 #: www/forum/message.php:162 www/frs/admin/showreleases.php:101
 #: www/frs/index.php:182 www/news/admin/news_admin_utils.php:55
-#: www/pm/calendar.php:285 www/pm/include/ProjectTaskHTML.class.php:163
-#: www/pm/include/ProjectTaskHTML.class.php:206
-#: www/project/admin/project_admin_utils.php:151
+#: www/pm/calendar.php:285 www/pm/include/ProjectTaskHTML.class.php:153
+#: www/project/admin/project_admin_utils.php:146
 #: www/project/stats/project_stats_utils.php:74 www/reporting/timeadd.php:140
 #: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:58
 #: www/search/include/renderers/ForumHtmlSearchRenderer.class.php:56
 #: www/search/include/renderers/ForumsHtmlSearchRenderer.class.php:50
 #: www/search/include/renderers/TrackersHtmlSearchRenderer.class.php:51
 #: www/stats/lastlogins.php:50 www/stats/users_graph.php:85
-#: www/stats/views_graph.php:105 www/tracker/include/ArtifactHtml.class.php:86
-#: www/tracker/include/ArtifactTypeHtml.class.php:472
+#: www/stats/views_graph.php:105 www/tracker/include/ArtifactHtml.class.php:46
+#: www/tracker/include/ArtifactTypeHtml.class.php:201
 msgid "Date"
 msgstr "Datum"
 
 #: common/forum/ForumHTML.class.php:67 common/include/Navigation.class.php:367
-#: www/my/dashboard.php:63 www/my/diary.php:181 www/pm/browse_task.php:255
+#: www/my/dashboard.php:63 www/my/diary.php:181 www/pm/browse_task.php:233
 #: www/pm/include/ProjectTaskHTML.class.php:115
 #: www/pm/include/pm_columns.php:31 www/project/report/index.php:136
 #: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:56
 #: www/search/include/renderers/NewsHtmlSearchRenderer.class.php:48
 #: www/search/include/renderers/TasksHtmlSearchRenderer.class.php:49
 #: www/search/include/renderers/TrackersHtmlSearchRenderer.class.php:49
-#: www/tracker/admin/form-customizelist.php:42 www/tracker/browse.php:190
-#: www/tracker/browse.php:624 www/tracker/item.php:300
-#: www/tracker/query.php:194 www/tracker/query.php:378
+#: www/tracker/admin/form-customizelist.php:42 www/tracker/browse.php:321
+#: www/tracker/browse.php:643 www/tracker/item.php:305
+#: www/tracker/query.php:197 www/tracker/query.php:381
 msgid "Summary"
 msgstr "Kurzbeschreibung"
 
@@ -1350,7 +1349,7 @@
 #: www/scm/include/scm_utils.php:51 www/survey/include/SurveyHTML.class.php:66
 #: www/survey/include/SurveyHTML.class.php:91 www/tracker/admin/tracker.php:28
 #: www/tracker/include/ArtifactTypeFactoryHtml.class.php:52
-#: www/tracker/include/ArtifactTypeHtml.class.php:984 www/tracker/ind.php:44
+#: www/tracker/include/ArtifactTypeHtml.class.php:799 www/tracker/ind.php:44
 msgid "Administration"
 msgstr "Administration"
 
@@ -1358,105 +1357,105 @@
 msgid "-tooltip:forum:admin"
 msgstr ""
 
-#: common/forum/ForumHTML.class.php:139 www/forum/monitor.php:59
+#: common/forum/ForumHTML.class.php:140 www/forum/monitor.php:59
 msgid "Stop Monitoring"
 msgstr "Stoppe Beobachtung"
 
-#: common/forum/ForumHTML.class.php:142 common/forum/ForumHTML.class.php:149
+#: common/forum/ForumHTML.class.php:144 common/forum/ForumHTML.class.php:152
 msgid "Monitor Forum"
-msgstr "Überwache Forum"
+msgstr "Beobachte Forum"
 
-#: common/forum/ForumHTML.class.php:145
+#: common/forum/ForumHTML.class.php:147
 msgid "Save Place"
 msgstr "Speicherplatz"
 
-#: common/forum/ForumHTML.class.php:154 common/forum/ForumHTML.class.php:155
+#: common/forum/ForumHTML.class.php:157 common/forum/ForumHTML.class.php:158
 msgid "Start New Thread"
 msgstr "Starten Sie eine neue Diskussion"
 
-#: common/forum/ForumHTML.class.php:204
+#: common/forum/ForumHTML.class.php:207
 msgid "This is the content of the pending message"
 msgstr "Dies ist der Inhalt der wartenden Nachricht"
 
-#: common/forum/ForumHTML.class.php:208 common/forum/ForumHTML.class.php:266
+#: common/forum/ForumHTML.class.php:211 common/forum/ForumHTML.class.php:269
 #: www/forum/message.php:126
 msgid "By:"
 msgstr "Von:"
 
-#: common/forum/ForumHTML.class.php:265 www/forum/message.php:123
+#: common/forum/ForumHTML.class.php:268 www/forum/message.php:123
 msgid "reply"
 msgstr "antworten"
 
-#: common/forum/ForumHTML.class.php:310
+#: common/forum/ForumHTML.class.php:313
 msgid "Current File"
 msgstr "Aktuelle Datei"
 
-#: common/forum/ForumHTML.class.php:318 common/forum/ForumHTML.class.php:351
+#: common/forum/ForumHTML.class.php:321 common/forum/ForumHTML.class.php:354
 msgid "Use the \"Browse\" button to find the file you want to attach"
 msgstr ""
 "Nutzen Sie den \"Browse\" Knopf um die Datei zu finden, die Sie anhängen "
 "möchten."
 
-#: common/forum/ForumHTML.class.php:321 common/forum/ForumHTML.class.php:354
+#: common/forum/ForumHTML.class.php:324 common/forum/ForumHTML.class.php:357
 msgid "File to upload"
 msgstr "Datei zum hochladen"
 
-#: common/forum/ForumHTML.class.php:324
+#: common/forum/ForumHTML.class.php:327
 #, fuzzy
 msgid "Warning: Uploaded file will replace current file"
 msgstr "Warnung: aktuelle Datei wird unwiderruflich gelöscht"
 
-#: common/forum/ForumHTML.class.php:512 common/forum/ForumHTML.class.php:576
+#: common/forum/ForumHTML.class.php:515 common/forum/ForumHTML.class.php:579
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: common/forum/ForumHTML.class.php:515 common/forum/ForumHTML.class.php:579
+#: common/forum/ForumHTML.class.php:518 common/forum/ForumHTML.class.php:582
 msgid "Message:"
 msgstr "Nachricht:"
 
-#: common/forum/ForumHTML.class.php:541 common/widget/Widget.class.php:92
+#: common/forum/ForumHTML.class.php:544 common/widget/Widget.class.php:92
 #: plugins/globalsearch/common/globalsearch_edit_utils.php:106
 #: plugins/globalsearch/common/globalsearch_edit_utils.php:156
 #: www/admin/admin_table.php:58 www/admin/admin_table.php:155
 #: www/admin/admin_table.php:214 www/forum/admin/index.php:428
 #: www/forum/monitor.php:65 www/my/rmproject.php:98
 #: www/people/editprofile.php:158 www/people/editprofile.php:217
-#: www/pm/mod_task.php:365 www/pm/templates/time_tracking.php:38
-#: www/register/index.php:281 www/reporting/timeadd.php:177
+#: www/pm/templates/time_tracking.php:40 www/register/index.php:281
+#: www/reporting/timeadd.php:177
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: common/forum/ForumHTML.class.php:596
+#: common/forum/ForumHTML.class.php:599
 msgid "HTML tags will display in your post as text"
 msgstr "HTML-Tags werden in Ihrer Nachricht als Text angezeigt"
 
-#: common/forum/ForumHTML.class.php:603
+#: common/forum/ForumHTML.class.php:606
 #, php-format
 msgid ""
 "You are posting anonymously because you are not <a href=\"%1$s\">logged in</"
 "a>"
 msgstr "Sie posten anonym, da Sie nicht <a href=\"%1$s\">angemeldet</a> sind"
 
-#: common/forum/ForumHTML.class.php:607
+#: common/forum/ForumHTML.class.php:610
 msgid "Post Comment"
 msgstr "Poste Kommentar"
 
-#: common/forum/ForumHTML.class.php:607
+#: common/forum/ForumHTML.class.php:610
 msgid "Anonymously"
 msgstr "Anonym"
 
-#: common/forum/ForumHTML.class.php:608
+#: common/forum/ForumHTML.class.php:611
 msgid "Receive followups via email"
 msgstr "Erhalten der Antworten per Email"
 
-#: common/forum/ForumHTML.class.php:620
+#: common/forum/ForumHTML.class.php:623
 #, php-format
 msgid "You could post if you were <a href=\"%1$s\">logged in</a>."
 msgstr ""
 "Sie könnten einen Beitrag posten, wenn Sie <a href=\"%1$s\">angemeldet</a> "
 "wären."
 
-#: common/forum/ForumHTML.class.php:624
+#: common/forum/ForumHTML.class.php:627
 #, php-format
 msgid "Please <a href=\"%1$s\">log in</a>"
 msgstr "Bitte <a href=\"%1$s\">loggen Sie sich ein</a>"
@@ -1498,7 +1497,7 @@
 
 #: common/forum/ForumMessage.class.php:356
 msgid "Must Include A Message Body And Subject"
-msgstr "Die Nachricht muss einen Hauptteil (Body) und einen Betreff beinhalten"
+msgstr "Die Nachricht muß einen Hauptteil (Body) und einen Betreff beinhalten"
 
 #: common/forum/ForumMessage.class.php:372
 msgid "ForumMessage::create() No Valid ParentMessage Object"
@@ -1573,7 +1572,7 @@
 
 #: common/frs/FRSFile.class.php:118
 msgid "FRSFile Name Must Be At Least 3 Characters"
-msgstr "FRSFile Name muss mindestens 3 Zeichen haben"
+msgstr "FRSFile Name muß mindestens 3 Zeichen haben"
 
 #: common/frs/FRSFile.class.php:122
 msgid ""
@@ -1598,7 +1597,7 @@
 #: common/frs/FRSPackage.class.php:133 common/frs/FRSPackage.class.php:364
 #: common/frs/FRSRelease.class.php:120 common/frs/FRSRelease.class.php:401
 msgid "FRSPackage Name Must Be At Least 3 Characters"
-msgstr "FRSPackage Name muss mindestens 3 Zeichen haben"
+msgstr "FRSPackage Name muß mindestens 3 Zeichen haben"
 
 #: common/frs/FRSPackage.class.php:137
 #, fuzzy
@@ -1611,7 +1610,7 @@
 
 #: common/frs/FRSPackage.class.php:514
 msgid "Cannot open the file archive."
-msgstr ""
+msgstr "Datenarchiv konnte nicht geöffnet werden"
 
 #: common/frs/FRSRelease.class.php:285
 #, php-format
@@ -1647,10 +1646,35 @@
 "\t\n"
 "\n"
 msgstr ""
+"Das Projekt %1$s (%2$s) hat eine neue Version des Pakets \"%3$s\" "
+"veröffentlicht\n"
+"\n"
+"Veröffentlichungsnachricht:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Änderungsnachricht:\n"
+"\n"
+"%5$s\n"
+"\n"
+"\n"
+"Sie können es unter folgendem Link herunterladen:\n"
+"\n"
+"%6$s\n"
+"\n"
+"Sie erhalten diese E-Mail, weil die benachrichtigt werden möchten,\n"
+"wenn neue Versionen des Pakets verfügbar sind. Wenn sie in Zukunft\n"
+"nicht mehr benachrichtigt werden wollen, loggen sie sich bitte hier\n"
+"%7$s unter folgendem Link ein:\n"
+"\n"
+"%8$s\n"
+"\t\t\n"
+"\t\n"
+"\n"
 
 #: common/include/DatabaseInstaller.class.php:44
 msgid "No database installation scripts found."
-msgstr ""
+msgstr "Kein Datenbankinstallationsskript gefunden."
 
 #: common/include/DatabaseInstaller.class.php:116
 #, fuzzy
@@ -1663,7 +1687,7 @@
 msgstr "Erlaubnis verweigert"
 
 #: common/include/Error.class.php:142 common/include/User.class.php:279
-#: www/tracker/tracker.php:99
+#: www/tracker/tracker.php:96
 msgid "Invalid Email Address"
 msgstr "Ungültige E-Mail Adresse"
 
@@ -1919,17 +1943,17 @@
 
 #: common/include/Group.class.php:2304
 msgid "Wrong destination role"
-msgstr ""
+msgstr "Falsche Zielrolle"
 
 #: common/include/Group.class.php:2436
 msgid "Group already active"
 msgstr "Diese Gruppe ist bereits aktiv."
 
-#: common/include/Group.class.php:2690 common/include/Group.class.php:2769
+#: common/include/Group.class.php:2696 common/include/Group.class.php:2775
 msgid "Group does not have any administrators."
 msgstr "Diese Gruppe besitzt keinen Administrator."
 
-#: common/include/Group.class.php:2698
+#: common/include/Group.class.php:2704
 #, php-format
 msgid ""
 "Your project registration for %4$s has been approved.\n"
@@ -1980,7 +2004,7 @@
 "angemeldet sind, finden Sie einen zusätzlichen Menüpunkt auf der\n"
 "linken Seite mit der Bezeichnung 'Projekt-Administrator'.\n"
 "\n"
-"Wir empfehlen Ihnen dringend, dass Sie jetzt %4$s besuchen und eine\n"
+"Wir empfehlen Ihnen dringend, daß Sie jetzt %4$s besuchen und eine\n"
 "öffentliche Beschreibung für Ihr Projekt erstellen. Das können Sie\n"
 "tun, wenn Sie Ihre Projektseite besuchen, während Sie\n"
 "angemeldet/eingeloggt sind, und Sie 'Projekt-Administrator' von den\n"
@@ -1999,12 +2023,12 @@
 "\n"
 "-- Die %4$s Leitung"
 
-#: common/include/Group.class.php:2734
+#: common/include/Group.class.php:2740
 #, php-format
 msgid "%1$s Project Approved"
 msgstr "%1$s Projekt genehmigt"
 
-#: common/include/Group.class.php:2776
+#: common/include/Group.class.php:2782
 #, php-format
 msgid ""
 "Your project registration for %3$s has been denied.\n"
@@ -2023,21 +2047,21 @@
 "Gründe für die negative Entscheidung:\n"
 "\n"
 
-#: common/include/Group.class.php:2795
+#: common/include/Group.class.php:2801
 #, php-format
 msgid "%1$s Project Denied"
 msgstr "%1$s Projekt abgelehnt"
 
-#: common/include/Group.class.php:2827
+#: common/include/Group.class.php:2833
 msgid "Could not find user who has submitted the project."
 msgstr "Der Nutzer, der das Projekt anlegte, konnte nicht gefunden werden."
 
-#: common/include/Group.class.php:2834
+#: common/include/Group.class.php:2840
 #, fuzzy
 msgid "There is no administrator to send the mail to."
 msgstr "Konnte keinen Administrator finden, dem die Mail zugesandt werden kann"
 
-#: common/include/Group.class.php:2846
+#: common/include/Group.class.php:2852
 #, fuzzy, php-format
 msgid ""
 "New %1$s Project Submitted\n"
@@ -2055,25 +2079,29 @@
 "abzuweisen:\n"
 "%4$s "
 
-#: common/include/Group.class.php:2856
+#: common/include/Group.class.php:2862
 #, fuzzy, php-format
 msgid "Submitter: %1$s (%2$s)\n"
 msgstr "Gepostet von %1$s (%2$s)"
 
-#: common/include/Group.class.php:2862
+#: common/include/Group.class.php:2868
 #, php-format
 msgid ""
 "\n"
 "Please visit the following URL to approve or reject this project:\n"
 "%1$s"
 msgstr ""
+"\n"
+"Bitte die folgende URL besuchen um das Projekt zu bestätigen oder zu "
+"verwerfen:\n"
+"%1$s"
 
-#: common/include/Group.class.php:2866 common/include/Group.class.php:2881
+#: common/include/Group.class.php:2872 common/include/Group.class.php:2887
 #, php-format
 msgid "New %1$s Project Submitted"
 msgstr "Neues %1$s Projekt vorgeschlagen"
 
-#: common/include/Group.class.php:2874
+#: common/include/Group.class.php:2880
 #, php-format
 msgid ""
 "New %1$s Project Submitted\n"
@@ -2092,50 +2120,50 @@
 "Das %1$s-Admin-Team wird jetzt Ihre Projekt-Anmeldung überprüfen. Sie werden "
 "über deren Entscheidung benachrichtigt."
 
-#: common/include/Group.class.php:2899
+#: common/include/Group.class.php:2905
 msgid "Group name is too short"
 msgstr "Der Gruppenname ist zu kurz"
 
-#: common/include/Group.class.php:2902
+#: common/include/Group.class.php:2908
 msgid "Group name is too long"
 msgstr "Der Gruppenname ist zu lang"
 
-#: common/include/Group.class.php:2905
+#: common/include/Group.class.php:2911
 msgid "Group name already taken"
 msgstr "Der Gruppenname wird bereits verwendet"
 
-#: common/include/Group.class.php:2996
+#: common/include/Group.class.php:3002
 #, php-format
 msgid "ERROR - Could Not Update Group Unix Status: %s"
 msgstr "Fehler - Konnte den Unix Gruppen Status nicht aktualisieren: %s"
 
-#: common/include/Group.class.php:3055
+#: common/include/Group.class.php:3061
 msgid "Error: Enable to get users from group"
-msgstr ""
+msgstr "Fehler: Unmöglich die Benutzer der Gruppe anzuzeigen"
 
-#: common/include/Group.class.php:3076
+#: common/include/Group.class.php:3082
 #, fuzzy, php-format
 msgid "ERROR - Could Not Update Group DocmanCreateOnline Status: %s"
 msgstr "Fehler - Konnte den Unix Gruppen Status nicht aktualisieren: %s"
 
-#: common/include/Group.class.php:3094
+#: common/include/Group.class.php:3100
 #, fuzzy, php-format
 msgid "ERROR - Could Not Update Group UseWebdab Status: %s"
 msgstr "Fehler - Konnte den Unix Gruppen Status nicht aktualisieren: %s"
 
-#: common/include/Group.class.php:3112
+#: common/include/Group.class.php:3118
 #, fuzzy, php-format
 msgid "ERROR - Could Not Update Group UseDocmanSearch Status: %s"
 msgstr "Fehler - Konnte den Unix Gruppen Status nicht aktualisieren: %s"
 
-#: common/include/Group.class.php:3130
+#: common/include/Group.class.php:3136
 #, fuzzy, php-format
 msgid "ERROR - Could Not Update Group force_docman_reindex %s"
 msgstr "Fehler - Konnte den Unix Gruppen Status nicht aktualisieren: %s"
 
 #: common/include/GroupJoinRequest.class.php:104
 msgid "Must include "
-msgstr ""
+msgstr "Muß beïnhalten "
 
 #: common/include/GroupJoinRequest.class.php:112
 msgid "You are already a member of this project."
@@ -2261,7 +2289,7 @@
 #: www/pm/include/ProjectGroupHTML.class.php:105
 #: www/scm/include/scm_utils.php:50
 #: www/tracker/include/ArtifactTypeFactoryHtml.class.php:48
-#: www/tracker/include/ArtifactTypeHtml.class.php:959
+#: www/tracker/include/ArtifactTypeHtml.class.php:774
 msgid "Reporting"
 msgstr "Auswertung"
 
@@ -2281,13 +2309,15 @@
 msgid "Project Features & Users Administration"
 msgstr "Projekt-Features und Nutzerverwaltung"
 
-#: common/include/Navigation.class.php:401 www/activity/index.php:83
-#: www/activity/index.php:164 www/activity/index.php:250
-#: www/export/rss_project.php:97
+#: common/include/Navigation.class.php:401 www/activity/index.php:85
+#: www/activity/index.php:94 www/activity/index.php:179
+#: www/activity/index.php:265 www/export/rss_project.php:97
+#: www/project/stats/index.php:85
 msgid "Activity"
 msgstr "Aktivität"
 
-#: common/include/Navigation.class.php:403
+#: common/include/Navigation.class.php:403 www/activity/index.php:87
+#: www/project/stats/index.php:87
 msgid "-tooltip:Activity"
 msgstr ""
 
@@ -2309,7 +2339,7 @@
 #: common/include/Navigation.class.php:435 common/include/rbac_texts.php:142
 #: common/include/rbac_texts.php:238 common/include/rbac_texts.php:240
 #: common/reporting/report_utils.php:143
-#: common/widget/Widget_ProjectPublicAreas.class.php:49
+#: common/widget/Widget_ProjectPublicAreas.class.php:51
 #: www/pm/include/ProjectTaskHTML.class.php:116 www/tracker/admin/ind.php:113
 #: www/tracker/ind.php:63
 msgid "Tracker"
@@ -2331,7 +2361,7 @@
 #: common/include/group_section_texts.php:30 common/include/rbac_texts.php:143
 #: common/include/rbac_texts.php:233 common/include/rbac_texts.php:235
 #: common/reporting/report_utils.php:155 common/reporting/report_utils.php:193
-#: common/widget/Widget_ProjectPublicAreas.class.php:128
+#: common/widget/Widget_ProjectPublicAreas.class.php:130
 #: plugins/blocks/www/index.php:170 www/my/dashboard.php:75
 #: www/project/stats/project_stats_utils.php:82
 #: www/project/stats/project_stats_utils.php:141
@@ -2339,7 +2369,7 @@
 #: www/stats/site_stats_utils.php:259 www/stats/site_stats_utils.php:385
 #: www/stats/site_stats_utils.php:440
 msgid "Tasks"
-msgstr "Aufträge"
+msgstr "Aufgaben"
 
 #: common/include/Navigation.class.php:470
 msgid "Task and Time Tracking"
@@ -2356,7 +2386,7 @@
 msgstr "Dokumentenmanager"
 
 #: common/include/Navigation.class.php:498
-#: common/widget/Widget_ProjectPublicAreas.class.php:152
+#: common/widget/Widget_ProjectPublicAreas.class.php:154
 #: plugins/blocks/www/index.php:172
 msgid "Surveys"
 msgstr "Umfragen"
@@ -2368,7 +2398,7 @@
 #: common/include/Navigation.class.php:513
 #: common/include/group_section_texts.php:33 plugins/blocks/www/index.php:173
 #: plugins/quota_management/www/quota_project.php:75
-#: www/activity/index.php:102 www/activity/index.php:299
+#: www/activity/index.php:117 www/activity/index.php:314
 #: www/admin/index.php:157 www/news/index.php:35
 msgid "News"
 msgstr "Neuigkeiten"
@@ -2419,16 +2449,18 @@
 "Some plugin did not provide a name. I'd gladly tell you which one, but "
 "obviously I can't. Sorry."
 msgstr ""
+"Manche Plugins liefern keinen Namen. Ich würd gerne sagen welche aber leider "
+"kann ich nicht. Tut mir leid."
 
 #: common/include/RBAC.php:1158
 #, php-format
 msgid "%s (global role)"
-msgstr ""
+msgstr "%1$s (globale Rolle)"
 
 #: common/include/RBAC.php:1162
-#, fuzzy, php-format
+#, php-format
 msgid "%s (in project %s)"
-msgstr "%1$s Projekte"
+msgstr "%s (in Projekt %s)"
 
 #: common/include/RBAC.php:1486
 #, fuzzy
@@ -2499,7 +2531,7 @@
 
 #: common/include/SCMPlugin.class.php:197
 msgid "Data about current and past states of the repository"
-msgstr ""
+msgstr "Daten über aktuelle und vergangene Zustände der Quellcoderepository"
 
 #: common/include/SCMPlugin.class.php:228
 #, fuzzy
@@ -2627,7 +2659,7 @@
 
 #: common/include/User.class.php:1017
 msgid "ERROR: Invalid Shell"
-msgstr ""
+msgstr "Fehler: Ungültige Shell"
 
 #: common/include/User.class.php:1026
 #, fuzzy
@@ -2646,7 +2678,7 @@
 
 #: common/include/account.php:33
 msgid "Password must be at least 6 characters."
-msgstr "Das Passwort muss aus mindestens 6 Buchstaben bestehen."
+msgstr "Das Passwort muß aus mindestens 6 Buchstaben bestehen."
 
 #: common/include/account.php:51
 msgid "There cannot be any spaces in the login name."
@@ -2654,11 +2686,11 @@
 
 #: common/include/account.php:57
 msgid "Name is too short. It must be at least 3 characters."
-msgstr "Der Name ist zu kurz. Er muss mindestens 3 Buchstaben enthalten."
+msgstr "Der Name ist zu kurz. Er muß mindestens 3 Buchstaben enthalten."
 
 #: common/include/account.php:61
 msgid "Name is too long. It must be less than 15 characters."
-msgstr "Der Name ist zu lang. Er muss kürzer als 15 Buchstaben sein."
+msgstr "Der Name ist zu lang. Er muß kürzer als 15 Buchstaben sein."
 
 #: common/include/account.php:66
 msgid "Illegal character in name."
@@ -2682,17 +2714,18 @@
 
 #: common/include/captcha.php:35
 msgid "Confirm that you’re a human:"
-msgstr ""
+msgstr "Bestätige, daß Du ein Mensch bist:"
 
 #: common/include/captcha.php:45
 msgid ""
 "Type the eight (8) digits, ‘+’, ‘/’, and uppercase/lowercase letters below."
 msgstr ""
+"Gib die acht (8) untenstehenden Zeichen (Zahlen, „+“, „/“, Groß- und "
+"Kleinbuchstaben) ein."
 
 #: common/include/captcha.php:52 common/include/captcha.php:64
-#, fuzzy
 msgid "Internal Error:"
-msgstr "Interner Fehler"
+msgstr "Interner Fehler:"
 
 #: common/include/captcha.php:53
 #, fuzzy
@@ -2873,6 +2906,41 @@
 msgid "locale-dependent-default-datepick-format"
 msgstr "dmy_de"
 
+#: common/include/descriptive.php:78
+msgid "Sort comments antichronologically"
+msgstr "Sortiere Kommentare, neueste zuerst"
+
+#: common/include/descriptive.php:81
+msgid "Sort comments chronologically"
+msgstr "Sortiere Kommentare, älteste zuerst"
+
+#: common/include/descriptive.php:131
+msgid "Sender"
+msgstr "Sender"
+
+#: common/include/descriptive.php:228 common/include/descriptive.php:229
+msgid "Click to edit"
+msgstr "Klicken zum Bearbeiten"
+
+#: common/include/descriptive.php:284
+msgid "Write a comment"
+msgstr "Einen Kommentar verfassen"
+
+#: common/include/descriptive.php:539
+#, php-format
+msgid "%s (Task)"
+msgstr "%s (Task/Aufgabe)"
+
+#: common/include/descriptive.php:544
+#, php-format
+msgid "%s (Bug/FR)"
+msgstr "%s (Bug/FR)"
+
+#: common/include/descriptive.php:549
+#, php-format
+msgid "%s (Forum Message)"
+msgstr "%s (Forumnachricht)"
+
 #: common/include/exit.php:32
 msgid "Exiting with error"
 msgstr "Beendigung mit Fehler"
@@ -2883,7 +2951,7 @@
 "Permission denied. This project's administrator will have to grant you "
 "permission to view this page."
 msgstr ""
-"Dieser Projekt-Administrator muss Sie berechtigen, um diese Seite zu sehen."
+"Dieser Projekt-Administrator muß Sie berechtigen, um diese Seite zu sehen."
 
 #: common/include/exit.php:68
 #, fuzzy
@@ -2943,10 +3011,11 @@
 msgid "Documentations"
 msgstr "Dokumentationen"
 
-#: common/include/pre.php:269
+#: common/include/pre.php:278
 #, php-format
 msgid "Posted data is too large. %1$s exceeds the maximum size of %2$s"
 msgstr ""
+"Gepostete Daten sind zu Lang. %1$s überschreitet die maximale Länge von %2$s"
 
 #: common/include/rbac_texts.php:43 common/include/rbac_texts.php:55
 #: common/include/rbac_texts.php:58 common/include/rbac_texts.php:60
@@ -2994,7 +3063,7 @@
 
 #: common/include/rbac_texts.php:53
 msgid "Hidden"
-msgstr ""
+msgstr "Versteckt"
 
 #: common/include/rbac_texts.php:54
 #, fuzzy
@@ -3032,18 +3101,17 @@
 #: common/include/rbac_texts.php:67 common/include/rbac_texts.php:75
 #: common/include/rbac_texts.php:89 common/include/rbac_texts.php:97
 msgid "Technician (no read access)"
-msgstr ""
+msgstr "Auswahlbox Techniker/Bearbeiter (kein Lesezugriff)"
 
 #: common/include/rbac_texts.php:68 common/include/rbac_texts.php:76
 #: common/include/rbac_texts.php:90 common/include/rbac_texts.php:98
-#, fuzzy
 msgid "Technician"
-msgstr "Auswahlbox Techniker/ Bearbeiter"
+msgstr "Auswahlbox Techniker/Bearbeiter"
 
 #: common/include/rbac_texts.php:69 common/include/rbac_texts.php:77
 #: common/include/rbac_texts.php:91 common/include/rbac_texts.php:99
 msgid "Manager (no read access)"
-msgstr ""
+msgstr "Cron-Manager (kein Lesezugriff)"
 
 #: common/include/rbac_texts.php:70 common/include/rbac_texts.php:78
 #: common/include/rbac_texts.php:92 common/include/rbac_texts.php:100
@@ -3058,9 +3126,8 @@
 
 #: common/include/rbac_texts.php:72 common/include/rbac_texts.php:80
 #: common/include/rbac_texts.php:94 common/include/rbac_texts.php:102
-#, fuzzy
 msgid "Tech & manager"
-msgstr "Auftrags-Verwaltung"
+msgstr ""
 
 #: common/include/rbac_texts.php:83 common/include/rbac_texts.php:105
 #, fuzzy
@@ -3099,7 +3166,7 @@
 
 #: common/include/rbac_texts.php:118
 msgid "View public packages only"
-msgstr ""
+msgstr "Nur öffentliche Pakete"
 
 #: common/include/rbac_texts.php:119
 #, fuzzy
@@ -3135,9 +3202,8 @@
 msgstr "Standardwert für neue Tracker"
 
 #: common/include/rbac_texts.php:147
-#, fuzzy
 msgid "Default for new task managers"
-msgstr "Standardwert für neue Aufträge/Tasks"
+msgstr ""
 
 #: common/include/rbac_texts.php:148 common/include/rbac_texts.php:229
 msgid "Default for new forums"
@@ -3223,13 +3289,13 @@
 #: common/include/rbac_texts.php:216 common/include/rbac_texts.php:218
 #: common/widget/Widget_MyArtifacts.class.php:116 www/admin/pluginman.php:176
 #: www/admin/pluginman.php:195 www/admin/pluginman.php:202
-#: www/admin/pluginman.php:203 www/include/html.php:307
-#: www/include/html.php:440 www/include/html.php:526 www/include/html.php:543
-#: www/include/html.php:577 www/include/html.php:618 www/include/html.php:657
-#: www/pm/ganttpage.php:62 www/tracker/include/ArtifactHtml.class.php:104
-#: www/tracker/include/ArtifactTypeHtml.class.php:676
-#: www/tracker/include/ArtifactTypeHtml.class.php:719
-#: www/tracker/include/ArtifactTypeHtml.class.php:906
+#: www/admin/pluginman.php:203 www/include/html.php:309
+#: www/include/html.php:418 www/include/html.php:510 www/include/html.php:527
+#: www/include/html.php:561 www/include/html.php:602 www/include/html.php:641
+#: www/pm/ganttpage.php:62 www/tracker/include/ArtifactHtml.class.php:64
+#: www/tracker/include/ArtifactTypeHtml.class.php:428
+#: www/tracker/include/ArtifactTypeHtml.class.php:489
+#: www/tracker/include/ArtifactTypeHtml.class.php:721
 msgid "None"
 msgstr "Keine"
 
@@ -3243,11 +3309,11 @@
 
 #: common/include/rbac_texts.php:234
 msgid "Default for new tasks"
-msgstr "Standardwert für neue Aufträge/Tasks"
+msgstr "Standardwert für neue Aufgaben/Tasks"
 
 #: common/include/rbac_texts.php:236 www/project/admin/tools.php:300
 msgid "Tasks Admin"
-msgstr "Tasks Administrator"
+msgstr "Tasks-Administrator"
 
 #: common/include/rbac_texts.php:241
 msgid "Anonymous Tracker"
@@ -3255,7 +3321,7 @@
 
 #: common/include/rbac_texts.php:242
 msgid "Tracker Admin"
-msgstr "Tracker Administrator"
+msgstr "Tracker-Administrator"
 
 #: common/include/rbac_texts.php:246 www/admin/approve-pending.php:136
 msgid "Project Admin"
@@ -3265,67 +3331,55 @@
 msgid "Documentation Manager"
 msgstr "Documentation Manager"
 
-#: common/include/session.php:136
+#: common/include/session.php:146
 msgid "Missing Password Or Users Name"
 msgstr "Fehlendes Passwort oder Benutzername"
 
-#: common/include/session.php:148 common/include/session.php:181
-#: common/include/session.php:232
+#: common/include/session.php:158 common/include/session.php:191
+#: common/include/session.php:242
 #: plugins/ldapextauth/include/LdapExtAuthPlugin.class.php:131
 #: plugins/ldapextauth/include/LdapExtAuthPlugin.class.php:187
 #: plugins/ldapextauth/include/LdapExtAuthPlugin.class.php:297
 msgid "Invalid Password Or User Name"
 msgstr "Ungültiges Passwort oder Benutzername"
 
-#: common/include/session.php:276
+#: common/include/session.php:286
 msgid "Account Suspended"
 msgstr "Account suspendiert"
 
-#: common/include/session.php:281
+#: common/include/session.php:291
 msgid "Account Pending"
 msgstr "Account schwebend"
 
-#: common/include/session.php:286
+#: common/include/session.php:296
 msgid "Account Deleted"
 msgstr "Account gelöscht"
 
-#: common/include/session.php:291
+#: common/include/session.php:301
 msgid "Account Not Active"
 msgstr "Account nicht aktiv"
 
-#: common/include/session.php:404
+#: common/include/session.php:419
 msgid "Your account is no longer active ; you have been disconnected"
-msgstr ""
+msgstr "Ihr Account ist nicht mehr aktiv; ihre Verbindung wurde unterbrochen"
 
-#: common/include/session.php:457
+#: common/include/session.php:472
 #, fuzzy, php-format
 msgid ""
 "Permission denied. The %s administrators will have to grant you permission "
 "to view this page."
 msgstr ""
-"Dieser Projekt-Administrator muss Sie berechtigen, um diese Seite zu sehen."
+"Dieser Projekt-Administrator muß Sie berechtigen, um diese Seite zu sehen."
 
-#: common/include/session.php:513
+#: common/include/session.php:528
 #, fuzzy
 msgid "Could not fetch user session data"
 msgstr "Zugriff nicht erhalten."
 
-#: common/include/session.php:541
+#: common/include/session.php:556
 msgid "No admin users ?"
 msgstr "Keine administrativen Benutzer?"
 
-#: common/include/showmess.php:47 www/pm/include/ProjectTaskHTML.class.php:153
-msgid "Sort comments antichronologically"
-msgstr "Sortiere Kommentare, neueste zuerst"
-
-#: common/include/showmess.php:50 www/pm/include/ProjectTaskHTML.class.php:157
-msgid "Sort comments chronologically"
-msgstr "Sortiere Kommentare, älteste zuerst"
-
-#: common/include/showmess.php:93
-msgid "Sender"
-msgstr "Sender"
-
 #: common/include/utils.php:178
 msgid "UTF-8"
 msgstr "UTF-8"
@@ -3357,7 +3411,7 @@
 #: common/mail/MailingList.class.php:120
 #: plugins/mailman/include/MailmanList.class.php:144
 msgid "Must Provide List Name That Is 4 or More Characters Long"
-msgstr "Der Listenname muss 4 oder mehr Zeichen lang sein"
+msgstr "Der Listenname muß 4 oder mehr Zeichen lang sein"
 
 #: common/mail/MailingList.class.php:129
 #: plugins/mailman/include/MailmanList.class.php:151
@@ -3413,7 +3467,7 @@
 "Ihr Listenpasswort ist: %6$s\n"
 "Sie sollten das Passwort so schnell wie möglich ändern.\n"
 "\n"
-"Vielen Dank, dass Sie Ihr Projekt auf %1$s registriert haben.\n"
+"Vielen Dank, daß Sie Ihr Projekt auf %1$s registriert haben.\n"
 "\n"
 "-- Die %1$s Leitung\n"
 
@@ -3430,7 +3484,7 @@
 
 #: common/mail/MailingList.class.php:383
 msgid "Sorry, this mailing list is special and must not be deleted."
-msgstr ""
+msgstr "Sorry, diese Malingliste kann nicht gelöscht werden."
 
 #: common/mail/MailingListFactory.class.php:99
 #: plugins/mailman/include/MailmanList.class.php:228
@@ -3444,39 +3498,32 @@
 msgstr "Projekt Kategorie: Name und Bevollmächtigter werden benötigt"
 
 #: common/pm/ProjectController.class.php:63
-#: common/reporting/TimeEntry.class.php:92 www/pm/mod_task.php:74
-#: www/pm/mod_task.php:75 www/reporting/timeadd.php:88
+#: common/reporting/TimeEntry.class.php:92 www/reporting/timeadd.php:88
 msgid "Successfully Added"
 msgstr "Erfolgreich hinzugefügt"
 
-#: common/pm/ProjectController.class.php:66 www/pm/mod_task.php:79
-#: www/reporting/timeadd.php:91
+#: common/pm/ProjectController.class.php:66 www/reporting/timeadd.php:91
 msgid "All Fields Are Required."
 msgstr "Alle Felder erforderlich."
 
-#: common/pm/ProjectController.class.php:102 www/pm/mod_task.php:106
-#, fuzzy
-msgid "Successfully Copied"
-msgstr "Erfolgreich hinzugefügt"
-
 #: common/pm/ProjectTask.class.php:731
 msgid "Circular Dependency Detected'"
 msgstr "Periodische Abhängigkeiten entdeckt"
 
-#: common/pm/ProjectTask.class.php:1207
+#: common/pm/ProjectTask.class.php:1209
 #, fuzzy, php-format
 msgid "[%1$s - %2$s] [Task #%3$d] "
 msgstr "[%1$s - %2$s] Task [#%3$d] "
 
 #: common/pm/ProjectTaskSqlQueries.php:41
 msgid "Internal Error: Cannot read out tasktracker_seq SEQUENCE"
-msgstr ""
+msgstr "Interner Fehler: Kann tasktracker_seq SEQUENCE nicht auslesen"
 
 #: common/pm/ProjectTaskSqlQueries.php:67
 #: common/pm/ProjectTaskSqlQueries.php:131
 #: common/pm/ProjectTaskSqlQueries.php:321
 msgid "<Information not public>"
-msgstr ""
+msgstr "<Information nicht öffentlich>"
 
 #: common/reporting/ReportDownloads.class.php:77
 #, fuzzy
@@ -3504,7 +3551,6 @@
 #: plugins/cvstracker/common/cvstrackerPlugin.class.php:79
 #: plugins/svntracker/common/svntrackerPlugin.class.php:73
 #: www/my/dashboard.php:123 www/news/admin/news_admin_utils.php:41
-#: www/pm/detail_task.php:84 www/pm/detail_task.php:88
 #: www/reporting/timeadd.php:119
 msgid "Y-m-d"
 msgstr "d.m.Y"
@@ -3635,7 +3681,7 @@
 msgstr "UPDATE FEHLGESCHLAGEN"
 
 #: common/survey/Survey.class.php:226
-#: common/survey/SurveyQuestion.class.php:169 www/pm/task.php:414
+#: common/survey/SurveyQuestion.class.php:169 www/pm/task.php:437
 #: www/survey/admin/question.php:75
 msgid "Delete failed"
 msgstr "Löschen fehlgeschlagen"
@@ -3718,39 +3764,39 @@
 msgid "Artifact: Only group members can view private artifact types"
 msgstr "Produkt: Nur Gruppenmitglieder können private Produkttypen sehen"
 
-#: common/tracker/Artifact.class.php:222 common/tracker/Artifact.class.php:765
-#: www/tracker/tracker.php:92 www/tracker/tracker.php:286
+#: common/tracker/Artifact.class.php:206 common/tracker/Artifact.class.php:749
+#: www/tracker/tracker.php:89 www/tracker/tracker.php:287
 msgid ""
 "Artifact: This ArtifactType Does Not Allow Anonymous Submissions. Please "
 "Login."
 msgstr ""
 "Produkt: Dieser Produkttyp erlaubt keine anonymen Eingaben. Bitte einloggen."
 
-#: common/tracker/Artifact.class.php:233
+#: common/tracker/Artifact.class.php:217
 msgid "Artifact: Message Summary Is Required"
 msgstr "Artefakt: Zusammenfassung der Nachricht erforderlich"
 
-#: common/tracker/Artifact.class.php:237
+#: common/tracker/Artifact.class.php:221
 msgid "Artifact: Message Body Is Required"
 msgstr "Gegenstand: Rumpf der Nachricht erforderlich"
 
-#: common/tracker/Artifact.class.php:256
+#: common/tracker/Artifact.class.php:240
 msgid "Artifact: Error remapping status"
 msgstr "Artifact: Fehler bom remapStatus"
 
-#: common/tracker/Artifact.class.php:598
+#: common/tracker/Artifact.class.php:582
 msgid "SetMonitor::Valid Email Address Required"
 msgstr "SetMonitor::Gültige Email-Adresse benötigt"
 
-#: common/tracker/Artifact.class.php:616
+#: common/tracker/Artifact.class.php:600
 msgid "Now Monitoring Artifact"
-msgstr "Überwachung aktiviert"
+msgstr "Beobachtung aktiviert"
 
-#: common/tracker/Artifact.class.php:626
+#: common/tracker/Artifact.class.php:610
 msgid "Artifact Monitoring Deactivated"
-msgstr "Überwachung deaktiviert"
+msgstr "Beobachtung deaktiviert"
 
-#: common/tracker/Artifact.class.php:1157
+#: common/tracker/Artifact.class.php:1141
 msgid "Nothing Changed - Update Cancelled"
 msgstr "Keine Änderungen - Aktualisierung abgebrochen"
 
@@ -3899,7 +3945,7 @@
 
 #: common/widget/Widget.class.php:89 plugins/mailman/www/mailman_utils.php:61
 #: plugins/mailman/www/mailman_utils.php:132 www/account/index.php:246
-#: www/include/Layout.class.php:1273
+#: www/include/Layout.class.php:1279
 msgid "Preferences"
 msgstr "Einstellungen"
 
@@ -3910,17 +3956,16 @@
 #: plugins/contribtracker/www/global_admin.php:452
 #: plugins/contribtracker/www/project_admin.php:193
 #: plugins/forumml/www/forumml_utils.php:603 plugins/forumml/www/index.php:126
-#: www/account/pending-resend.php:75 www/activity/index.php:176
+#: www/account/pending-resend.php:75 www/activity/index.php:191
 #: www/admin/admin_table.php:212 www/admin/cronman.php:37
 #: www/admin/globalroleedit.php:247 www/admin/index.php:152
 #: www/admin/pending-news.php:174 www/forum/admin/index.php:427
 #: www/include/vote_function.php:281 www/my/bookmark_add.php:50
 #: www/my/bookmark_edit.php:63 www/news/admin/index.php:163
-#: www/news/submit.php:168 www/pm/add_task.php:52 www/pm/add_task.php:147
-#: www/pm/add_task.php:161 www/pm/admin/index.php:219
+#: www/news/submit.php:168 www/pm/admin/index.php:219
 #: www/pm/admin/index.php:264 www/pm/admin/index.php:300
-#: www/pm/deletetask.php:44 www/pm/include/ProjectView.class.php:193
-#: www/pm/mod_task.php:121 www/pm/mod_task.php:325
+#: www/pm/deletetask.php:44 www/pm/include/ProjectView.class.php:210
+#: www/pm/include/ProjectView.class.php:214
 #: www/project/admin/editimages.php:237 www/project/admin/roledelete.php:85
 #: www/project/admin/roleedit.php:359 www/project/request.php:69
 #: www/register/index.php:280 www/survey/include/SurveyHTML.class.php:552
@@ -3942,15 +3987,14 @@
 msgstr "Abschicken"
 
 #: common/widget/WidgetLayoutManager.class.php:242
-#: common/widget/WidgetLayoutManager.class.php:246
-#: www/include/project_home.php:73 www/my/index.php:54
-#: www/widgets/widgets.php:73
+#: common/widget/WidgetLayoutManager.class.php:246 www/include/html.php:909
+#: www/include/project_home.php:73 www/widgets/widgets.php:73
 #, fuzzy
 msgid "Add widgets"
 msgstr "Datum hinzufügen"
 
 #: common/widget/WidgetLayoutManager.class.php:243
-#: common/widget/WidgetLayoutManager.class.php:247 www/my/index.php:55
+#: common/widget/WidgetLayoutManager.class.php:247 www/include/html.php:913
 #: www/widgets/widgets.php:71
 #, fuzzy
 msgid "Customize layout"
@@ -3959,7 +4003,7 @@
 #: common/widget/WidgetLayoutManager.class.php:323
 #, php-format
 msgid "%s Widgets"
-msgstr ""
+msgstr "%s Widgets"
 
 #: common/widget/WidgetLayoutManager.class.php:492
 #: common/widget/WidgetLayoutManager.class.php:518
@@ -3972,7 +4016,7 @@
 #: common/widget/WidgetLayoutManager.class.php:655
 #, php-format
 msgid "Your <a href=\"%s\">dashboard</a> has been updated."
-msgstr ""
+msgstr "Ihr <a href=\"%s\">Dashboard</a> wurde aktualisiert."
 
 #: common/widget/Widget_MyAdmin.class.php:33
 #, fuzzy
@@ -4010,18 +4054,16 @@
 msgstr "Artefakt löschen"
 
 #: common/widget/Widget_MyArtifacts.class.php:82
-#, fuzzy
 msgid "assigned to me [A]"
-msgstr "Zugewiesen an"
+msgstr "zugewiesen an mich [A]"
 
 #: common/widget/Widget_MyArtifacts.class.php:83
-#, fuzzy
 msgid "submitted by me [S]"
-msgstr "Gepostet von"
+msgstr "gepostet von mir [S]"
 
 #: common/widget/Widget_MyArtifacts.class.php:84
 msgid "assigned to or submitted by me [AS]"
-msgstr ""
+msgstr "zugewiesen oder eingereicht von mir [AS]"
 
 #: common/widget/Widget_MyArtifacts.class.php:114
 #, fuzzy
@@ -4031,6 +4073,8 @@
 #: common/widget/Widget_MyArtifacts.class.php:264
 msgid "List artifacts you have submitted or assigned to you, by project."
 msgstr ""
+"Liste der von ihnen übermittelten oder ihnen zugewiesenen Artefakte des "
+"Projekts."
 
 #: common/widget/Widget_MyBookmarks.class.php:35
 msgid "My Bookmarks"
@@ -4042,9 +4086,8 @@
 msgstr "Momentan verfügen Sie über keine gespeicherten Lesezeichen."
 
 #: common/widget/Widget_MyBookmarks.class.php:61
-#, fuzzy
 msgid "Delete this bookmark?"
-msgstr "Diesen Auftrag löschen"
+msgstr "Dieses Lesezeichen löschen"
 
 #: common/widget/Widget_MyBookmarks.class.php:66
 #, fuzzy
@@ -4074,20 +4117,19 @@
 
 #: common/widget/Widget_MyLatestSvnCommits.class.php:66
 msgid "by"
-msgstr ""
+msgstr "von"
 
 #: common/widget/Widget_MyLatestSvnCommits.class.php:88
 msgid "Maximum number of SVN commits to display per project"
-msgstr ""
+msgstr "Maximale Anzahl der angezeigten SVN Commits pro Projekt"
 
 #: common/widget/Widget_MyLatestSvnCommits.class.php:111
 msgid "List SVN commits you have done, by project."
-msgstr ""
+msgstr "Liste der gegebennen SVN Commits für das Projekt."
 
 #: common/widget/Widget_MyMonitoredDocuments.class.php:36
-#, fuzzy
 msgid "Monitored Documents"
-msgstr "Überwachte Foren"
+msgstr "Beobachtete Dokumente"
 
 #: common/widget/Widget_MyMonitoredDocuments.class.php:43
 #, fuzzy
@@ -4099,17 +4141,21 @@
 "If you monitor documents, you will be sent new update in the form of an "
 "email."
 msgstr ""
+"Wenn sie ein Dokument beobachten, werden sie per E-Mail über Neuheiten "
+"benachrichtigt."
 
 #: common/widget/Widget_MyMonitoredDocuments.class.php:43
 msgid ""
 "You can monitor documents by clicking on the appropriate icon action in the "
 "directory itself."
 msgstr ""
+"Sie können Dokumente mit einem Klick auf das entsprechende Symbol im "
+"Verzeichnis beobachten."
 
 #: common/widget/Widget_MyMonitoredDocuments.class.php:99
 #: common/widget/Widget_MyMonitoredFp.class.php:106
 msgid "STOP MONITORING"
-msgstr ""
+msgstr "BEOBACHTUNG STOPPEN"
 
 #: common/widget/Widget_MyMonitoredDocuments.class.php:103
 #: common/widget/Widget_MyMonitoredForums.class.php:122
@@ -4124,10 +4170,13 @@
 "any of the monitored items just click on the trash icon next to the item "
 "label."
 msgstr ""
+"Liste der Dokumente, die Sie gerade in diesem Projekt beobachten.<br />Um "
+"eines der beobachteten Objekte freizugeben, einfach auf den Mülleimer "
+"klicken."
 
 #: common/widget/Widget_MyMonitoredForums.class.php:34
 msgid "Monitored Forums"
-msgstr "Überwachte Foren"
+msgstr "Beobachtete Foren"
 
 #: common/widget/Widget_MyMonitoredForums.class.php:57
 msgid "You are not monitoring any forums."
@@ -4138,12 +4187,16 @@
 "If you monitor forums, you will be sent new posts in the form of an email, "
 "with a link to the new message."
 msgstr ""
+"Wenn sie ein Forum beobachten, bekommen sie eine Nachricht per E-Mail mit "
+"einem Link auf den neusten Beitrag."
 
 #: common/widget/Widget_MyMonitoredForums.class.php:57
 msgid ""
 "You can monitor forums by clicking on the appropriate menu item in the "
 "discussion forum itself."
 msgstr ""
+"Sie können ein Forum beobachten, indem Sie auf das entsprechende Feld im "
+"Menü des Diskusionsforums klicken."
 
 #: common/widget/Widget_MyMonitoredForums.class.php:116
 #, fuzzy
@@ -4160,6 +4213,8 @@
 "any of the monitored items just click on the trash icon next to the item "
 "label."
 msgstr ""
+"Liste der Foren, die Sie im Projekt beobachten.<br />Um eines der "
+"beobachteten Objekte freizugeben, einfach auf den Mülleimer klicken"
 
 #: common/widget/Widget_MyMonitoredFp.class.php:33
 #, fuzzy
@@ -4167,21 +4222,24 @@
 msgstr "Keine Dateipakete"
 
 #: common/widget/Widget_MyMonitoredFp.class.php:55
-#, fuzzy
 msgid "You are not monitoring any files"
-msgstr "Sie überwachen keine Dateien."
+msgstr "Sie beobachten keine Dateien"
 
 #: common/widget/Widget_MyMonitoredFp.class.php:55
 msgid ""
 "If you monitor files, you will be sent new release notices via email, with a "
 "link to the new file on our download server."
 msgstr ""
+"Wenn sie eine Datei beobachten, bekommen sie per E-Mail Bescheid gesagt, "
+"wenn diese neu erschienen ist, mit Link auf unseren Downloadserver."
 
 #: common/widget/Widget_MyMonitoredFp.class.php:55
 msgid ""
 "You can monitor files by visiting a project's "Summary Page" and "
 "clicking on the appropriate icon in the files section."
 msgstr ""
+"Sie können Dateien durch den Besuch einer Projekt Übersichtsseite und dem "
+"Klicken auf das entsprechende Symbol beobachten."
 
 #: common/widget/Widget_MyMonitoredFp.class.php:104
 #, fuzzy
@@ -4194,6 +4252,8 @@
 "any of the monitored items just click on the trash icon next to the item "
 "label."
 msgstr ""
+"Liste der beobachteten Pakete, nach Projekten.<br />Um eines der "
+"beobachteten Objekte freizugeben, einfach auf den Mülleimer klicken"
 
 #: common/widget/Widget_MyProjects.class.php:34
 msgid "My Projects"
@@ -4220,16 +4280,20 @@
 "List the projects you belong to. Selecting any of these projects brings you "
 "to the corresponding Project Summary page."
 msgstr ""
+"Liste ihrer Projekte. Wählen sie eines aus um die zugehörige "
+"Projektbeschreibungsseite zu öffnen."
 
 #: common/widget/Widget_MyRss.class.php:35
 #: common/widget/Widget_ProjectRss.class.php:41
 msgid ""
 "Allow you to include public rss (or atom) feeds into your personal page."
 msgstr ""
+"Erlaubt es ihenen öffentliche RSS (oder Atom) Feeds in ihre persönliche "
+"Seite einzubinden"
 
 #: common/widget/Widget_MySurveys.class.php:55
 msgid "<p>There are no surveys in your groups.</p>"
-msgstr ""
+msgstr "<p>Es gibt keine Umfragen in ihrer Gruppe.</p>"
 
 #: common/widget/Widget_MySurveys.class.php:121
 #, fuzzy
@@ -4238,7 +4302,7 @@
 
 #: common/widget/Widget_MySurveys.class.php:127
 msgid "List the surveys you have not answered."
-msgstr ""
+msgstr "Liste die nicht beantworteten Umfragen."
 
 #: common/widget/Widget_MyTasks.class.php:118
 #, fuzzy
@@ -4246,14 +4310,12 @@
 msgstr "Noch nicht aktiviert"
 
 #: common/widget/Widget_MyTasks.class.php:122
-#, fuzzy
 msgid "My Tasks"
-msgstr "Nach Auftrag"
+msgstr "Meine Aufgaben (Tasks)"
 
 #: common/widget/Widget_MyTasks.class.php:141
-#, fuzzy
 msgid "List the tasks assigned to you."
-msgstr "Sie haben keine offenen Aufträge, die Ihnen zugeordnet sind."
+msgstr ""
 
 #: common/widget/Widget_ProjectDescription.class.php:33
 #, fuzzy
@@ -4266,7 +4328,7 @@
 
 #: common/widget/Widget_ProjectDescription.class.php:67
 msgid "Allow you to view the project description"
-msgstr ""
+msgstr "Projektbeschreibung einsehen"
 
 #: common/widget/Widget_ProjectInfo.class.php:31 www/include/user_home.php:194
 msgid "Project Info"
@@ -4342,7 +4404,7 @@
 msgstr "Anmerkungen"
 
 #: common/widget/Widget_ProjectLatestFileReleases.class.php:64
-#: www/tracker/include/ArtifactTypeHtml.class.php:974 www/tracker/item.php:245
+#: www/tracker/include/ArtifactTypeHtml.class.php:789 www/tracker/item.php:250
 msgid "Monitor"
 msgstr "Beobachte"
 
@@ -4381,10 +4443,18 @@
 "listed in your Personal Page and can be canceled from this page or from the "
 "main page of the file release system."
 msgstr ""
+"Liste der zum Download stehenden Pakete, mit ihren Revisionen.<br /> Ein "
+"Release-Note Symbol erlabt es ihnen die neusten Änderungen und "
+"Entwickerkommentare der Revision zu lesen. <br />Mit dem Monitor-Symbol "
+"können sie das Paket beobachten. <br />Somit werden sie Automatisch per E-"
+"Mail benachrichtigt sobald eine neue Version erschienen ist. Alle "
+"beobachteten Datei-Releases werden auf Ihrer persönlichen Seite aufgeführt "
+"und können auch von dort oder der Hauptseite des Dateifreigabesystems "
+"abgebrochen werden."
 
 #: common/widget/Widget_ProjectLatestNews.class.php:65
 msgid "List the last 10 pieces of news posted by the project members."
-msgstr ""
+msgstr "Die letzen 10 Nachrichten der Projektmitglieder anzeigen"
 
 #: common/widget/Widget_ProjectMembers.class.php:31
 #, fuzzy
@@ -4417,20 +4487,20 @@
 msgid "Public Areas"
 msgstr "Öffentliche Bereiche"
 
-#: common/widget/Widget_ProjectPublicAreas.class.php:42
+#: common/widget/Widget_ProjectPublicAreas.class.php:43
 msgid "Home Page"
 msgstr "Homepage"
 
-#: common/widget/Widget_ProjectPublicAreas.class.php:42
+#: common/widget/Widget_ProjectPublicAreas.class.php:44
 msgid "Project Home Page"
 msgstr "Projekt-Homepage"
 
-#: common/widget/Widget_ProjectPublicAreas.class.php:63
+#: common/widget/Widget_ProjectPublicAreas.class.php:65
 #: www/include/project_summary.php:149
 msgid "There are no public trackers available"
 msgstr "Es sind keine öffentlichen Tracker verfügbar"
 
-#: common/widget/Widget_ProjectPublicAreas.class.php:75
+#: common/widget/Widget_ProjectPublicAreas.class.php:77
 #: www/include/project_summary.php:154
 #, php-format
 msgid "(<strong>%1$s</strong> open / <strong>%2$s</strong> total)"
@@ -4438,48 +4508,48 @@
 msgstr[0] "(<strong>%1$s</strong> offen / <strong>%2$s</strong> gesamt)"
 msgstr[1] "(<strong>%1$s</strong> offen / <strong>%2$s</strong> gesamt)"
 
-#: common/widget/Widget_ProjectPublicAreas.class.php:90
+#: common/widget/Widget_ProjectPublicAreas.class.php:92
 msgid "Public Forums"
 msgstr "Öffentliche Foren"
 
-#: common/widget/Widget_ProjectPublicAreas.class.php:95
+#: common/widget/Widget_ProjectPublicAreas.class.php:97
 #, php-format
 msgid "<strong>%d</strong> message"
 msgid_plural "<strong>%d</strong> messages"
 msgstr[0] "<strong>%d</strong> Nachricht"
 msgstr[1] "<strong>%d</strong> Nachrichten"
 
-#: common/widget/Widget_ProjectPublicAreas.class.php:97
+#: common/widget/Widget_ProjectPublicAreas.class.php:99
 #, fuzzy, php-format
 msgid "<strong>%d</strong> forum"
 msgid_plural "<strong>%d</strong> forums"
 msgstr[0] "<strong>%d</strong> Nachricht"
 msgstr[1] "<strong>%d</strong> Nachrichten"
 
-#: common/widget/Widget_ProjectPublicAreas.class.php:106
+#: common/widget/Widget_ProjectPublicAreas.class.php:108
 msgid "DocManager: Project Documentation"
 msgstr "Dokumenten-Manager: Projekt-Dokumentation"
 
-#: common/widget/Widget_ProjectPublicAreas.class.php:116
+#: common/widget/Widget_ProjectPublicAreas.class.php:118
 msgid "Mailing Lists"
 msgstr "Mailinglisten"
 
-#: common/widget/Widget_ProjectPublicAreas.class.php:120
+#: common/widget/Widget_ProjectPublicAreas.class.php:122
 #, php-format
 msgid "(<strong>%1$s</strong> public mailing list)"
 msgid_plural "(<strong>%1$s</strong> public mailing lists)"
 msgstr[0] "(<strong>%1$s</strong> öffentliche Mailingliste)"
 msgstr[1] "(<strong>%1$s</strong> öffentliche Mailinglisten)"
 
-#: common/widget/Widget_ProjectPublicAreas.class.php:135
+#: common/widget/Widget_ProjectPublicAreas.class.php:137
 msgid "There are no public subprojects available"
 msgstr "Keine öffentlichen Unterprojekte vorhanden"
 
-#: common/widget/Widget_ProjectPublicAreas.class.php:154
+#: common/widget/Widget_ProjectPublicAreas.class.php:156
 msgid "surveys"
 msgstr "Umfragen"
 
-#: common/widget/Widget_ProjectPublicAreas.class.php:163
+#: common/widget/Widget_ProjectPublicAreas.class.php:165
 #: plugins/scmgit/www/index.php:23 plugins/scmgit/www/index.php:36
 #: www/register/index.php:221 www/scm/admin/index.php:72
 #: www/scm/admin/index.php:89 www/scm/browser.php:30 www/scm/index.php:32
@@ -4487,11 +4557,11 @@
 msgid "SCM Repository"
 msgstr "SCM Repository"
 
-#: common/widget/Widget_ProjectPublicAreas.class.php:186
+#: common/widget/Widget_ProjectPublicAreas.class.php:188
 msgid "Anonymous FTP Space"
 msgstr "Anonymer FTP-Zugriff"
 
-#: common/widget/Widget_ProjectPublicAreas.class.php:204
+#: common/widget/Widget_ProjectPublicAreas.class.php:206
 msgid ""
 "List all available services for this project along with some information "
 "next to it. Click on any of this item to access a service.<br />The role of "
@@ -4499,41 +4569,46 @@
 "the screen except that it shows additional information about each of the "
 "service (e.g. total number of open bugs, tasks, ...)"
 msgstr ""
+"Liste aller für das Projekt verfügbaren Dienste mit ihren Informationen. "
+"Klicken Sie auf eine um ihn einzusehen. <br/>Die Aufgaben dieses Bereiches "
+"ist in etwar gleichzusetzen mit der, der Projekt-Hauptseite im oberen "
+"Bereich des Bildschirms, außer das hier Zusatzinformationen zu jedem Dienst "
+"einsehbar sind (z.B. Gasamtzahl der offenen Bugs, Aufgaben, ...)"
 
 #: common/widget/Widget_Rss.class.php:99
 msgid "http://search.twitter.com/search.atom?q=fusionforge&show_user=1"
-msgstr ""
+msgstr "http://search.twitter.com/search.atom?q=fusionforge&show_user=1"
 
 #: common/widget/Widget_Rss.class.php:183
 msgid "less than 1 minute"
-msgstr ""
+msgstr "weniger als eine Minute"
 
 #: common/widget/Widget_Rss.class.php:183
 msgid "1 minute"
-msgstr ""
+msgstr "eine Minute"
 
 #: common/widget/Widget_Rss.class.php:185
 #, php-format
 msgid "%s minutes ago"
-msgstr ""
+msgstr "vor %s Minuten"
 
 #: common/widget/Widget_Rss.class.php:187
 msgid "About one hour"
-msgstr ""
+msgstr "Ungefähr eine Stunde"
 
 #: common/widget/Widget_Rss.class.php:189
 #, php-format
 msgid "about %s hours"
-msgstr ""
+msgstr "Ungefähr %s Stunden"
 
 #: common/widget/Widget_Rss.class.php:191
 msgid "About one day"
-msgstr ""
+msgstr "Ungefähr ein Tag"
 
 #: common/widget/Widget_Rss.class.php:193
 #, php-format
 msgid "%s days ago"
-msgstr ""
+msgstr "vor %s Tagen"
 
 #: common/widget/Widget_Rss.class.php:195
 #, fuzzy
@@ -4547,12 +4622,12 @@
 
 #: common/widget/Widget_Rss.class.php:199
 msgid "About one year"
-msgstr ""
+msgstr "Ungefähr ein Jahr"
 
 #: common/widget/Widget_Rss.class.php:201
 #, php-format
 msgid "over %s years"
-msgstr ""
+msgstr "Über %s Jahre"
 
 #: cronjobs/homedirs.php:132
 msgid "Default Web Page for groups that haven't setup their page yet"
@@ -4611,10 +4686,10 @@
 "\n"
 "Click here to visit the item %3$s"
 msgstr ""
-"Diese Mail wird Ihnen geschickt, um Sie an anstehende/überfällige Aufträge "
+"Diese Mail wird Ihnen geschickt, um Sie an anstehende/überfällige Aufgaben "
 "zu erinnern.\n"
-"Das Element des Auftrag-Managers [#%1$d] ist schwebend:\n"
-"Auftragszusammenfassung: %2$s\n"
+"Das Element des Aufgaben-Managers [#%1$d] ist schwebend:\n"
+"Aufgabenzusammenfassung: %2$s\n"
 "Erstellt von: %4$s\n"
 "Status: %5$s\n"
 "Prozent fertiggestellt: %6$s\n"
@@ -4659,11 +4734,13 @@
 
 #: plugins/blocks/www/index.php:59
 msgid "Block to replace the default project description with an enhanced one."
-msgstr ""
+msgstr "Block um das Beispielprojekt gegen ein verbessertes auszutauschen"
 
 #: plugins/blocks/www/index.php:64
 msgid "Block to list informations requested to ask to join a project"
 msgstr ""
+"Block der Liste von Informationen, die für eine Beitritsantrage zu einem "
+"Projekt nötig sind"
 
 #: plugins/blocks/www/index.php:69 plugins/blocks/www/index.php:78
 #: plugins/blocks/www/index.php:87 plugins/blocks/www/index.php:96
@@ -4671,17 +4748,17 @@
 #: plugins/blocks/www/index.php:120 plugins/blocks/www/index.php:125
 #: plugins/blocks/www/index.php:130
 msgid "Display block at the top of the listing"
-msgstr ""
+msgstr "Block am Anfang der Liste anzeigen"
 
 #: plugins/blocks/www/index.php:72 plugins/blocks/www/index.php:81
 #: plugins/blocks/www/index.php:90 plugins/blocks/www/index.php:99
 #: plugins/blocks/www/index.php:114
 msgid "Display block at the top"
-msgstr ""
+msgstr "Block am Anfang anzeigen"
 
 #: plugins/blocks/www/index.php:106
 msgid "Display block at the top of the main page"
-msgstr ""
+msgstr "Block am Anfang der Hauptseite anzeigen"
 
 #: plugins/blocks/www/index.php:150 plugins/mantisbt/www/getAttachment.php:38
 #: plugins/mantisbt/www/index.php:79 plugins/quota_management/www/index.php:51
@@ -4696,11 +4773,11 @@
 
 #: plugins/blocks/www/index.php:179
 msgid "Cannot Process your request : No TYPE specified"
-msgstr ""
+msgstr "Anfrage kann nicht bearbeitet werden: Kein Typ ausgewählt"
 
 #: plugins/blocks/www/index.php:181
 msgid "Cannot Process your request : No ID specified"
-msgstr ""
+msgstr "Anfrage kann nicht bearbeitet werden: Keine ID ausgewählt"
 
 #: plugins/blocks/www/index.php:189 plugins/blocks/www/index.php:204
 #: plugins/blocks/www/index.php:267 plugins/blocks/www/index.php:315
@@ -4710,13 +4787,15 @@
 #: plugins/quota_management/www/index.php:102
 #, php-format
 msgid "First activate the %s plugin through the Project's Admin Interface"
-msgstr ""
+msgstr "Erst das %s Plugin in der Projekt-Admin Schaltfläche aktivieren"
 
 #: plugins/blocks/www/index.php:217
 msgid ""
 "Blocks are customizable HTML boxes in the left or right side of the pages "
 "the web site. They are created manually."
 msgstr ""
+"Blöcke sind anpassbare HTML-Kästen auf der linken oder rechten Seite der "
+"Website. Sie werden manuell erstellt."
 
 #: plugins/blocks/www/index.php:226
 #: plugins/scmcvs/common/CVSPlugin.class.php:151
@@ -4724,7 +4803,7 @@
 #: plugins/scmsvn/common/SVNPlugin.class.php:196 www/admin/useredit.php:234
 #: www/project/admin/editimages.php:267 www/reporting/usersummary.php:101
 #: www/search/include/renderers/SkillHtmlSearchRenderer.class.php:44
-#: www/sendmessage.php:69 www/tracker/include/ArtifactTypeHtml.class.php:471
+#: www/sendmessage.php:69 www/tracker/include/ArtifactTypeHtml.class.php:200
 msgid "Name"
 msgstr "Name"
 
@@ -4745,25 +4824,28 @@
 
 #: plugins/blocks/www/index.php:307
 msgid "Block Saved"
-msgstr ""
+msgstr "Block gespeichert"
 
 #: plugins/blocks/www/index.php:327
 msgid ""
 "Edit the block as you want. If you activate the HTML editor, you will be "
 "able to use WYSIWYG formatting (bold, colors...)"
 msgstr ""
+"Bearbeiten sie den Block nach belieben. Wenn sie den HTML Editor aktivieren, "
+"sind sie berechtigt die WYSIWYG formatierung zu verwenden (fett, Farben, ...)"
 
 #: plugins/blocks/www/index.php:359
 #: plugins/contribtracker/www/global_admin.php:400
 #: plugins/contribtracker/www/global_admin.php:426
 #: plugins/contribtracker/www/global_admin.php:490
 #: plugins/contribtracker/www/project_admin.php:214
+#: www/pm/select_columns.php:102
 msgid "Save"
 msgstr "Speichern"
 
 #: plugins/blocks/www/index.php:365
 msgid "Tips"
-msgstr ""
+msgstr "Tips"
 
 #: plugins/blocks/www/index.php:367
 msgid ""
@@ -5283,7 +5365,7 @@
 
 #: plugins/extratabs/www/index.php:79 plugins/extratabs/www/index.php:296
 msgid "ERROR: Malformed URL (only http, https and ftp allowed)"
-msgstr ""
+msgstr "Fehler: Missgebildete URL (nur http, https und ftp erlaubt)"
 
 #: plugins/extratabs/www/index.php:94
 msgid "ERROR: Name for tab is already used."
@@ -5425,7 +5507,7 @@
 
 #: plugins/extratabs/www/index.php:360
 msgid "Tooltip:"
-msgstr ""
+msgstr "Tooltip:"
 
 #: plugins/extratabs/www/index.php:365
 msgid "URL of the tab:"
@@ -5444,7 +5526,7 @@
 #: plugins/projects_hierarchy/common/projects_hierarchyPlugin.class.php:163
 #: plugins/projects_hierarchy/common/projects_hierarchyPlugin.class.php:180
 #: plugins/projects_hierarchy/common/projects_hierarchyPlugin.class.php:190
-#: www/pm/templates/detail_template.php:137
+#: www/pm/templates/detail_template.php:125
 msgid "Link"
 msgstr "Link/Verweis"
 
@@ -5522,7 +5604,7 @@
 
 #: plugins/fckeditor/common/fckeditorPlugin.class.php:34
 msgid "HTML editor"
-msgstr ""
+msgstr "HTML Editor"
 
 #: plugins/forumml/include/ForumMLGroupSearchEngine.class.php:17
 #, fuzzy
@@ -5550,9 +5632,8 @@
 msgstr ""
 
 #: plugins/forumml/include/forummlPlugin.class.php:110
-#, fuzzy
 msgid "This project's mailing lists"
-msgstr "Die Aufträge dieses Projekts"
+msgstr ""
 
 #: plugins/forumml/include/forummlPlugin.class.php:159
 #, fuzzy
@@ -5600,11 +5681,11 @@
 
 #: plugins/forumml/www/forumml_utils.php:424
 msgid "Toggle font family (typewriter/normal)"
-msgstr ""
+msgstr "Schriftfamilie wählen (Schreibmaschiene / Normal)"
 
 #: plugins/forumml/www/forumml_utils.php:442
 msgid "Cc :"
-msgstr ""
+msgstr "Cc:"
 
 #: plugins/forumml/www/forumml_utils.php:563
 #, fuzzy
@@ -5613,7 +5694,7 @@
 
 #: plugins/forumml/www/forumml_utils.php:585
 msgid "Add cc :"
-msgstr ""
+msgstr "Cc hinzufügen:"
 
 #: plugins/forumml/www/forumml_utils.php:586 plugins/forumml/www/index.php:117
 #: plugins/forumml/www/scripts/cc_attach_js.php:50
@@ -5623,7 +5704,7 @@
 
 #: plugins/forumml/www/forumml_utils.php:604 plugins/forumml/www/index.php:127
 msgid "Erase"
-msgstr ""
+msgstr "Löschen"
 
 #: plugins/forumml/www/forumml_utils.php:686
 #, fuzzy
@@ -5664,19 +5745,20 @@
 
 #: plugins/forumml/www/index.php:62
 msgid "The mailing  list does not exist or is inactive"
-msgstr ""
+msgstr "Es existiert keine Mailliste oder sie ist nicht aktiv"
 
 #: plugins/forumml/www/index.php:72
 msgid "Submit failed you must specify the mail subject."
-msgstr ""
+msgstr "Es muß immer ein Betreff angegeben werden."
 
 #: plugins/forumml/www/index.php:77
 msgid "There can be some delay before to see the message in the archives."
 msgstr ""
+"Es kann zu Verzögerungen kommen beim Anzeigen der Nachrichten im Archiv"
 
 #: plugins/forumml/www/index.php:77
 msgid " Redirecting to archive page, please wait ..."
-msgstr ""
+msgstr "Umleiten auf die Archivseite, bitte warten ..."
 
 #: plugins/forumml/www/index.php:101 plugins/forumml/www/message.php:151
 #, fuzzy
@@ -5719,6 +5801,7 @@
 #: plugins/forumml/www/message.php:120
 msgid "Email succefully sent. It can take some time before being displayed"
 msgstr ""
+"E-Mail erfolgreich versand. Es kann etwas dauern bis die angezeigt wird"
 
 #: plugins/forumml/www/message.php:159
 #, fuzzy
@@ -5742,7 +5825,7 @@
 
 #: plugins/forumml/www/message.php:177
 msgid "Original list archives"
-msgstr ""
+msgstr "Orginal Kommentarliste"
 
 #: plugins/forumml/www/message.php:177
 #, fuzzy
@@ -5776,7 +5859,7 @@
 
 #: plugins/forumml/www/scripts/cc_attach_js.php:42
 msgid "CC :"
-msgstr ""
+msgstr "CC:"
 
 #: plugins/forumml/www/upload.php:82
 #, fuzzy
@@ -5886,8 +5969,8 @@
 #: plugins/globalsearch/common/globalsearch_edit_utils.php:232
 #: plugins/globalsearch/common/globalsearch_edit_utils.php:233
 #: plugins/mailman/www/admin/index.php:148
-#: plugins/mailman/www/admin/index.php:180 www/admin/groupedit.php:147
-#: www/admin/groupedit.php:167 www/forum/admin/index.php:109
+#: plugins/mailman/www/admin/index.php:180 www/admin/groupedit.php:159
+#: www/admin/groupedit.php:180 www/forum/admin/index.php:109
 #: www/forum/admin/index.php:114 www/forum/admin/index.php:153
 #: www/forum/admin/index.php:158 www/forum/admin/index.php:237
 #: www/mail/admin/index.php:192 www/mail/admin/index.php:223
@@ -5903,8 +5986,8 @@
 #: plugins/globalsearch/common/globalsearch_edit_utils.php:232
 #: plugins/globalsearch/common/globalsearch_edit_utils.php:233
 #: plugins/mailman/www/admin/index.php:149
-#: plugins/mailman/www/admin/index.php:181 www/admin/groupedit.php:146
-#: www/admin/groupedit.php:166 www/forum/admin/index.php:110
+#: plugins/mailman/www/admin/index.php:181 www/admin/groupedit.php:158
+#: www/admin/groupedit.php:179 www/forum/admin/index.php:110
 #: www/forum/admin/index.php:115 www/forum/admin/index.php:154
 #: www/forum/admin/index.php:159 www/forum/admin/index.php:238
 #: www/mail/admin/index.php:193 www/mail/admin/index.php:224
@@ -5998,7 +6081,7 @@
 #: plugins/globalsearch/www/index.php:83
 #, fuzzy
 msgid "Search must be at least three characters"
-msgstr "Das Passwort muss aus mindestens 6 Buchstaben bestehen."
+msgstr "Das Passwort muß aus mindestens 6 Buchstaben bestehen."
 
 #: plugins/globalsearch/www/index.php:89
 msgid "Enter Your Search Words Above"
@@ -6037,14 +6120,14 @@
 
 #: plugins/gravatar/common/gravatarPlugin.class.php:29
 msgid "Gravatar Plugin"
-msgstr ""
+msgstr "Gravatar Plugin"
 
 #: plugins/hudson/include/HudsonBuild.class.php:39
 #: plugins/hudson/include/HudsonJob.class.php:43
 #: plugins/hudson/include/HudsonTestResult.class.php:39
 #, php-format
 msgid "Wrong Job URL: %s"
-msgstr ""
+msgstr "Falsche Job URL: %s"
 
 #: plugins/hudson/include/HudsonBuild.class.php:61
 #: plugins/hudson/include/HudsonJob.class.php:91
@@ -6072,7 +6155,7 @@
 #: plugins/hudson/include/HudsonJob.class.php:157
 #: plugins/hudson/include/HudsonJob.class.php:165
 msgid "In progress"
-msgstr ""
+msgstr "In Bearbeitung"
 
 #: plugins/hudson/include/HudsonJob.class.php:145
 #, fuzzy
@@ -6081,7 +6164,7 @@
 
 #: plugins/hudson/include/HudsonJob.class.php:153
 msgid "Failure"
-msgstr ""
+msgstr "Fehler"
 
 #: plugins/hudson/include/HudsonJob.class.php:161
 #, fuzzy
@@ -6095,9 +6178,8 @@
 
 #: plugins/hudson/include/HudsonJobWidget.class.php:58
 #: plugins/hudson/include/HudsonJobWidget.class.php:80
-#, fuzzy
 msgid "Monitored job:"
-msgstr "Überwachte Foren"
+msgstr ""
 
 #: plugins/hudson/include/HudsonJobWidget.class.php:94
 #, fuzzy
@@ -6108,7 +6190,7 @@
 #: plugins/hudson/include/hudsonPlugin.class.php:20
 #: plugins/hudson/include/hudsonViews.class.php:50
 msgid "Hudson"
-msgstr ""
+msgstr "Hudson"
 
 #: plugins/hudson/include/hudson.class.php:60
 #: plugins/hudson/include/hudson.class.php:86
@@ -6141,9 +6223,8 @@
 msgstr "Fehlende Parameter"
 
 #: plugins/hudson/include/hudsonActions.class.php:53
-#, fuzzy
 msgid "Unable to add Hudson job."
-msgstr "Konnte Überwachung nicht hinzufügen"
+msgstr ""
 
 #: plugins/hudson/include/hudsonActions.class.php:55
 msgid "Hudson job added."
@@ -6152,11 +6233,13 @@
 #: plugins/hudson/include/hudsonActions.class.php:56
 #: plugins/hudson/include/hudsonActions.class.php:85
 msgid "Please wait 1 hour for triggers to be updated."
-msgstr ""
+msgstr "Bitte eine Stunde warten damit die Trigger upgedatet werden können."
 
 #: plugins/hudson/include/hudsonActions.class.php:71
 msgid "Spaces are not allowed in job name. They were replaced by \"_\"."
 msgstr ""
+"Leerzeichen sind nicht erlaubt in Jobnamen. Sie müssen durch \"_\" ersetzt "
+"werden"
 
 #: plugins/hudson/include/hudsonActions.class.php:82
 #, fuzzy
@@ -6184,7 +6267,7 @@
 
 #: plugins/hudson/include/hudsonPlugin.class.php:203
 msgid "Hudson Build"
-msgstr ""
+msgstr "Hudson Build"
 
 #: plugins/hudson/include/hudsonPlugin.class.php:204
 msgid "Hudson Job"
@@ -6192,7 +6275,7 @@
 
 #: plugins/hudson/include/hudsonPlugin.class.php:234
 msgid "Build performed on:"
-msgstr ""
+msgstr "Build durchgeführt am:"
 
 #: plugins/hudson/include/hudsonPlugin.class.php:235
 #: www/export/rssAboTask.php:145
@@ -6243,11 +6326,11 @@
 
 #: plugins/hudson/include/hudsonPluginDescriptor.class.php:25
 msgid "Continuous Integration"
-msgstr ""
+msgstr "Kontinuierliche Eingliederung"
 
 #: plugins/hudson/include/hudsonPluginDescriptor.class.php:25
 msgid "Continuous Integration with Hudson"
-msgstr ""
+msgstr "Kontinuierliche Eingliederung mit Hudson"
 
 #: plugins/hudson/include/hudsonViews.class.php:59
 #: utils/fixscripts/populate_template_project.php:81
@@ -6256,7 +6339,7 @@
 
 #: plugins/hudson/include/hudsonViews.class.php:212
 msgid "Back to jobs list"
-msgstr ""
+msgstr "Zurück zur Jobliste"
 
 #: plugins/hudson/include/hudsonViews.class.php:214
 #, fuzzy
@@ -6272,7 +6355,7 @@
 #: plugins/hudson/include/hudsonViews.class.php:221
 #: plugins/hudson/include/hudsonViews.class.php:398
 msgid "eg: http://myCIserver/hudson/job/myJob"
-msgstr ""
+msgstr "z.B.: http://myCIserver/hudson/job/myJob"
 
 #: plugins/hudson/include/hudsonViews.class.php:224
 #, fuzzy
@@ -6283,6 +6366,7 @@
 #, php-format
 msgid "Name (with no space) used to make a reference to this job. Eg: job #%s"
 msgstr ""
+"Name (ohne Leerzeichen) wird als Referenz zum Job verwendet. Z.B.: Job #%s"
 
 #: plugins/hudson/include/hudsonViews.class.php:232
 #, fuzzy
@@ -6297,7 +6381,7 @@
 #: plugins/hudson/include/hudsonViews.class.php:254
 #: plugins/hudson/include/hudsonViews.class.php:413
 msgid "with (optional) token:"
-msgstr ""
+msgstr "Mit (optional) Kürzel:"
 
 #: plugins/hudson/include/hudsonViews.class.php:262
 #, fuzzy
@@ -6327,32 +6411,32 @@
 
 #: plugins/hudson/include/hudsonViews.class.php:295
 msgid "SVN trigger"
-msgstr ""
+msgstr "SVN Trigger"
 
 #: plugins/hudson/include/hudsonViews.class.php:298
 msgid "CVS trigger"
-msgstr ""
+msgstr "CSV Trigger"
 
 #: plugins/hudson/include/hudsonViews.class.php:320
 #, php-format
 msgid "Show job %s"
-msgstr ""
+msgstr "Zeigt Job %s"
 
 #: plugins/hudson/include/hudsonViews.class.php:322
 #: plugins/hudson/include/hudsonViews.class.php:327
 #, php-format
 msgid "Show build #%s of job %s"
-msgstr ""
+msgstr "Zeigt Build #%s von Job %s"
 
 #: plugins/hudson/include/hudsonViews.class.php:322
 #: plugins/hudson/include/hudsonViews.class.php:327
 msgid "build"
-msgstr ""
+msgstr "Build"
 
 #: plugins/hudson/include/hudsonViews.class.php:331
 #, php-format
 msgid "RSS feed of all builds for %s job"
-msgstr ""
+msgstr "RSS Feeds aller Builds des Jobs %s"
 
 #: plugins/hudson/include/hudsonViews.class.php:335
 msgid "SVN commit will trigger a build"
@@ -6370,18 +6454,19 @@
 #: plugins/hudson/include/hudsonViews.class.php:366
 #, fuzzy, php-format
 msgid "Are you sure you want to delete Job %s from project %s?"
-msgstr "Sind Sie sicher, dass Sie %1$s löschen wollen?"
+msgstr "Sind Sie sicher, daß Sie %1$s löschen wollen?"
 
 #: plugins/hudson/include/hudsonViews.class.php:367
-#, fuzzy
 msgid "Delete this job"
-msgstr "Diesen Auftrag löschen"
+msgstr ""
 
 #: plugins/hudson/include/hudsonViews.class.php:380
 msgid ""
 "No Hudson jobs associated with this project. To add a job, select the link "
 "just below."
 msgstr ""
+"Kein Job gehört zu diesem Projekt. Um einen Job auszuwählen benutzen sie den "
+"unten stehenden Link"
 
 #: plugins/hudson/include/hudsonViews.class.php:389
 #, fuzzy
@@ -6390,11 +6475,11 @@
 
 #: plugins/hudson/include/hudsonViews.class.php:402
 msgid "Trigger a build after commits:"
-msgstr ""
+msgstr "Build einleiten:"
 
 #: plugins/hudson/include/hudsonViews.class.php:404
 msgid "SVN"
-msgstr ""
+msgstr "SVN"
 
 #: plugins/hudson/include/hudsonViews.class.php:408
 #: www/project/stats/project_stats_utils.php:83
@@ -6406,7 +6491,7 @@
 #: plugins/hudson/include/hudson_Widget_JobBuildHistory.class.php:46
 #, php-format
 msgid "%s Builds History"
-msgstr ""
+msgstr "%s Verlauf"
 
 #: plugins/hudson/include/hudson_Widget_JobBuildHistory.class.php:48
 #, fuzzy
@@ -6419,6 +6504,9 @@
 "each build of the list, you can see the build number, the status and the "
 "date the build has been scheduled."
 msgstr ""
+"Zeigt den Verlauf des ausgewählten Jobs inform eines RSS feeds. Für jeden "
+"Build der Liste  können sie, Die Build-Nummer, den Status und das "
+"Erstellungsdatum sehen."
 
 #: plugins/hudson/include/hudson_Widget_JobBuildHistory.class.php:89
 #: plugins/hudson/include/hudson_Widget_JobLastArtifacts.class.php:106
@@ -6444,11 +6532,13 @@
 "Show the last successfully published artifacts of one job. To display "
 "something, your job needs to publish artifacts."
 msgstr ""
+"Zeige die letzten erfolgreich veröffentlicht Artefakte von einem Job. Um sie "
+"anzuzeigen müssen die Artefakte des Projektes veröffentlicht werden."
 
 #: plugins/hudson/include/hudson_Widget_JobLastBuilds.class.php:46
 #, php-format
 msgid "%s Last Builds"
-msgstr ""
+msgstr "Letzten %s Tage"
 
 #: plugins/hudson/include/hudson_Widget_JobLastBuilds.class.php:48
 #, fuzzy
@@ -6461,11 +6551,15 @@
 "and the weather report. The trend is represented by a weather report (sun, "
 "thunder, etc.) meaning that the trend is good or not."
 msgstr ""
+"Zeigt den letzten Build für den aktuellen Job (letzter, letzter Erfolg, "
+"letzter Fehlschlag) und den Wetterbericht. Der Verlauf wird dirch einen "
+"Wetterbericht dargestellt (Sonne, Donner, usw.) bedeutet der Verlauf ist gut "
+"oder nicht."
 
 #: plugins/hudson/include/hudson_Widget_JobTestResults.class.php:49
 #, php-format
 msgid "%1$s Test Results (%2$s / %3$s)"
-msgstr ""
+msgstr "Nächste Ergebnisse %1$s (%2$s / %3$s)"
 
 #: plugins/hudson/include/hudson_Widget_JobTestResults.class.php:52
 #, fuzzy, php-format
@@ -6484,6 +6578,9 @@
 "something, your job needs to execute tests and publish them. The result is "
 "shown on a pie chart."
 msgstr ""
+"Zeigt das testresultat des letzten Builds, des ausgewählten Projekts. Um "
+"etwas anzuzeigen muß der Job dort getestet und Veröffentlicht worden sein. "
+"Die Ergebnisse werden in eijnem Kuchendiagramm dargestellt."
 
 #: plugins/hudson/include/hudson_Widget_JobTestResults.class.php:105
 #: plugins/hudson/include/hudson_Widget_JobTestTrend.class.php:100
@@ -6495,7 +6592,7 @@
 #: plugins/hudson/include/hudson_Widget_JobTestTrend.class.php:94
 #, php-format
 msgid "%s Test Result Trend"
-msgstr ""
+msgstr "Nächste Ergebnisse von %s"
 
 #: plugins/hudson/include/hudson_Widget_JobTestTrend.class.php:49
 #, fuzzy
@@ -6509,20 +6606,23 @@
 "successfull) along  time. The number of tests is increasing while the number "
 "of build and commits are increasing too."
 msgstr ""
+"Um anzuzeigen was ihr Job braucht, zeigen sie seine Ergebnisse an. Der Graf "
+"zeigt die Anzahl der Tests (Erfolge und Misserfolge) über die Zeit an. Die "
+"Zahl der Tests steigt mit der Anzahl der Builds und Commits.*"
 
 #: plugins/hudson/include/hudson_Widget_MyMonitoredJobs.class.php:85
 #: plugins/hudson/include/hudson_Widget_ProjectJobsOverview.class.php:63
 msgid "One or more failure or pending job"
-msgstr ""
+msgstr "Ein oder mehrere fehlgeschlagene oder anstehende Jobs"
 
 #: plugins/hudson/include/hudson_Widget_MyMonitoredJobs.class.php:88
 #: plugins/hudson/include/hudson_Widget_ProjectJobsOverview.class.php:66
 msgid "One or more unstable job"
-msgstr ""
+msgstr "Ein oder mehrere unstabile Jobs"
 
 #: plugins/hudson/include/hudson_Widget_MyMonitoredJobs.class.php:101
 msgid "My Hudson Jobs"
-msgstr ""
+msgstr "Mein geposteten Jobs"
 
 #: plugins/hudson/include/hudson_Widget_MyMonitoredJobs.class.php:106
 msgid ""
@@ -6530,15 +6630,17 @@
 "can of course select the jobs you wish to display by selecting the "
 "preferences link of the widget."
 msgstr ""
+"Zeigt eine Liste aller Arbeiten der Projekte derer sie Mitglied sind. "
+"Natürlich können sie die Arbeiten aussuchen die sie sich näher ansehen "
+"möchten, indem sie auf den entsptechenden Link im Widget klicken."
 
 #: plugins/hudson/include/hudson_Widget_MyMonitoredJobs.class.php:142
-#, fuzzy
 msgid "Monitored jobs:"
-msgstr "Überwachte Foren"
+msgstr ""
 
 #: plugins/hudson/include/hudson_Widget_MyMonitoredJobs.class.php:158
 msgid "Use global status:"
-msgstr ""
+msgstr "Globalen Status benutzen:"
 
 #: plugins/hudson/include/hudson_Widget_ProjectJobsOverview.class.php:79
 #, fuzzy
@@ -6550,6 +6652,8 @@
 "Shows an overview of all the jobs associated with this project. You can "
 "always choose the ones you want to display in the widget (preferences link)."
 msgstr ""
+"Zeigt alle Arbeiten an die zu diesem Projekt gehören. Sie können jederzeit "
+"wählen welche sie angezeigt haben möchten (bevorzugte Links)."
 
 #: plugins/hudson/www/test_result_pie_chart.php:22
 #, fuzzy, php-format
@@ -6583,7 +6687,7 @@
 
 #: plugins/mailman/include/MailmanPluginDescriptor.class.php:29
 msgid "Offers a better integration of Mailman in the forge"
-msgstr ""
+msgstr "Bietet eine bessere Integration des Post-Admin"
 
 #: plugins/mailman/include/mailmanPlugin.class.php:81
 msgid "-tooltip:plugin:mailman"
@@ -6607,14 +6711,12 @@
 msgstr "Entfernen"
 
 #: plugins/mailman/include/mailmanPlugin.class.php:156
-#, fuzzy
 msgid "Monitored Lists"
-msgstr "Überwachte Items"
+msgstr ""
 
 #: plugins/mailman/include/mailmanPlugin.class.php:170
-#, fuzzy
 msgid "You are not monitoring any lists."
-msgstr "Sie überwachen keine Dateien."
+msgstr ""
 
 #: plugins/mailman/include/mailmanPlugin.class.php:172
 #, fuzzy
@@ -6730,7 +6832,7 @@
 "You can administrate lists from here. Please note that private lists can "
 "still be viewed by members of your project, but are not listed on %1$s."
 msgstr ""
-"Sie können die Listen von hier aus administrieren. Bitte bedenken Sie, dass "
+"Sie können die Listen von hier aus administrieren. Bitte bedenken Sie, daß "
 "private Listen immernoch von Mitgliedern Ihres Projektes angeschaut werden "
 "können, die aber nicht in %1$s aufgelistet sind."
 
@@ -6759,6 +6861,9 @@
 "You seem to have mailman account with a different name or password. If you "
 "want to update mailman information, click on "
 msgstr ""
+"Sie scheinen ein Post-Admin-Konto mit einem anderen Namen oder Passwort zu "
+"haben. Wenn Sie die Post-Admin-Informationen aktualisieren wollen, klicken "
+"Sie auf"
 
 #: plugins/mailman/www/index.php:73 www/mail/index.php:73
 #, fuzzy
@@ -6802,7 +6907,7 @@
 "Ihr Listenpasswort ist: %6$s\n"
 "Sie sollten das Passwort so schnell wie möglich ändern.\n"
 "\n"
-"Vielen Dank, dass Sie Ihr Projekt auf %1$s registriert haben.\n"
+"Vielen Dank, daß Sie Ihr Projekt auf %1$s registriert haben.\n"
 "\n"
 "-- Die %1$s Leitung\n"
 
@@ -6897,11 +7002,11 @@
 
 #: plugins/mantisbt/www/index.php:39
 msgid "Roadmap"
-msgstr ""
+msgstr "Fahrplan"
 
 #: plugins/mantisbt/www/index.php:40
 msgid "Tickets"
-msgstr ""
+msgstr "Tickets"
 
 #: plugins/mantisbt/www/index.php:45
 msgid "-tooltip:plugin:mantisbt:roadmap"
@@ -6916,7 +7021,6 @@
 msgstr ""
 
 #: plugins/mantisbt/www/index.php:52 www/admin/index.php:162
-#: www/project/admin/project_admin_utils.php:84
 msgid "Stats"
 msgstr "Statistiken"
 
@@ -6952,12 +7056,13 @@
 #, php-format
 msgid "First activate the User's %s plugin through Account Maintenance Page"
 msgstr ""
+"Aktivieren Sie zuerst das Plugin des Benutzers %s auf der Kontenpflege Seite"
 
 #: plugins/mantisbt/www/index.php:155
 #: plugins/quota_management/www/index.php:90
 #, php-format
 msgid "You cannot access other user's personal %s"
-msgstr ""
+msgstr "Sie können nicht auf %s anderer Benutzer zugreifen"
 
 #: plugins/mantisbt/www/index.php:205
 #: plugins/quota_management/www/index.php:115
@@ -6972,7 +7077,7 @@
 
 #: plugins/mediawiki/common/MediaWikiPlugin.class.php:194
 msgid "No reading"
-msgstr ""
+msgstr "Keine Wertrückgabe"
 
 #: plugins/mediawiki/common/MediaWikiPlugin.class.php:199
 msgid "Mediawiki write access"
@@ -7022,7 +7127,7 @@
 
 #: plugins/mediawiki/common/MediaWikiPlugin.class.php:216
 msgid "Edit interface, import XML dumps"
-msgstr ""
+msgstr "Erstelle Interface, füge XML Dumps ein"
 
 #: plugins/mediawiki/common/MediaWikiPlugin.class.php:343
 msgid "MediaWiki Plugin admin"
@@ -7102,7 +7207,7 @@
 
 #: plugins/mediawiki/www/plugin_admin.php:147
 msgid "Nightly XML dump"
-msgstr ""
+msgstr "Nächtlicher XML Dump"
 
 #: plugins/mediawiki/www/plugin_admin.php:149
 #, php-format
@@ -7311,14 +7416,12 @@
 msgstr "Editieren Sie die %1$ss Tabelle"
 
 #: plugins/projectlabels/www/index.php:182
-#, fuzzy
 msgid "[Delete this label]"
-msgstr "Diesen Auftrag löschen"
+msgstr "[Dieses Etikett löschen]"
 
 #: plugins/projectlabels/www/index.php:190
-#, fuzzy
 msgid "Add new labels"
-msgstr "Füge neuen Auftrag hinzu"
+msgstr "Neue Etiketten hinzufügen"
 
 #: plugins/projectlabels/www/index.php:191
 msgid "You can create new labels with the form below."
@@ -7405,9 +7508,8 @@
 msgstr "Neues Projekt hinzufügen"
 
 #: plugins/projects_hierarchy/common/projects_hierarchyPlugin.class.php:234
-#, fuzzy
 msgid "Add a link"
-msgstr "Füge neuen Auftrag hinzu"
+msgstr ""
 
 #: plugins/projects_hierarchy/common/projects_hierarchyPlugin.class.php:249
 #: plugins/projects_hierarchy/common/projects_hierarchyPlugin.class.php:298
@@ -7443,9 +7545,8 @@
 #: plugins/projects_hierarchy/common/projects_hierarchyPlugin.class.php:329
 #: plugins/projects_hierarchy/common/projects_hierarchyPlugin.class.php:357
 #: plugins/projects_hierarchy/common/projects_hierarchyPlugin.class.php:388
-#, fuzzy
 msgid "Do you really want to delete this link?"
-msgstr "Sind Sie sicher, daß Sie diesen Auftrag löschen wollen?"
+msgstr ""
 
 #: plugins/projects_hierarchy/common/projects_hierarchyPlugin.class.php:323
 #: plugins/projects_hierarchy/common/projects_hierarchyPlugin.class.php:386
@@ -7479,6 +7580,12 @@
 "Need validation.\n"
 "Please visit the following URL %3$s"
 msgstr ""
+"Neue Eltern-Relation erstellt \n"
+"\n"
+"Eltern Projekt (voller Name): %1$s\n"
+"Kind Projekt (voller Name): %2$s\n"
+"Muß Bestätigt werden\n"
+"Bitte besuchen sie den folgenden Link: %3$s"
 
 #: plugins/projects_hierarchy/www/add_son.php:56
 #: plugins/projects_hierarchy/www/wait_son.php:57
@@ -7565,7 +7672,7 @@
 msgstr[1] "<strong>%1$s</strong> Projekte in der Ergebnisliste."
 
 #: plugins/projects_hierarchy/www/softwaremap.php:400
-#: www/include/Layout.class.php:1336
+#: www/include/Layout.class.php:1342
 msgid "Project Tree"
 msgstr "Projektbaum"
 
@@ -7577,6 +7684,10 @@
 "Parent Project Full Name: %1$s\n"
 "Child Project Full Name: %2$s"
 msgstr ""
+"Neue Eltern-Relatione bestätigt \n"
+"\n"
+"Eltern-Projekt (voller Name): %1$s\n"
+"Kind-Projekt (voller Name): %2$s"
 
 #: plugins/projects_hierarchy/www/wait_son.php:63
 #, fuzzy, php-format
@@ -7615,11 +7726,11 @@
 
 #: plugins/quota_management/www/index.php:63
 msgid "No TYPE specified"
-msgstr ""
+msgstr "Kein Typ gewählt"
 
 #: plugins/quota_management/www/index.php:65
 msgid "No ID specified"
-msgstr ""
+msgstr "Keine ID gewählt"
 
 #: plugins/quota_management/www/quota.php:33
 #: plugins/quota_management/www/quota_admin.php:34 www/admin/vhost.php:111
@@ -7691,12 +7802,12 @@
 #: plugins/quota_management/www/quota.php:216
 #: plugins/quota_management/www/quota_admin.php:101
 msgid "disk quota soft"
-msgstr ""
+msgstr "Disk Quote weich"
 
 #: plugins/quota_management/www/quota.php:219
 #: plugins/quota_management/www/quota_admin.php:102
 msgid "disk quota hard"
-msgstr ""
+msgstr "Disk Quote hart"
 
 #: plugins/quota_management/www/quota.php:263
 #: plugins/quota_management/www/quota.php:267
@@ -7742,7 +7853,7 @@
 #: plugins/quota_management/www/quota_admin.php:53
 #, fuzzy
 msgid "Input error: Hard quota must be greater than soft quota"
-msgstr "Eingabefehler: Hard quota muss größer als soft quota sein."
+msgstr "Eingabefehler: Hard quota muß größer als soft quota sein."
 
 #: plugins/quota_management/www/quota_admin.php:62
 #, fuzzy
@@ -7837,8 +7948,8 @@
 #: plugins/scmcvs/common/CVSPlugin.class.php:171
 #: plugins/scmdarcs/common/DarcsPlugin.class.php:216
 #: plugins/scmsvn/common/SVNPlugin.class.php:216 www/pm/index.php:103
-#: www/pm/mod_task.php:399 www/pm/templates/time_tracking.php:64
-#: www/stats/site_stats_utils.php:285 www/tracker/ind.php:63
+#: www/pm/templates/time_tracking.php:66 www/stats/site_stats_utils.php:285
+#: www/tracker/ind.php:63
 msgid "Total"
 msgstr "Gesamt"
 
@@ -7922,7 +8033,7 @@
 #: plugins/scmbzr/common/BzrPlugin.class.php:95
 #: plugins/scmbzr/common/BzrPlugin.class.php:103
 msgid "Developer Bazaar Access via SSH"
-msgstr ""
+msgstr "Bazaar Entwicklerzugang über SSH"
 
 #: plugins/scmbzr/common/BzrPlugin.class.php:98
 #, fuzzy
@@ -7999,7 +8110,7 @@
 "Mounten Sie die VOB entweder mit einem <tt>Cleartool Mount%1$s</tt> oder "
 "wählen Sie die <tt>%1$s</tt> VOB in Ihrem ClearCase Explorer."
 
-#: plugins/scmccase/common/CCasePlugin.class.php:111 www/tracker/item.php:449
+#: plugins/scmccase/common/CCasePlugin.class.php:111 www/tracker/item.php:440
 msgid "History"
 msgstr "Verlauf"
 
@@ -8079,7 +8190,7 @@
 #: plugins/scmcvs/common/CVSPlugin.class.php:91
 #: plugins/scmcvs/common/CVSPlugin.class.php:100
 msgid "Developer CVS Access via SSH"
-msgstr ""
+msgstr "CVS Entwicklerzugang über SSH"
 
 #: plugins/scmcvs/common/CVSPlugin.class.php:93
 #, fuzzy
@@ -8104,7 +8215,7 @@
 msgstr ""
 "<p><b>CVS Entwicklerzugang über SSH</b></p><p>Ausschliesslich "
 "Projektentwickler können mit dieser Methode auf den CVS Baum zugreifen. SSH "
-"muss auf Ihrem Client-Rechner installiert sein. Ersetzen Sie <i>modulename</"
+"muß auf Ihrem Client-Rechner installiert sein. Ersetzen Sie <i>modulename</"
 "i> und <i>developername</i> durch die korrekten Werte. Geben Sie nach der "
 "Aufforderung Ihr Site-Passwort ein.</p>"
 
@@ -8145,7 +8256,7 @@
 #: plugins/scmdarcs/common/DarcsPlugin.class.php:198
 #: plugins/scmsvn/common/SVNPlugin.class.php:198
 #: utils/fixscripts/populate_template_project.php:188
-#: www/activity/index.php:107 www/stats/site_stats_utils.php:303
+#: www/activity/index.php:122 www/stats/site_stats_utils.php:303
 msgid "Commits"
 msgstr "Commits"
 
@@ -8174,20 +8285,20 @@
 
 #: plugins/scmdarcs/common/DarcsPlugin.class.php:110
 msgid "<p>where REPO can be: "
-msgstr ""
+msgstr "<p>Ort der REPO:"
 
 #: plugins/scmdarcs/common/DarcsPlugin.class.php:110
 #: plugins/scmdarcs/common/DarcsPlugin.class.php:615
 msgid ", "
-msgstr ""
+msgstr ","
 
 #: plugins/scmdarcs/common/DarcsPlugin.class.php:115
 msgid "<p><em>No repositories defined.</em></p>"
-msgstr ""
+msgstr "<p><em>Keine Ablage definiert.</em></p>"
 
 #: plugins/scmdarcs/common/DarcsPlugin.class.php:119
 msgid "<p><em>Repository not yet created, wait an hour.</em></p>"
-msgstr ""
+msgstr "<p><em>Ablage noch nicht erstellt, warten sie eine Stunde.</em></p>"
 
 #: plugins/scmdarcs/common/DarcsPlugin.class.php:126
 #, fuzzy
@@ -8206,7 +8317,7 @@
 
 #: plugins/scmdarcs/common/DarcsPlugin.class.php:138
 msgid "Developer Darcs Access via SSH"
-msgstr ""
+msgstr "Darcs Entwicklerzugang über SSH"
 
 #: plugins/scmdarcs/common/DarcsPlugin.class.php:163
 #, fuzzy
@@ -8285,12 +8396,16 @@
 "Some of this project's members also have personal Git repositories that can "
 "be checked out anonymously."
 msgstr[0] ""
+"Ein Mitglied des Projekts hat eine persönliche Git-Ablage die Anonym "
+"durchsucht werden kann"
 msgstr[1] ""
+"Manche Mitglieder des Projekts haben eine persönliche Git-Ablage die Anonym "
+"durchsucht werden kann"
 
 #: plugins/scmgit/common/GitPlugin.class.php:112
 #: plugins/scmgit/common/GitPlugin.class.php:131
 msgid "Developer GIT Access via SSH"
-msgstr ""
+msgstr "GIT-Entwicklerzugang über SSH"
 
 #: plugins/scmgit/common/GitPlugin.class.php:115
 #, fuzzy
@@ -8307,7 +8422,7 @@
 #: plugins/scmgit/common/GitPlugin.class.php:121
 #: plugins/scmgit/common/GitPlugin.class.php:140
 msgid "Developer GIT Access via HTTP"
-msgstr ""
+msgstr "GIT-Entwicklerzugang über HTTP"
 
 #: plugins/scmgit/common/GitPlugin.class.php:124
 #: plugins/scmgit/common/GitPlugin.class.php:143
@@ -8336,7 +8451,7 @@
 
 #: plugins/scmgit/common/GitPlugin.class.php:157
 msgid "Access to your personal repository"
-msgstr ""
+msgstr "Zugang zur persönlichen Ablage"
 
 #: plugins/scmgit/common/GitPlugin.class.php:160
 #, fuzzy
@@ -8350,7 +8465,7 @@
 
 #: plugins/scmgit/common/GitPlugin.class.php:168
 msgid "Request a personal repository"
-msgstr ""
+msgstr "Anfrage für eine persönliche Ablage"
 
 #: plugins/scmgit/common/GitPlugin.class.php:171
 msgid ""
@@ -8360,11 +8475,16 @@
 "project's main repository.  Note that the personal repository may take some "
 "time before it is created (less than an hour in most situations)."
 msgstr ""
+"Sie können die Projekt-Ablage in eine persönliche kopieren, in der nur sie "
+"alleine schreiben können. Andere Projektmitglieder haben nur Lesezugriff. "
+"Für Nicht-Projektmitglieder gelten die selben Einstellungen wie in der "
+"Projekt-Ablage. Beachten sie das die Erstellung einer eigenen ablage ihre "
+"Zeit braucht (im Normalfall weniger als eine Stunde)."
 
 #: plugins/scmgit/common/GitPlugin.class.php:174
 #, php-format
 msgid "<a href=\"%s\">Request a personal repository</a>."
-msgstr ""
+msgstr "<a href=\"%s\">Eigene Ablage beantragen</a>."
 
 #: plugins/scmgit/common/GitPlugin.class.php:217
 msgid "Git Repository Browser"
@@ -8390,12 +8510,16 @@
 "You have already requested a personal Git repository for this project.  If "
 "it does not exist yet, it will be created shortly."
 msgstr ""
+"Sie haben bereits um eine persönliche Git-Ablage für dieses Projekt gebeten. "
+"Sollte sie noch nicht existieren wird sie in kürze erstellt."
 
 #: plugins/scmgit/www/index.php:37
 msgid ""
 "You have now requested a personal Git repository for this project.  If will "
 "be created shortly."
 msgstr ""
+"Sie haben um eine persönliche Git-Ablage für dieses Projekt gebeten. Diese "
+"wird in Kürze erstellt werden."
 
 #: plugins/scmhg/common/HgPlugin.class.php:42
 #, fuzzy
@@ -8410,7 +8534,7 @@
 #: plugins/scmhg/common/HgPlugin.class.php:63
 #: plugins/scmhg/common/HgPlugin.class.php:72
 msgid "Developer Mercurial Access via SSH"
-msgstr ""
+msgstr "Entwickler Mercurial Zugang über SSH*"
 
 #: plugins/scmhg/common/HgPlugin.class.php:66
 #, fuzzy
@@ -8470,7 +8594,7 @@
 #: plugins/scmsvn/common/SVNPlugin.class.php:128
 #: plugins/scmsvn/common/SVNPlugin.class.php:147
 msgid "Developer Subversion Access via SSH"
-msgstr ""
+msgstr "Subversionszugang für Entwickler über SSH"
 
 #: plugins/scmsvn/common/SVNPlugin.class.php:131
 #, fuzzy
@@ -8480,14 +8604,14 @@
 msgstr ""
 "<p><b>Subversion Entwicklerzugang über SSH</b></p><p>Ausschliesslich "
 "Projektentwickler können mit dieser Methode auf den SVN - Baum zugreifen. "
-"SSH muss auf Ihrem Client-Rechner installiert sein. Ersetzen Sie "
+"SSH muß auf Ihrem Client-Rechner installiert sein. Ersetzen Sie "
 "<i>developername</i> durch den korrekten Wert. Geben Sie nach der "
 "Aufforderung Ihr Site-Passwort ein.</p>"
 
 #: plugins/scmsvn/common/SVNPlugin.class.php:137
 #: plugins/scmsvn/common/SVNPlugin.class.php:156
 msgid "Developer Subversion Access via DAV"
-msgstr ""
+msgstr "Subversionszugang für Entwickler über DAV"
 
 #: plugins/scmsvn/common/SVNPlugin.class.php:140
 #, fuzzy
@@ -8527,7 +8651,7 @@
 
 #: plugins/scmsvn/common/SVNPlugin.class.php:173
 msgid "Subversion Repository Browser"
-msgstr "Durchsuche Subversion Repository"
+msgstr "Durchsuche Subversions Ablage"
 
 #: plugins/scmsvn/common/SVNPlugin.class.php:175
 #, fuzzy
@@ -8728,6 +8852,8 @@
 "Changing your email address will require confirmation from your new email "
 "address, so that we can ensure we have a good email address on file."
 msgstr ""
+"Eine Änderung der E-Mailadresse erfordert eine Bestätigung von der neuen E-"
+"Mailadresse, um sicher zu stellen das diese auch Korrekt ist."
 
 #: www/account/change_email.php:81
 #, fuzzy
@@ -8738,11 +8864,11 @@
 "do so."
 msgstr ""
 "<p>Das Ändern Ihrer EMail-Adresse erfordert eine Bestätigung von Ihrem neu "
-"angegebenen EMail-Konto aus, damit wir sicherstellen können, dass wir eine "
+"angegebenen EMail-Konto aus, damit wir sicherstellen können, daß wir eine "
 "korrekte EMail-Adresse gespeichert haben.</p><p>Wir müssen für jeden "
 "Benutzer eine korrekte EMail-Adresse pflegen, weil wir über diese die "
 "Zugriffsberechtigung regeln. Falls wir aus projektbezogenen Gründen einen "
-"Benutzer erreichen müssen, ist es wichtig, dass uns das auch möglich ist.</"
+"Benutzer erreichen müssen, ist es wichtig, daß uns das auch möglich ist.</"
 "p>  <p>Durch das Abschicken des unten stehenden Formulars wird Ihnen eine "
 "EMail mit einem Bestätigungs-Link  an Ihre neue EMail-Adresse zugeschickt. "
 "Das Besuchen dieses Links wird die Änderung der EMail-Adresse endgültig "
@@ -8753,6 +8879,9 @@
 "Submitting the form below will mail a confirmation URL to the new email "
 "address. Visiting this link will complete the email change."
 msgstr ""
+"Durch die Benutzung der unten stehenden Formulars wird eine bestätigungs URL "
+"an die neue E-Mailadresse gesand. Mit dem besuchen des Links wird die "
+"Änderung der Adresse bestätigt."
 
 #: www/account/change_email.php:88
 msgid "New Email Address:"
@@ -8843,11 +8972,11 @@
 "the CVS server in your ~/.ssh/authorized_keys file. This is done by a cron "
 "job, so it may not happen immediately.  Please allow for a one hour delay."
 msgstr ""
-"<p>Um zu vermeiden, dass Sie jedesmal Ihr Passwort für ihren CVS/SSH "
+"<p>Um zu vermeiden, daß Sie jedesmal Ihr Passwort für ihren CVS/SSH "
 "Entwickler Account eingeben müssen, können Sie Ihre(n) öffentlichen "
 "Schlüssel hier hochladen und Sie werden auf dem CVS Server in Ihrer ~/.ssh/"
 "authorized_keys Datei abgelegt. Dies wird von einem Cron-Job erledigt, sodaß "
-"dies nicht sofort passieren muss. Bitte geben Sie uns bis zu einer Stunde "
+"dies nicht sofort passieren muß. Bitte geben Sie uns bis zu einer Stunde "
 "Zeit dafür.</p><p>Um einen öffentlichen Schlüssel zu generieren, führen Sie "
 "das Programm 'ssh-keygen' aus (Sie können beide Protokolle 1 oder 2 "
 "benutzen). Der öffentliche Schlüssel wird in '~/.ssh/identity."
@@ -8864,11 +8993,11 @@
 "pub' (protocol version 2). Read the ssh documentation for further "
 "information on sharing keys."
 msgstr ""
-"<p>Um zu vermeiden, dass Sie jedesmal Ihr Passwort für ihren CVS/SSH "
+"<p>Um zu vermeiden, daß Sie jedesmal Ihr Passwort für ihren CVS/SSH "
 "Entwickler Account eingeben müssen, können Sie Ihre(n) öffentlichen "
 "Schlüssel hier hochladen und Sie werden auf dem CVS Server in Ihrer ~/.ssh/"
 "authorized_keys Datei abgelegt. Dies wird von einem Cron-Job erledigt, sodaß "
-"dies nicht sofort passieren muss. Bitte geben Sie uns bis zu einer Stunde "
+"dies nicht sofort passieren muß. Bitte geben Sie uns bis zu einer Stunde "
 "Zeit dafür.</p><p>Um einen öffentlichen Schlüssel zu generieren, führen Sie "
 "das Programm 'ssh-keygen' aus (Sie können beide Protokolle 1 oder 2 "
 "benutzen). Der öffentliche Schlüssel wird in '~/.ssh/identity."
@@ -8882,9 +9011,9 @@
 "except between keys. After submitting, verify that the number of keys in "
 "your file is what you expected.</em>"
 msgstr ""
-"Authorisierte Schlüssel:<br /><em>Wichtig: Stellen Sie sicher, dass es keine "
+"Authorisierte Schlüssel:<br /><em>Wichtig: Stellen Sie sicher, daß es keine "
 "Zeilenumbrüche, außer zwischen Schlüsseln, gibt. Nach Bestätigung überprüfen "
-"Sie, dass die Anzahl der Schlüssel in Ihrer Datei wie erwartet ist.</em>"
+"Sie, daß die Anzahl der Schlüssel in Ihrer Datei wie erwartet ist.</em>"
 
 #: www/account/first.php:31
 #, php-format
@@ -8892,6 +9021,8 @@
 "You are now a registered user on %1$s, the online development environment "
 "for Open Source projects."
 msgstr ""
+"Sie sind nun ein registrierter Benutzer auf %1$s, die online "
+"Entwicklungsplattform für Open Source Projekte."
 
 #: www/account/first.php:33
 #, fuzzy, php-format
@@ -8924,7 +9055,7 @@
 msgstr "Aktualisiert"
 
 #: www/account/index.php:101 www/account/index.php:106
-#: www/include/html.php:931
+#: www/include/html.php:928
 msgid "Account Maintenance"
 msgstr "Accountverwaltung"
 
@@ -9128,6 +9259,9 @@
 "You've been redirected to this login page because you have tried accessing a "
 "page that was not available to you as an anonymous user."
 msgstr ""
+"Sie wurden auf diese Anmeldeseite weitergeleitet weil sie eine Seite "
+"versucht haben zu besuchen, die als anonymer Benutzer nicht eingesehen "
+"werden kann."
 
 #: www/account/login.php:128
 msgid "Cookies must be enabled past this point."
@@ -9240,6 +9374,8 @@
 "Hey... losing your password is serious business. It compromises the security "
 "of your account, your projects, and this site."
 msgstr ""
+"Hey... das Passwort zu verlieren ist ernst. Es kompromitiert die Sicherheit "
+"ihres Zugangs, ihrer Projekte und dieser Seite."
 
 #: www/account/lostpw.php:83
 #, fuzzy
@@ -9340,7 +9476,7 @@
 #: www/account/register.php:112
 #, php-format
 msgid "You have registered the %1$s account on %2$s."
-msgstr ""
+msgstr "Das Konto %1$s wurde auf %2$s registriert."
 
 #: www/account/register.php:116
 #, fuzzy
@@ -9491,29 +9627,38 @@
 "<p>Melden Sie sich jetzt an, um Ihre Registrierung zu vervollständigen. Ihr "
 "Account wird dann für normale Anmeldungen aktiviert sein.</p>"
 
-#: www/activity/index.php:90
+#: www/activity/index.php:89 www/project/stats/index.php:89
+#, fuzzy
+msgid "Statistics"
+msgstr "Benutze Statistiken"
+
+#: www/activity/index.php:91 www/project/stats/index.php:91
+msgid "-tooltip:stats"
+msgstr ""
+
+#: www/activity/index.php:105
 msgid "Forum Post"
 msgstr "Foren Eintrag"
 
-#: www/activity/index.php:95
+#: www/activity/index.php:110
 msgid "Tracker Opened"
 msgstr "Tracker Geöffnet"
 
-#: www/activity/index.php:97
+#: www/activity/index.php:112
 msgid "Tracker Closed"
 msgstr "Tracker Geschlossen"
 
-#: www/activity/index.php:112 www/activity/index.php:289
+#: www/activity/index.php:127 www/activity/index.php:304
 msgid "FRS Release"
 msgstr "FRS Freigabe/Version"
 
-#: www/activity/index.php:153
+#: www/activity/index.php:168
 #, fuzzy
 msgid "Invalid Data Passed to query"
 msgstr "Ungültiges Passwort:"
 
-#: www/activity/index.php:165 www/frs/reporting/downloads.php:96
-#: www/project/stats/index.php:105 www/reporting/groupadded.php:61
+#: www/activity/index.php:180 www/frs/reporting/downloads.php:96
+#: www/project/stats/index.php:111 www/reporting/groupadded.php:61
 #: www/reporting/groupcum.php:60 www/reporting/projectact.php:65
 #: www/reporting/projecttime.php:76 www/reporting/siteact.php:65
 #: www/reporting/sitetime.php:73 www/reporting/sitetimebar.php:60
@@ -9523,8 +9668,8 @@
 msgid "Start"
 msgstr "Start"
 
-#: www/activity/index.php:166 www/frs/reporting/downloads.php:98
-#: www/project/stats/index.php:106 www/reporting/groupadded.php:62
+#: www/activity/index.php:181 www/frs/reporting/downloads.php:98
+#: www/project/stats/index.php:112 www/reporting/groupadded.php:62
 #: www/reporting/groupcum.php:61 www/reporting/projectact.php:66
 #: www/reporting/projecttime.php:77 www/reporting/siteact.php:66
 #: www/reporting/sitetime.php:74 www/reporting/sitetimebar.php:61
@@ -9534,46 +9679,46 @@
 msgid "End"
 msgstr "Ende"
 
-#: www/activity/index.php:182 www/activity/index.php:245
+#: www/activity/index.php:197 www/activity/index.php:260
 msgid "No Activity Found"
 msgstr "Keine Aktivität gefunden"
 
-#: www/activity/index.php:249 www/reporting/projecttime.php:89
+#: www/activity/index.php:264 www/reporting/projecttime.php:89
 #: www/reporting/sitetime.php:88 www/reporting/sitetimebar.php:90
 msgid "Time"
 msgstr "Zeit"
 
-#: www/activity/index.php:251 www/pm/include/ProjectTaskHTML.class.php:207
-#: www/project/admin/project_admin_utils.php:152
-#: www/tracker/include/ArtifactHtml.class.php:87
-#: www/tracker/include/ArtifactTypeHtml.class.php:473
+#: www/activity/index.php:266 www/pm/include/ProjectTaskHTML.class.php:154
+#: www/project/admin/project_admin_utils.php:147
+#: www/tracker/include/ArtifactHtml.class.php:47
+#: www/tracker/include/ArtifactTypeHtml.class.php:202
 msgid "By"
 msgstr "Von"
 
-#: www/activity/index.php:274
+#: www/activity/index.php:289
 msgid "Commit for Tracker Item"
 msgstr "Commit für das Tracker Element"
 
-#: www/activity/index.php:279 www/activity/index.php:284
-#: www/tracker/taskmgr.php:101 www/tracker/taskmgr.php:155
-#: www/tracker/tracker.php:313
+#: www/activity/index.php:294 www/activity/index.php:299
+#: www/tracker/taskmgr.php:103 www/tracker/taskmgr.php:157
+#: www/tracker/tracker.php:314
 msgid "Tracker Item"
 msgstr "Tracker Element"
 
-#: www/activity/index.php:279 www/stats/site_stats_utils.php:288
+#: www/activity/index.php:294 www/stats/site_stats_utils.php:288
 #: www/stats/site_stats_utils.php:290 www/stats/site_stats_utils.php:292
 #: www/stats/site_stats_utils.php:294 www/stats/site_stats_utils.php:298
 msgid "Opened"
 msgstr "Offen"
 
-#: www/activity/index.php:284 www/reporting/usersummary.php:55
+#: www/activity/index.php:299 www/reporting/usersummary.php:55
 #: www/stats/site_stats_utils.php:289 www/stats/site_stats_utils.php:291
 #: www/stats/site_stats_utils.php:293 www/stats/site_stats_utils.php:295
 #: www/stats/site_stats_utils.php:299
 msgid "Closed"
 msgstr "Geschlossen"
 
-#: www/activity/index.php:294
+#: www/activity/index.php:309
 msgid "Forum Post "
 msgstr "Foren Eintrag"
 
@@ -9617,7 +9762,7 @@
 #: www/admin/admin_table.php:144
 #, php-format
 msgid "Are you sure you want to delete this %1$s?"
-msgstr "Sind Sie sicher, dass Sie %1$s löschen wollen?"
+msgstr "Sind Sie sicher, daß Sie %1$s löschen wollen?"
 
 #: www/admin/admin_table.php:173
 #, php-format
@@ -9711,11 +9856,11 @@
 msgid "Reject"
 msgstr "Ablehnen"
 
-#: www/admin/approve-pending.php:171 www/admin/groupedit.php:189
+#: www/admin/approve-pending.php:171 www/admin/groupedit.php:202
 msgid "Home Box:"
 msgstr "Home-Bereich:"
 
-#: www/admin/approve-pending.php:175 www/admin/groupedit.php:199
+#: www/admin/approve-pending.php:175 www/admin/groupedit.php:212
 msgid "HTTP Domain:"
 msgstr "HTTP Domäne:"
 
@@ -9723,7 +9868,7 @@
 msgid "Other Information"
 msgstr "Weitere Informationen"
 
-#: www/admin/approve-pending.php:184 www/admin/groupedit.php:176
+#: www/admin/approve-pending.php:184 www/admin/groupedit.php:189
 #, fuzzy
 msgid "Unix Project Name:"
 msgstr "Neuer Projektname"
@@ -9753,7 +9898,7 @@
 #: www/admin/approve-pending.php:221
 #, php-format
 msgid "Based on template project: %s (%s)"
-msgstr ""
+msgstr "Basiert auf vorlageprojekt: %s (%s)"
 
 #: www/admin/approve-pending.php:236
 msgid "Approve All On This Page"
@@ -9767,11 +9912,11 @@
 #: www/admin/configman.php:35
 #, php-format
 msgid "Configuration from the config API (*.ini files)"
-msgstr ""
+msgstr "Konfiguration auf der API raus (*.ini Datei)"
 
 #: www/admin/configman.php:37
 msgid "Variable"
-msgstr ""
+msgstr "Kennwert"
 
 #: www/admin/configman.php:37
 #, fuzzy
@@ -9780,7 +9925,7 @@
 
 #: www/admin/configman.php:37
 msgid "Result (possibly after interpolation)"
-msgstr ""
+msgstr "Ergebnis (ggf. nach erweiterung)"
 
 #: www/admin/configman.php:53
 #, fuzzy, php-format
@@ -9824,7 +9969,7 @@
 #: www/admin/database.php:102 www/admin/massmail.php:137 www/frs/index.php:186
 #: www/people/editprofile.php:107 www/people/editprofile.php:282
 #: www/people/skills_utils.php:48 www/people/skills_utils.php:156
-#: www/project/stats/index.php:104 www/reporting/groupadded.php:60
+#: www/project/stats/index.php:110 www/reporting/groupadded.php:60
 #: www/reporting/groupcum.php:59 www/reporting/projectact.php:64
 #: www/reporting/projecttime.php:75 www/reporting/projecttime.php:88
 #: www/reporting/siteact.php:64 www/reporting/sitetime.php:72
@@ -9859,7 +10004,7 @@
 
 #: www/admin/globalroledelete.php:43
 msgid "You can only delete a global role from here."
-msgstr ""
+msgstr "Es können nur Globale Rollen von hier gelöscht werden."
 
 #: www/admin/globalroledelete.php:49 www/project/admin/roledelete.php:62
 #, fuzzy
@@ -9873,7 +10018,7 @@
 
 #: www/admin/globalroledelete.php:55
 msgid "Error: Please confirm the deletion of the role."
-msgstr ""
+msgstr "Fehler: Bitte die löschung der Rolle bestätigen."
 
 #: www/admin/globalroleedit.php:81 www/project/admin/roleedit.php:120
 msgid "Successfully Created New Role"
@@ -9896,11 +10041,11 @@
 
 #: www/admin/globalroleedit.php:108
 msgid "Can't add user to this type of role"
-msgstr ""
+msgstr "Kann Benutzer nicht zu dieser Art von Rolle hinzufügen."
 
 #: www/admin/globalroleedit.php:115
 msgid "ERROR: You did not tick the “really remove” box!"
-msgstr ""
+msgstr "FEHLER: Sie haben das Feld \"wirklich entfernen\" nicht bestätigt!"
 
 #: www/admin/globalroleedit.php:123
 #, fuzzy, php-format
@@ -9914,7 +10059,7 @@
 
 #: www/admin/globalroleedit.php:133
 msgid "Can't remove user from this type of role"
-msgstr ""
+msgstr "Kann den Benutzer nicht von seiner Rolle entheben"
 
 #: www/admin/globalroleedit.php:143
 #, fuzzy
@@ -9930,7 +10075,7 @@
 
 #: www/admin/globalroleedit.php:172
 msgid "Really remove ticked users from role?"
-msgstr ""
+msgstr "Den Benutzer wirklich seiner Rolle entheben?"
 
 #: www/admin/globalroleedit.php:179
 #, fuzzy
@@ -9950,7 +10095,7 @@
 
 #: www/admin/globalroleedit.php:206
 msgid "Public role (can be referenced by projects)"
-msgstr ""
+msgstr "Öffentliche Rolle (kann durch Projekte verwiesen werden)"
 
 #: www/admin/globalroleedit.php:211 www/project/admin/roleedit.php:183
 msgid "Section"
@@ -9965,7 +10110,7 @@
 msgstr "Einstellungen"
 
 #: www/admin/globalroleedit.php:254 www/admin/globalroleedit.php:256
-#: www/project/admin/users.php:426
+#: www/project/admin/users.php:452
 #, fuzzy
 msgid "Delete role"
 msgstr "Datei löschen"
@@ -10021,29 +10166,37 @@
 msgid "Holding (H)"
 msgstr "Haltend (H)"
 
-#: www/admin/groupedit.php:136 www/admin/grouplist.php:93
+#: www/admin/groupedit.php:137
+#, php-format
+msgid ""
+"With PFO-RBAC, the “is_public” property is gone. Instead, to make a project "
+"public, <%1$s>link<%2$s> the global role “Anonymous/not logged in” then <"
+"%3$s>give<%4$s> it “Project visibility” permissions."
+msgstr ""
+
+#: www/admin/groupedit.php:148 www/admin/grouplist.php:93
 msgid "Public?"
 msgstr "Öffentlich?"
 
-#: www/admin/groupedit.php:156 www/admin/grouplist.php:96
+#: www/admin/groupedit.php:169 www/admin/grouplist.php:96
 #, fuzzy
 msgid "Template?"
 msgstr "Template auswählen"
 
-#: www/admin/groupedit.php:208
+#: www/admin/groupedit.php:221
 msgid "Registration Application:"
 msgstr "Projektbeschreibung:"
 
-#: www/admin/groupedit.php:218
+#: www/admin/groupedit.php:231
 msgid "SCM Box:"
 msgstr "SCM Box:"
 
-#: www/admin/groupedit.php:230
+#: www/admin/groupedit.php:243
 msgid "Resend New Project Instruction Email"
 msgstr "Sende erneut neue Email mit Projekt-Anweisungen"
 
-#: www/admin/grouplist.php:27 www/include/Layout.class.php:1342
-#: www/themes/evolvis/Theme.class.php:539
+#: www/admin/grouplist.php:27 www/include/Layout.class.php:1348
+#: www/themes/evolvis/Theme.class.php:540
 msgid "Project List"
 msgstr "Projektliste"
 
@@ -10116,7 +10269,7 @@
 msgid "Edit Role"
 msgstr "Rolle bearbeiten"
 
-#: www/admin/index.php:94 www/project/admin/users.php:440
+#: www/admin/index.php:94 www/project/admin/users.php:477
 #, fuzzy
 msgid "Create Role"
 msgstr "Erstellen"
@@ -10177,7 +10330,7 @@
 
 #: www/admin/index.php:159
 msgid "Pending news (moderation for front-page)"
-msgstr ""
+msgstr "Ankommente Nachricht (Moderation für front-page)"
 
 #: www/admin/index.php:164
 msgid "Site-Wide Stats"
@@ -10247,7 +10400,7 @@
 
 #: www/admin/massmail.php:45
 msgid "Target Audience"
-msgstr ""
+msgstr "Zielgruppe"
 
 #: www/admin/massmail.php:50
 #, fuzzy
@@ -10284,7 +10437,7 @@
 "submitting it WILL lead to sending email to lots of users."
 msgstr ""
 "Seien Sie <span class=\"important\">SEHR</span> vorsichtig mit diesem "
-"Formular, da es beim abschicken dafür sorgt, dass eine MENGE Nutzer E-Mails "
+"Formular, da es beim abschicken dafür sorgt, daß eine MENGE Nutzer E-Mails "
 "erhalten."
 
 #: www/admin/massmail.php:97
@@ -10330,8 +10483,8 @@
 #: www/admin/massmail.php:136 www/admin/search.php:89 www/admin/search.php:167
 #: www/my/dashboard.php:61 www/pm/include/ProjectTaskHTML.class.php:114
 #: www/pm/index.php:99 www/project/admin/editimages.php:265
-#: www/tracker/admin/form-addcanned.php:41 www/tracker/browse.php:188
-#: www/tracker/browse.php:622 www/tracker/query.php:192
+#: www/tracker/admin/form-addcanned.php:41 www/tracker/browse.php:319
+#: www/tracker/browse.php:641 www/tracker/query.php:195
 msgid "ID"
 msgstr "ID"
 
@@ -10341,7 +10494,7 @@
 
 #: www/admin/massmail.php:167
 msgid "No deliveries active."
-msgstr ""
+msgstr "Keine Übertragung aktiv."
 
 #: www/admin/passedit.php:53
 msgid "Error: You must supply valid password (at least 6 chars)"
@@ -10416,12 +10569,10 @@
 msgstr "Gepostet für Gruppe"
 
 #: www/admin/pending-news.php:148 www/my/dashboard.php:73
-#: www/news/admin/index.php:135 www/pm/detail_task.php:39
-#: www/pm/include/ProjectTaskHTML.class.php:164 www/pm/mod_task.php:119
-#: www/pm/templates/detail_template.php:69
+#: www/news/admin/index.php:135 www/pm/templates/detail_template.php:64
 #: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:57
 #: www/search/include/renderers/TrackersHtmlSearchRenderer.class.php:50
-#: www/tracker/browse.php:638 www/tracker/item.php:204
+#: www/tracker/browse.php:657 www/tracker/item.php:211
 msgid "Submitted by"
 msgstr "Gepostet von"
 
@@ -10435,9 +10586,11 @@
 
 #: www/admin/pending-news.php:156 www/my/diary.php:185
 #: www/news/admin/index.php:145 www/news/submit.php:153
-#: www/pm/browse_task.php:483 www/pm/include/pm_columns.php:43
-#: www/pm/templates/detail_template.php:12
-#: www/pm/templates/detail_template.php:117 www/tracker/item.php:131
+#: www/pm/browse_task.php:424 www/pm/include/ProjectView.class.php:295
+#: www/pm/include/ProjectView.class.php:299
+#: www/pm/include/ProjectView.class.php:303
+#: www/pm/include/ProjectView.class.php:308 www/pm/include/pm_columns.php:43
+#: www/pm/templates/detail_template.php:7 www/tracker/item.php:138
 msgid "Details"
 msgstr "Details"
 
@@ -10482,12 +10635,18 @@
 "plugins/ folder. Then, you should activate them also per project, per user "
 "or whatever the plugin specifically applies to."
 msgstr ""
+"Hier können sie Seitenweit Plugins aktivieren / deaktivieren welche sich im "
+"Plugin-Ordner befinden. Danach sollten sie diese für das Projekt, den "
+"Benutzer oder was auch immer das Plugin verlangt aktivieren."
 
 #: www/admin/pluginman.php:115
 msgid ""
 "Be careful because some projects/users can be using the plugin. Deactivating "
 "it will remove the plugin from all users/projects."
 msgstr ""
+"Vorsicht beim Deaktivieren von Plugins, andere Benutzer/Projekte können "
+"diese benutzen. Plugins dekativieren entfernd sie von allen Benutzern und "
+"Projekten."
 
 #: www/admin/pluginman.php:117
 msgid "Plugin Name"
@@ -10495,8 +10654,8 @@
 
 #: www/admin/pluginman.php:119 www/people/people_utils.php:158
 #: www/people/people_utils.php:299 www/project/admin/users.php:316
-#: www/project/admin/users.php:396 www/project/admin/users.php:459
-#: www/project/admin/users.php:483
+#: www/project/admin/users.php:406 www/project/admin/users.php:494
+#: www/project/admin/users.php:518
 msgid "Action"
 msgstr "Aktion"
 
@@ -11062,7 +11221,7 @@
 
 #: www/developer/monitor.php:45
 msgid "Monitor a User"
-msgstr "Überwache einen Benutzer"
+msgstr "Beobachte einen Benutzer"
 
 #: www/developer/monitor.php:60
 msgid "Error inserting into user_diary_monitor"
@@ -11070,11 +11229,11 @@
 
 #: www/developer/monitor.php:62
 msgid "User is now being monitored"
-msgstr "Der Benutzer wird nun überwacht"
+msgstr "Der Benutzer wird nun beobachtet"
 
 #: www/developer/monitor.php:63
 msgid "You will now be emailed this user's diary entries."
-msgstr ""
+msgstr "Sie bekommen ab jetzt die Beiträge des Benutzers per E-Mail zugesand"
 
 #: www/developer/monitor.php:64
 #, fuzzy
@@ -11083,12 +11242,12 @@
 "again."
 msgstr ""
 "<p>Sie werden nun die Terminkalendereinträge dieses Benutzers per Email "
-"bekommen.</p><p>Um die Überwachung zu beenden, klicken Sie einfach wieder "
-"auf den <strong>Überwache Benutzer</strong>-Link.</p>"
+"bekommen.</p><p>Um die Beobachtung zu beenden, klicken Sie einfach wieder "
+"auf den <strong>Beobachte Benutzer</strong>-Link.</p>"
 
 #: www/developer/monitor.php:71
 msgid "Monitoring has been turned off"
-msgstr "Die Überwachung wurde beendet."
+msgstr "Die Beobachtung wurde beendet."
 
 #: www/developer/monitor.php:72
 msgid "You will not receive any more emails from this user"
@@ -11096,7 +11255,7 @@
 
 #: www/developer/monitor.php:77
 msgid "Error - Choose a User To Monitor First"
-msgstr "Fehler - Wählen Sie zuerst einen Benutzer zum Überwachen aus"
+msgstr "Fehler - Wählen Sie zuerst einen Benutzer zum Beobachten aus"
 
 #: www/developer/rate.php:34
 #, fuzzy
@@ -11148,15 +11307,15 @@
 
 #: www/docman/view.php:102
 msgid "Unable to open zip archive for backup"
-msgstr ""
+msgstr "Nicht möglich Zip-Archiv für Backup zu öffnen"
 
 #: www/docman/view.php:106
 msgid "Unable to fill zip archive for backup"
-msgstr ""
+msgstr "Nicht möglich Zip-Archiv für Backup zu füllen"
 
 #: www/docman/view.php:109
 msgid "Unable to close zip archive for backup"
-msgstr ""
+msgstr "Nicht möglich Zip-Archiv für Backup zu schließen"
 
 #: www/docman/view.php:117
 #, fuzzy
@@ -11165,11 +11324,11 @@
 
 #: www/docman/view.php:129
 msgid "Webdav Access Canceled by user"
-msgstr ""
+msgstr "Webdav Zugang vom Benutzer beendet"
 
 #: www/docman/view.php:135
 msgid "No webdav interface enabled."
-msgstr ""
+msgstr "Keine webdav Oberfläche freigeschaltet"
 
 #: www/docman/view.php:139
 msgid "No document to display - invalid or inactive document number."
@@ -11241,7 +11400,6 @@
 msgstr "Details:"
 
 #: www/export/rssAboTask.php:161 www/news/news_utils.php:183
-#: www/pm/include/ProjectTaskHTML.class.php:162
 msgid "Comment"
 msgstr "Kommentar"
 
@@ -11349,7 +11507,7 @@
 "You can adjust forum features from here. Please note that private forums can "
 "still be viewed by members of your project, not the general public."
 msgstr ""
-"Sie können hier Foren-Merkmale einstellen. Bitte beachten Sie, dass private "
+"Sie können hier Foren-Merkmale einstellen. Bitte beachten Sie, daß private "
 "Foren von Mitgliedern Ihres Projektes weiterhin gelesen werden können, aber "
 "nicht von der allgemeinen Öffentlichkeit."
 
@@ -11454,16 +11612,14 @@
 
 #: www/forum/admin/index.php:482 www/forum/admin/monitor.php:48
 msgid "Monitoring Users"
-msgstr "Überwache Benutzer"
+msgstr "Beobachte Benutzer"
 
 #: www/forum/admin/monitor.php:56
-#, fuzzy
 msgid "No Monitoring Users"
-msgstr "Überwache Benutzer"
+msgstr ""
 
-#: www/forum/admin/monitor.php:61 www/pm/mod_task.php:340
-#: www/pm/templates/time_tracking.php:8 www/reporting/useract.php:77
-#: www/reporting/usertime.php:88
+#: www/forum/admin/monitor.php:61 www/pm/templates/time_tracking.php:8
+#: www/reporting/useract.php:77 www/reporting/usertime.php:88
 msgid "User"
 msgstr "Benutzer"
 
@@ -11497,7 +11653,7 @@
 
 #: www/forum/attachment.php:42 www/forum/attachment.php:126
 #: www/forum/attachment.php:154
-#: www/tracker/include/ArtifactTypeHtml.class.php:468
+#: www/tracker/include/ArtifactTypeHtml.class.php:196
 msgid "Attachments"
 msgstr "Anhänge"
 
@@ -11513,7 +11669,7 @@
 msgid "You cannot edit this attachment"
 msgstr "Sie können diesen Anhang nicht bearbeiten"
 
-#: www/forum/attachment.php:149
+#: www/forum/attachment.php:149 www/include/helppage.php:42
 msgid "Close Window"
 msgstr "Fenster schließen"
 
@@ -11779,7 +11935,7 @@
 
 #: www/frs/admin/editrelease.php:193
 msgid "File not deleted: you did not check \"I'm Sure\""
-msgstr ""
+msgstr "Datei nicht gelöscht: Sie haben nicht \"Ich bin mir sicher\" bestätigt"
 
 #: www/frs/admin/editrelease.php:209
 msgid "File Updated"
@@ -11847,7 +12003,7 @@
 
 #: www/frs/admin/editrelease.php:282
 msgid "Now, choose a file to upload into the system."
-msgstr ""
+msgstr "Datei wählen um sie hochzuladen."
 
 #: www/frs/admin/editrelease.php:290 www/frs/admin/qrs.php:205
 #, php-format
@@ -12182,11 +12338,12 @@
 
 #: www/frs/index.php:136
 msgid "Download latest release as zip:"
-msgstr ""
+msgstr "Neuste zip-Datei herrunterladen:"
 
 #: www/frs/index.php:139
 msgid "This link always points to the newest release as a zip file."
 msgstr ""
+"Dieser Link verwesit immer auf die neuste als zip-Datei veröffentlichte Datei"
 
 #: www/frs/index.php:184
 #, fuzzy
@@ -12210,29 +12367,29 @@
 
 #: www/frs/monitor.php:58
 msgid "Monitoring Has Been Stopped"
-msgstr "Überwachung wurde gestoppt"
+msgstr "Beobachtung wurde gestoppt"
 
 #: www/frs/monitor.php:59
 msgid "Monitoring stopped"
-msgstr "Überwachung gestoppt"
+msgstr "Beobachtung gestoppt"
 
 #: www/frs/monitor.php:66
 msgid "Monitoring Has Been Started"
-msgstr "Überwachung wurde gestartet"
+msgstr "Beobachtung wurde gestartet"
 
 #: www/frs/monitor.php:67
 msgid "Monitoring started"
-msgstr "Überwachung gestartet"
+msgstr "Beobachtung gestartet"
 
 #: www/frs/monitor.php:72
 msgid "File Module ID"
-msgstr ""
+msgstr "Datenmodul ID"
 
 #: www/frs/reporting/downloads.php:84
 msgid "File Release Reporting"
 msgstr "Datenfreigabe Melden"
 
-#: www/frs/reporting/downloads.php:100 www/project/stats/index.php:107
+#: www/frs/reporting/downloads.php:100 www/project/stats/index.php:113
 #: www/reporting/groupadded.php:63 www/reporting/groupcum.php:62
 #: www/reporting/projectact.php:67 www/reporting/projecttime.php:78
 #: www/reporting/siteact.php:67 www/reporting/sitetime.php:77
@@ -12260,47 +12417,47 @@
 msgid "Release Name:"
 msgstr "Versionsname:"
 
-#: www/include/Layout.class.php:136
+#: www/include/Layout.class.php:137
 #, fuzzy
 msgid "Can't find theme directory!"
 msgstr "Konnte Datei nicht ins Zielverzeichnis kopieren"
 
-#: www/include/Layout.class.php:289 www/themes/evolvis/Theme.class.php:106
+#: www/include/Layout.class.php:290 www/themes/evolvis/Theme.class.php:106
 msgid "en"
 msgstr "de"
 
-#: www/include/Layout.class.php:668
+#: www/include/Layout.class.php:673
 msgid "Quick Jump To..."
 msgstr "Schnellwechsel nach…"
 
-#: www/include/Layout.class.php:1266
+#: www/include/Layout.class.php:1272
 msgid "Close"
 msgstr "Schließen"
 
-#: www/include/Layout.class.php:1268
+#: www/include/Layout.class.php:1274
 msgid "Maximise"
 msgstr "Maximieren"
 
-#: www/include/Layout.class.php:1270
+#: www/include/Layout.class.php:1276
 msgid "Minimise"
 msgstr "Minimieren"
 
-#: www/include/Layout.class.php:1330
+#: www/include/Layout.class.php:1336
 msgid "Tag cloud"
 msgstr "Tag Wolke"
 
-#: www/include/Layout.class.php:1332
+#: www/include/Layout.class.php:1338
 msgid "Display all public projects by their tags"
-msgstr ""
+msgstr "Zeige alle Projekte anhand ihrer Tags"
 
-#: www/include/Layout.class.php:1338
+#: www/include/Layout.class.php:1344
 #, fuzzy
 msgid "Display all public projects as trove tree"
 msgstr "Zeige vollständige Projektliste/Bearbeite Projekte"
 
-#: www/include/Layout.class.php:1344 www/themes/evolvis/Theme.class.php:540
+#: www/include/Layout.class.php:1350 www/themes/evolvis/Theme.class.php:541
 msgid "Display an alphabetically sorted list of all public projects"
-msgstr ""
+msgstr "Zeige eine alphabetisch sortierte Liste aller Projekte an"
 
 #: www/include/features_boxes.php:40
 msgid "Tag Cloud"
@@ -12380,16 +12537,16 @@
 #: www/include/filechecks.php:62
 #, php-format
 msgid "Failed tar/gz integrity check. Output follows: <p>$s</p>"
-msgstr ""
+msgstr "Fehlgeschlagene tar/gz Intigritätsprüfung. Ausgabe folgt: <p>$s</p>"
 
 #: www/include/filechecks.php:77
 #, php-format
 msgid "Failed gzip integrity check. Output follows: <p>$s</p>"
-msgstr ""
+msgstr "Fehlgeschlagene gzip Intigritätsprüfung. Ausgabe folgt: <p>$s</p>"
 
 #: www/include/filechecks.php:170
 msgid "This file does not have a system-recognized filename type."
-msgstr ""
+msgstr "Die Datei hat keinen vom System erkannten Datentyp."
 
 #: www/include/filechecks.php:174
 #, fuzzy
@@ -12400,25 +12557,32 @@
 #, php-format
 msgid "File does not exist. File %s is not in incoming FTP directory."
 msgstr ""
+"Datei existiert nicht. Die Datei %s ist nicht auf dem eingehenden FTP "
+"Verzeichnis"
 
-#: www/include/html.php:348 www/include/html.php:500 www/include/html.php:762
-#: www/pm/browse_task.php:631 www/pm/browse_task.php:656
-#: www/pm/browse_task.php:667 www/tracker/browse.php:810
-#: www/tracker/browse.php:818 www/tracker/browse.php:827
-msgid "No Change"
-msgstr "Keine Änderung"
+#: www/include/help.php:40
+msgid "Mehr Info…"
+msgstr "Mehr Info…"
 
-#: www/include/html.php:357
+#: www/include/help.php:51
 msgid ""
 "This drop-down box represents the person to which a tracker item is assigned."
 msgstr ""
-"Diese Drop-Down-Box dient der Zuordnung eines Tracker-Items zu einem Bearbeiter."
+"Diese Drop-Down-Box dient der Zuordnung eines Tracker-Items zu einem "
+"Bearbeiter."
 
-#: www/include/html.php:359
+#: www/include/help.php:56
+#, fuzzy
+msgid "This drop-down box represents the current status of a tracker item."
+msgstr ""
+"Diese Drop-Down-Box dient der Zuordnung eines Tracker-Items zu einem "
+"Bearbeiter."
+
+#: www/include/help.php:57
+#, fuzzy
 msgid ""
-"This drop-down box represents the current status of a tracker item.<br /"
-"><br />You can set the status to 'Pending' if you are waiting for a response "
-"from the tracker item author.  When the author responds the status is "
+"You can set the status to 'Pending' if you are waiting for a response from "
+"the tracker item author.  When the author responds the status is "
 "automatically reset to that of 'Open'. Otherwise, if the author doesn't "
 "respond with an admin-defined amount of time (default is 14 days) then the "
 "item is given a status of 'Deleted'."
@@ -12430,34 +12594,38 @@
 "Andernfalls, wenn der Autor nicht in der vom Administrator vorgegebenen Zeit "
 "antwortet (vorgegeben sind 14 Tage), dann wechselt der Status zu 'Gelöscht'."
 
-#: www/include/html.php:361
+#: www/include/help.php:62
 msgid "Tracker category"
 msgstr "Tracker Kategorie"
 
-#: www/include/html.php:363
+#: www/include/help.php:66
 msgid "Tracker group"
 msgstr "Tracker Gruppe"
 
-#: www/include/html.php:365
+#: www/include/help.php:71
 msgid ""
 "The Sort By option allows you to determine how the browse results are sorted."
-"<br /><br />  You can sort by ID, Priority, Summary, Open Date, Close Date, "
-"Submitter, or Assignee.  You can also have the results sorted in Ascending "
-"or Descending order."
 msgstr ""
+
+#: www/include/help.php:72
+#, fuzzy
+msgid ""
+"You can sort by ID, Priority, Summary, Open Date, Close Date, Submitter, or "
+"Assignee.  You can also have the results sorted in Ascending or Descending "
+"order."
+msgstr ""
 "Die Sortieroption erlaubt Ihnen zu bestimmen, wie die Browse-Ergebnisse "
 "sortiert werden.<br /><br />  Sie können nach ID, Priorität, "
 "Zusammenfassung, Eröffnungsdatum, Schließdatum, Einsender oder nach dem "
 "Verantworlichem sortieren.  Sie können die Ergebnisse auch nach "
 "aufsteigender- oder absteigender Reihenfolge sortieren."
 
-#: www/include/html.php:367
+#: www/include/help.php:78
+#, fuzzy
 msgid ""
 "The Data Type option determines the type of tracker item this is.  Since the "
 "tracker rolls into one the bug, patch, support, etc... managers you need to "
-"be able to determine which one of these an item should belong.<br /><br /"
-">This has the added benefit of enabling an admin to turn a support request "
-"into a bug."
+"be able to determine which one of these an item should belong."
 msgstr ""
 "Die Datentyp-Option entscheidet, was es für ein Tracker-Element ist.  Da der "
 "Tracker zwichen Bug, Patch, Support, etc unterscheidet, sollten Manager "
@@ -12465,23 +12633,39 @@
 "<br /><br />Dies hat den Vorteil, daß ein Administrator bevollmächtigt wird, "
 "eine Support-Anfrage in einen Bug umzuwandeln."
 
-#: www/include/html.php:369
+#: www/include/help.php:79
 msgid ""
+"This has the added benefit of enabling an admin to turn a support request "
+"into a bug."
+msgstr ""
+
+#: www/include/help.php:85
+#, fuzzy
+msgid ""
 "The priority option allows a user to define a tracker item priority (ranging "
-"from 1-Lowest to 5-Highest).<br /><br />This is especially helpful for bugs "
-"and support requests where a user might find a critical problem with a "
-"project."
+"from 1-Lowest to 5-Highest)."
 msgstr ""
 "Die Prioritätsoption erlaubt einem Benutzer eine Priortiät für ein Tracker-"
 "Element zu definieren (von 1-niedrigste bis 5-höchste).<br /><br />Dies ist "
 "besonders hilfreich bei Bugs und Support-Bitten, wo ein Benutzer ein "
 "kritisches Problem in einem Projekt finden kann."
 
-#: www/include/html.php:371 www/pm/ganttpage.php:159
+#: www/include/help.php:86
+#, fuzzy
+msgid ""
+"This is especially helpful for bugs and support requests where a user might "
+"find a critical problem with a project."
+msgstr ""
+"Die Prioritätsoption erlaubt einem Benutzer eine Priortiät für ein Tracker-"
+"Element zu definieren (von 1-niedrigste bis 5-höchste).<br /><br />Dies ist "
+"besonders hilfreich bei Bugs und Support-Bitten, wo ein Benutzer ein "
+"kritisches Problem in einem Projekt finden kann."
+
+#: www/include/help.php:91 www/pm/ganttpage.php:159
 msgid "Resolution"
 msgstr "Auflösung"
 
-#: www/include/html.php:373
+#: www/include/help.php:95
 msgid ""
 "The summary text-box represents a short tracker item summary. Useful when "
 "browsing through several tracker items."
@@ -12489,12 +12673,11 @@
 "Das Zusammenfassungs-Textfeld repräsentiert eine kurze Tracker-Item "
 "Zusammenfassung. Nützlich wenn man durch verschiedene Tracker-Items browst."
 
-#: www/include/html.php:375
+#: www/include/help.php:100
+#, fuzzy
 msgid ""
 "The canned response drop-down represents a list of project admin-defined "
-"canned responses to common support or bug submission.<br /><br /> If you are "
-"a project admin you can click the '(admin)' link to define your own canned "
-"responses"
+"canned responses to common support or bug submission."
 msgstr ""
 "Die vorgespeicherte Antwort repräsentiert eine Liste von Projekt-"
 "Administratoren-definierten vorgespeicherten Antworten auf gängige Support "
@@ -12502,28 +12685,82 @@
 "sind, können Sie auf den '(admin)' Link klicken, um Ihre eigenen "
 "vorgespeicherten Antworten zu definieren."
 
-#: www/include/html.php:377
+#: www/include/help.php:101
 msgid ""
+"If you are a project admin you can click the '(admin)' link to define your "
+"own canned responses"
+msgstr ""
+
+#: www/include/help.php:107
+msgid ""
 "Anyone can add here comments to give additional information, answers and "
 "solutions. Please, be as precise as possible to avoid misunderstanding. If "
 "relevant, screenshots or documents can be added as attached files."
 msgstr ""
+"Jeder kann hier Kommentare hinterlassen für Zusatzinformationen, Antworten "
+"und Lösungen zu geben. Bitte seien Sie so präzise wie möglich um "
+"Missverständnisse zu vermeiden. Wenn wichtig können Screenshots oder "
+"Dokumente als Dateien angehängt werden."
 
-#: www/include/html.php:379
+#: www/include/help.php:108 www/include/help.php:144
+msgid "Detailed formatting help is available in the notepad form."
+msgstr ""
+"Erläuterung zu Formatierungsanweisungen ist im Notizblock-Formular zu sehen."
+
+#: www/include/help.php:114
 #, fuzzy
 msgid "Enter the complete description."
 msgstr "Genaue Beschreibung"
 
-#: www/include/html.php:380
-msgid ""
-"<div align=\"left\"><b>Editing tips:</b><br/><strong>http,https or ftp</"
-"strong>: Hyperlinks.<br/><strong>[#NNN]</strong>: Tracker id NNN.<br/"
-"><strong>[TNNN]</strong>: Task id NNN.<br/><strong>[wiki:<pagename>]</"
-"strong>: Wiki page.<br/><strong>[forum:<msg_id>]</strong>: Forum post."
-"</div>"
+#: www/include/help.php:116
+#, fuzzy
+msgid "Editing tips:"
+msgstr "Existente Dateien"
+
+#: www/include/help.php:119
+msgid "http, https or ftp"
 msgstr ""
 
-#: www/include/html.php:383
+#: www/include/help.php:120
+#, fuzzy
+msgid "Hyperlinks"
+msgstr "Permalink"
+
+#: www/include/help.php:123
+msgid "[#NNN]"
+msgstr ""
+
+#: www/include/help.php:124
+#, fuzzy
+msgid "Tracker ID NNN"
+msgstr "Tracker Element"
+
+#: www/include/help.php:127
+msgid "[TNNN]"
+msgstr ""
+
+#: www/include/help.php:128
+msgid "Task ID NNN"
+msgstr "Aufgaben-ID NNN"
+
+#: www/include/help.php:131
+msgid "[wiki:<pagename>]"
+msgstr ""
+
+#: www/include/help.php:132
+msgid "Wiki page"
+msgstr ""
+
+#: www/include/help.php:135
+msgid "[forum:<msg_id>]"
+msgstr ""
+
+#: www/include/help.php:136
+#, fuzzy
+msgid "Forum post"
+msgstr "Foren Eintrag"
+
+#: www/include/help.php:148
 msgid ""
 "When you wish to attach a file to a tracker item you must check this "
 "checkbox before submitting changes."
@@ -12531,72 +12768,158 @@
 "Wenn Sie einen Anhang an ein Tracker-Element hängen wollen, müssen sie diese "
 "Box markieren, bevor sie Änderungen bestätigen."
 
-#: www/include/html.php:385
+#: www/include/help.php:153
 msgid ""
-"You can monitor or un-monitor this item by clicking the \"Monitor\" button. "
-"<br /><br /><strong>Note!</strong> this will send you additional email. If "
-"you add comments to this item, or submitted, or are assigned this item, you "
-"will also get emails for those reasons as well!"
+"You can monitor or un-monitor this item by clicking the \"Monitor\" button."
 msgstr ""
+
+#: www/include/help.php:154
+#, fuzzy
+msgid "Note!"
+msgstr "Anmerkungen"
+
+#: www/include/help.php:155
+#, fuzzy
+msgid ""
+"This will send you additional eMail. If you add comments to this item, or "
+"submitted, or are assigned this item, you will also get emails for those "
+"reasons as well!"
+msgstr ""
 "Sie können diesen Gegenstand beobachten oder dies stoppen, indem Sie auf den "
 "\"Monitor\" Knopf klicken.<br /><br /><strong>Achtung!</strong> Dadurch "
 "erhalten Sie zusätzliche E-Mails. Wenn Sie diesem Gegenstand Kommentare "
 "hinzufügen, den Gegenstand eingereicht oder beauftragt haben, erhalten Sie "
 "aus diesen Gründen ebenfalls E-Mails."
 
-#: www/include/html.php:765
+#: www/include/help.php:158
+msgid "Browser, in dem der Fehler aufgetaucht ist (mit Version)."
+msgstr ""
+
+#: www/include/help.php:162
+msgid "Einzelne Komponenten des Projekts eintragen."
+msgstr ""
+
+#: www/include/help.php:166
+msgid "Hardware, mit der getestet wurde, als der Bug auftrat."
+msgstr ""
+
+#: www/include/help.php:170
+msgid "Betriebssystem, in dem der Fehler aufgetreten ist."
+msgstr ""
+
+#: www/include/help.php:174
+#, fuzzy
+msgid "Projektname"
+msgstr "Projektname"
+
+#: www/include/help.php:178
+msgid "Bei Browseranwendungen die URL, auf der der Fehler auftrat."
+msgstr ""
+
+#: www/include/help.php:182
+msgid "Versionen des Projekts (wann ist der Bug behoben)"
+msgstr ""
+
+#: www/include/help.php:186
+msgid "Version des Projekts, in der der Bug aufgetreten ist."
+msgstr ""
+
+#: www/include/help.php:190
+msgid ""
+"Meldungsstatus eines Bugeintrags; siehe „Mehr Info…“ für Prozeßspezifikation."
+msgstr ""
+
+#: www/include/help.php:451
+msgid ""
+"Schweregrad eines Bugeintrags; siehe „Mehr Info…“ für Prozeßspezifikation."
+msgstr ""
+
+#: www/include/helppage.php:32
+msgid "Do not call me directly!"
+msgstr "Rufe mich nicht direkt auf!"
+
+#: www/include/helppage.php:35
+#, php-format
+msgid "Forge Help Facility: %s"
+msgstr "Evolvis Hilfedienst: %s"
+
+#: www/include/html.php:350 www/include/html.php:484 www/include/html.php:746
+#: www/pm/browse_task.php:550 www/pm/browse_task.php:575
+#: www/pm/browse_task.php:586 www/tracker/browse.php:829
+#: www/tracker/browse.php:837 www/tracker/browse.php:846
+msgid "No Change"
+msgstr "Keine Änderung"
+
+#: www/include/html.php:749
 msgid "Lowest"
-msgstr "Gering"
+msgstr "Geringstes"
 
-#: www/include/html.php:769
+#: www/include/html.php:753
 msgid "Highest"
-msgstr "Hoch"
+msgstr "Höchstes"
 
-#: www/include/html.php:862
+#: www/include/html.php:846
 #, fuzzy, php-format
 msgid "Project access problem: %s"
 msgstr "Projekt Ressourcennutzung"
 
-#: www/include/html.php:864
+#: www/include/html.php:848
 #, fuzzy, php-format
 msgid "Project Problem: %s"
 msgstr "Projekt %s"
 
-#: www/include/html.php:917 www/my/bookmark_add.php:28
+#: www/include/html.php:901 www/my/bookmark_add.php:28
 msgid "My Personal Page"
 msgstr "Meine persönliche Seite"
 
-#: www/include/html.php:919 www/themes/evolvis/Theme.class.php:127
+#: www/include/html.php:903 www/themes/evolvis/Theme.class.php:127
 msgid "Manage projects, assigned tasks, bugs, etc."
+msgstr "Bearbeite Projekte, stelle Aufgaben, Fehler, usw."
+
+#: www/include/html.php:911
+#, fuzzy
+msgid ""
+"Select widgets to add to the User Summary page from a list of available "
+"widgets"
 msgstr ""
+"Wähle Widgets die zur Projektaufstellung hinzugefügt werden aus einer Liste "
+"verfügbarer Widgets"
 
-#: www/include/html.php:921
+#: www/include/html.php:915 www/include/project_home.php:82
+msgid "Customise number and sizes of columns to use for widgets"
+msgstr ""
+"Benutzerdefinierte Anzahl und Größe der Spalten die in Widgets verwendet "
+"werden."
+
+#: www/include/html.php:918
 #, fuzzy
 msgid "Trackers dashboard"
 msgstr "Tracker aktualisiert"
 
-#: www/include/html.php:923
+#: www/include/html.php:920
 msgid "Have an overview about all tracker items related to you"
 msgstr ""
+"Erhalten sie einen Überblick über alle Tracker-Objekte die für sie relevant "
+"sind"
 
-#: www/include/html.php:926
+#: www/include/html.php:923
 msgid "Diary & Notes"
 msgstr "Terminkalender & Notizen"
 
-#: www/include/html.php:928
+#: www/include/html.php:925
 msgid "-tooltip:diary-and-notes"
 msgstr ""
 
-#: www/include/html.php:933
+#: www/include/html.php:930
 msgid "Change the password, SSH keys; configure account settings"
-msgstr ""
+msgstr "Passwort, SSH-Schlüssel ändern; Benutzerkonteneinstellungen ändern"
 
-#: www/include/html.php:937 www/register/index.php:166
-#: www/themes/evolvis/Theme.class.php:535
+#: www/include/html.php:934 www/register/index.php:166
+#: www/themes/evolvis/Theme.class.php:536
 msgid "Register Project"
 msgstr "Registriere Projekt"
 
-#: www/include/html.php:939 www/themes/evolvis/Theme.class.php:536
+#: www/include/html.php:936 www/themes/evolvis/Theme.class.php:537
 #, fuzzy
 msgid "Register a new Project on the forge"
 msgstr "Neues Projekt registrieren"
@@ -12616,13 +12939,12 @@
 "Select widgets to add to the Project Summary page from a list of available "
 "widgets"
 msgstr ""
+"Wähle Widgets die zur Projektaufstellung hinzugefügt werden aus einer Liste "
+"verfügbarer Widgets"
 
-#: www/include/project_home.php:82
-msgid "Customise number and sizes of columns to use for widgets"
-msgstr ""
-
-#: www/include/tool_reports.php:65 www/pm/index.php:102
-#: www/reporting/usersummary.php:54 www/tracker/ind.php:63
+#: www/include/tool_reports.php:65 www/pm/include/ProjectView.class.php:356
+#: www/pm/index.php:102 www/reporting/usersummary.php:54
+#: www/tracker/ind.php:63
 msgid "Open"
 msgstr "Offen"
 
@@ -12752,7 +13074,7 @@
 "the user and others."
 msgstr ""
 "<p>Wenn Sie diesen Nutzer kennen, nehmen Sie sich bitte einen Moment Zeit um "
-"Ihn/Sie nach den folgenden Kriterien zu bewerten. Bitte beachten Sie dass "
+"Ihn/Sie nach den folgenden Kriterien zu bewerten. Bitte beachten Sie daß "
 "Ihre Bewertung für den Nutzer und Andere sichtbar ist.</p><p>Das %1$s Peer-"
 "Rating-System basiert auf Konzepten von <a href=\"http://www.advogato.com/"
 "\">Advogato.</a> Das System wurde wieder eingeführt und in einigen Aspekten "
@@ -12766,7 +13088,7 @@
 "expanded in a few ways."
 msgstr ""
 "<p>Wenn Sie diesen Nutzer kennen, nehmen Sie sich bitte einen Moment Zeit um "
-"Ihn/Sie nach den folgenden Kriterien zu bewerten. Bitte beachten Sie dass "
+"Ihn/Sie nach den folgenden Kriterien zu bewerten. Bitte beachten Sie daß "
 "Ihre Bewertung für den Nutzer und Andere sichtbar ist.</p><p>Das %1$s Peer-"
 "Rating-System basiert auf Konzepten von <a href=\"http://www.advogato.com/"
 "\">Advogato.</a> Das System wurde wieder eingeführt und in einigen Aspekten "
@@ -12866,7 +13188,7 @@
 
 #: www/index_std.php:22
 msgid "Evolvis – Make it into a project!"
-msgstr ""
+msgstr "Evolvis – Mach es zu einem Projekt!"
 
 #: www/index_std.php:24
 msgid ""
@@ -12879,6 +13201,14 @@
 "release and document management, downloads and <a href=\"http://info.evolvis."
 "org/\">more</a>."
 msgstr ""
+"Evolvis stammt vom lateinischen Verb \"evolvere\" ab und bedeutet \"sich "
+"entwickln\". \"Evolution\" sowie Spuren zurück zu diesem Wort. <br /> "
+"evolvis.org ist eine kosztenlose Projekt-Plattform, die öffentlich "
+"verfügbaren Instanzen der Evolvis-POlattform werden von der tarent GmbH zur "
+"verfügung gestellt. Hier können Entwickler und andere Projektteilnehmer "
+"alles was für eine kostenlose Softwareentwicklung nötig ist finden. Source-"
+"Code-Management, bug-Tracking, Diskusionsrunden, Release- und Dokumeten-"
+"Management, Downloads und <a href = \"http://info.evolvis.org/\"> mehr </a>."
 
 #: www/index_std.php:26
 #, fuzzy
@@ -12951,34 +13281,42 @@
 
 #: www/index_std.php:47
 msgid "New Funky Theme (Capgemini)."
-msgstr ""
+msgstr "Neue funky Themen (Capgemini)."
 
 #: www/index_std.php:48
 msgid ""
 "New UI and features for the document manager (download as zip, locking, "
 "referencing documents by URL) (Capgemini)."
 msgstr ""
+"Neue Benutzeroberfläche und Funktionen zur Datenverwaltung (download als "
+"zip, sperren, Dokumente auf URLs beziehen)(Capgemini)."
 
 #: www/index_std.php:49
 msgid ""
 "New progress bar displaying completion state of trackers using a custom "
 "status field."
 msgstr ""
+"Neuer Fortschrittsbalken zur Anzeige des Fortschrittes der Tracker in einem "
+"eigenen Fenster."
 
 #: www/index_std.php:50
 msgid "Improved sorting in trackers (Alcatel-Lucent)."
-msgstr ""
+msgstr "Verbesserte sortierung der Tracker (Alcatel-Lucent)."
 
 #: www/index_std.php:51
 msgid ""
 "More flexible and more powerful role-based access control system (Coclico)."
 msgstr ""
+"Flexibleres und Leistungsfähigeres Aufgabenbasiertes Zugangskontrollsystem "
+"(Coclico)."
 
 #: www/index_std.php:52
 msgid ""
 "New unobtrusive tooltip system based on jquery and tipsy to replace old help "
 "window (Alcatel-Lucent)"
 msgstr ""
+"Neues unaufdringliches Schnellhilfe-System basierend auf jquery und tipsy "
+"als ersatz des alten Hilfe-Fensters (Alcatel-Lucent)"
 
 #: www/index_std.php:53
 msgid ""
@@ -12989,7 +13327,7 @@
 
 #: www/index_std.php:54
 msgid "scmgit plugin: Personal Git repositories for project members (AdaCore)."
-msgstr ""
+msgstr "scmgit Plug-In: Persönliche Git Ablage für Projektmitglieder (AdaCore)"
 
 #: www/index_std.php:55
 msgid ""
@@ -12997,19 +13335,21 @@
 "projects can pick which template to clone from for their new projects "
 "(Coclico)."
 msgstr ""
+"Vorlagenprojekte: Es können mehrere vorhanden sein, Benutzer wählen die "
+"Vorlage aus mithilfe derer ihr eigenes Projekt erstellt wird (Coclico)"
 
 #: www/index_std.php:56
 msgid "Simplified configuration system, using standard *.ini files."
 msgstr ""
+"Vereinfachtes Konfigurationssystem, Benutzung von standart *.ini Dateien."
 
 #: www/index_std.php:57
 msgid "Reorganised, modular Apache configuration."
-msgstr ""
+msgstr "Reorganisierte, modulare Apache Konfiguration"
 
 #: www/mail/admin/deletelist.php:58
-#, fuzzy
 msgid "Mailing List Successfully deleted"
-msgstr "Auftrag erfolgreich gelöscht"
+msgstr "Mailingliste erfolgreich gelöscht"
 
 #: www/mail/admin/deletelist.php:63
 #, fuzzy
@@ -13131,7 +13471,7 @@
 msgid "Edit Bookmark"
 msgstr "Lesezeichen editieren"
 
-#: www/my/dashboard.php:37 www/my/index.php:40 www/widgets/widgets.php:57
+#: www/my/dashboard.php:37 www/my/index.php:50 www/widgets/widgets.php:57
 #, php-format
 msgid "Personal Page For %s"
 msgstr "Persönliche Seite für %s"
@@ -13150,21 +13490,19 @@
 msgid "Changed"
 msgstr "Ändern"
 
-#: www/my/dashboard.php:69 www/pm/add_task.php:62 www/pm/browse_task.php:240
-#: www/pm/browse_task.php:471 www/pm/browse_task.php:657
-#: www/pm/detail_task.php:68 www/pm/include/pm_columns.php:37
-#: www/pm/mod_task.php:150 www/pm/templates/detail_template.php:25
-#: www/tracker/admin/form-customizelist.php:45 www/tracker/browse.php:189
-#: www/tracker/browse.php:634 www/tracker/browse.php:814
-#: www/tracker/item.php:156 www/tracker/query.php:193
+#: www/my/dashboard.php:69 www/pm/browse_task.php:218
+#: www/pm/browse_task.php:412 www/pm/browse_task.php:576
+#: www/pm/include/pm_columns.php:37 www/pm/templates/detail_template.php:20
+#: www/tracker/admin/form-customizelist.php:45 www/tracker/browse.php:320
+#: www/tracker/browse.php:653 www/tracker/browse.php:833
+#: www/tracker/item.php:163 www/tracker/query.php:196
 msgid "Priority"
 msgstr "Priorität"
 
-#: www/my/dashboard.php:71 www/pm/add_task.php:131 www/pm/browse_task.php:469
-#: www/pm/browse_task.php:664 www/pm/detail_task.php:125
-#: www/pm/mod_task.php:244 www/pm/templates/detail_template.php:35
-#: www/tracker/browse.php:636 www/tracker/browse.php:817
-#: www/tracker/item.php:170
+#: www/my/dashboard.php:71 www/pm/browse_task.php:410
+#: www/pm/browse_task.php:583 www/pm/templates/detail_template.php:30
+#: www/tracker/browse.php:655 www/tracker/browse.php:836
+#: www/tracker/item.php:177
 msgid "Assigned to"
 msgstr "Zugewiesen an"
 
@@ -13269,7 +13607,7 @@
 #: www/my/my_utils.php:133
 #, php-format
 msgid "%s new items"
-msgstr ""
+msgstr "%s neue Objekte"
 
 #: www/my/rmproject.php:61
 #, fuzzy, php-format
@@ -13428,7 +13766,7 @@
 msgid "No News Items Found"
 msgstr "Keine Nachrichten gefunden"
 
-#: www/news/news_utils.php:185 www/pm/include/ProjectView.class.php:303
+#: www/news/news_utils.php:185 www/pm/include/ProjectView.class.php:320
 #: www/survey/include/SurveyHTML.class.php:653
 msgid "Comments"
 msgstr "Kommentar"
@@ -13498,10 +13836,120 @@
 msgid "For project"
 msgstr "Für Projekt"
 
-#: www/notepad.php:54
+#: www/notepad.php:48
 msgid "FusionForge Notepad"
+msgstr "FusoinForge Notizblock"
+
+#: www/notepad.php:105
+msgid ""
+"You can apply basic formatting to the messages: by default, they are "
+"displayed as running text with automatic line breaks; manual line breaks "
+"(one newline) and paragraph breaks (two or more newlines) are also "
+"supported. Furthermore, the following formatting is supported:"
 msgstr ""
+"Du kannst Deine Nachrichten mit grundlegenden Formatierungen versehen: "
+"standardmäßig werden sie als Fließtext mit automatischen Umbrüchen "
+"dargestellt; Zeilenumbrüche können auch von Hand durch einmal Enter "
+"eingefügt werden, Absatzumbrüche durch zwei- oder mehrmals Enter. Außerdem "
+"werden die folgenden Formatierungen unterstützt:"
 
+#: www/notepad.php:107
+msgid "<tt>{{{</tt> on a line by itself switches to preformatted text"
+msgstr ""
+"<tt>{{{</tt> allein auf einer Zeile schaltet auf vorformatierten Text (pre) "
+"um"
+
+#: www/notepad.php:108
+msgid ""
+"<tt><<<b:</tt><i>sometext</i><tt>>>></tt> displays "
+"“sometext” in a <b>boldface</b> font"
+msgstr ""
+"<tt><<<b:</tt><i>irgendwas</i><tt>>>></tt> stellt "
+"„irgendwas“ im <b>Fettdruck</b> dar"
+
+#: www/notepad.php:109
+msgid ""
+"<tt><<<i:</tt><i>sometext</i><tt>>>></tt> displays "
+"“sometext” in an <i>italic</i> font"
+msgstr ""
+"<tt><<<i:</tt><i>irgendwas</i><tt>>>></tt> stellt "
+"„irgendwas“ <i>kursiv</i> dar"
+
+#: www/notepad.php:110
+msgid ""
+"<tt><<<tt:</tt><i>sometext</i><tt>>>></tt> displays "
+"“sometext” in <tt>monospace</tt> (teletype font)"
+msgstr ""
+"<tt><<<tt:</tt><i>irgendwas</i><tt>>>></tt> stellt "
+"„irgendwas“ in <tt>Konsolenschrift</tt> (Festbreite) dar"
+
+#: www/notepad.php:111
+msgid ""
+"<tt><<<ins:</tt><i>sometext</i><tt>>>></tt> displays "
+"“sometext” as <ins>insertion</ins> (with browser-defined rendering)"
+msgstr ""
+"<tt><<<ins:</tt><i>irgendwas</i><tt>>>></tt> stellt "
+"„irgendwas“ als <ins>Einfügung</ins> dar (genaue Umsetzung ist "
+"browserabhängig)"
+
+#: www/notepad.php:112
+msgid ""
+"<tt><<<del:</tt><i>sometext</i><tt>>>></tt> displays "
+"“sometext” as <del>deletion</del> (with browser-defined rendering)"
+msgstr ""
+"<tt><<<del:</tt><i>irgendwas</i><tt>>>></tt> stellt "
+"„irgendwas“ als <del>Löschung</del> dar (genaue Umsetzung ist "
+"browserabhängig)"
+
+#: www/notepad.php:114
+msgid ""
+"If the message contains three spaces in a row or a horizontal tabulator, "
+"it’s also assumed to be preformatted text unless it contains other "
+"formatting instructions, i.e. ‘>>>’ or ‘}}}’. You can switch out of "
+"preformatted text by ‘}}}’ on a line by itself. The following formatting "
+"instructions are recognised in both preformatted and running text:"
+msgstr ""
+"Falls die Nachricht keine Formatierungsanweisungen (also „}}}“ oder „>>"
+">“) enthält, wird sie, wenn sie drei Leerzeichen hintereinander oder "
+"einen horizontalen Tabulator enthält, auch als vorformatierter Text (pre) "
+"angesehen. Aus diesem Modus in Fließtext zurück schaltet man mit „}}}“ "
+"allein auf einer Zeile. Die folgenden Formatierungsanweisungen werden sowohl "
+"in Fließtext als auch vorformatiertem Text umgesetzt:"
+
+#: www/notepad.php:116
+msgid ""
+"<b>[#<i>123</i>]</b> links to the Tracker Item with the number <i>123</i> "
+"(or, if unique, Task Item)"
+msgstr ""
+"<b>[#<i>123</i>]</b> verweist auf das Tracker-Item (Bug/FR/…) mit der Nummer "
+"<i>123</i> (oder, falls eindeutig, auf die entsprechende Aufgabe/Task)"
+
+#: www/notepad.php:117
+msgid "<b>[T<i>123</i>]</b> links to the Task Item with the number <i>123</i>"
+msgstr ""
+"<b>[T<i>123</i>]</b> verweist auf die Aufgabe (Task) mit der Nummer <i>123</"
+"i>"
+
+#: www/notepad.php:118
+msgid ""
+"<b>[forum:<i>123</i>]</b> links to the Forum Message with the ID <i>123</i>"
+msgstr ""
+"<b>[forum:<i>123</i>]</b> verweist auf die Forennachricht mit der ID <i>123</"
+"i>"
+
+#: www/notepad.php:119
+msgid ""
+"<b>[wiki:<i>Some Page</i>]</b> links to the Wiki Page with the name "
+"<i>Some_Page</i>"
+msgstr ""
+"<b>[wiki:<i>Irgendne Seite</i>]</b> verweist auf die Seite "
+"<i>Irgendne_Seite</i> im Projektwiki"
+
+#: www/notepad.php:120
+msgid "Almost any valid URI by itself is converted into a hyperlink"
+msgstr ""
+"Beinahe jeder gültige URI wird automatisch in einen Hyperlink umgewandelt"
+
 #: www/people/admin/index.php:52
 #, fuzzy
 msgid " Error inserting value: "
@@ -13533,11 +13981,9 @@
 #: www/people/createjob.php:49 www/people/editjob.php:52
 #: www/people/editjob.php:74 www/people/editjob.php:163
 #: www/people/people_utils.php:350 www/people/people_utils.php:406
-#: www/pm/add_task.php:45 www/pm/browse_task.php:329
-#: www/pm/browse_task.php:467 www/pm/browse_task.php:654
-#: www/pm/detail_task.php:49 www/pm/ganttpage.php:157
-#: www/pm/include/pm_columns.php:35 www/pm/mod_task.php:128
-#: www/pm/mod_task.php:339 www/pm/templates/detail_template.php:30
+#: www/pm/browse_task.php:297 www/pm/browse_task.php:408
+#: www/pm/browse_task.php:573 www/pm/ganttpage.php:157
+#: www/pm/include/pm_columns.php:35 www/pm/templates/detail_template.php:25
 #: www/pm/templates/time_tracking.php:7 www/reporting/timeadd.php:142
 #: www/snippet/package.php:163 www/snippet/submit.php:131
 msgid "Category"
@@ -13597,7 +14043,7 @@
 
 #: www/people/editjob.php:107
 msgid "Job Inventory"
-msgstr ""
+msgstr "Jobbestandteile"
 
 #: www/people/editjob.php:114
 #, fuzzy, php-format
@@ -13614,7 +14060,7 @@
 
 #: www/people/editjob.php:128
 msgid "Job ID"
-msgstr ""
+msgstr "Job ID"
 
 #: www/people/editjob.php:134
 #, fuzzy, php-format
@@ -13655,7 +14101,7 @@
 
 #: www/people/editjob.php:159
 msgid "All postings are automatically closed after two weeks."
-msgstr ""
+msgstr "Alle Mitteilungen werden automatisch nach zwei Wochen geschlossen."
 
 #: www/people/editjob.php:175
 msgid "Update Descriptions"
@@ -13857,24 +14303,21 @@
 msgstr "Alle Felder werden benötigt!"
 
 #: www/people/editprofile.php:283 www/people/skills_utils.php:50
-#: www/people/skills_utils.php:157 www/pm/add_task.php:102
-#: www/pm/browse_task.php:237 www/pm/browse_task.php:461
-#: www/pm/detail_task.php:83 www/pm/ganttpage.php:70
-#: www/pm/include/pm_columns.php:32 www/pm/mod_task.php:217
-#: www/pm/templates/detail_template.php:47
+#: www/people/skills_utils.php:157 www/pm/browse_task.php:215
+#: www/pm/browse_task.php:402 www/pm/ganttpage.php:70
+#: www/pm/include/pm_columns.php:32 www/pm/templates/detail_template.php:42
 #: www/search/include/renderers/TasksHtmlSearchRenderer.class.php:50
-#: www/tracker/include/ArtifactTypeHtml.class.php:417
+#: www/tracker/include/ArtifactTypeHtml.class.php:145
 msgid "Start Date"
 msgstr "Startdatum"
 
 #: www/people/editprofile.php:284 www/people/skills_utils.php:51
-#: www/people/skills_utils.php:158 www/pm/add_task.php:117
-#: www/pm/browse_task.php:238 www/pm/browse_task.php:463
-#: www/pm/detail_task.php:87 www/pm/ganttpage.php:71
-#: www/pm/include/pm_columns.php:33 www/pm/mod_task.php:231
-#: www/pm/templates/detail_template.php:52 www/reporting/usersummary.php:106
+#: www/people/skills_utils.php:158 www/pm/browse_task.php:216
+#: www/pm/browse_task.php:404 www/pm/ganttpage.php:71
+#: www/pm/include/pm_columns.php:33 www/pm/templates/detail_template.php:47
+#: www/reporting/usersummary.php:106
 #: www/search/include/renderers/TasksHtmlSearchRenderer.class.php:51
-#: www/tracker/include/ArtifactTypeHtml.class.php:418
+#: www/tracker/include/ArtifactTypeHtml.class.php:146
 msgid "End Date"
 msgstr "Enddatum"
 
@@ -13892,7 +14335,7 @@
 
 #: www/people/editprofile.php:320
 msgid "Edit/Delete Your Skills"
-msgstr "Andern /löschen Ihrer Fähigkeiten"
+msgstr "Ändern /löschen Ihrer Fähigkeiten"
 
 #: www/people/helpwanted-latest.php:36
 msgid "Help Wanted Latest Posts"
@@ -13916,6 +14359,8 @@
 "The %1$s Project Help Wanted board is for non-commercial, project volunteer "
 "openings. Commercial use is prohibited."
 msgstr ""
+"Die Hilfe des Projektes %1$s ist nur für Projektmitarbeiter sichtbar. Die "
+"öffentliche Verwendung ist untersagt."
 
 #: www/people/index.php:65
 msgid ""
@@ -13923,22 +14368,31 @@
 "whichever comes first. (Project administrators may always re-post expired "
 "openings.)"
 msgstr ""
+"Projekte bleiben zwei Wochen sichtbar, oder so lange bis der Ersteller sie "
+"schließt, je nachdem was früher eintrifft (Projektadministratoren können "
+"Projekte jederzeit wieder öffnen)."
 
 #: www/people/index.php:69
 msgid ""
 "Browse through the category menu to find projects looking for your help."
 msgstr ""
+"Durchsuchen sie das Kategorien-Menü und finden sie Projekte die ihre Hilfe "
+"benötigen."
 
 #: www/people/index.php:73
 msgid ""
 "If you're a project admin, log in and submit help wanted requests through "
 "your project administration page."
 msgstr ""
+"Wenn sie Projektadministrator sind melden sie sich an und beantworten sie "
+"Hilfe-Anfragen zu ihrem Projekt auf der Administratoren-Seite"
 
 #: www/people/index.php:77
 msgid ""
 "To suggest new job categories, submit a request via the support manager."
 msgstr ""
+"Um neue Arbeitskategorien vorzuschlagen, wird über den Support Manager eine "
+"Anfrage gesendet"
 
 #: www/people/index.php:82
 msgid "Last posts"
@@ -14043,8 +14497,8 @@
 
 #: www/people/viewjob.php:80 www/pm/include/ProjectTaskHTML.class.php:118
 #: www/project/report/index.php:137
-#: www/tracker/admin/form-customizelist.php:43 www/tracker/browse.php:191
-#: www/tracker/browse.php:628 www/tracker/query.php:195
+#: www/tracker/admin/form-customizelist.php:43 www/tracker/browse.php:322
+#: www/tracker/browse.php:647 www/tracker/query.php:198
 msgid "Open Date"
 msgstr "Eröffnet am"
 
@@ -14079,63 +14533,6 @@
 msgid "User_id not found."
 msgstr "Umfrage nicht gefunden."
 
-#: www/pm/add_task.php:33
-msgid "Add a new Task"
-msgstr "Füge neuen Auftrag hinzu"
-
-#: www/pm/add_task.php:48 www/pm/mod_task.php:129
-msgid "admin"
-msgstr "Administrator"
-
-#: www/pm/add_task.php:58 www/pm/browse_task.php:239
-#: www/pm/browse_task.php:465 www/pm/detail_task.php:63
-#: www/pm/ganttpage.php:72 www/pm/include/pm_columns.php:34
-#: www/pm/mod_task.php:145 www/pm/templates/detail_template.php:15
-msgid "Percent Complete"
-msgstr "Prozent fertig"
-
-#: www/pm/add_task.php:69 www/pm/browse_task.php:236
-#: www/pm/browse_task.php:459 www/pm/detail_task.php:94
-#: www/pm/ganttpage.php:69 www/pm/include/ProjectTaskHTML.class.php:84
-#: www/pm/mod_task.php:164 www/pm/templates/detail_template.php:112
-#: www/tracker/include/ArtifactTypeHtml.class.php:416
-msgid "Task Summary"
-msgstr "Zusammenfassung des Auftrags"
-
-#: www/pm/add_task.php:76
-msgid "Task Details"
-msgstr "Auftragsdetails"
-
-#: www/pm/add_task.php:95 www/pm/add_task.php:156 www/pm/browse_task.php:485
-#: www/pm/detail_task.php:145 www/pm/include/pm_columns.php:44
-#: www/pm/mod_task.php:268 www/pm/mod_task.php:276 www/pm/mod_task.php:338
-#: www/pm/templates/detail_template.php:60
-msgid "Estimated Hours"
-msgstr "Geschätzte Stunden"
-
-#: www/pm/add_task.php:109 www/pm/mod_task.php:224
-msgid ""
-"The system will modify your start/end dates if you attempt to create a start "
-"date earlier than the end date of any tasks you depend on."
-msgstr ""
-"Das System wird Ihre Anfangs- und Enddaten ändern, falls Sie versuchen ein "
-"Startdatum früher als das Enddatum eines Auftrags anzulegen."
-
-#: www/pm/add_task.php:110 www/pm/include/ProjectView.class.php:409
-#: www/pm/include/ProjectView.class.php:411 www/pm/mod_task.php:225
-msgid "View Calendar"
-msgstr "Zeige Kalender"
-
-#: www/pm/add_task.php:137 www/pm/detail_task.php:138 www/pm/mod_task.php:254
-#: www/pm/templates/detail_template.php:159
-msgid "Dependent on task"
-msgstr "Abhängig von Auftrag"
-
-#: www/pm/add_task.php:141
-#, fuzzy
-msgid "Dependent note"
-msgstr "Abhängige Mitteilung"
-
 #: www/pm/admin/index.php:62 www/pm/admin/index.php:95
 #: www/pm/admin/index.php:115 www/pm/admin/index.php:173
 #: www/pm/admin/index.php:236 www/pm/admin/index.php:247
@@ -14186,7 +14583,7 @@
 msgstr "Keine Kategorien definiert"
 
 #: www/pm/admin/index.php:215 www/pm/admin/index.php:259
-#: www/pm/browse_task.php:491 www/pm/include/pm_columns.php:47
+#: www/pm/browse_task.php:432 www/pm/include/pm_columns.php:47
 #: www/reporting/timecategory.php:72 www/reporting/timecategory.php:91
 msgid "Category Name"
 msgstr "Name der Kategorie"
@@ -14222,8 +14619,8 @@
 "Add a new subproject to the Tasks. <strong>This is different than adding a "
 "task to a subproject.</strong>"
 msgstr ""
-"Neues Projekt zum Projekt/Auftrags-Manager hinzufügen. <strong>Dies ist "
-"unterschiedlich, als einen Auftrag zu einem Projekt hinzuzufügen.</strong>"
+"Neues Projekt zum Projekt/Aufgaben-Manager hinzufügen. <strong>Dies ist "
+"unterschiedlich, als eine Aufgabe zu einem Projekt hinzuzufügen.</strong>"
 
 #: www/pm/admin/index.php:291
 #, fuzzy
@@ -14235,14 +14632,13 @@
 msgstr "Schicke alle Änderungen an"
 
 #: www/pm/admin/index.php:309 www/pm/admin/index.php:374
-#: www/tracker/taskmgr.php:53
+#: www/tracker/taskmgr.php:55
 msgid "Could Not Get ProjectGroup"
-msgstr ""
+msgstr "Konnte nicht auf ProjektGroup zugreifen"
 
 #: www/pm/admin/index.php:316
-#, fuzzy
 msgid "Change Tasks Status"
-msgstr "Auftragsstatus"
+msgstr ""
 
 #: www/pm/admin/index.php:319
 #, fuzzy
@@ -14252,7 +14648,7 @@
 "the general public."
 msgstr ""
 "Sie können ein existierendes Projekt ändern, indem Sie diese Form benutzen. "
-"Bitte bedenken Sie, dass private Projekte immernoch von Mitgliedern Ihres "
+"Bitte bedenken Sie, daß private Projekte immernoch von Mitgliedern Ihres "
 "Projektes angesehen werden können. Die Allgemeinheit kann diese aber nicht "
 "sehen."
 
@@ -14276,10 +14672,10 @@
 "Sie sind dabei dieses Unterprojekt und all seine Daten dauerhaft und "
 "unwiderbringlich zu löschen!"
 
-#: www/pm/admin/index.php:403 www/pm/index.php:47 www/pm/task.php:83
-#: www/tracker/browse.php:92 www/tracker/taskmgr.php:136
+#: www/pm/admin/index.php:403 www/pm/index.php:47 www/pm/task.php:95
+#: www/tracker/browse.php:102 www/tracker/taskmgr.php:138
 msgid "Could Not Get Factory"
-msgstr ""
+msgstr "Konnte nicht auf Factory zurgreifen"
 
 #: www/pm/admin/index.php:411
 #, fuzzy
@@ -14292,13 +14688,12 @@
 msgstr "Neues Projekt hinzufügen"
 
 #: www/pm/admin/index.php:420
-#, fuzzy
 msgid ""
 "Add a subproject, which can contain a set of tasks. This is different than "
 "creating a new task."
 msgstr ""
-"Füge neues Projekt hinzu, welches weitere Aufträge enthalten kann. Dies ist "
-"unterschiedlich, als neuen Auftrag zu erstellen."
+"Füge neues Subprojekt hinzu, welches weitere Aufgaben enthalten kann. Dies "
+"ist etwas anderes als eine neue Aufgabe einzustellen."
 
 #: www/pm/admin/index.php:428
 #, fuzzy
@@ -14318,149 +14713,148 @@
 msgid "Edit/Update Subproject"
 msgstr "Ändere/Aktualisiere Projekt"
 
-#: www/pm/browse_task.php:157
+#: www/pm/browse_task.php:135
 msgid "Browse tasks"
-msgstr "Aufträge durchsuchen"
+msgstr "Aufgaben durchsuchen"
 
-#: www/pm/browse_task.php:216 www/pm/browse_task.php:227
-#: www/pm/browse_task.php:328 www/pm/ganttpage.php:56 www/pm/ganttpage.php:58
+#: www/pm/browse_task.php:194 www/pm/browse_task.php:205
+#: www/pm/browse_task.php:296 www/pm/ganttpage.php:56 www/pm/ganttpage.php:58
 #: www/pm/ganttpage.php:60 www/pm/ganttpage.php:62
-#: www/reporting/usersummary.php:53 www/tracker/browse.php:176
-#: www/tracker/browse.php:255 www/tracker/browse.php:262
-#: www/tracker/query.php:341
+#: www/reporting/usersummary.php:53 www/tracker/browse.php:307
+#: www/tracker/browse.php:386 www/tracker/browse.php:393
+#: www/tracker/query.php:344
 msgid "Any"
 msgstr "Alle"
 
-#: www/pm/browse_task.php:218 www/pm/browse_task.php:628
-#: www/pm/ganttpage.php:58 www/tracker/browse.php:181
+#: www/pm/browse_task.php:196 www/pm/browse_task.php:547
+#: www/pm/ganttpage.php:58 www/tracker/browse.php:312
 msgid "Unassigned"
 msgstr "Nicht zugeordnet"
 
-#: www/pm/browse_task.php:235 www/pm/browse_task.php:457
+#: www/pm/browse_task.php:213 www/pm/browse_task.php:398
 #: www/pm/ganttpage.php:68 www/pm/include/ProjectTaskHTML.class.php:83
 msgid "Task Id"
-msgstr "Auftrags-ID"
+msgstr "Aufgaben-ID"
 
-#: www/pm/browse_task.php:256
+#: www/pm/browse_task.php:214 www/pm/browse_task.php:400
+#: www/pm/ganttpage.php:69 www/pm/include/ProjectTaskHTML.class.php:84
+#: www/pm/templates/detail_template.php:99
+#: www/tracker/include/ArtifactTypeHtml.class.php:144
+msgid "Task Summary"
+msgstr "Zusammenfassung der Aufgabe"
+
+#: www/pm/browse_task.php:217 www/pm/browse_task.php:406
+#: www/pm/ganttpage.php:72 www/pm/include/pm_columns.php:34
+#: www/pm/templates/detail_template.php:10
+msgid "Percent Complete"
+msgstr "Prozent fertig"
+
+#: www/pm/browse_task.php:234
 msgid "Detailed"
 msgstr "detailliert"
 
-#: www/pm/browse_task.php:326
+#: www/pm/browse_task.php:294
 #, fuzzy
 msgid "Subprojects"
 msgstr "Unterprojekt"
 
-#: www/pm/browse_task.php:327 www/pm/ganttpage.php:155
-#: www/tracker/browse.php:194 www/tracker/browse.php:474
-#: www/tracker/query.php:198 www/tracker/query.php:338
+#: www/pm/browse_task.php:295 www/pm/ganttpage.php:155
+#: www/tracker/browse.php:325 www/tracker/browse.php:493
+#: www/tracker/query.php:201 www/tracker/query.php:341
 msgid "Assignee"
 msgstr "Bearbeiter"
 
-#: www/pm/browse_task.php:330 www/pm/ganttpage.php:158
+#: www/pm/browse_task.php:298 www/pm/ganttpage.php:158
 msgid "Sort On"
 msgstr "Sortiere nach"
 
-#: www/pm/browse_task.php:331
+#: www/pm/browse_task.php:299
 msgid "Detail View"
 msgstr "Detailansicht"
 
-#: www/pm/browse_task.php:337
+#: www/pm/browse_task.php:305
 #, fuzzy
 msgid "Customise display:"
 msgstr "Anpassbares Feld Gelöscht"
 
-#: www/pm/browse_task.php:338
+#: www/pm/browse_task.php:306
 msgid "Add/Remove Columns"
-msgstr ""
+msgstr "Rubrik hinzufügen/entfernen"
 
-#: www/pm/browse_task.php:387
+#: www/pm/browse_task.php:346
 msgid "No Matching Tasks found"
-msgstr "Keine übereinstimmenden Aufträge gefunden"
+msgstr "Keine übereinstimmenden Aufgaben gefunden"
 
-#: www/pm/browse_task.php:389
+#: www/pm/browse_task.php:348
 msgid "Add tasks using the link above"
-msgstr "Fügen Sie Aufträge hinzu, indem Sie auf den obigen Link klicken"
+msgstr "Fügen Sie Aufgaben hinzu, indem Sie auf den obigen Link klicken"
 
-#: www/pm/browse_task.php:400
+#: www/pm/browse_task.php:351
 #, php-format
-msgid "Displaying results %1$d‒%2$d."
-msgstr "Stelle Ergebnisse %1$d‒%2$d dar."
+msgid "Displaying %d results."
+msgstr "Stelle %d Ergebnisse dar."
 
-#: www/pm/browse_task.php:403 www/tracker/browse.php:401
-#, php-format
-msgid "Displaying %2$s results."
-msgstr "Stelle insgesamt %2$s Ergebnisse dar."
-
-#: www/pm/browse_task.php:405 www/top/topusers.php:67
-#: www/tracker/browse.php:403
-msgid "Change"
-msgstr "Ändern"
-
-#: www/pm/browse_task.php:475
-#, fuzzy
+#: www/pm/browse_task.php:416
 msgid "Project Task Id"
-msgstr "Projekt/Auftrag"
+msgstr ""
 
-#: www/pm/browse_task.php:477 www/pm/include/pm_columns.php:40
-#: www/snippet/browse.php:83 www/tracker/query.php:336
+#: www/pm/browse_task.php:418 www/pm/include/pm_columns.php:40
+#: www/snippet/browse.php:83 www/tracker/query.php:339
 msgid "Creator"
 msgstr "Ersteller"
 
-#: www/pm/browse_task.php:479 www/pm/include/pm_columns.php:41
+#: www/pm/browse_task.php:420 www/pm/include/pm_columns.php:41
 #, fuzzy
 msgid "Duration"
 msgstr "Operationen"
 
-#: www/pm/browse_task.php:481 www/pm/include/pm_columns.php:42
+#: www/pm/browse_task.php:422 www/pm/include/pm_columns.php:42
 #, fuzzy
 msgid "Parent Id"
 msgstr "Für Projekt"
 
-#: www/pm/browse_task.php:487 www/pm/include/pm_columns.php:45
+#: www/pm/browse_task.php:426 www/pm/include/pm_columns.php:44
+#: www/pm/templates/detail_template.php:55
+msgid "Estimated Hours"
+msgstr "Geschätzte Stunden"
+
+#: www/pm/browse_task.php:428 www/pm/include/pm_columns.php:45
 #, fuzzy
 msgid "Status Id"
 msgstr "Status"
 
-#: www/pm/browse_task.php:489 www/pm/include/pm_columns.php:46
+#: www/pm/browse_task.php:430 www/pm/include/pm_columns.php:46
 #, fuzzy
 msgid "Category Id"
 msgstr "Kategorie"
 
-#: www/pm/browse_task.php:493 www/pm/include/pm_columns.php:48
+#: www/pm/browse_task.php:434 www/pm/include/pm_columns.php:48
 #, fuzzy
 msgid "Last Modified Date"
 msgstr "Zuletzt veränderter Datumsbereich"
 
-#: www/pm/browse_task.php:495 www/pm/include/pm_columns.php:49
+#: www/pm/browse_task.php:436 www/pm/include/pm_columns.php:49
 msgid "External Id"
-msgstr ""
+msgstr "Externe ID"
 
-#: www/pm/browse_task.php:497 www/pm/include/pm_columns.php:50
+#: www/pm/browse_task.php:438 www/pm/include/pm_columns.php:50
 #, fuzzy
 msgid "Sub-Project"
 msgstr "Unterprojekt"
 
-#: www/pm/browse_task.php:593
-msgid "previous"
-msgstr "Vorherige Seite"
-
-#: www/pm/browse_task.php:602
-msgid "next"
-msgstr "Nächste Seite"
-
-#: www/pm/browse_task.php:612 www/tracker/browse.php:771
+#: www/pm/browse_task.php:531 www/tracker/browse.php:790
 msgid "Mass Update"
 msgstr "Massen-Update"
 
-#: www/pm/browse_task.php:647
+#: www/pm/browse_task.php:566
 msgid "Check all"
 msgstr "Alle auswählen"
 
-#: www/pm/browse_task.php:649
+#: www/pm/browse_task.php:568
 msgid "Clear all"
 msgstr "Alle abwählen"
 
-#: www/pm/browse_task.php:651 www/tracker/browse.php:793
+#: www/pm/browse_task.php:570 www/tracker/browse.php:812
 msgid ""
 "<strong>Admin:</strong> If you wish to apply changes to all items selected "
 "above, use these controls to change their properties and click once on "
@@ -14470,18 +14864,17 @@
 "Änderungen durchführen möchten, nutzen Sie diese Bedienungselemente, um ihre "
 "Eigenschaften zu ändern, und klicken Sie anschließend auf \"Massen-Update\"."
 
-#: www/pm/browse_task.php:670 www/pm/mod_task.php:133
-#: www/pm/templates/detail_template.php:84
+#: www/pm/browse_task.php:589 www/pm/templates/detail_template.php:79
 msgid "Subproject"
 msgstr "Unterprojekt"
 
-#: www/pm/browse_task.php:673 www/tracker/browse.php:834
+#: www/pm/browse_task.php:592 www/tracker/browse.php:853
 msgid "Mass update"
 msgstr "Massen-Update"
 
-#: www/pm/browse_task.php:721
+#: www/pm/browse_task.php:640
 msgid "* Denotes overdue tasks"
-msgstr "* markiert überfällige Aufträge"
+msgstr "* markiert überfällige Aufgaben"
 
 #: www/pm/calendar.php:52
 msgid "Invalid year: Not between 1990 and 2020"
@@ -14569,17 +14962,17 @@
 #: www/pm/calendar.php:150
 #, php-format
 msgid "Task summary: %s"
-msgstr "Zusammenfassung des Auftrags %s"
+msgstr "Zusammenfassung der Aufgabe: %s"
 
 #: www/pm/calendar.php:153
 #, php-format
 msgid "Task %d begins"
-msgstr "Auftrag %d startet"
+msgstr "Aufgabe %d startet"
 
 #: www/pm/calendar.php:154
 #, php-format
 msgid "Task %d ends"
-msgstr "Auftrag %d endet"
+msgstr "Aufgabe %d endet"
 
 #: www/pm/calendar.php:197
 #, fuzzy
@@ -14615,9 +15008,8 @@
 msgstr "ausgewähltes Datum"
 
 #: www/pm/csv.php:49 www/pm/format_csv.php:49 www/pm/uploadcsv.php:31
-#, fuzzy
 msgid "Upload data into the tasks."
-msgstr "Daten in den Auftrags-Manager hochladen."
+msgstr ""
 
 #: www/pm/csv.php:63
 #, fuzzy
@@ -14653,37 +15045,24 @@
 
 #: www/pm/deletetask.php:26
 msgid "Delete a Task"
-msgstr "Einen Auftrag löschen"
+msgstr "Eine Aufgabe löschen"
 
 #: www/pm/deletetask.php:37
 msgid "Are you sure you want to delete this task?"
-msgstr "Sind Sie sicher, daß Sie diesen Auftrag löschen wollen?"
+msgstr "Sind Sie sicher, daß Sie diese Aufgabe löschen wollen?"
 
 #: www/pm/deletetask.php:41
 msgid "Yes, I want to delete this task"
-msgstr "Ja, ich möchte diesen Auftrag löschen"
+msgstr "Ja, ich möchte diese Aufgabe löschen"
 
-#: www/pm/detail_task.php:32
-msgid "Task Detail"
-msgstr "Auftragsdetails"
-
-#: www/pm/detail_task.php:76 www/pm/include/ProjectView.class.php:480
-#: www/pm/include/ProjectView.class.php:482 www/pm/mod_task.php:178
-msgid "Subscribe to task"
-msgstr "Task abonnieren"
-
-#: www/pm/detail_task.php:101 www/pm/mod_task.php:185
-msgid "Original Comment"
-msgstr "Original Kommentar"
-
-#: www/pm/downloadcsv.php:96 www/pm/gantt.php:35 www/tracker/taskmgr.php:60
+#: www/pm/downloadcsv.php:96 www/pm/gantt.php:35 www/tracker/taskmgr.php:62
 msgid "Could Not Get ProjectTaskFactory"
-msgstr ""
+msgstr "Konnte nicht auf ProjektTaskFaktory zugreifen"
 
 #: www/pm/gantt.php:25 www/pm/ganttofuser.php:33
 #: www/survey/admin/graphs.php:44
 msgid "Package JPGraph not installed"
-msgstr ""
+msgstr "Paket JPGraph wurde noch nicht installiert"
 
 #: www/pm/gantt.php:37
 #, fuzzy
@@ -14702,7 +15081,7 @@
 
 #: www/pm/ganttpage.php:89
 msgid "Years"
-msgstr ""
+msgstr "Jahr"
 
 #: www/pm/ganttpage.php:90 www/pm/ganttpage.php:94
 msgid "Months"
@@ -14735,9 +15114,8 @@
 msgstr "Ändere/Aktualisiere Projekt"
 
 #: www/pm/include/ProjectGroupHTML.class.php:65
-#, fuzzy
 msgid "Add Task"
-msgstr "Auftrag hinzufügen"
+msgstr "Aufgabe hinzufügen"
 
 #: www/pm/include/ProjectGroupHTML.class.php:67
 msgid "-tooltip:pm:new"
@@ -14773,7 +15151,7 @@
 
 #: www/pm/include/ProjectTaskHTML.class.php:99
 msgid "No Tasks are Dependent on This Task"
-msgstr "Von diesem Auftrag hängen keine anderen Aufträge ab"
+msgstr "Von dieser Aufgabe hängen keine anderen Aufgaben ab"
 
 #: www/pm/include/ProjectTaskHTML.class.php:109
 msgid "No Related Tracker Items Have Been Added"
@@ -14783,113 +15161,98 @@
 msgid "Tick an item and submit to remove the relation."
 msgstr "Anhaken und abschicken, um die Beziehung zu entfernen."
 
-#: www/pm/include/ProjectTaskHTML.class.php:188
-msgid "No Comments Have Been Added"
-msgstr "Es wurden bislang keine Kommentare verfaßt."
-
-#: www/pm/include/ProjectTaskHTML.class.php:204
-#: www/project/admin/project_admin_utils.php:149
-#: www/tracker/include/ArtifactHtml.class.php:84
+#: www/pm/include/ProjectTaskHTML.class.php:151
+#: www/project/admin/project_admin_utils.php:144
+#: www/tracker/include/ArtifactHtml.class.php:44
 msgid "Field"
 msgstr "Feld"
 
-#: www/pm/include/ProjectTaskHTML.class.php:205
-#: www/project/admin/project_admin_utils.php:150
-#: www/tracker/include/ArtifactHtml.class.php:85
+#: www/pm/include/ProjectTaskHTML.class.php:152
+#: www/project/admin/project_admin_utils.php:145
+#: www/tracker/include/ArtifactHtml.class.php:45
 msgid "Old Value"
 msgstr "Alter Wert"
 
-#: www/pm/include/ProjectTaskHTML.class.php:247
+#: www/pm/include/ProjectTaskHTML.class.php:194
 msgid "No Changes Have Been Made"
 msgstr "Es wurden keine Änderungen gemacht"
 
-#: www/pm/include/ProjectView.class.php:311
+#: www/pm/include/ProjectView.class.php:328
 msgid "No comments have been written."
 msgstr "Es wurden bislang keine Kommentare verfaßt."
 
-#: www/pm/include/ProjectView.class.php:469 www/pm/mod_task.php:319
+#: www/pm/include/ProjectView.class.php:444
+msgid "View Calendar"
+msgstr "Zeige Kalender"
+
+#: www/pm/include/ProjectView.class.php:508
 #: www/tracker/admin/form-addextrafield.php:60
 msgid "Copy"
 msgstr "Kopieren"
 
-#: www/pm/include/ProjectView.class.php:491
-#: www/pm/include/ProjectView.class.php:493 www/pm/mod_task.php:172
+#: www/pm/include/ProjectView.class.php:521
+#: www/pm/include/ProjectView.class.php:523
+msgid "Subscribe to task"
+msgstr "Task abonnieren"
+
+#: www/pm/include/ProjectView.class.php:533
+#: www/pm/include/ProjectView.class.php:535
 msgid "Delete this task"
-msgstr "Diesen Auftrag löschen"
+msgstr "Diese Aufgabe löschen"
 
+#: www/pm/include/ProjectView.class.php:562
+msgid "Add category"
+msgstr "Kategorie hinzufügen"
+
 #: www/pm/include/pm_columns.php:36
 #: www/tracker/admin/form-customizelist.php:46
 msgid "Assigned To"
 msgstr "Zugewiesen an"
 
+#: www/pm/include/pm_columns.php:84
+msgid "Select PM Display Columns"
+msgstr "Task-Anzeigespalten auswählen"
+
+#: www/pm/include/pm_columns.php:90
+msgid "Select Columns"
+msgstr "Spalten auswählen"
+
 #: www/pm/index.php:57
-#, fuzzy, php-format
+#, php-format
 msgid "Subprojects for %1$s"
-msgstr "Unterprojekte"
+msgstr "Unterprojekte für %1$s"
 
 #: www/pm/index.php:62
-#, fuzzy
 msgid "No Subprojects Found"
-msgstr "Keine Projektgruppen gefunden"
+msgstr "Keine Unterprojekte gefunden"
 
 #: www/pm/index.php:63
 msgid "No subprojects have been set up, or you cannot view them."
 msgstr ""
+"Es wurden noch keine Unterprojekte erstellt oder sie Können sie nicht sehen."
 
 #: www/pm/index.php:64
 msgid ""
 "The Admin for this project will have to set up subprojects using the admin "
 "page."
 msgstr ""
+"Der Administrator für dieses Projekt muß noch das Unterprojekt mithilfe der "
+"Admin-Seite aufsetzen."
 
 #: www/pm/index.php:67
 msgid "Choose a Subproject and you can browse/edit/add tasks to it."
 msgstr ""
-"Wählen Sie ein Unterprojekt aus und Sie können Aufträge dafür durchsuchen, "
+"Wählen Sie ein Unterprojekt aus und Sie können Aufgaben dafür durchsuchen, "
 "ändern und hinzufügen."
 
-#: www/pm/mod_task.php:37 www/pm/pm_task.php:39
-msgid "Modify Task"
-msgstr "Auftrag modifizieren"
-
-#: www/pm/mod_task.php:197
-msgid "Add A Comment"
-msgstr "Kommentar hinzufügen"
-
-#: www/pm/mod_task.php:262
-msgid ""
-"You should choose only tasks which must be completed before this task can "
-"start."
-msgstr ""
-"Sie dürfen nur abgeschlossene Aufträge auswählen, bevor dieser Auftrag "
-"starten kann."
-
-#: www/pm/mod_task.php:317 www/pm/templates/detail_template.php:96
-#, fuzzy
-msgid "Copy to another Subproject"
-msgstr "Ändere/Aktualisiere Projekt"
-
-#: www/pm/mod_task.php:332 www/pm/pm_task.php:67
-#: www/pm/templates/time_tracking.php:1 www/reporting/timeadd.php:102
+#: www/pm/pm_task.php:83 www/pm/templates/time_tracking.php:1
+#: www/reporting/timeadd.php:102
 msgid "Time tracking"
 msgstr "Zeitverfolgung"
 
-#: www/pm/mod_task.php:336 www/reporting/sitetimebar.php:89
-msgid "Week"
-msgstr "Woche"
-
-#: www/pm/mod_task.php:337 www/pm/templates/time_tracking.php:5
-#: www/stats/site_stats_utils.php:378
-msgid "Day"
-msgstr "Tag"
-
-#: www/pm/mod_task.php:415 www/pm/templates/time_tracking.php:71
-msgid "Time tracking list"
-msgstr "Zeitverfolgungsliste"
-
 #: www/pm/reporting/index.php:53
 msgid "Task Reporting System"
-msgstr "Auftrags-Auswertungs System"
+msgstr "Aufgaben-Auswertungs System"
 
 #: www/pm/reporting/index.php:59 www/pm/reporting/index.php:95
 msgid "Aging Report"
@@ -14905,156 +15268,194 @@
 
 #: www/pm/reporting/index.php:134
 msgid "Average duration for closed tasks (days)"
-msgstr "Durchschnittliche Dauer für geschlossene Aufträge (Tage)"
+msgstr "Durchschnittliche Dauer für geschlossene Aufgaben (Tage)"
 
 #: www/pm/reporting/index.php:157
 msgid "Number of started tasks"
-msgstr "Anzahl der gestarteten Aufträge"
+msgstr "Anzahl der gestarteten Aufgaben"
 
 #: www/pm/reporting/index.php:182
 msgid "Number of tasks still not completed"
-msgstr "Anzahl der unfertigen Aufträge"
+msgstr "Anzahl der unfertigen Aufgaben"
 
 #: www/pm/reporting/index.php:210
 msgid "Tasks By Category"
-msgstr "Aufträge nach Kategorie"
+msgstr "Aufgaben nach Kategorie"
 
 #: www/pm/reporting/index.php:211
 msgid "Open Tasks By Category"
-msgstr "Öffne Aufträge nach Kategorie"
+msgstr "Öffne Aufgaben nach Kategorie"
 
 #: www/pm/reporting/index.php:212
 msgid "All Tasks By Category"
-msgstr "Alle Aufträge nach Kategorie"
+msgstr "Alle Aufgaben nach Kategorie"
 
 #: www/pm/reporting/index.php:240
 msgid "Tasks By Assignee"
-msgstr "Aufträge nach Techniker"
+msgstr "Aufgaben nach Techniker"
 
 #: www/pm/reporting/index.php:241
 msgid "Open Tasks By Assignee"
-msgstr "Öffne Aufträge nach Techniker"
+msgstr "Öffne Aufgaben nach Techniker"
 
 #: www/pm/reporting/index.php:242
 msgid "All Tasks By Assignee"
-msgstr "Alle Aufträge nach Techniker"
+msgstr "Alle Aufgaben nach Techniker"
 
 #: www/pm/reporting/index.php:243
 msgid ""
 "<p>Note that same task can be assigned to several technicians. Such task "
 "will be counted for each of them.</p>"
 msgstr ""
-"<p>Beachten Sie, dass derselbe Auftrag auch mehreren Technikern zugeordnet "
-"sein kann. Eine solcher Auftrag wird für jedes von ihnen gezählt.</p>"
+"<p>Beachten Sie, daß dieselbe Aufgabe auch mehreren Technikern zugeordnet "
+"sein kann. Eine solche Aufgabe wird für jedes von ihnen gezählt.</p>"
 
+#: www/pm/select_columns.php:72
+msgid "Select which columns to display."
+msgstr "Wähle die anzuzeigenden Spalten aus."
+
+#: www/pm/select_columns.php:79
+msgid "Columns"
+msgstr "Spalten"
+
+#: www/pm/select_columns.php:93
+msgid "Select/Deselect All"
+msgstr "Alle an-/abwählen"
+
+#: www/pm/select_columns.php:96
+msgid "Reset to Defaults"
+msgstr "Standardwerte verwenden"
+
+#: www/pm/select_columns.php:103
+msgid "Abort"
+msgstr "Abbrechen"
+
 #: www/pm/t_lookup.php:35
 msgid "Task ID"
-msgstr "Auftrags-ID"
+msgstr "Aufgaben-ID"
 
 #: www/pm/t_lookup.php:41
 msgid "No Task with ID: "
 msgstr "Keine Aufgabe mit ID: "
 
-#: www/pm/task.php:66
+#: www/pm/task.php:78
 msgid "Group ID"
 msgstr "Gruppen-ID"
 
-#: www/pm/task.php:69
+#: www/pm/task.php:81
 #, fuzzy
 msgid "Group Project ID"
 msgstr "Top-Projekte"
 
-#: www/pm/task.php:101 www/pm/task.php:209 www/pm/task.php:366
-#: www/pm/task.php:388 www/pm/task.php:405 www/pm/task.php:445
+#: www/pm/task.php:113 www/pm/task.php:161 www/pm/task.php:232
+#: www/pm/task.php:389 www/pm/task.php:411 www/pm/task.php:428
+#: www/pm/task.php:468
 #, fuzzy
 msgid "Could Not Get ProjectTask"
 msgstr "Konnte kein Foren-Objekt einholen"
 
-#: www/pm/task.php:119
+#: www/pm/task.php:131
 #, fuzzy
 msgid "Could Not Get Empty ProjectTask"
 msgstr "Konnte kein Foren-Objekt einholen"
 
-#: www/pm/task.php:127 www/pm/task.php:217
+#: www/pm/task.php:139 www/pm/task.php:240
 msgid "Illegal format for hours: must be an integer or a float number."
 msgstr ""
+"Ungültiges Format für Stunde: es muß ein integer-Wert oder float-Wert sein."
 
-#: www/pm/task.php:149
+#: www/pm/task.php:156
 msgid "Task Created Successfully"
-msgstr "Auftrag erfolgreich erstellt"
+msgstr "Aufgabe erfolgreich erstellt"
 
-#: www/pm/task.php:187
+#: www/pm/task.php:203
 #, fuzzy
 msgid "Task Copied Successfully"
-msgstr "Auftrag erfolgreich erstellt"
+msgstr "Aufgabe erfolgreich erstellt"
 
-#: www/pm/task.php:246 www/pm/task.php:350 www/pm/task.php:537
+#: www/pm/task.php:269 www/pm/task.php:373 www/pm/task.php:594
 msgid "Task Updated Successfully"
-msgstr "Auftrag erfolgreich aktualisiert"
+msgstr "Aufgabe erfolgreich aktualisiert"
 
-#: www/pm/task.php:347
+#: www/pm/task.php:370
 #, fuzzy
 msgid "No task selected"
 msgstr "Kein Nutzer ausgewählt"
 
-#: www/pm/task.php:373
+#: www/pm/task.php:396
 msgid "Successfully Added Tracker Relationship"
 msgstr "Tracker Verknüpfung erfolgreich hinzugefügt"
 
-#: www/pm/task.php:410
+#: www/pm/task.php:433
 msgid "Confirmation failed. Task not deleted"
-msgstr "Bestätigung fehlgeschlagen. Auftrag nicht gelöscht."
+msgstr "Bestätigung fehlgeschlagen. Aufgabe nicht gelöscht."
 
-#: www/pm/task.php:416
+#: www/pm/task.php:439
 msgid "Task Successfully Deleted"
-msgstr "Auftrag erfolgreich gelöscht"
+msgstr "Aufgabe erfolgreich gelöscht"
 
-#: www/pm/templates/detail_template.php:74 www/tracker/item.php:230
+#: www/pm/templates/detail_template.php:69 www/tracker/item.php:237
 msgid "Permalink"
 msgstr "Permalink"
 
-#: www/pm/templates/detail_template.php:79
+#: www/pm/templates/detail_template.php:74
 #, fuzzy
 msgid "Task Detail Information"
 msgstr "Persönliche Information"
 
-#: www/pm/templates/detail_template.php:140
+#: www/pm/templates/detail_template.php:129
 #, fuzzy
 msgid "Related Commits"
 msgstr "Verwandte Aufgaben"
 
-#: www/pm/templates/detail_template.php:144
+#: www/pm/templates/detail_template.php:133
 #, fuzzy
 msgid "Group name"
 msgstr "Gruppe"
 
-#: www/pm/templates/detail_template.php:145
-#, fuzzy
+#: www/pm/templates/detail_template.php:134
 msgid "Revision"
-msgstr "Version"
+msgstr "Revision"
 
-#: www/pm/templates/detail_template.php:150
+#: www/pm/templates/detail_template.php:139
 #, fuzzy
 msgid "Link to version control repository"
 msgstr "Durchsuche Subversion Repository"
 
-#: www/pm/templates/detail_template.php:171
+#: www/pm/templates/detail_template.php:149
+msgid "Dependent on task"
+msgstr "Abhängig von Aufgabe"
+
+#: www/pm/templates/detail_template.php:162
 msgid "Related Tracker Items"
 msgstr "Verwandte Tracker Elemente"
 
-#: www/pm/templates/detail_template.php:181
+#: www/pm/templates/detail_template.php:172
 #, fuzzy
+msgid "Copy to another Subproject"
+msgstr "Ändere/Aktualisiere Projekt"
+
+#: www/pm/templates/detail_template.php:185
+#, fuzzy
 msgid "Change protocol"
 msgstr "Änderungsprotokoll"
 
-#: www/pm/templates/detail_template.php:184
+#: www/pm/templates/detail_template.php:188
 msgid "Task Change History"
-msgstr "Auftragsänderungs-Verlauf"
+msgstr "Aufgabenänderungsverlauf"
 
+#: www/pm/templates/time_tracking.php:5 www/stats/site_stats_utils.php:378
+msgid "Day"
+msgstr "Tag"
+
 #: www/pm/templates/time_tracking.php:6 www/reporting/timeadd.php:141
 msgid "Hours worked"
 msgstr "Geleistete Stunden"
 
+#: www/pm/templates/time_tracking.php:73
+msgid "Time tracking list"
+msgstr "Zeitverfolgungsliste"
+
 #: www/pm/uploadcsv.php:36
 msgid "Warning!"
 msgstr "Warnung!"
@@ -15142,17 +15543,17 @@
 #: www/project/admin/editimages.php:47
 msgid "ERROR - file must be > 20 bytes and < 256000 bytes in length"
 msgstr ""
-"FEHLER - Datei muss größer als 20 bytes und kleiner als 256000 Bytes sein"
+"FEHLER - Datei muß größer als 20 bytes und kleiner als 256000 Bytes sein"
 
-#: www/project/admin/editimages.php:59 www/tracker/tracker.php:147
-#: www/tracker/tracker.php:392
+#: www/project/admin/editimages.php:59 www/tracker/tracker.php:144
+#: www/tracker/tracker.php:393
 #, fuzzy
 msgid "Invalid filename"
 msgstr "Ungültiger Dateiname."
 
 #: www/project/admin/editimages.php:101
 msgid "ERROR: DB: Cannot store multimedia file : "
-msgstr ""
+msgstr "FEHLER: DB: Multimediadatei kann nicht gespeichert werden."
 
 #: www/project/admin/editimages.php:103
 msgid "Multimedia File Uploaded"
@@ -15164,7 +15565,7 @@
 
 #: www/project/admin/editimages.php:139
 msgid "ERROR: DB: Cannot delete multimedia file: "
-msgstr ""
+msgstr "FEHLER: DB: Multimediadatei kann nicht gelöscht werden."
 
 #: www/project/admin/editimages.php:141
 msgid "Multimedia File Deleted"
@@ -15176,7 +15577,7 @@
 
 #: www/project/admin/editimages.php:163
 msgid "ERROR: DB: Cannot update multimedia file"
-msgstr ""
+msgstr "FEHLER: DB: Multimediadatei kann nicht geupdatet werden."
 
 #: www/project/admin/editimages.php:165
 msgid "Multimedia File Properties Updated"
@@ -15251,6 +15652,9 @@
 "categories. If the project does not require any or all of these locations, "
 "simply select \"None Selected\"."
 msgstr ""
+"Wählen sie bis zu drei Aufstellungen für dieses Projekt in jeder der haupt "
+"Umfragekategorien. Wenn das Projekt keine oder alle diese Eingellungen "
+"beansprucht, einfach \"keine Ausgewählt\" wählen."
 
 #: www/project/admin/group_trove.php:78
 #, fuzzy
@@ -15329,6 +15733,8 @@
 #: www/project/admin/index.php:167
 msgid "Or pick a tag from those used by other projects: "
 msgstr ""
+"oder wähle einen Tag von denen, die von einem Anderen Projekt verwendet "
+"werden."
 
 #: www/project/admin/index.php:200
 #, fuzzy
@@ -15398,14 +15804,14 @@
 msgid "Finish"
 msgstr "Fertig"
 
-#: www/project/admin/massfinish.php:53 www/reporting/timecategory.php:42
-#: www/reporting/timecategory.php:52
-msgid "Successful"
-msgstr "Erfolgreich"
+#: www/project/admin/massfinish.php:53
+#, fuzzy
+msgid "Members Added Successfully"
+msgstr "Benutzer erfolgreich hinzugefügt"
 
 #: www/project/admin/massfinish.php:58
 msgid "No IDs Were Passed"
-msgstr ""
+msgstr "Keine ID hat bestanden"
 
 #: www/project/admin/massfinish.php:70
 msgid "Choose the role for each user and then press "Add All"."
@@ -15427,19 +15833,21 @@
 
 #: www/project/admin/project_admin_utils.php:56
 msgid "Edit project name, description, homepage, tags, …"
-msgstr ""
+msgstr "Hinzufügen eines Projektnamens, Homepage, Beschreibung, Abgrenzung ..."
 
 #: www/project/admin/project_admin_utils.php:57
 msgid "Add/Remove users; assign roles to members; import global roles"
 msgstr ""
+"Benutzer hinzufügen/entfernen; Aufgaben der Benutzer festlegen, globale "
+"Aufgaben importieren"
 
 #: www/project/admin/project_admin_utils.php:58
 msgid "Enable/Disable features and plugins; administrate those"
-msgstr ""
+msgstr "Funktionen und Plugins ein-/ausschalten; verwalte diese"
 
 #: www/project/admin/project_admin_utils.php:59
 msgid "Show log of project info changes"
-msgstr ""
+msgstr "Zeige Aufzeichnungen der Änderungen der Projektinformationen."
 
 #: www/project/admin/project_admin_utils.php:61
 msgid "Post Jobs"
@@ -15477,27 +15885,23 @@
 msgid "-tooltip:projadm:database"
 msgstr ""
 
-#: www/project/admin/project_admin_utils.php:86
-msgid "-tooltip:projadm:stats"
-msgstr ""
-
-#: www/project/admin/project_admin_utils.php:146
+#: www/project/admin/project_admin_utils.php:141
 msgid ""
 "This log will show who made significant changes to your project and when"
 msgstr ""
 "Dieser Log wird Ihnen zeigen, wer wichtige Änderungen an Ihrem Projekt "
 "vorgenommen hat und wann"
 
-#: www/project/admin/project_admin_utils.php:177
+#: www/project/admin/project_admin_utils.php:172
 msgid "No changes"
 msgstr "Keine Änderung"
 
-#: www/project/admin/project_admin_utils.php:208
+#: www/project/admin/project_admin_utils.php:203
 #, fuzzy
 msgid "Failed to find namespace for database"
 msgstr "Konnte Nutzer %s nicht finden"
 
-#: www/project/admin/project_admin_utils.php:222
+#: www/project/admin/project_admin_utils.php:217
 msgid ""
 "<strong>NOTE:</strong><dl><dt><strong>Project Admins (bold)</strong></"
 "dt><dd>can access this page and other project administration pages</"
@@ -15517,9 +15921,9 @@
 "Projektadministratorseiten</dd><dt><strong>Freigabetechniker</strong></"
 "dt><dd>können die Dateien freigeben (ein beliebiger Projektadministrator und "
 "ein Freigabetechniker)</dd><dt><strong>Tool Techniker (T)</strong></dt><dd> "
-"können Fehler/Aufträge/Patches zugeordnet werden</dd><dt><strong>Tool "
+"können Fehler/Aufgaben/Patches zugeordnet werden</dd><dt><strong>Tool "
 "Administratoren (A)</strong></dt><dd>können Änderungen an Programmfehlern/"
-"Aufträge/Patches vornehmen und die /Toolname/Admin/ Seiten benutzen</"
+"Aufgaben/Patches vornehmen und die /Toolname/Admin/ Seiten benutzen</"
 "dd><dt><strong>Tool keine Berechtigung(N/A)</strong></dt><dd>Entwickler hat "
 "keine spezifischen Rechte ( aktuell gleichwertig mit '-')</"
 "dd><dt><strong>Moderatoren</strong> (foren)</dt><dd> können Nachrichten aus "
@@ -15529,17 +15933,19 @@
 
 #: www/project/admin/roledelete.php:52
 msgid "You can't delete a global role from here."
-msgstr ""
+msgstr "Sie können keine globale Rolle von hieraus löschen."
 
 #: www/project/admin/roledelete.php:56
 msgid "You can't delete a role belonging to another project."
-msgstr ""
+msgstr "Sie können keine Rolle eines anderen Projekten löschen."
 
 #: www/project/admin/roledelete.php:68
 msgid ""
 "Error: Please check \"I'm Sure\" to confirm or return to previous page to "
 "cancel."
 msgstr ""
+"Fehler: Bitte Häckchen bei \"Ich bin mir sicher\" setzen um zu bestätigen "
+"oder zur vorigen Seite zurückkehren um abzubrechen."
 
 #: www/project/admin/roledelete.php:74
 #, fuzzy, php-format
@@ -15556,7 +15962,7 @@
 msgid "Could Not Get RoleObserver"
 msgstr "Konnte die Rolle nicht bekommen"
 
-#: www/project/admin/roleedit.php:141 www/project/admin/users.php:450
+#: www/project/admin/roleedit.php:141 www/project/admin/users.php:485
 msgid "Edit Observer"
 msgstr "Bearbeite Beobachter"
 
@@ -15622,7 +16028,7 @@
 #: www/project/admin/tools.php:177
 #, fuzzy
 msgid "Use Tasks"
-msgstr "Aufträge"
+msgstr "Aufgaben"
 
 #: www/project/admin/tools.php:190
 #, fuzzy
@@ -15761,37 +16167,37 @@
 
 #: www/project/admin/users.php:372
 msgid "Grant extra role"
-msgstr ""
+msgstr "weitere Rolle erteilen"
 
 #: www/project/admin/users.php:392 www/tracker/admin/form-workflow.php:119
 msgid "Edit Roles"
 msgstr "Rollen bearbeiten"
 
-#: www/project/admin/users.php:395 www/project/admin/users.php:458
-#: www/project/admin/users.php:482
+#: www/project/admin/users.php:404 www/project/admin/users.php:493
+#: www/project/admin/users.php:517
 #, fuzzy
 msgid "Role name"
 msgstr "Rollenname"
 
-#: www/project/admin/users.php:418
+#: www/project/admin/users.php:434
 #, fuzzy
 msgid "Edit Permissions"
 msgstr "Berechtigungen aktualisiert"
 
-#: www/project/admin/users.php:456
+#: www/project/admin/users.php:491
 msgid "Currently used external roles"
-msgstr ""
+msgstr "zur Zeit benutzte externe Rolle"
 
-#: www/project/admin/users.php:471
+#: www/project/admin/users.php:506
 #, fuzzy
 msgid "Unlink Role"
 msgstr "Rolle bearbeiten"
 
-#: www/project/admin/users.php:480
+#: www/project/admin/users.php:515
 msgid "Available external roles"
-msgstr ""
+msgstr "Verfügbare externe Rollen"
 
-#: www/project/admin/users.php:501
+#: www/project/admin/users.php:536
 #, fuzzy
 msgid "Link external role"
 msgstr "Interner Fehler"
@@ -15825,6 +16231,9 @@
 "<em>yourhost.org</em> at <strong>%1$s.%2$s</strong>.  %3$s does not "
 "currently host mail (i.e. cannot be an MX) or DNS</strong>."
 msgstr ""
+"Um einen neuen virtuellen Host hinzu zufügen - einfach auf <strong>CNAME</"
+"strong> klicken, um <em>yourhost.org</em> auf <strong>%1$s.%2$s</strong>."
+"%3$s unterstütz zur Zeit kein Mail ( das heiß, es kann kein MX sein) oder DNS"
 
 #: www/project/admin/vhost.php:112
 #, php-format
@@ -15833,6 +16242,9 @@
 "will be synced to the project webservers - such that <em>yourhost.org</em> "
 "will display the material at <em>%1$s.%2$s</em>."
 msgstr ""
+"Auf \"erstellen\" klicken um die Erstellung eines virtuellen Hosts "
+"auszuführen. Dieser wird mit dem Projekt Webserver synchronisiert - damit "
+"<em> yourhost.org </em> das Material dort <em>%1$s.%2$s</em> anzeigen wird."
 
 #: www/project/admin/vhost.php:120
 msgid "New Virtual Host <em>(e.g. vhost.org)</em>"
@@ -15900,9 +16312,9 @@
 msgstr "Kontakt"
 
 #: www/project/report/index.php:237 www/reporting/usersummary.php:102
-#: www/tracker/taskmgr.php:106
+#: www/tracker/taskmgr.php:108
 msgid "Task"
-msgstr "Auftrag"
+msgstr "Aufgabe"
 
 #: www/project/request.php:49
 msgid "Your request has been submitted."
@@ -15934,21 +16346,12 @@
 msgstr[0] "Sie müssen dem Administrator einen Kommentar zusenden:"
 msgstr[1] "Sie müssen den Administratoren einen Kommentar zusenden:"
 
-#: www/project/stats/index.php:83
+#: www/project/stats/index.php:94
 #, fuzzy
 msgid "Project Statistics"
 msgstr "Benutze Statistiken"
 
-#: www/project/stats/index.php:87
-#, fuzzy
-msgid "Statistics"
-msgstr "Benutze Statistiken"
-
-#: www/project/stats/index.php:89
-msgid "-tooltip:stats"
-msgstr ""
-
-#: www/project/stats/index.php:103 www/reporting/projectact.php:63
+#: www/project/stats/index.php:109 www/reporting/projectact.php:63
 #: www/reporting/siteact.php:63 www/reporting/useract.php:78
 msgid "Areas"
 msgstr "Gebiete"
@@ -16025,12 +16428,12 @@
 #: www/register/index.php:141
 #, php-format
 msgid "<div class=\"error\">ERROR: %1$s</div>"
-msgstr ""
+msgstr "<div class=\"error\">FEHLER: %1$s</div>"
 
 #: www/register/index.php:146
 #, php-format
 msgid "<div class=\"error\">Approval ERROR: %1$s</div>"
-msgstr ""
+msgstr "<div class=\"error\">FEHLER Bestätigung: %1$s</div>"
 
 #: www/register/index.php:148
 #, fuzzy, php-format
@@ -16178,6 +16581,10 @@
 "configuration as the template (same roles and permissions, same trackers, "
 "same set of enabled plugins, and so on)."
 msgstr ""
+"Sie können entweder mit einem leeren Projekt starten, oder sie wählen ein "
+"Projekt welches ihnen als Vorlage dient. Ihr Projekt wir die Einstellungen "
+"der Vorlage sofort übernehmen (Die selben Aufgaben und Genehmigungen, die "
+"selben Tracker, den selben Satz von freigeschalteten Plugins usw.)."
 
 #: www/register/index.php:240 www/register/index.php:260
 #, fuzzy
@@ -16191,6 +16598,10 @@
 "will initially have the same configuration as the template (same roles and "
 "permissions, same trackers, same set of enabled plugins, and so on)."
 msgstr ""
+"Bitte ein Projekt als Vorlage für ihr eingenes Projekt wählen. Ihr Projekt "
+"wir die Einstellungen der Vorlage sofort übernehmen (Die selben Aufgaben und "
+"Genehmigungen, die selben Tracker, den selben Satz von freigeschalteten "
+"Plugins usw.)."
 
 #: www/register/index.php:254
 #, php-format
@@ -16200,6 +16611,10 @@
 "as the template (same roles and permissions, same trackers, same set of "
 "enabled plugins, and so on)."
 msgstr ""
+"Sie können entweder mit einem leeren Projekt anfangen, oder dieses Projekt "
+"%s als Vorlage verwenden. Ihr Projekt wir die Einstellungen der Vorlage "
+"sofort übernehmen (Die selben Aufgaben und Genehmigungen, die selben "
+"Tracker, den selben Satz von freigeschalteten Plugins usw.)."
 
 #: www/register/index.php:266
 #, php-format
@@ -16208,11 +16623,14 @@
 "(same roles and permissions, same trackers, same set of enabled plugins, and "
 "so on)."
 msgstr ""
+"Ihr Projekt wird nun die selben Konfigurationen haben wie dieses Projekt %s "
+"(Die selben Aufgaben und Genehmigungen, die selben Tracker, den selben Satz "
+"von freigeschalteten Plugins usw.)."
 
 #: www/register/index.php:273
 #, php-format
 msgid "Since no template project is available, your project will start empty."
-msgstr ""
+msgstr "Wenn keine Projektvorlage vorhanden ist, wird ihr Projekt leer starten"
 
 #: www/reporting/groupadded.php:51 www/reporting/groupcum.php:50
 #: www/reporting/projectact.php:53 www/reporting/projecttime.php:53
@@ -16221,7 +16639,7 @@
 #: www/reporting/useract.php:54 www/reporting/useradded.php:50
 #: www/reporting/usercum.php:51 www/reporting/usertime.php:54
 msgid "Start and end dates must be different"
-msgstr ""
+msgstr "Beginn- und Enddatum müssen verschieden sein"
 
 #: www/reporting/groupadded.php:54
 msgid "Projects Added"
@@ -16258,7 +16676,7 @@
 #: www/reporting/index.php:50
 msgid "Project-specific reports: Tracker, Task Mgr, Forums, Doc Mgr, Downloads"
 msgstr ""
-"Projekt-spezifische Auswertungen: Tracker, Auftragsmanager, Foren, "
+"Projekt-spezifische Auswertungen: Tracker, Aufgabenmanager, Foren, "
 "Dokumenten-Manager, Downloads"
 
 #: www/reporting/index.php:52
@@ -16306,7 +16724,7 @@
 
 #: www/reporting/index.php:63
 msgid "Site-Wide Task & Hours (report)"
-msgstr "Seitenübergreifender Auftrag & Stunden (Bericht)"
+msgstr "Seitenübergreifende Aufgabe & Stunden (Bericht)"
 
 #: www/reporting/index.php:66
 msgid "Administrative"
@@ -16351,7 +16769,7 @@
 #: www/reporting/projecttime.php:58 www/reporting/sitetime.php:58
 #: www/reporting/usertime.php:74
 msgid "By Task"
-msgstr "Nach Auftrag"
+msgstr "Nach Aufgabe"
 
 #: www/reporting/projecttime.php:60 www/reporting/sitetime.php:60
 #: www/reporting/usertime.php:76
@@ -16370,7 +16788,7 @@
 #: www/reporting/rebuild.php:47
 #, fuzzy
 msgid "Reporting System Initialization"
-msgstr "Auftrags-Auswertungs System"
+msgstr "Aufgabenauswertungs System"
 
 #: www/reporting/rebuild.php:50
 msgid ""
@@ -16386,7 +16804,7 @@
 "If you are sure you want to rebuild all the reporting tables, check the \"I "
 "am sure\" box and click the button below."
 msgstr ""
-"Wenn Sie sicher sind, dass Sie alle Berichtsverzeichnisse neu erstellen "
+"Wenn Sie sicher sind, daß Sie alle Berichtsverzeichnisse neu erstellen "
 "möchten, wählen Sie das \"Ich bin sicher\" Kästchen aus und klicken Sie auf "
 "den Knopf darunter."
 
@@ -16410,9 +16828,13 @@
 msgid "Site-Wide Time Tracking"
 msgstr "Seitenübergreifende Zeitverfolgung"
 
+#: www/reporting/sitetimebar.php:89
+msgid "Week"
+msgstr "Woche"
+
 #: www/reporting/timeadd.php:65
 msgid "INTERNAL ERROR: delete: "
-msgstr ""
+msgstr "INTERNER FEHLER: lösche:"
 
 #: www/reporting/timeadd.php:119
 #, php-format
@@ -16421,7 +16843,7 @@
 
 #: www/reporting/timeadd.php:139
 msgid "Project/Task"
-msgstr "Projekt/Auftrag"
+msgstr "Projekt/Aufgabe"
 
 #: www/reporting/timeadd.php:182
 msgid "Total Hours"
@@ -16436,11 +16858,11 @@
 "Choose a Project/Subproject in the Task Manager. You will then have to "
 "choose a Task and category to record your time in."
 msgstr ""
-"Wählen Sie ein Projekt/Unterprojekt im Auftrags-Manager. Sie müssen dann "
-"einen Auftrag und Kategorie wählen, in der Sie Ihre Zeit erfassen."
+"Wählen Sie ein Projekt/Unterprojekt im Aufgabenmanager. Sie müssen dann eine "
+"Aufgabe und Kategorie wählen, in der Sie Ihre Zeit erfassen."
 
-#: www/reporting/timeadd.php:197 www/tracker/taskmgr.php:102
-#: www/tracker/taskmgr.php:156
+#: www/reporting/timeadd.php:197 www/tracker/taskmgr.php:104
+#: www/tracker/taskmgr.php:158
 #, fuzzy
 msgid "Tasks Project"
 msgstr "Task Manager Projekt"
@@ -16463,12 +16885,16 @@
 "in the Task Manager."
 msgstr ""
 "Nachdem Sie eine Woche gewählt haben werden Sie aufgefordert ein Projekt/"
-"Unterprojekt im Auftrags-Manager zu wählen."
+"Unterprojekt im Aufgaben-Manager zu wählen."
 
 #: www/reporting/timeadd.php:226
 msgid "Week Starting"
 msgstr "Woche startend"
 
+#: www/reporting/timecategory.php:42 www/reporting/timecategory.php:52
+msgid "Successful"
+msgstr "Erfolgreich"
+
 #: www/reporting/timecategory.php:71
 msgid "Time Code"
 msgstr "Zeitcode"
@@ -16518,11 +16944,11 @@
 "with an open date in that range."
 msgstr ""
 "Wählen Sie die Reichweite der Pop-up Box unten. Der Bericht wird alle "
-"Aufträge mit einem offenen Datum in der Reichweite auflisten."
+"Aufgaben mit einem offenen Datum in der Reichweite auflisten."
 
 #: www/reporting/usersummary.php:71
 msgid "Task Status"
-msgstr "Auftragsstatus"
+msgstr "Aufgabenstatus"
 
 #: www/reporting/usersummary.php:98
 msgid "No matches found"
@@ -16817,12 +17243,16 @@
 #: www/sendmessage.php:124
 msgid "In an attempt to reduce spam, we are using this form to send email."
 msgstr ""
+"Im Bestreben Spam zu vermeiden, nutzen wir dieses Formular zum senden von "
+"Emails"
 
 #: www/sendmessage.php:128
 msgid ""
 "Fill it out accurately and completely or the receiver may not be able to "
 "respond."
 msgstr ""
+"Bitte vollständige und wahrheitsgetreue Angaben machen, sonst besteht die "
+"Möglichkeit das der Empfänger nicht antworten kann."
 
 #: www/sendmessage.php:132
 #, fuzzy
@@ -16834,7 +17264,7 @@
 msgstr ""
 "Um die Spam-Menge zu reduzieren, nutzen wir dieses Formular zum Versenden "
 "von E-Mails.<p />Füllen Sie es genau und vollständig aus, sonst kann es "
-"sein, dass der Empfänger nicht antworten kann.<p /><span class=\"important"
+"sein, daß der Empfänger nicht antworten kann.<p /><span class=\"important"
 "\"><b>WENN SIE SCHREIBEN UM HILFE ZU ERHALTEN:</b>Haben Sie die "
 "Seitendokumentation gelesen? Haben Sie Ihre <b>user_id</b> und Ihren "
 "<b>user_name</b>eingefügt? Wenn Sie zu einem Projekt schreiben, fügen Sie "
@@ -16907,6 +17337,8 @@
 msgid ""
 "You can use this form repeatedly to keep adding snippets to your package."
 msgstr ""
+"Sie können dieses Formular wiederholt verwenden um Schnipsel zu ihrem Paket "
+"hinzu zu fügen."
 
 #: www/snippet/add_snippet_to_package.php:132
 #, fuzzy
@@ -17153,12 +17585,17 @@
 "The purpose of this archive is to let you share your code snippets, scripts, "
 "and functions with the Open Source Software Community."
 msgstr ""
+"Die Aufgabe dieses Archievs ist es, ihnen zu ermöglichen ihre Code-"
+"Schnipsel, Skripte und Funktionen mit der Open Source Software Community zu "
+"teilen."
 
 #: www/snippet/index.php:52
 msgid ""
 "You can create a \"new snippet\", then post additional versions of that "
 "snippet quickly and easily."
 msgstr ""
+"Wenn sie einen \"neuen Schnipsel\" erstellt haben, können sie schnell und "
+"einfach verschiedene Versionen davon bekannt geben."
 
 #: www/snippet/index.php:54
 msgid ""
@@ -17166,6 +17603,9 @@
 "snippets. That package can contain multiple, specific versions of other "
 "snippets."
 msgstr ""
+"Wenn sie einen Schnipsel bekannt gegeben haben, können sie ein \"Paket\" von "
+"Schnipseln erstellen. Dieses verschiedene, spezifische Versionen anderer "
+"Schnipsel enthalten."
 
 #: www/snippet/index.php:56
 #, fuzzy
@@ -17174,7 +17614,7 @@
 
 #: www/snippet/index.php:58
 msgid "You can browse the snippet library quickly:"
-msgstr ""
+msgstr "Sie können die Schnipselbibliothek schnell durchsuchen:"
 
 #: www/snippet/index.php:64
 msgid "Browse by Language"
@@ -17211,16 +17651,22 @@
 "interface. Before creating your package, make sure all your snippets are in "
 "place and you have made a note of the snippet ID's."
 msgstr ""
+"Sie können vorhandene Schnipsel gruppieren und in einem Paket indem sie "
+"diese Schaltfläche verwenden. Bevor sie das Paket erstellen, stellen sie "
+"sicher das alle Schnipsel an ihrem Platz sind und schreiben sie sich die "
+"Schnipsel ID raus."
 
 #: www/snippet/package.php:136
 msgid "Create the package using this form."
-msgstr ""
+msgstr "Dieses Formular zum erstellen eines Packetes benutzen"
 
 #: www/snippet/package.php:137
 msgid ""
 "<strong>Then</strong> use the \"Add Snippets to Package\" link to add files "
 "to your package."
 msgstr ""
+"<strong>Dann</strong> den \"Schnipsel zum Paket hinzufügen\" Link nutzen um "
+"die Datei ihrem Packet hinzu zufügen."
 
 #: www/snippet/package.php:139
 msgid ""
@@ -17229,6 +17675,10 @@
 "package. You should only use this page if you are submitting an entirely new "
 "package."
 msgstr ""
+"<span class=\"important\">Anmerkung:</span> Sie können eine neue Version "
+"eines bestehenden Paket einrechen, indem sie in der Bibliothek nach dem "
+"Entsprechenden Link suche. Verwenden sie diese Seite ausschließlich um ein "
+"noch nicht vorhandenes Paket einzureichen."
 
 #: www/snippet/package.php:157 www/snippet/submit.php:125
 #: www/stats/i18n.php:33
@@ -17670,23 +18120,29 @@
 
 #: www/survey/admin/index.php:58
 msgid "It's simple to create a survey."
-msgstr ""
+msgstr "Es ist einfach eine Umfrage zu erstellen"
 
 #: www/survey/admin/index.php:62
 msgid "Create questions and comments using the forms above."
 msgstr ""
+"Nutzen Sie die oben stehenden Formulare um Fragen und Bemerkungen zu "
+"erstellen"
 
 #: www/survey/admin/index.php:65
 msgid ""
 "Create a survey, listing the questions in order (choose from <strong>your</"
 "strong> list of questions)."
 msgstr ""
+"Umfrage erstellen, die Fragen in einer Reihenfolge ordnen (wählen sie aus "
+"<strong>ihrer</strong> Liste von Fragen)"
 
 #: www/survey/admin/index.php:68
 #, php-format
 msgid ""
 "Link to the survey using this format: %1$s where XX is the survey number"
 msgstr ""
+"Dieses Format für Verweise auf Umfragen nutzen: %1$s wenn XX die Nunner der "
+"Umfrage ist."
 
 #: www/survey/admin/index.php:73
 #, php-format
@@ -17883,6 +18339,8 @@
 #, php-format
 msgid "Please %1$s create a question %2$s before creating a survey"
 msgstr ""
+"%1$s bitte erstellen sie erst eine Frage %2$s bevor sie eine Umfrage "
+"erstellen"
 
 #: www/survey/include/SurveyHTML.class.php:174
 #, fuzzy
@@ -17956,7 +18414,7 @@
 
 #: www/survey/include/SurveyHTML.class.php:366
 msgid "Did I Vote?"
-msgstr ""
+msgstr "Stimme abgegeben?"
 
 #: www/survey/include/SurveyHTML.class.php:372
 #: www/survey/include/SurveyHTML.class.php:440
@@ -18009,6 +18467,9 @@
 "The information collected in these surveys will never be sold to third "
 "parties or used to solicit you to purchase any goods or services."
 msgstr ""
+"Die in dieser Befragung gesammelten Informationen werden niemals an dritte "
+"weiter gegeben oder benutzt um bei Ihnen für Produkte oder Dienstleistungen "
+"zu werben."
 
 #: www/survey/privacy.php:39
 msgid ""
@@ -18016,24 +18477,33 @@
 "developers being surveyed. That profile will help visitors to the site "
 "understand the quality of a given project."
 msgstr ""
+"Diese Information wurde für die Erstellung ein Profil des Projektes und die "
+"Entwickler wurden befragt. Das Profil wird Besuchern der Seite helfen doe "
+"gegebene Qualität eines Projektes zu verstehen."
 
 #: www/survey/privacy.php:42
 msgid ""
 "The ID's of those who answer surveys are suppressed and not viewable by "
 "project administrators or the public or third parties."
 msgstr ""
+"Die ID's derer die auf Befragungen antworten sind unterdrückt und weder von "
+"dem Projektadministrator noch von dritten einsehbar."
 
 #: www/survey/privacy.php:45
 msgid ""
 "The information gathered is used only in aggregate form, not to single out "
 "specific users or developers."
 msgstr ""
+"Die gesammelten Informationen werden nur in aggregierter Form gesammelt, um "
+"nicht bestimmte Benutzer oder Entwickler aus zu schließen."
 
 #: www/survey/privacy.php:48
 msgid ""
 "If any changes are made to this policy, it will affect only future data that "
 "is collected and the user will of course have the ability to 'opt-out'."
 msgstr ""
+"Änderungen die an der Methode gemacht werden, werden nur die ausgewählten "
+"Dateien berühren und der Benutzer hat die Möglichkeit dies ab zu wehren."
 
 #: www/survey/privacy.php:53
 #, php-format
@@ -18064,7 +18534,7 @@
 
 #: www/survey/rating_resp.php:65
 msgid "Flag"
-msgstr ""
+msgstr "Flag"
 
 #: www/survey/survey.php:51
 #, fuzzy, php-format
@@ -18140,7 +18610,7 @@
 
 #: www/themes/evolvis/Theme.class.php:140
 msgid "Register a user account with the Forge system"
-msgstr ""
+msgstr "Registriere einen neuen Benutzer mit dem Forge-System"
 
 #: www/themes/evolvis/Theme.class.php:169
 #, php-format
@@ -18152,9 +18622,9 @@
 msgid "Forge: %s"
 msgstr "Forge: %s"
 
-#: www/themes/evolvis/Theme.class.php:209
-#: www/themes/evolvis/Theme.class.php:212
-#: www/themes/evolvis/Theme.class.php:275
+#: www/themes/evolvis/Theme.class.php:210
+#: www/themes/evolvis/Theme.class.php:213
+#: www/themes/evolvis/Theme.class.php:276
 msgid "Toggle"
 msgstr "Ein-/Ausklappen"
 
@@ -18245,6 +18715,10 @@
 msgid "Last Rank"
 msgstr "Letzter Rang"
 
+#: www/top/topusers.php:67 www/tracker/browse.php:278
+msgid "Change"
+msgstr "Ändern"
+
 #: www/top/topusers.php:86
 msgid "N/A"
 msgstr "keine Angaben"
@@ -18435,7 +18909,7 @@
 msgstr "Außerstande ein ArtifactCanned Objekt anzulegen"
 
 #: www/tracker/admin/form-clonetracker.php:48
-#: www/tracker/include/ArtifactTypeHtml.class.php:1020
+#: www/tracker/include/ArtifactTypeHtml.class.php:835
 msgid "Clone Tracker"
 msgstr "Tracker-Vorlage klonen"
 
@@ -18446,13 +18920,13 @@
 "projet with default values and set permissions propertly so you can access "
 "them."
 msgstr ""
-"Wählen Sie den Template Tracker zum Klonen. Der Site Administrator muss "
+"Wählen Sie den Template Tracker zum Klonen. Der Site Administrator muß "
 "Tracker mit Standardwerten aufsetzen und Erlaubnisse korrekt einrichten "
 "damit Sie Zugang erhalten."
 
 #: www/tracker/admin/form-clonetracker.php:54
 msgid "Choose the template tracker to clone."
-msgstr ""
+msgstr "Template-Tracker zum klonen auswählen"
 
 #: www/tracker/admin/form-clonetracker.php:57
 msgid ""
@@ -18482,19 +18956,17 @@
 msgid "Submitted By"
 msgstr "Gepostet von"
 
-#: www/tracker/admin/form-customizelist.php:48 www/tracker/browse.php:192
-#: www/tracker/browse.php:630 www/tracker/query.php:196
+#: www/tracker/admin/form-customizelist.php:48 www/tracker/browse.php:323
+#: www/tracker/browse.php:649 www/tracker/query.php:199
 msgid "Close Date"
 msgstr "Schließdatum"
 
-#: www/tracker/admin/form-customizelist.php:49
-#: www/tracker/include/ArtifactHtml.class.php:57
-#: www/tracker/include/ArtifactHtml.class.php:62 www/tracker/item.php:325
-#: www/tracker/query.php:380
+#: www/tracker/admin/form-customizelist.php:49 www/tracker/item.php:322
+#: www/tracker/item.php:333 www/tracker/query.php:383
 msgid "Detailed description"
 msgstr "Genaue Beschreibung"
 
-#: www/tracker/admin/form-customizelist.php:50 www/tracker/browse.php:640
+#: www/tracker/admin/form-customizelist.php:50 www/tracker/browse.php:659
 #, fuzzy
 msgid "Related tasks"
 msgstr "Verwandte Aufgaben"
@@ -18621,7 +19093,7 @@
 "things are dependent upon it. When you change the custom field name, all "
 "related items will be changed to the new name"
 msgstr ""
-"Es ist nicht empfehlenswert, dass Sie die Extrafeldnamen ändern,weil andere "
+"Es ist nicht empfehlenswert, daß Sie die Extrafeldnamen ändern,weil andere "
 "Dinge davon abhängig sind. Wenn Sie den Extrafeldnamen ändern, werden alle "
 "verwandten Elemente zum neuen Namen geändert."
 
@@ -18687,7 +19159,7 @@
 
 #: www/tracker/admin/form-workflow.php:34
 msgid "Internal error: Illegal number of status fields (WKFL01)."
-msgstr ""
+msgstr "Interner Fehler: Ungültiger Statuswert im Feld (WKFL01)."
 
 #: www/tracker/admin/form-workflow.php:37
 msgid "Configure workflow"
@@ -18716,7 +19188,7 @@
 #: www/tracker/admin/ind.php:48
 #, fuzzy
 msgid "Tracker created successfully"
-msgstr "Auftrag erfolgreich erstellt"
+msgstr "Aufgabe erfolgreich erstellt"
 
 #: www/tracker/admin/ind.php:62 www/tracker/ind.php:27
 #, fuzzy
@@ -18785,7 +19257,7 @@
 msgstr "Erlaube anonyme Beiträge"
 
 #: www/tracker/admin/index.php:68 www/tracker/admin/updates.php:170
-#: www/tracker/download.php:43 www/tracker/tracker.php:49
+#: www/tracker/download.php:43 www/tracker/tracker.php:46
 #, fuzzy
 msgid "ArtifactType could not be created"
 msgstr "Artefakt konnte nicht erzeugt werden"
@@ -18800,7 +19272,7 @@
 msgstr "Erfolgreich gelöscht."
 
 #: www/tracker/admin/tracker.php:31
-#: www/tracker/include/ArtifactTypeHtml.class.php:929
+#: www/tracker/include/ArtifactTypeHtml.class.php:744
 msgid "New Tracker"
 msgstr "Neuer Tracker"
 
@@ -18810,7 +19282,7 @@
 msgstr "Standardwert für neue Tracker"
 
 #: www/tracker/admin/tracker.php:36
-#: www/tracker/include/ArtifactTypeHtml.class.php:995
+#: www/tracker/include/ArtifactTypeHtml.class.php:810
 msgid "Update Settings"
 msgstr "Einstellungen aktualisieren"
 
@@ -18820,7 +19292,7 @@
 msgstr "Richten Sie Einstellungen ein, wie z.B. Ablaufzeit, Emailadressen"
 
 #: www/tracker/admin/tracker.php:41
-#: www/tracker/include/ArtifactTypeHtml.class.php:1000
+#: www/tracker/include/ArtifactTypeHtml.class.php:815
 msgid "Manage Custom Fields"
 msgstr "Hinzufügen/Aktualisieren Extra-Felder"
 
@@ -18837,7 +19309,7 @@
 "Produkttypen"
 
 #: www/tracker/admin/tracker.php:46
-#: www/tracker/include/ArtifactTypeHtml.class.php:1005
+#: www/tracker/include/ArtifactTypeHtml.class.php:820
 msgid "Manage Workflow"
 msgstr "Workflow verwalten"
 
@@ -18846,7 +19318,7 @@
 msgstr "Tracker Workflow bearbeiten."
 
 #: www/tracker/admin/tracker.php:51
-#: www/tracker/include/ArtifactTypeHtml.class.php:1010
+#: www/tracker/include/ArtifactTypeHtml.class.php:825
 msgid "Customize List"
 msgstr "Liste Anpassen"
 
@@ -18855,7 +19327,7 @@
 msgstr "Anzeige für den Tracker Anpassen"
 
 #: www/tracker/admin/tracker.php:56
-#: www/tracker/include/ArtifactTypeHtml.class.php:1015
+#: www/tracker/include/ArtifactTypeHtml.class.php:830
 msgid "Add/Update Canned Responses"
 msgstr "Vorgefertigte Antworten hinzufügen/aktualisieren"
 
@@ -18870,7 +19342,7 @@
 
 #: www/tracker/admin/tracker.php:62
 msgid "Duplicate parameters and fields from a template trackers in this one."
-msgstr ""
+msgstr "Parameter und Felder aus einem Template-Tracker in diesen kopieren"
 
 #: www/tracker/admin/tracker.php:67
 msgid "Permanently delete this tracker."
@@ -18988,93 +19460,104 @@
 msgid "Element deleted"
 msgstr "Element aktualisiert"
 
-#: www/tracker/browse.php:193 www/tracker/query.php:197
+#: www/tracker/browse.php:168
+msgid "Query Name"
+msgstr "Name der Suchanfrage"
+
+#: www/tracker/browse.php:172 www/tracker/browse.php:471
+msgid "Load"
+msgstr "Laden"
+
+#: www/tracker/browse.php:184
+#, fuzzy
+msgid "Deleted query successful."
+msgstr "Löschung Erfolgreich"
+
+#: www/tracker/browse.php:224
+#, fuzzy, php-format
+msgid "Saved query with name \"%s\"."
+msgstr "Gespeicherte Suchanfrage mit Name: "
+
+#: www/tracker/browse.php:273
+#, php-format
+msgid "Displaying results %1$d‒%2$d out of %3$d total."
+msgstr "Stelle Resultate %1$d‒%2$d von %3$d dar."
+
+#: www/tracker/browse.php:276
+#, php-format
+msgid "Displaying %2$s results."
+msgstr "Stelle insgesamt %2$s Ergebnisse dar."
+
+#: www/tracker/browse.php:324 www/tracker/query.php:200
 msgid "Submitter"
 msgstr "Sender"
 
-#: www/tracker/browse.php:210 www/tracker/query.php:214
+#: www/tracker/browse.php:341 www/tracker/query.php:217
 msgid "Ascending"
 msgstr "Aufsteigend"
 
-#: www/tracker/browse.php:211 www/tracker/query.php:215
+#: www/tracker/browse.php:342 www/tracker/query.php:218
 msgid "Descending"
 msgstr "Absteigend"
 
-#: www/tracker/browse.php:221 www/tracker/query.php:226
+#: www/tracker/browse.php:352 www/tracker/query.php:229
 msgid "Any changes"
 msgstr "Jede Änderung"
 
-#: www/tracker/browse.php:222 www/tracker/query.php:227
+#: www/tracker/browse.php:353 www/tracker/query.php:230
 msgid "Last 24H"
 msgstr "Letzten 24 h"
 
-#: www/tracker/browse.php:223 www/tracker/query.php:228
+#: www/tracker/browse.php:354 www/tracker/query.php:231
 msgid "Last 7days"
 msgstr "Letzten 7 Tage"
 
-#: www/tracker/browse.php:224 www/tracker/query.php:229
+#: www/tracker/browse.php:355 www/tracker/query.php:232
 msgid "Last 2weeks"
 msgstr "Letzte 2 Wochen"
 
-#: www/tracker/browse.php:225 www/tracker/query.php:230
+#: www/tracker/browse.php:356 www/tracker/query.php:233
 msgid "Last 1month"
 msgstr "Letzten Monat"
 
-#: www/tracker/browse.php:280
+#: www/tracker/browse.php:411
 #, fuzzy
 msgid "Advanced queries"
 msgstr "Erweiterte Suche"
 
-#: www/tracker/browse.php:301
-msgid "Query Name"
-msgstr "Name der Suchanfrage"
+#: www/tracker/browse.php:431
+msgid "Select Query"
+msgstr "Suchanfrage wählen"
 
-#: www/tracker/browse.php:350
-msgid "Saved query with Name: "
-msgstr "Gespeicherte Suchanfrage mit Name: "
-
-#: www/tracker/browse.php:398
-#, php-format
-msgid "Displaying results %1$d‒%2$d out of %3$d total."
-msgstr "Stelle Resultate %1$d‒%2$d von %3$d dar."
-
-#: www/tracker/browse.php:413 www/tracker/query.php:286
-msgid "Load Query"
-msgstr "Suchanfrage laden"
-
-#: www/tracker/browse.php:415
+#: www/tracker/browse.php:433
 msgid "Select One"
 msgstr "Eine auswählen"
 
-#: www/tracker/browse.php:426
+#: www/tracker/browse.php:444
 msgid "Tracker Queries"
 msgstr "Tracker-Suchanfragen"
 
-#: www/tracker/browse.php:443
+#: www/tracker/browse.php:461
 msgid "Private Queries"
 msgstr "Private Suchanfragen"
 
-#: www/tracker/browse.php:453
-msgid "Load"
-msgstr "Laden"
-
-#: www/tracker/browse.php:467
+#: www/tracker/browse.php:486
 msgid "Simple Filtering and Sorting"
 msgstr "Einfaches Filtern und Sortieren"
 
-#: www/tracker/browse.php:496 www/tracker/query.php:387
+#: www/tracker/browse.php:515 www/tracker/query.php:390
 msgid "Order by"
 msgstr "Sortieren nach"
 
-#: www/tracker/browse.php:499
+#: www/tracker/browse.php:518
 msgid "Quick Browse"
 msgstr "Schnellsuche"
 
-#: www/tracker/browse.php:531
+#: www/tracker/browse.php:550
 msgid "Default"
 msgstr "Standard"
 
-#: www/tracker/browse.php:532
+#: www/tracker/browse.php:551
 msgid ""
 "Viewing only opened records by default, use 'Advanced queries' or 'Simple "
 "Filtering and Sorting' to change."
@@ -19082,61 +19565,61 @@
 "Standardmäßig nur geöffnete Aufzeichnungen ansehen, nutzen Sie 'Erweiterte "
 "Suche' oder 'Einfaches Filtern und Sortieren' um dies zu ändern."
 
-#: www/tracker/browse.php:789
+#: www/tracker/browse.php:808
 #, fuzzy
 msgid "Check  all"
 msgstr "Alle auswählen"
 
-#: www/tracker/browse.php:791
+#: www/tracker/browse.php:810
 #, fuzzy
 msgid "Clear  all"
 msgstr "Alle abwählen"
 
-#: www/tracker/browse.php:818
-#: www/tracker/include/ArtifactTypeHtml.class.php:841
-#: www/tracker/include/ArtifactTypeHtml.class.php:873
+#: www/tracker/browse.php:837
+#: www/tracker/include/ArtifactTypeHtml.class.php:656
+#: www/tracker/include/ArtifactTypeHtml.class.php:688
 msgid "Nobody"
 msgstr "Niemanden"
 
-#: www/tracker/browse.php:822
+#: www/tracker/browse.php:841
 msgid "Canned Response"
 msgstr "Vorgespeicherte Antwort"
 
-#: www/tracker/browse.php:839 www/tracker/browse.php:841
+#: www/tracker/browse.php:858 www/tracker/browse.php:860
 msgid "Caption"
 msgstr "Legende"
 
-#: www/tracker/browse.php:844
+#: www/tracker/browse.php:863
 #, php-format
 msgid "* Denotes requests > %1$s Days Old"
 msgstr "* Anfragen, die älter als %1$s Tage sind"
 
-#: www/tracker/browse.php:854
+#: www/tracker/browse.php:873
 msgid "No items found"
 msgstr "Keine Beiträge gefunden"
 
-#: www/tracker/deleteartifact.php:11
+#: www/tracker/deleteartifact.php:13
 msgid "Delete artifact"
 msgstr "Artefakt löschen"
 
-#: www/tracker/deleteartifact.php:21
+#: www/tracker/deleteartifact.php:23
 #, fuzzy
 msgid "Confirm Deletion"
 msgstr "Löschen bestätigen"
 
-#: www/tracker/deleteartifact.php:30
+#: www/tracker/deleteartifact.php:32
 msgid "Are you sure you want to delete this artifact?"
 msgstr "Wollen Sie das Produkt wirklich löschen?"
 
-#: www/tracker/deleteartifact.php:33
+#: www/tracker/deleteartifact.php:35
 msgid "Yes, I want to delete this artifact"
 msgstr "Ja, ich möchte dieses Produkt löschen"
 
-#: www/tracker/download.php:51 www/tracker/taskmgr.php:34
-#: www/tracker/tracker.php:90 www/tracker/tracker.php:282
-#: www/tracker/tracker.php:456 www/tracker/tracker.php:473
-#: www/tracker/tracker.php:502 www/tracker/tracker.php:523
-#: www/tracker/tracker.php:572
+#: www/tracker/download.php:51 www/tracker/taskmgr.php:36
+#: www/tracker/tracker.php:87 www/tracker/tracker.php:283
+#: www/tracker/tracker.php:473 www/tracker/tracker.php:490
+#: www/tracker/tracker.php:519 www/tracker/tracker.php:540
+#: www/tracker/tracker.php:589
 msgid "Artifact Could Not Be Created"
 msgstr "Artefakt konnte nicht erzeugt werden"
 
@@ -19145,16 +19628,16 @@
 msgid "ArtifactFile Could Not Be Created"
 msgstr "Artefakt konnte nicht erzeugt werden"
 
-#: www/tracker/include/ArtifactHtml.class.php:78
+#: www/tracker/include/ArtifactHtml.class.php:38
 msgid "No Changes Have Been Made to This Item"
 msgstr "An dem Element wurden keine Änderungen vorgenommen"
 
-#: www/tracker/include/ArtifactHtml.class.php:138
+#: www/tracker/include/ArtifactHtml.class.php:98
 #, fuzzy
 msgid "Backward Relations"
-msgstr "Erstelle Auftragsverbindung"
+msgstr "Erstelle Aufgabenverbindung"
 
-#: www/tracker/include/ArtifactHtml.class.php:149
+#: www/tracker/include/ArtifactHtml.class.php:109
 #, php-format
 msgid "%1$s: %2$s <%4$s>(Relation: %3$s)</%5$s>"
 msgstr "%1$s: %2$s <%4$s>(Beziehungsfeld: %3$s)</%5$s>"
@@ -19166,137 +19649,144 @@
 msgstr "Foren für %1$s"
 
 #: www/tracker/include/ArtifactTypeFactoryHtml.class.php:45
-#: www/tracker/include/ArtifactTypeHtml.class.php:935
+#: www/tracker/include/ArtifactTypeHtml.class.php:750
 #, fuzzy
 msgid "View Trackers"
 msgstr "Neuer Tracker"
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:197
-#: www/tracker/include/ArtifactTypeHtml.class.php:204
-#: www/tracker/include/ArtifactTypeHtml.class.php:353
-#: www/tracker/include/ArtifactTypeHtml.class.php:360
-#: www/tracker/query.php:363
-#, fuzzy, php-format
-msgid "(%% for wildcards)"
-msgstr "(% als Joker)"
-
-#: www/tracker/include/ArtifactTypeHtml.class.php:411
+#: www/tracker/include/ArtifactTypeHtml.class.php:139
 msgid "No related tasks."
 msgstr "Keine Aufgabenbezüge."
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:421
+#: www/tracker/include/ArtifactTypeHtml.class.php:149
 msgid "Remove Relation"
 msgstr "Entferne Beziehung"
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:458
+#: www/tracker/include/ArtifactTypeHtml.class.php:186
 #, php-format
 msgid "Average completion rate: %d%%"
-msgstr ""
+msgstr "Durchschnittliche Abschussrate: %d%%"
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:807
+#: www/tracker/include/ArtifactTypeHtml.class.php:231
+#, fuzzy
+msgid "Tick an attachment and submit to delete it."
+msgstr "Anhaken und abschicken, um die Beziehung zu entfernen."
+
+#: www/tracker/include/ArtifactTypeHtml.class.php:611
 #, php-format
 msgid "[#%d] (unknown)"
 msgstr "[#%d] (unbekannt)"
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:821
+#: www/tracker/include/ArtifactTypeHtml.class.php:625
 msgid ""
 "Tip: Enter a space-separated list of artifact ids ([#NNN] also accepted)"
 msgstr ""
 "Tipp: Geben Sie eine durch Leerzeichen getrennte Liste von Artefakt-IDs ein "
 "([#NNN] wird auch akzeptiert)."
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:931
+#: www/tracker/include/ArtifactTypeHtml.class.php:746
 #, fuzzy
 msgid "Create a new Tracker"
 msgstr "Standardwert für neue Tracker"
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:937
+#: www/tracker/include/ArtifactTypeHtml.class.php:752
 msgid "-tooltip:tracker:viewtrackers"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:943
+#: www/tracker/include/ArtifactTypeHtml.class.php:758
 msgid "Browse all items in the current Tracker"
-msgstr ""
+msgstr "Alle Elemente im aktuellen Tracker druchsuchen"
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:946
+#: www/tracker/include/ArtifactTypeHtml.class.php:761
 msgid "Download .csv"
 msgstr ".csv herunterladen"
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:949
+#: www/tracker/include/ArtifactTypeHtml.class.php:764
 msgid "Download an overview over the items in the current Tracker as CSV file"
 msgstr ""
+"Herunterladen einer Übersicht über die Elemente im aktuellen Tracker als CSV "
+"Datei"
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:952
+#: www/tracker/include/ArtifactTypeHtml.class.php:767
 msgid "Submit New"
 msgstr "Eintrag anlegen"
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:955
+#: www/tracker/include/ArtifactTypeHtml.class.php:770
 msgid "Enter a new item into the current Tracker"
-msgstr ""
+msgstr "Neues Element in den aktuellen Tracker eintragen"
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:962
+#: www/tracker/include/ArtifactTypeHtml.class.php:777
 msgid "-tooltip:tracker:reporting"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:965
+#: www/tracker/include/ArtifactTypeHtml.class.php:780
 msgid "Stop Monitor"
 msgstr "Beobachtung beenden"
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:969
+#: www/tracker/include/ArtifactTypeHtml.class.php:784
 msgid "-tooltip:tracker:stopmonitor"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:978
+#: www/tracker/include/ArtifactTypeHtml.class.php:793
 msgid "-tooltip:tracker:startmonitor"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:988
+#: www/tracker/include/ArtifactTypeHtml.class.php:803
 msgid ""
 "Administrating that tracker; click here to return to the Tracker Admin "
 "overview page"
 msgstr ""
+"Verwalte den Tracker; hier anklicken um zur Tracker Admin Übersichtsseite zu "
+"kommen."
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:990
+#: www/tracker/include/ArtifactTypeHtml.class.php:805
 msgid "Administrate the current tracker"
-msgstr ""
+msgstr "Aktuellen Tracker verwalten"
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:998
+#: www/tracker/include/ArtifactTypeHtml.class.php:813
 msgid "-tooltip:tracker:updatesettings"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:1003
+#: www/tracker/include/ArtifactTypeHtml.class.php:818
 #, fuzzy
 msgid "-tooltip:tracker:managecustomfields"
 msgstr "In Tracker und extra Felder"
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:1008
+#: www/tracker/include/ArtifactTypeHtml.class.php:823
 msgid "Assign Role permissions to state transitions"
-msgstr ""
+msgstr "Befugnisse der Rolle zur Festlegung der Übergänge"
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:1013
+#: www/tracker/include/ArtifactTypeHtml.class.php:828
 msgid "-tooltip:tracker:customiselist"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:1018
+#: www/tracker/include/ArtifactTypeHtml.class.php:833
 msgid "-tooltip:tracker:cannedresp"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:1023
+#: www/tracker/include/ArtifactTypeHtml.class.php:838
 msgid "-tooltip:tracker:clonetracker"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:1025
+#: www/tracker/include/ArtifactTypeHtml.class.php:840
 #, fuzzy
 msgid "Really delete the entire tracker"
 msgstr "Diesen Tracker dauerhaft löschen."
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:1028
+#: www/tracker/include/ArtifactTypeHtml.class.php:843
 #, fuzzy
 msgid "Irrevocably delete this entire Tracker and all its contents"
 msgstr ""
 "Sie sind dabei diesen Tracker und dessen gesamten Inhalt dauerhaft und "
 "unwiderbringlich zu löschen!"
 
+#: www/tracker/include/ArtifactTypeHtml.class.php:952
+#: www/tracker/include/ArtifactTypeHtml.class.php:957
+#: www/tracker/query.php:366
+#, php-format
+msgid "(%% for wildcards)"
+msgstr "(%% als Joker)"
+
 #: www/tracker/ind.php:46
 msgid "-tooltip:tracker:admin"
 msgstr ""
@@ -19313,7 +19803,7 @@
 "up data types using the %1$s admin page %2$s</span></p>"
 msgstr ""
 "Es wurden keine Tracker eingerichtet oder Sie können sie nicht ersehen."
-"<p><span class=\"important\">Der Projekt-Admin muss Datentypen aufsetzen, "
+"<p><span class=\"important\">Der Projekt-Admin muß Datentypen aufsetzen, "
 "indem er die %1$s Admin-Seite %2$s</span> nutzt."
 
 #: www/tracker/ind.php:58
@@ -19327,182 +19817,181 @@
 msgid "Could Not Get Artifact Object"
 msgstr "Konnte kein Foren-Objekt einholen"
 
-#: www/tracker/item.php:77
+#: www/tracker/item.php:83
 #, php-format
 msgid "%1$s %2$s: Submit New"
 msgstr "%1$s %2$s: Erstellen"
 
-#: www/tracker/item.php:192
+#: www/tracker/item.php:199
 msgid "New submission"
-msgstr ""
+msgstr "Neu Eingabe"
 
-#: www/tracker/item.php:195
+#: www/tracker/item.php:202
 msgid "Date Submitted"
 msgstr "Datum abgeschickt"
 
-#: www/tracker/item.php:200
+#: www/tracker/item.php:207
 msgid "Date Closed"
 msgstr "Datum geschlossen"
 
-#: www/tracker/item.php:213
+#: www/tracker/item.php:220
 msgid "Data Type"
 msgstr "Datentyp"
 
-#: www/tracker/item.php:241
+#: www/tracker/item.php:247
 msgid "Stop monitor"
 msgstr "Stoppe Beobachtung"
 
-#: www/tracker/item.php:270 www/tracker/item.php:406 www/tracker/query.php:262
+#: www/tracker/item.php:275 www/tracker/item.php:397 www/tracker/query.php:265
 msgid "Save Changes"
 msgstr "Änderungen speichern"
 
-#: www/tracker/item.php:277
+#: www/tracker/item.php:282
 #, fuzzy
 msgid "Debugging Functions"
 msgstr "Mathematische Funktionen"
 
-#: www/tracker/item.php:294
+#: www/tracker/item.php:299
 #, fuzzy
 msgid "Item Description"
 msgstr "Beschreibung"
 
-#: www/tracker/item.php:342 www/tracker/query.php:382
+#: www/tracker/item.php:341 www/tracker/query.php:385
 msgid "Followups"
 msgstr "Kommentare"
 
-#: www/tracker/item.php:343
+#: www/tracker/item.php:342
 msgid "No Followups Have Been Posted"
 msgstr "Es wurden bislang keine Kommentare verfaßt."
 
-#: www/tracker/item.php:355
+#: www/tracker/item.php:356
 msgid "Attach files to this submission"
 msgstr "Dateien an diesen Eintrag anhängen"
 
-#: www/tracker/item.php:366
+#: www/tracker/item.php:364
 msgid "Create an attachment"
 msgstr "Dateianhang erstellen"
 
 #: www/tracker/item.php:379
-msgid "Write a comment"
-msgstr "Einen Kommentar verfassen"
-
-#: www/tracker/item.php:388
 msgid "OR use a canned response"
 msgstr "ODER eine vorgespeicherte Antwort benutzen"
 
-#: www/tracker/item.php:403
+#: www/tracker/item.php:394
 msgid "indicates required fields."
 msgstr "zeigt Pflichtfelder an."
 
-#: www/tracker/item.php:413
+#: www/tracker/item.php:404
 msgid "Item Relationships"
 msgstr "Beziehungen zwischen Einträgen"
 
-#: www/tracker/item.php:422
+#: www/tracker/item.php:413
 msgid "You do not have sufficient privileges to view Task relations."
 msgstr "Du hast ungenügende Rechte, Aufgabenbeziehungen einzusehen."
 
-#: www/tracker/item.php:424
+#: www/tracker/item.php:415
 msgid "This project does not use Tasks."
 msgstr "Dieses Projekt benutzt Aufgaben nicht."
 
-#: www/tracker/item.php:430
+#: www/tracker/item.php:421
 msgid "Build Task Relation"
-msgstr "Erstelle Auftragsverbindung"
+msgstr "Erstelle Aufgabenverbindung"
 
-#: www/tracker/item.php:431
+#: www/tracker/item.php:422
 msgid "Related Tasks"
 msgstr "Verwandte Aufgaben"
 
-#: www/tracker/item.php:453
+#: www/tracker/item.php:444
 msgid "Instructions"
 msgstr "Anleitung"
 
-#: www/tracker/item.php:456
+#: www/tracker/item.php:447
 msgid "DO NOT enter passwords or confidential information in your message!"
 msgstr ""
 "Fügen Sie KEINE Paßwörter oder vertrauliche Informationen in Ihre Nachricht "
 "ein!"
 
-#: www/tracker/query.php:64
+#: www/tracker/query.php:67
 #, fuzzy
 msgid "Query Successfully Created"
 msgstr "Element erfolgreich angelegt"
 
-#: www/tracker/query.php:112
+#: www/tracker/query.php:115
 #, fuzzy
 msgid "Query Updated"
 msgstr "Tagebuch aktualisiert"
 
-#: www/tracker/query.php:141
+#: www/tracker/query.php:144
 #, fuzzy
 msgid "Query Deleted"
 msgstr "Datei gelöscht"
 
-#: www/tracker/query.php:153
+#: www/tracker/query.php:156
 msgid "Missing Build Query Action"
-msgstr ""
+msgstr "Keine Suche vorhanden"
 
-#: www/tracker/query.php:249 www/tracker/query.php:253
+#: www/tracker/query.php:252 www/tracker/query.php:256
 msgid "Build Query"
 msgstr "Suche erzeugen"
 
-#: www/tracker/query.php:285 www/tracker/query.php:296
+#: www/tracker/query.php:288 www/tracker/query.php:299
 msgid "Name and Save Query"
 msgstr "Suchanfrage benennen und speichern"
 
 #: www/tracker/query.php:289
+msgid "Load Query"
+msgstr "Suchanfrage laden"
+
+#: www/tracker/query.php:292
 msgid "Update Query"
 msgstr "Suchanfrage aktualisieren"
 
-#: www/tracker/query.php:290
+#: www/tracker/query.php:293
 msgid "Delete Query"
 msgstr "Suchanfrage löschen"
 
-#: www/tracker/query.php:293
-#, fuzzy
+#: www/tracker/query.php:296
 msgid "Run Query"
 msgstr "Suche erzeugen"
 
-#: www/tracker/query.php:316
+#: www/tracker/query.php:319
 #, fuzzy, php-format
 msgid "Note: The default project query is currently '%1$s'."
 msgstr "Hinweis: Die Standard Projektsuche ist momentan '%1$s'."
 
-#: www/tracker/query.php:319
+#: www/tracker/query.php:322
 #, fuzzy
 msgid "Note: There is no default project query defined."
 msgstr "Hinweis: Es gibt keine standardmäßig festgelegte Projektsuche."
 
-#: www/tracker/query.php:324
+#: www/tracker/query.php:327
 #, fuzzy
 msgid "Type of query"
 msgstr "Typ des Extrafeldes"
 
-#: www/tracker/query.php:326
+#: www/tracker/query.php:329
 #, fuzzy
 msgid "Private query"
 msgstr "Privat"
 
-#: www/tracker/query.php:328
+#: www/tracker/query.php:331
 #, fuzzy
 msgid "Project level query (query is public)"
 msgstr "Projektlevel-Suche (Suchanfrage ist öffentlich)"
 
-#: www/tracker/query.php:330
+#: www/tracker/query.php:333
 #, fuzzy
 msgid "Default project query (for project level query only)"
 msgstr "Standard Projektsuche (nur für Projektlevel-Suche)"
 
-#: www/tracker/query.php:368
+#: www/tracker/query.php:371
 msgid "Last Modified Date range"
 msgstr "Zuletzt veränderter Datumsbereich"
 
-#: www/tracker/query.php:370
+#: www/tracker/query.php:373
 msgid "Open Date range"
 msgstr "Offener Datumsbereich"
 
-#: www/tracker/query.php:372
+#: www/tracker/query.php:375
 msgid "Close Date range"
 msgstr "Geschlossener Datumsbereich"
 
@@ -19517,118 +20006,118 @@
 msgstr "Bearbeiter"
 
 #: www/tracker/reporting/trackeract_graph.php:49
-#: www/tracker/reporting/trackerpie_graph.php:63 www/tracker/tracker.php:295
+#: www/tracker/reporting/trackerpie_graph.php:63 www/tracker/tracker.php:296
 msgid "Error: "
 msgstr "Fehler: "
 
-#: www/tracker/taskmgr.php:75 www/tracker/taskmgr.php:92
+#: www/tracker/taskmgr.php:77 www/tracker/taskmgr.php:94
 #, fuzzy
 msgid "No Available Tasks Found"
 msgstr "keine ansprechbaren Tracker gefunden"
 
-#: www/tracker/taskmgr.php:97 www/tracker/taskmgr.php:152
+#: www/tracker/taskmgr.php:99 www/tracker/taskmgr.php:154
 #, fuzzy
 msgid "Build Relationship Between Tracker Items and Tasks"
 msgstr "Beziehung zwischen Tracker Items und Task Manager aufbauen"
 
-#: www/tracker/taskmgr.php:112
+#: www/tracker/taskmgr.php:114
 #, fuzzy
 msgid "Add Relationship to Selected Task"
-msgstr "Eine Beziehung zum ausgewählten Auftrag hinzufügen"
+msgstr "Eine Beziehung zur ausgewählten Aufgabe hinzufügen"
 
-#: www/tracker/taskmgr.php:146
+#: www/tracker/taskmgr.php:148
 msgid "No Existing Project Groups Found"
 msgstr "Keine existierenden Projektgruppen gefunden"
 
-#: www/tracker/taskmgr.php:163
+#: www/tracker/taskmgr.php:165
 #, fuzzy
 msgid "Add Relation to Existing Task"
-msgstr "Eine Beziehung zum existierenden Auftrag hinzufügen."
+msgstr "Eine Beziehung zu existierender Aufgabe hinzufügen."
 
-#: www/tracker/taskmgr.php:164
+#: www/tracker/taskmgr.php:166
 msgid "Create New Task"
-msgstr "Neuen Auftrag anlegen"
+msgstr "Neue Aufgabe anlegen"
 
-#: www/tracker/tracker.php:139 www/tracker/tracker.php:386
+#: www/tracker/tracker.php:136 www/tracker/tracker.php:387
 #, fuzzy
 msgid "Could Not Create File Object"
 msgstr "Konnte kein Foren-Objekt einholen"
 
-#: www/tracker/tracker.php:153
+#: www/tracker/tracker.php:150
 msgid "Could Not Attach File to Item: "
-msgstr ""
+msgstr "Konnte Datei nicht an Element anhängen: "
 
-#: www/tracker/tracker.php:157
-#, fuzzy, php-format
-msgid "Item %s successfully created"
-msgstr "Element erfolgreich angelegt"
+#: www/tracker/tracker.php:155
+#, php-format
+msgid "Item [#%d] successfully created"
+msgstr "Element [#%d] erfolgreich angelegt"
 
-#: www/tracker/tracker.php:248
+#: www/tracker/tracker.php:249
 msgid "Updated Successfully"
 msgstr "Aktualisierung erfolgreich"
 
-#: www/tracker/tracker.php:295
+#: www/tracker/tracker.php:296
 #, fuzzy, php-format
 msgid "Could not get Project Task for %d"
 msgstr "Konnte kein Foren-Objekt einholen"
 
-#: www/tracker/tracker.php:323 www/tracker/tracker.php:342
+#: www/tracker/tracker.php:324 www/tracker/tracker.php:343
 msgid "Comment added"
 msgstr "Kommentar hinzugefügt"
 
-#: www/tracker/tracker.php:367
+#: www/tracker/tracker.php:368
 #, php-format
 msgid "ERROR: Skipping attachment %d: file is too large."
-msgstr ""
+msgstr "FEHLER: Überspringe Anhang %d: Datei ist zu groß "
 
-#: www/tracker/tracker.php:371
+#: www/tracker/tracker.php:372
 #, php-format
 msgid "ERROR: Skipping attachment %d: transfer interrupted."
-msgstr ""
+msgstr "FEHLER: Überspringe Anhang %d: Übermittlung unterbrochen"
 
-#: www/tracker/tracker.php:395
+#: www/tracker/tracker.php:396
 msgid "File Upload: Error"
 msgstr "Dateihochlade-Fehler"
 
-#: www/tracker/tracker.php:398
+#: www/tracker/tracker.php:399
 msgid "File Upload: Successful"
 msgstr "Datei hochladen: Erfolgreich"
 
-#: www/tracker/tracker.php:415
+#: www/tracker/tracker.php:416
 #, fuzzy
 msgid "Could Not Create File Object::"
 msgstr "Konnte kein Foren-Objekt einholen"
 
-#: www/tracker/tracker.php:420
+#: www/tracker/tracker.php:421
 msgid "File Delete:"
 msgstr "Datei löschen:"
 
-#: www/tracker/tracker.php:423
+#: www/tracker/tracker.php:424
 msgid "File Delete: Successful"
 msgstr "Datei löschen: Erfolgreich"
 
-#: www/tracker/tracker.php:434
-#, fuzzy, php-format
-msgid "Item %s successfully updated"
-msgstr "Element erfolgreich angelegt"
+#: www/tracker/tracker.php:436
+#, php-format
+msgid "Item [#%d] successfully updated"
+msgstr "Element [#%d] erfolgreich aktualisiert"
 
-#: www/tracker/tracker.php:461 www/tracker/tracker.php:478
+#: www/tracker/tracker.php:478 www/tracker/tracker.php:495
 msgid "Monitoring Started"
-msgstr "Überwachung gestartet"
+msgstr "Beobachtung gestartet"
 
-#: www/tracker/tracker.php:463 www/tracker/tracker.php:480
+#: www/tracker/tracker.php:480 www/tracker/tracker.php:497
 msgid "Monitoring Deactivated"
 msgstr "Beobachtung des Trackers deaktiviert."
 
-#: www/tracker/tracker.php:528
+#: www/tracker/tracker.php:545
 msgid "Confirmation failed. Artifact not deleted"
 msgstr "Bestätigung fehlgeschlagen. Produkt wurde nicht gelöscht"
 
-#: www/tracker/tracker.php:532
+#: www/tracker/tracker.php:549
 msgid "Artifact Delete Failed"
 msgstr "Löschen des Produktes fehlgeschlagen."
 
-#: www/tracker/tracker.php:534
+#: www/tracker/tracker.php:551
 msgid "Artifact Deleted Successfully"
 msgstr "Produkt erfolgreich gelöscht"
 

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/translations/fusionforge.pot
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/translations/fusionforge.pot	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/translations/fusionforge.pot	2011-12-23 17:24:04 UTC (rev 17935)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-07 21:54+0100\n"
+"POT-Creation-Date: 2011-12-23 14:46+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,19 +18,19 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: common/advanced_search/AdvancedSearch.class.php:79
-#: common/advanced_search/AdvancedSearch.class.php:84
+#: common/advanced_search/AdvancedSearch.class.php:92
+#: common/advanced_search/AdvancedSearch.class.php:97
 #: common/docman/views/search.php:51 common/include/Navigation.class.php:143
 #: common/include/Navigation.class.php:410
 #: plugins/globalsearch/common/globalsearch_stats_boxes.php:48
-#: www/pm/browse_task.php:332
+#: www/pm/browse_task.php:300
 #: www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php:330
 #: www/search/include/renderers/HtmlGroupSearchRenderer.class.php:65
 #: www/search/include/renderers/SkillHtmlSearchRenderer.class.php:57
 msgid "Search"
 msgstr ""
 
-#: common/advanced_search/AdvancedSearch.class.php:86
+#: common/advanced_search/AdvancedSearch.class.php:99
 msgid "Save Query as "
 msgstr ""
 
@@ -335,13 +335,13 @@
 
 #: common/docman/include/utils.php:196 common/docman/include/utils.php:197
 #: common/docman/views/listfile.php:204 common/docman/views/listfile.php:206
-#: common/forum/ForumHTML.class.php:66 common/forum/ForumHTML.class.php:218
-#: common/forum/ForumHTML.class.php:459 common/include/showmess.php:92
-#: common/pm/ProjectTask.class.php:1195 common/tracker/Artifact.class.php:1527
-#: common/tracker/Artifact.class.php:1529
-#: common/tracker/Artifact.class.php:1533
-#: common/tracker/Artifact.class.php:1535
-#: common/tracker/Artifact.class.php:1631
+#: common/forum/ForumHTML.class.php:66 common/forum/ForumHTML.class.php:221
+#: common/forum/ForumHTML.class.php:462 common/include/descriptive.php:130
+#: common/pm/ProjectTask.class.php:1197 common/tracker/Artifact.class.php:1511
+#: common/tracker/Artifact.class.php:1513
+#: common/tracker/Artifact.class.php:1517
+#: common/tracker/Artifact.class.php:1519
+#: common/tracker/Artifact.class.php:1615
 #: common/widget/Widget_MyLatestSvnCommits.class.php:65
 #: common/widget/Widget_ProjectInfo.class.php:66
 #: common/widget/Widget_Rss.class.php:74
@@ -361,11 +361,10 @@
 #: www/include/user_home.php:144 www/my/diary.php:216
 #: www/news/news_utils.php:153 www/news/news_utils.php:165
 #: www/news/news_utils.php:273 www/people/people_utils.php:422
-#: www/people/viewjob.php:81 www/pm/browse_task.php:534
-#: www/pm/browse_task.php:537 www/pm/include/ProjectTaskHTML.class.php:133
-#: www/pm/include/ProjectTaskHTML.class.php:181
-#: www/pm/include/ProjectTaskHTML.class.php:239 www/pm/mod_task.php:388
-#: www/project/admin/project_admin_utils.php:170
+#: www/people/viewjob.php:81 www/pm/browse_task.php:475
+#: www/pm/browse_task.php:478 www/pm/include/ProjectTaskHTML.class.php:133
+#: www/pm/include/ProjectTaskHTML.class.php:186
+#: www/project/admin/project_admin_utils.php:165
 #: www/reporting/usersummary.php:127
 #: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:71
 #: www/search/include/renderers/DocsHtmlSearchRenderer.class.php:63
@@ -378,15 +377,15 @@
 #: www/snippet/detail.php:80 www/snippet/detail.php:169
 #: www/soap/tracker/tracker.php:1131 www/softwaremap/full_list.php:169
 #: www/softwaremap/tag_cloud.php:176 www/softwaremap/trove_list.php:311
-#: www/stats/lastlogins.php:61 www/tracker/browse.php:674
-#: www/tracker/browse.php:689 www/tracker/downloadcsv.php:63
+#: www/stats/lastlogins.php:61 www/tracker/browse.php:693
+#: www/tracker/browse.php:708 www/tracker/downloadcsv.php:63
 #: www/tracker/downloadcsv.php:64 www/tracker/downloadcsv.php:65
-#: www/tracker/include/ArtifactHtml.class.php:100
-#: www/tracker/include/ArtifactHtml.class.php:109
-#: www/tracker/include/ArtifactTypeHtml.class.php:432
-#: www/tracker/include/ArtifactTypeHtml.class.php:433
-#: www/tracker/include/ArtifactTypeHtml.class.php:489 www/tracker/item.php:196
-#: www/tracker/item.php:201
+#: www/tracker/include/ArtifactHtml.class.php:60
+#: www/tracker/include/ArtifactHtml.class.php:69
+#: www/tracker/include/ArtifactTypeHtml.class.php:160
+#: www/tracker/include/ArtifactTypeHtml.class.php:161
+#: www/tracker/include/ArtifactTypeHtml.class.php:223 www/tracker/item.php:203
+#: www/tracker/item.php:208
 msgid "Y-m-d H:i"
 msgstr ""
 
@@ -444,14 +443,14 @@
 #: www/forum/admin/index.php:174 www/forum/index.php:72 www/mail/index.php:77
 #: www/people/editjob.php:52 www/people/editjob.php:74
 #: www/pm/admin/index.php:295 www/pm/admin/index.php:342 www/pm/index.php:101
-#: www/pm/templates/detail_template.php:109
+#: www/pm/templates/detail_template.php:96
 #: www/project/admin/editimages.php:228 www/project/admin/editimages.php:255
 #: www/project/admin/editimages.php:271
 #: www/search/include/renderers/DocsHtmlSearchRenderer.class.php:51
 #: www/search/include/renderers/ProjectHtmlSearchRenderer.class.php:45
 #: www/snippet/submit.php:110 www/tracker/admin/form-updatetracker.php:52
 #: www/tracker/admin/ind.php:113 www/tracker/admin/ind.php:142
-#: www/tracker/browse.php:626 www/tracker/ind.php:63
+#: www/tracker/browse.php:645 www/tracker/ind.php:63
 msgid "Description"
 msgstr ""
 
@@ -472,10 +471,10 @@
 msgstr ""
 
 #: common/docman/include/utils.php:326 common/docman/views/editfile.php:132
-#: www/pm/browse_task.php:666 www/project/admin/database.php:208
-#: www/tracker/admin/form-customizelist.php:44 www/tracker/browse.php:477
-#: www/tracker/browse.php:632 www/tracker/browse.php:826
-#: www/tracker/query.php:341
+#: www/pm/browse_task.php:585 www/project/admin/database.php:208
+#: www/tracker/admin/form-customizelist.php:44 www/tracker/browse.php:496
+#: www/tracker/browse.php:651 www/tracker/browse.php:845
+#: www/tracker/query.php:344
 msgid "State"
 msgstr ""
 
@@ -621,9 +620,8 @@
 #: www/admin/admin_table.php:314 www/admin/responses_admin.php:45
 #: www/admin/responses_admin.php:92 www/admin/trove/trove_cat_list.php:53
 #: www/frs/admin/showreleases.php:111 www/people/skills_utils.php:45
-#: www/people/skills_utils.php:103 www/pm/mod_task.php:427
-#: www/pm/templates/time_tracking.php:76 www/project/admin/editimages.php:264
-#: www/project/admin/editimages.php:295
+#: www/people/skills_utils.php:103 www/pm/templates/time_tracking.php:78
+#: www/project/admin/editimages.php:264 www/project/admin/editimages.php:295
 #: www/survey/include/SurveyHTML.class.php:321
 #: www/survey/include/SurveyHTML.class.php:369
 #: www/survey/include/SurveyHTML.class.php:430
@@ -726,22 +724,20 @@
 #: www/frs/admin/index.php:155 www/my/dashboard.php:67
 #: www/news/admin/index.php:139 www/people/editjob.php:74
 #: www/people/editjob.php:166 www/people/viewjob.php:75
-#: www/pm/browse_task.php:328 www/pm/browse_task.php:473
-#: www/pm/detail_task.php:150 www/pm/ganttpage.php:156
-#: www/pm/include/ProjectTaskHTML.class.php:117
-#: www/pm/include/pm_columns.php:38 www/pm/mod_task.php:168
-#: www/pm/mod_task.php:281 www/pm/templates/detail_template.php:20
+#: www/pm/browse_task.php:296 www/pm/browse_task.php:414
+#: www/pm/ganttpage.php:156 www/pm/include/ProjectTaskHTML.class.php:117
+#: www/pm/include/pm_columns.php:38 www/pm/templates/detail_template.php:15
 #: www/reporting/usersummary.php:103
 #: www/tracker/admin/form-addextrafield.php:132
 #: www/tracker/admin/form-addextrafieldoption.php:101
 #: www/tracker/admin/form-updateextrafieldelement.php:60
-#: www/tracker/include/ArtifactTypeHtml.class.php:419 www/tracker/item.php:143
+#: www/tracker/include/ArtifactTypeHtml.class.php:147 www/tracker/item.php:150
 msgid "Status"
 msgstr ""
 
 #: common/docman/views/listfile.php:121 www/frs/index.php:183
 #: www/pm/ganttpage.php:160 www/project/admin/editimages.php:269
-#: www/tracker/include/ArtifactTypeHtml.class.php:474
+#: www/tracker/include/ArtifactTypeHtml.class.php:203
 msgid "Size"
 msgstr ""
 
@@ -839,9 +835,9 @@
 #: common/include/rbac_texts.php:215 common/include/rbac_texts.php:217
 #: common/include/rbac_texts.php:219
 #: common/widget/Widget_MyProjects.class.php:79
-#: plugins/mantisbt/www/index.php:49 www/include/Layout.class.php:686
-#: www/tracker/admin/ind.php:90 www/tracker/item.php:176
-#: www/tracker/item.php:393
+#: plugins/mantisbt/www/index.php:49 www/include/Layout.class.php:691
+#: www/tracker/admin/ind.php:90 www/tracker/item.php:183
+#: www/tracker/item.php:384
 msgid "Admin"
 msgstr ""
 
@@ -899,8 +895,9 @@
 #: www/tracker/admin/form-addextrafield.php:82
 #: www/tracker/admin/form-deleteextrafield.php:41
 #: www/tracker/admin/form-deletetracker.php:34
-#: www/tracker/admin/tracker.php:66 www/tracker/deleteartifact.php:36
-#: www/tracker/item.php:261
+#: www/tracker/admin/tracker.php:66 www/tracker/browse.php:180
+#: www/tracker/browse.php:472 www/tracker/deleteartifact.php:38
+#: www/tracker/item.php:266
 msgid "Delete"
 msgstr ""
 
@@ -909,8 +906,8 @@
 #: common/widget/WidgetLayoutManager.class.php:520
 #: www/admin/admin_table.php:54 www/admin/database.php:170
 #: www/admin/trove/trove_cat_add.php:123 www/admin/trove/trove_cat_list.php:51
-#: www/admin/trove/trove_cat_list.php:54 www/pm/mod_task.php:365
-#: www/pm/templates/time_tracking.php:37 www/reporting/timeadd.php:177
+#: www/admin/trove/trove_cat_list.php:54 www/pm/select_columns.php:79
+#: www/pm/templates/time_tracking.php:39 www/reporting/timeadd.php:177
 #: www/reporting/timecategory.php:100 www/trove/admin/trove_cat_add.php:101
 #: www/trove/admin/trove_cat_list.php:43
 msgid "Add"
@@ -1007,7 +1004,7 @@
 #: common/forum/Forum.class.php:620 common/frs/FRSPackage.class.php:447
 #: common/frs/FRSRelease.class.php:356 common/include/Group.class.php:1652
 #: common/mail/MailingList.class.php:388 common/pm/ProjectGroup.class.php:376
-#: common/pm/ProjectTask.class.php:513 common/tracker/Artifact.class.php:505
+#: common/pm/ProjectTask.class.php:513 common/tracker/Artifact.class.php:489
 #: common/tracker/ArtifactExtraField.class.php:429
 #: common/tracker/ArtifactType.class.php:816
 msgid "Please tick all checkboxes."
@@ -1086,13 +1083,13 @@
 msgid "Release"
 msgstr ""
 
-#: common/forum/ForumAdmin.class.php:357 common/forum/ForumHTML.class.php:327
-#: common/forum/ForumHTML.class.php:540
+#: common/forum/ForumAdmin.class.php:357 common/forum/ForumHTML.class.php:330
+#: common/forum/ForumHTML.class.php:543
 #: plugins/mailman/www/admin/index.php:186 plugins/mailman/www/index.php:67
 #: plugins/mailman/www/mailman_utils.php:74
 #: plugins/mailman/www/mailman_utils.php:181 www/account/editsshkeys.php:85
 #: www/account/index.php:315 www/account/lostlogin.php:100
-#: www/admin/groupedit.php:229 www/admin/trove/trove_cat_edit.php:152
+#: www/admin/groupedit.php:242 www/admin/trove/trove_cat_edit.php:152
 #: www/admin/useredit.php:204 www/admin/vhost.php:189
 #: www/forum/admin/index.php:178 www/frs/admin/index.php:178
 #: www/mail/admin/index.php:229 www/mail/admin/index.php:280
@@ -1169,7 +1166,7 @@
 msgid "Posted by"
 msgstr ""
 
-#: common/forum/ForumHTML.class.php:66 common/include/showmess.php:91
+#: common/forum/ForumHTML.class.php:66 common/include/descriptive.php:129
 #: common/widget/Widget_ProjectLatestFileReleases.class.php:58
 #: plugins/contribtracker/common/ContribTrackerPlugin.class.php:109
 #: plugins/cvstracker/common/cvstrackerPlugin.class.php:109
@@ -1178,31 +1175,30 @@
 #: www/developer/diary.php:76 www/forum/forum.php:254
 #: www/forum/message.php:162 www/frs/admin/showreleases.php:101
 #: www/frs/index.php:182 www/news/admin/news_admin_utils.php:55
-#: www/pm/calendar.php:285 www/pm/include/ProjectTaskHTML.class.php:163
-#: www/pm/include/ProjectTaskHTML.class.php:206
-#: www/project/admin/project_admin_utils.php:151
+#: www/pm/calendar.php:285 www/pm/include/ProjectTaskHTML.class.php:153
+#: www/project/admin/project_admin_utils.php:146
 #: www/project/stats/project_stats_utils.php:74 www/reporting/timeadd.php:140
 #: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:58
 #: www/search/include/renderers/ForumHtmlSearchRenderer.class.php:56
 #: www/search/include/renderers/ForumsHtmlSearchRenderer.class.php:50
 #: www/search/include/renderers/TrackersHtmlSearchRenderer.class.php:51
 #: www/stats/lastlogins.php:50 www/stats/users_graph.php:85
-#: www/stats/views_graph.php:105 www/tracker/include/ArtifactHtml.class.php:86
-#: www/tracker/include/ArtifactTypeHtml.class.php:472
+#: www/stats/views_graph.php:105 www/tracker/include/ArtifactHtml.class.php:46
+#: www/tracker/include/ArtifactTypeHtml.class.php:201
 msgid "Date"
 msgstr ""
 
 #: common/forum/ForumHTML.class.php:67 common/include/Navigation.class.php:367
-#: www/my/dashboard.php:63 www/my/diary.php:181 www/pm/browse_task.php:255
+#: www/my/dashboard.php:63 www/my/diary.php:181 www/pm/browse_task.php:233
 #: www/pm/include/ProjectTaskHTML.class.php:115
 #: www/pm/include/pm_columns.php:31 www/project/report/index.php:136
 #: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:56
 #: www/search/include/renderers/NewsHtmlSearchRenderer.class.php:48
 #: www/search/include/renderers/TasksHtmlSearchRenderer.class.php:49
 #: www/search/include/renderers/TrackersHtmlSearchRenderer.class.php:49
-#: www/tracker/admin/form-customizelist.php:42 www/tracker/browse.php:190
-#: www/tracker/browse.php:624 www/tracker/item.php:300
-#: www/tracker/query.php:194 www/tracker/query.php:378
+#: www/tracker/admin/form-customizelist.php:42 www/tracker/browse.php:321
+#: www/tracker/browse.php:643 www/tracker/item.php:305
+#: www/tracker/query.php:197 www/tracker/query.php:381
 msgid "Summary"
 msgstr ""
 
@@ -1245,7 +1241,7 @@
 #: www/scm/include/scm_utils.php:51 www/survey/include/SurveyHTML.class.php:66
 #: www/survey/include/SurveyHTML.class.php:91 www/tracker/admin/tracker.php:28
 #: www/tracker/include/ArtifactTypeFactoryHtml.class.php:52
-#: www/tracker/include/ArtifactTypeHtml.class.php:984 www/tracker/ind.php:44
+#: www/tracker/include/ArtifactTypeHtml.class.php:799 www/tracker/ind.php:44
 msgid "Administration"
 msgstr ""
 
@@ -1253,100 +1249,100 @@
 msgid "-tooltip:forum:admin"
 msgstr ""
 
-#: common/forum/ForumHTML.class.php:139 www/forum/monitor.php:59
+#: common/forum/ForumHTML.class.php:140 www/forum/monitor.php:59
 msgid "Stop Monitoring"
 msgstr ""
 
-#: common/forum/ForumHTML.class.php:142 common/forum/ForumHTML.class.php:149
+#: common/forum/ForumHTML.class.php:144 common/forum/ForumHTML.class.php:152
 msgid "Monitor Forum"
 msgstr ""
 
-#: common/forum/ForumHTML.class.php:145
+#: common/forum/ForumHTML.class.php:147
 msgid "Save Place"
 msgstr ""
 
-#: common/forum/ForumHTML.class.php:154 common/forum/ForumHTML.class.php:155
+#: common/forum/ForumHTML.class.php:157 common/forum/ForumHTML.class.php:158
 msgid "Start New Thread"
 msgstr ""
 
-#: common/forum/ForumHTML.class.php:204
+#: common/forum/ForumHTML.class.php:207
 msgid "This is the content of the pending message"
 msgstr ""
 
-#: common/forum/ForumHTML.class.php:208 common/forum/ForumHTML.class.php:266
+#: common/forum/ForumHTML.class.php:211 common/forum/ForumHTML.class.php:269
 #: www/forum/message.php:126
 msgid "By:"
 msgstr ""
 
-#: common/forum/ForumHTML.class.php:265 www/forum/message.php:123
+#: common/forum/ForumHTML.class.php:268 www/forum/message.php:123
 msgid "reply"
 msgstr ""
 
-#: common/forum/ForumHTML.class.php:310
+#: common/forum/ForumHTML.class.php:313
 msgid "Current File"
 msgstr ""
 
-#: common/forum/ForumHTML.class.php:318 common/forum/ForumHTML.class.php:351
+#: common/forum/ForumHTML.class.php:321 common/forum/ForumHTML.class.php:354
 msgid "Use the \"Browse\" button to find the file you want to attach"
 msgstr ""
 
-#: common/forum/ForumHTML.class.php:321 common/forum/ForumHTML.class.php:354
+#: common/forum/ForumHTML.class.php:324 common/forum/ForumHTML.class.php:357
 msgid "File to upload"
 msgstr ""
 
-#: common/forum/ForumHTML.class.php:324
+#: common/forum/ForumHTML.class.php:327
 msgid "Warning: Uploaded file will replace current file"
 msgstr ""
 
-#: common/forum/ForumHTML.class.php:512 common/forum/ForumHTML.class.php:576
+#: common/forum/ForumHTML.class.php:515 common/forum/ForumHTML.class.php:579
 msgid "Subject:"
 msgstr ""
 
-#: common/forum/ForumHTML.class.php:515 common/forum/ForumHTML.class.php:579
+#: common/forum/ForumHTML.class.php:518 common/forum/ForumHTML.class.php:582
 msgid "Message:"
 msgstr ""
 
-#: common/forum/ForumHTML.class.php:541 common/widget/Widget.class.php:92
+#: common/forum/ForumHTML.class.php:544 common/widget/Widget.class.php:92
 #: plugins/globalsearch/common/globalsearch_edit_utils.php:106
 #: plugins/globalsearch/common/globalsearch_edit_utils.php:156
 #: www/admin/admin_table.php:58 www/admin/admin_table.php:155
 #: www/admin/admin_table.php:214 www/forum/admin/index.php:428
 #: www/forum/monitor.php:65 www/my/rmproject.php:98
 #: www/people/editprofile.php:158 www/people/editprofile.php:217
-#: www/pm/mod_task.php:365 www/pm/templates/time_tracking.php:38
-#: www/register/index.php:281 www/reporting/timeadd.php:177
+#: www/pm/templates/time_tracking.php:40 www/register/index.php:281
+#: www/reporting/timeadd.php:177
 msgid "Cancel"
 msgstr ""
 
-#: common/forum/ForumHTML.class.php:596
+#: common/forum/ForumHTML.class.php:599
 msgid "HTML tags will display in your post as text"
 msgstr ""
 
-#: common/forum/ForumHTML.class.php:603
+#: common/forum/ForumHTML.class.php:606
 #, php-format
 msgid ""
 "You are posting anonymously because you are not <a href=\"%1$s\">logged in</"
 "a>"
 msgstr ""
 
-#: common/forum/ForumHTML.class.php:607
+#: common/forum/ForumHTML.class.php:610
 msgid "Post Comment"
 msgstr ""
 
-#: common/forum/ForumHTML.class.php:607
+#: common/forum/ForumHTML.class.php:610
 msgid "Anonymously"
 msgstr ""
 
-#: common/forum/ForumHTML.class.php:608
+#: common/forum/ForumHTML.class.php:611
 msgid "Receive followups via email"
 msgstr ""
 
-#: common/forum/ForumHTML.class.php:620
+#: common/forum/ForumHTML.class.php:623
 #, php-format
 msgid "You could post if you were <a href=\"%1$s\">logged in</a>."
 msgstr ""
 
-#: common/forum/ForumHTML.class.php:624
+#: common/forum/ForumHTML.class.php:627
 #, php-format
 msgid "Please <a href=\"%1$s\">log in</a>"
 msgstr ""
@@ -1526,7 +1522,7 @@
 msgstr ""
 
 #: common/include/Error.class.php:142 common/include/User.class.php:279
-#: www/tracker/tracker.php:99
+#: www/tracker/tracker.php:96
 msgid "Invalid Email Address"
 msgstr ""
 
@@ -1764,11 +1760,11 @@
 msgid "Group already active"
 msgstr ""
 
-#: common/include/Group.class.php:2690 common/include/Group.class.php:2769
+#: common/include/Group.class.php:2696 common/include/Group.class.php:2775
 msgid "Group does not have any administrators."
 msgstr ""
 
-#: common/include/Group.class.php:2698
+#: common/include/Group.class.php:2704
 #, php-format
 msgid ""
 "Your project registration for %4$s has been approved.\n"
@@ -1804,12 +1800,12 @@
 "-- the %4$s crew"
 msgstr ""
 
-#: common/include/Group.class.php:2734
+#: common/include/Group.class.php:2740
 #, php-format
 msgid "%1$s Project Approved"
 msgstr ""
 
-#: common/include/Group.class.php:2776
+#: common/include/Group.class.php:2782
 #, php-format
 msgid ""
 "Your project registration for %3$s has been denied.\n"
@@ -1821,20 +1817,20 @@
 "\n"
 msgstr ""
 
-#: common/include/Group.class.php:2795
+#: common/include/Group.class.php:2801
 #, php-format
 msgid "%1$s Project Denied"
 msgstr ""
 
-#: common/include/Group.class.php:2827
+#: common/include/Group.class.php:2833
 msgid "Could not find user who has submitted the project."
 msgstr ""
 
-#: common/include/Group.class.php:2834
+#: common/include/Group.class.php:2840
 msgid "There is no administrator to send the mail to."
 msgstr ""
 
-#: common/include/Group.class.php:2846
+#: common/include/Group.class.php:2852
 #, php-format
 msgid ""
 "New %1$s Project Submitted\n"
@@ -1843,12 +1839,12 @@
 "Submitted Description: %3$s\n"
 msgstr ""
 
-#: common/include/Group.class.php:2856
+#: common/include/Group.class.php:2862
 #, php-format
 msgid "Submitter: %1$s (%2$s)\n"
 msgstr ""
 
-#: common/include/Group.class.php:2862
+#: common/include/Group.class.php:2868
 #, php-format
 msgid ""
 "\n"
@@ -1856,12 +1852,12 @@
 "%1$s"
 msgstr ""
 
-#: common/include/Group.class.php:2866 common/include/Group.class.php:2881
+#: common/include/Group.class.php:2872 common/include/Group.class.php:2887
 #, php-format
 msgid "New %1$s Project Submitted"
 msgstr ""
 
-#: common/include/Group.class.php:2874
+#: common/include/Group.class.php:2880
 #, php-format
 msgid ""
 "New %1$s Project Submitted\n"
@@ -1873,43 +1869,43 @@
 "notified of their decision."
 msgstr ""
 
-#: common/include/Group.class.php:2899
+#: common/include/Group.class.php:2905
 msgid "Group name is too short"
 msgstr ""
 
-#: common/include/Group.class.php:2902
+#: common/include/Group.class.php:2908
 msgid "Group name is too long"
 msgstr ""
 
-#: common/include/Group.class.php:2905
+#: common/include/Group.class.php:2911
 msgid "Group name already taken"
 msgstr ""
 
-#: common/include/Group.class.php:2996
+#: common/include/Group.class.php:3002
 #, php-format
 msgid "ERROR - Could Not Update Group Unix Status: %s"
 msgstr ""
 
-#: common/include/Group.class.php:3055
+#: common/include/Group.class.php:3061
 msgid "Error: Enable to get users from group"
 msgstr ""
 
-#: common/include/Group.class.php:3076
+#: common/include/Group.class.php:3082
 #, php-format
 msgid "ERROR - Could Not Update Group DocmanCreateOnline Status: %s"
 msgstr ""
 
-#: common/include/Group.class.php:3094
+#: common/include/Group.class.php:3100
 #, php-format
 msgid "ERROR - Could Not Update Group UseWebdab Status: %s"
 msgstr ""
 
-#: common/include/Group.class.php:3112
+#: common/include/Group.class.php:3118
 #, php-format
 msgid "ERROR - Could Not Update Group UseDocmanSearch Status: %s"
 msgstr ""
 
-#: common/include/Group.class.php:3130
+#: common/include/Group.class.php:3136
 #, php-format
 msgid "ERROR - Could Not Update Group force_docman_reindex %s"
 msgstr ""
@@ -2031,7 +2027,7 @@
 #: www/pm/include/ProjectGroupHTML.class.php:105
 #: www/scm/include/scm_utils.php:50
 #: www/tracker/include/ArtifactTypeFactoryHtml.class.php:48
-#: www/tracker/include/ArtifactTypeHtml.class.php:959
+#: www/tracker/include/ArtifactTypeHtml.class.php:774
 msgid "Reporting"
 msgstr ""
 
@@ -2051,13 +2047,15 @@
 msgid "Project Features & Users Administration"
 msgstr ""
 
-#: common/include/Navigation.class.php:401 www/activity/index.php:83
-#: www/activity/index.php:164 www/activity/index.php:250
-#: www/export/rss_project.php:97
+#: common/include/Navigation.class.php:401 www/activity/index.php:85
+#: www/activity/index.php:94 www/activity/index.php:179
+#: www/activity/index.php:265 www/export/rss_project.php:97
+#: www/project/stats/index.php:85
 msgid "Activity"
 msgstr ""
 
-#: common/include/Navigation.class.php:403
+#: common/include/Navigation.class.php:403 www/activity/index.php:87
+#: www/project/stats/index.php:87
 msgid "-tooltip:Activity"
 msgstr ""
 
@@ -2079,7 +2077,7 @@
 #: common/include/Navigation.class.php:435 common/include/rbac_texts.php:142
 #: common/include/rbac_texts.php:238 common/include/rbac_texts.php:240
 #: common/reporting/report_utils.php:143
-#: common/widget/Widget_ProjectPublicAreas.class.php:49
+#: common/widget/Widget_ProjectPublicAreas.class.php:51
 #: www/pm/include/ProjectTaskHTML.class.php:116 www/tracker/admin/ind.php:113
 #: www/tracker/ind.php:63
 msgid "Tracker"
@@ -2101,7 +2099,7 @@
 #: common/include/group_section_texts.php:30 common/include/rbac_texts.php:143
 #: common/include/rbac_texts.php:233 common/include/rbac_texts.php:235
 #: common/reporting/report_utils.php:155 common/reporting/report_utils.php:193
-#: common/widget/Widget_ProjectPublicAreas.class.php:128
+#: common/widget/Widget_ProjectPublicAreas.class.php:130
 #: plugins/blocks/www/index.php:170 www/my/dashboard.php:75
 #: www/project/stats/project_stats_utils.php:82
 #: www/project/stats/project_stats_utils.php:141
@@ -2126,7 +2124,7 @@
 msgstr ""
 
 #: common/include/Navigation.class.php:498
-#: common/widget/Widget_ProjectPublicAreas.class.php:152
+#: common/widget/Widget_ProjectPublicAreas.class.php:154
 #: plugins/blocks/www/index.php:172
 msgid "Surveys"
 msgstr ""
@@ -2138,7 +2136,7 @@
 #: common/include/Navigation.class.php:513
 #: common/include/group_section_texts.php:33 plugins/blocks/www/index.php:173
 #: plugins/quota_management/www/quota_project.php:75
-#: www/activity/index.php:102 www/activity/index.php:299
+#: www/activity/index.php:117 www/activity/index.php:314
 #: www/admin/index.php:157 www/news/index.php:35
 msgid "News"
 msgstr ""
@@ -2594,6 +2592,41 @@
 msgid "locale-dependent-default-datepick-format"
 msgstr ""
 
+#: common/include/descriptive.php:78
+msgid "Sort comments antichronologically"
+msgstr ""
+
+#: common/include/descriptive.php:81
+msgid "Sort comments chronologically"
+msgstr ""
+
+#: common/include/descriptive.php:131
+msgid "Sender"
+msgstr ""
+
+#: common/include/descriptive.php:228 common/include/descriptive.php:229
+msgid "Click to edit"
+msgstr ""
+
+#: common/include/descriptive.php:284
+msgid "Write a comment"
+msgstr ""
+
+#: common/include/descriptive.php:539
+#, php-format
+msgid "%s (Task)"
+msgstr ""
+
+#: common/include/descriptive.php:544
+#, php-format
+msgid "%s (Bug/FR)"
+msgstr ""
+
+#: common/include/descriptive.php:549
+#, php-format
+msgid "%s (Forum Message)"
+msgstr ""
+
 #: common/include/exit.php:32
 msgid "Exiting with error"
 msgstr ""
@@ -2654,7 +2687,7 @@
 msgid "Documentations"
 msgstr ""
 
-#: common/include/pre.php:269
+#: common/include/pre.php:278
 #, php-format
 msgid "Posted data is too large. %1$s exceeds the maximum size of %2$s"
 msgstr ""
@@ -2905,13 +2938,13 @@
 #: common/include/rbac_texts.php:216 common/include/rbac_texts.php:218
 #: common/widget/Widget_MyArtifacts.class.php:116 www/admin/pluginman.php:176
 #: www/admin/pluginman.php:195 www/admin/pluginman.php:202
-#: www/admin/pluginman.php:203 www/include/html.php:307
-#: www/include/html.php:440 www/include/html.php:526 www/include/html.php:543
-#: www/include/html.php:577 www/include/html.php:618 www/include/html.php:657
-#: www/pm/ganttpage.php:62 www/tracker/include/ArtifactHtml.class.php:104
-#: www/tracker/include/ArtifactTypeHtml.class.php:676
-#: www/tracker/include/ArtifactTypeHtml.class.php:719
-#: www/tracker/include/ArtifactTypeHtml.class.php:906
+#: www/admin/pluginman.php:203 www/include/html.php:309
+#: www/include/html.php:418 www/include/html.php:510 www/include/html.php:527
+#: www/include/html.php:561 www/include/html.php:602 www/include/html.php:641
+#: www/pm/ganttpage.php:62 www/tracker/include/ArtifactHtml.class.php:64
+#: www/tracker/include/ArtifactTypeHtml.class.php:428
+#: www/tracker/include/ArtifactTypeHtml.class.php:489
+#: www/tracker/include/ArtifactTypeHtml.class.php:721
 msgid "None"
 msgstr ""
 
@@ -2947,65 +2980,53 @@
 msgid "Documentation Manager"
 msgstr ""
 
-#: common/include/session.php:136
+#: common/include/session.php:146
 msgid "Missing Password Or Users Name"
 msgstr ""
 
-#: common/include/session.php:148 common/include/session.php:181
-#: common/include/session.php:232
+#: common/include/session.php:158 common/include/session.php:191
+#: common/include/session.php:242
 #: plugins/ldapextauth/include/LdapExtAuthPlugin.class.php:131
 #: plugins/ldapextauth/include/LdapExtAuthPlugin.class.php:187
 #: plugins/ldapextauth/include/LdapExtAuthPlugin.class.php:297
 msgid "Invalid Password Or User Name"
 msgstr ""
 
-#: common/include/session.php:276
+#: common/include/session.php:286
 msgid "Account Suspended"
 msgstr ""
 
-#: common/include/session.php:281
+#: common/include/session.php:291
 msgid "Account Pending"
 msgstr ""
 
-#: common/include/session.php:286
+#: common/include/session.php:296
 msgid "Account Deleted"
 msgstr ""
 
-#: common/include/session.php:291
+#: common/include/session.php:301
 msgid "Account Not Active"
 msgstr ""
 
-#: common/include/session.php:404
+#: common/include/session.php:419
 msgid "Your account is no longer active ; you have been disconnected"
 msgstr ""
 
-#: common/include/session.php:457
+#: common/include/session.php:472
 #, php-format
 msgid ""
 "Permission denied. The %s administrators will have to grant you permission "
 "to view this page."
 msgstr ""
 
-#: common/include/session.php:513
+#: common/include/session.php:528
 msgid "Could not fetch user session data"
 msgstr ""
 
-#: common/include/session.php:541
+#: common/include/session.php:556
 msgid "No admin users ?"
 msgstr ""
 
-#: common/include/showmess.php:47 www/pm/include/ProjectTaskHTML.class.php:153
-msgid "Sort comments antichronologically"
-msgstr ""
-
-#: common/include/showmess.php:50 www/pm/include/ProjectTaskHTML.class.php:157
-msgid "Sort comments chronologically"
-msgstr ""
-
-#: common/include/showmess.php:93
-msgid "Sender"
-msgstr ""
-
 #: common/include/utils.php:178
 msgid "UTF-8"
 msgstr ""
@@ -3103,25 +3124,19 @@
 msgstr ""
 
 #: common/pm/ProjectController.class.php:63
-#: common/reporting/TimeEntry.class.php:92 www/pm/mod_task.php:74
-#: www/pm/mod_task.php:75 www/reporting/timeadd.php:88
+#: common/reporting/TimeEntry.class.php:92 www/reporting/timeadd.php:88
 msgid "Successfully Added"
 msgstr ""
 
-#: common/pm/ProjectController.class.php:66 www/pm/mod_task.php:79
-#: www/reporting/timeadd.php:91
+#: common/pm/ProjectController.class.php:66 www/reporting/timeadd.php:91
 msgid "All Fields Are Required."
 msgstr ""
 
-#: common/pm/ProjectController.class.php:102 www/pm/mod_task.php:106
-msgid "Successfully Copied"
-msgstr ""
-
 #: common/pm/ProjectTask.class.php:731
 msgid "Circular Dependency Detected'"
 msgstr ""
 
-#: common/pm/ProjectTask.class.php:1207
+#: common/pm/ProjectTask.class.php:1209
 #, php-format
 msgid "[%1$s - %2$s] [Task #%3$d] "
 msgstr ""
@@ -3161,7 +3176,6 @@
 #: plugins/cvstracker/common/cvstrackerPlugin.class.php:79
 #: plugins/svntracker/common/svntrackerPlugin.class.php:73
 #: www/my/dashboard.php:123 www/news/admin/news_admin_utils.php:41
-#: www/pm/detail_task.php:84 www/pm/detail_task.php:88
 #: www/reporting/timeadd.php:119
 msgid "Y-m-d"
 msgstr ""
@@ -3289,7 +3303,7 @@
 msgstr ""
 
 #: common/survey/Survey.class.php:226
-#: common/survey/SurveyQuestion.class.php:169 www/pm/task.php:414
+#: common/survey/SurveyQuestion.class.php:169 www/pm/task.php:437
 #: www/survey/admin/question.php:75
 msgid "Delete failed"
 msgstr ""
@@ -3372,38 +3386,38 @@
 msgid "Artifact: Only group members can view private artifact types"
 msgstr ""
 
-#: common/tracker/Artifact.class.php:222 common/tracker/Artifact.class.php:765
-#: www/tracker/tracker.php:92 www/tracker/tracker.php:286
+#: common/tracker/Artifact.class.php:206 common/tracker/Artifact.class.php:749
+#: www/tracker/tracker.php:89 www/tracker/tracker.php:287
 msgid ""
 "Artifact: This ArtifactType Does Not Allow Anonymous Submissions. Please "
 "Login."
 msgstr ""
 
-#: common/tracker/Artifact.class.php:233
+#: common/tracker/Artifact.class.php:217
 msgid "Artifact: Message Summary Is Required"
 msgstr ""
 
-#: common/tracker/Artifact.class.php:237
+#: common/tracker/Artifact.class.php:221
 msgid "Artifact: Message Body Is Required"
 msgstr ""
 
-#: common/tracker/Artifact.class.php:256
+#: common/tracker/Artifact.class.php:240
 msgid "Artifact: Error remapping status"
 msgstr ""
 
-#: common/tracker/Artifact.class.php:598
+#: common/tracker/Artifact.class.php:582
 msgid "SetMonitor::Valid Email Address Required"
 msgstr ""
 
-#: common/tracker/Artifact.class.php:616
+#: common/tracker/Artifact.class.php:600
 msgid "Now Monitoring Artifact"
 msgstr ""
 
-#: common/tracker/Artifact.class.php:626
+#: common/tracker/Artifact.class.php:610
 msgid "Artifact Monitoring Deactivated"
 msgstr ""
 
-#: common/tracker/Artifact.class.php:1157
+#: common/tracker/Artifact.class.php:1141
 msgid "Nothing Changed - Update Cancelled"
 msgstr ""
 
@@ -3541,7 +3555,7 @@
 
 #: common/widget/Widget.class.php:89 plugins/mailman/www/mailman_utils.php:61
 #: plugins/mailman/www/mailman_utils.php:132 www/account/index.php:246
-#: www/include/Layout.class.php:1273
+#: www/include/Layout.class.php:1279
 msgid "Preferences"
 msgstr ""
 
@@ -3552,17 +3566,16 @@
 #: plugins/contribtracker/www/global_admin.php:452
 #: plugins/contribtracker/www/project_admin.php:193
 #: plugins/forumml/www/forumml_utils.php:603 plugins/forumml/www/index.php:126
-#: www/account/pending-resend.php:75 www/activity/index.php:176
+#: www/account/pending-resend.php:75 www/activity/index.php:191
 #: www/admin/admin_table.php:212 www/admin/cronman.php:37
 #: www/admin/globalroleedit.php:247 www/admin/index.php:152
 #: www/admin/pending-news.php:174 www/forum/admin/index.php:427
 #: www/include/vote_function.php:281 www/my/bookmark_add.php:50
 #: www/my/bookmark_edit.php:63 www/news/admin/index.php:163
-#: www/news/submit.php:168 www/pm/add_task.php:52 www/pm/add_task.php:147
-#: www/pm/add_task.php:161 www/pm/admin/index.php:219
+#: www/news/submit.php:168 www/pm/admin/index.php:219
 #: www/pm/admin/index.php:264 www/pm/admin/index.php:300
-#: www/pm/deletetask.php:44 www/pm/include/ProjectView.class.php:193
-#: www/pm/mod_task.php:121 www/pm/mod_task.php:325
+#: www/pm/deletetask.php:44 www/pm/include/ProjectView.class.php:210
+#: www/pm/include/ProjectView.class.php:214
 #: www/project/admin/editimages.php:237 www/project/admin/roledelete.php:85
 #: www/project/admin/roleedit.php:359 www/project/request.php:69
 #: www/register/index.php:280 www/survey/include/SurveyHTML.class.php:552
@@ -3584,14 +3597,13 @@
 msgstr ""
 
 #: common/widget/WidgetLayoutManager.class.php:242
-#: common/widget/WidgetLayoutManager.class.php:246
-#: www/include/project_home.php:73 www/my/index.php:54
-#: www/widgets/widgets.php:73
+#: common/widget/WidgetLayoutManager.class.php:246 www/include/html.php:909
+#: www/include/project_home.php:73 www/widgets/widgets.php:73
 msgid "Add widgets"
 msgstr ""
 
 #: common/widget/WidgetLayoutManager.class.php:243
-#: common/widget/WidgetLayoutManager.class.php:247 www/my/index.php:55
+#: common/widget/WidgetLayoutManager.class.php:247 www/include/html.php:913
 #: www/widgets/widgets.php:71
 msgid "Customize layout"
 msgstr ""
@@ -3947,7 +3959,7 @@
 msgstr ""
 
 #: common/widget/Widget_ProjectLatestFileReleases.class.php:64
-#: www/tracker/include/ArtifactTypeHtml.class.php:974 www/tracker/item.php:245
+#: www/tracker/include/ArtifactTypeHtml.class.php:789 www/tracker/item.php:250
 msgid "Monitor"
 msgstr ""
 
@@ -4020,20 +4032,20 @@
 msgid "Public Areas"
 msgstr ""
 
-#: common/widget/Widget_ProjectPublicAreas.class.php:42
+#: common/widget/Widget_ProjectPublicAreas.class.php:43
 msgid "Home Page"
 msgstr ""
 
-#: common/widget/Widget_ProjectPublicAreas.class.php:42
+#: common/widget/Widget_ProjectPublicAreas.class.php:44
 msgid "Project Home Page"
 msgstr ""
 
-#: common/widget/Widget_ProjectPublicAreas.class.php:63
+#: common/widget/Widget_ProjectPublicAreas.class.php:65
 #: www/include/project_summary.php:149
 msgid "There are no public trackers available"
 msgstr ""
 
-#: common/widget/Widget_ProjectPublicAreas.class.php:75
+#: common/widget/Widget_ProjectPublicAreas.class.php:77
 #: www/include/project_summary.php:154
 #, php-format
 msgid "(<strong>%1$s</strong> open / <strong>%2$s</strong> total)"
@@ -4041,48 +4053,48 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: common/widget/Widget_ProjectPublicAreas.class.php:90
+#: common/widget/Widget_ProjectPublicAreas.class.php:92
 msgid "Public Forums"
 msgstr ""
 
-#: common/widget/Widget_ProjectPublicAreas.class.php:95
+#: common/widget/Widget_ProjectPublicAreas.class.php:97
 #, php-format
 msgid "<strong>%d</strong> message"
 msgid_plural "<strong>%d</strong> messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: common/widget/Widget_ProjectPublicAreas.class.php:97
+#: common/widget/Widget_ProjectPublicAreas.class.php:99
 #, php-format
 msgid "<strong>%d</strong> forum"
 msgid_plural "<strong>%d</strong> forums"
 msgstr[0] ""
 msgstr[1] ""
 
-#: common/widget/Widget_ProjectPublicAreas.class.php:106
+#: common/widget/Widget_ProjectPublicAreas.class.php:108
 msgid "DocManager: Project Documentation"
 msgstr ""
 
-#: common/widget/Widget_ProjectPublicAreas.class.php:116
+#: common/widget/Widget_ProjectPublicAreas.class.php:118
 msgid "Mailing Lists"
 msgstr ""
 
-#: common/widget/Widget_ProjectPublicAreas.class.php:120
+#: common/widget/Widget_ProjectPublicAreas.class.php:122
 #, php-format
 msgid "(<strong>%1$s</strong> public mailing list)"
 msgid_plural "(<strong>%1$s</strong> public mailing lists)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: common/widget/Widget_ProjectPublicAreas.class.php:135
+#: common/widget/Widget_ProjectPublicAreas.class.php:137
 msgid "There are no public subprojects available"
 msgstr ""
 
-#: common/widget/Widget_ProjectPublicAreas.class.php:154
+#: common/widget/Widget_ProjectPublicAreas.class.php:156
 msgid "surveys"
 msgstr ""
 
-#: common/widget/Widget_ProjectPublicAreas.class.php:163
+#: common/widget/Widget_ProjectPublicAreas.class.php:165
 #: plugins/scmgit/www/index.php:23 plugins/scmgit/www/index.php:36
 #: www/register/index.php:221 www/scm/admin/index.php:72
 #: www/scm/admin/index.php:89 www/scm/browser.php:30 www/scm/index.php:32
@@ -4090,11 +4102,11 @@
 msgid "SCM Repository"
 msgstr ""
 
-#: common/widget/Widget_ProjectPublicAreas.class.php:186
+#: common/widget/Widget_ProjectPublicAreas.class.php:188
 msgid "Anonymous FTP Space"
 msgstr ""
 
-#: common/widget/Widget_ProjectPublicAreas.class.php:204
+#: common/widget/Widget_ProjectPublicAreas.class.php:206
 msgid ""
 "List all available services for this project along with some information "
 "next to it. Click on any of this item to access a service.<br />The role of "
@@ -4295,7 +4307,7 @@
 #: plugins/scmsvn/common/SVNPlugin.class.php:196 www/admin/useredit.php:234
 #: www/project/admin/editimages.php:267 www/reporting/usersummary.php:101
 #: www/search/include/renderers/SkillHtmlSearchRenderer.class.php:44
-#: www/sendmessage.php:69 www/tracker/include/ArtifactTypeHtml.class.php:471
+#: www/sendmessage.php:69 www/tracker/include/ArtifactTypeHtml.class.php:200
 msgid "Name"
 msgstr ""
 
@@ -4327,6 +4339,7 @@
 #: plugins/contribtracker/www/global_admin.php:426
 #: plugins/contribtracker/www/global_admin.php:490
 #: plugins/contribtracker/www/project_admin.php:214
+#: www/pm/select_columns.php:102
 msgid "Save"
 msgstr ""
 
@@ -4945,7 +4958,7 @@
 #: plugins/projects_hierarchy/common/projects_hierarchyPlugin.class.php:163
 #: plugins/projects_hierarchy/common/projects_hierarchyPlugin.class.php:180
 #: plugins/projects_hierarchy/common/projects_hierarchyPlugin.class.php:190
-#: www/pm/templates/detail_template.php:137
+#: www/pm/templates/detail_template.php:125
 msgid "Link"
 msgstr ""
 
@@ -5334,8 +5347,8 @@
 #: plugins/globalsearch/common/globalsearch_edit_utils.php:232
 #: plugins/globalsearch/common/globalsearch_edit_utils.php:233
 #: plugins/mailman/www/admin/index.php:148
-#: plugins/mailman/www/admin/index.php:180 www/admin/groupedit.php:147
-#: www/admin/groupedit.php:167 www/forum/admin/index.php:109
+#: plugins/mailman/www/admin/index.php:180 www/admin/groupedit.php:159
+#: www/admin/groupedit.php:180 www/forum/admin/index.php:109
 #: www/forum/admin/index.php:114 www/forum/admin/index.php:153
 #: www/forum/admin/index.php:158 www/forum/admin/index.php:237
 #: www/mail/admin/index.php:192 www/mail/admin/index.php:223
@@ -5351,8 +5364,8 @@
 #: plugins/globalsearch/common/globalsearch_edit_utils.php:232
 #: plugins/globalsearch/common/globalsearch_edit_utils.php:233
 #: plugins/mailman/www/admin/index.php:149
-#: plugins/mailman/www/admin/index.php:181 www/admin/groupedit.php:146
-#: www/admin/groupedit.php:166 www/forum/admin/index.php:110
+#: plugins/mailman/www/admin/index.php:181 www/admin/groupedit.php:158
+#: www/admin/groupedit.php:179 www/forum/admin/index.php:110
 #: www/forum/admin/index.php:115 www/forum/admin/index.php:154
 #: www/forum/admin/index.php:159 www/forum/admin/index.php:238
 #: www/mail/admin/index.php:193 www/mail/admin/index.php:224
@@ -6260,7 +6273,6 @@
 msgstr ""
 
 #: plugins/mantisbt/www/index.php:52 www/admin/index.php:162
-#: www/project/admin/project_admin_utils.php:84
 msgid "Stats"
 msgstr ""
 
@@ -6843,7 +6855,7 @@
 msgstr[1] ""
 
 #: plugins/projects_hierarchy/www/softwaremap.php:400
-#: www/include/Layout.class.php:1336
+#: www/include/Layout.class.php:1342
 msgid "Project Tree"
 msgstr ""
 
@@ -7085,8 +7097,8 @@
 #: plugins/scmcvs/common/CVSPlugin.class.php:171
 #: plugins/scmdarcs/common/DarcsPlugin.class.php:216
 #: plugins/scmsvn/common/SVNPlugin.class.php:216 www/pm/index.php:103
-#: www/pm/mod_task.php:399 www/pm/templates/time_tracking.php:64
-#: www/stats/site_stats_utils.php:285 www/tracker/ind.php:63
+#: www/pm/templates/time_tracking.php:66 www/stats/site_stats_utils.php:285
+#: www/tracker/ind.php:63
 msgid "Total"
 msgstr ""
 
@@ -7209,7 +7221,7 @@
 "%1$s</tt> VOB in your ClearCase Explorer."
 msgstr ""
 
-#: plugins/scmccase/common/CCasePlugin.class.php:111 www/tracker/item.php:449
+#: plugins/scmccase/common/CCasePlugin.class.php:111 www/tracker/item.php:440
 msgid "History"
 msgstr ""
 
@@ -7323,7 +7335,7 @@
 #: plugins/scmdarcs/common/DarcsPlugin.class.php:198
 #: plugins/scmsvn/common/SVNPlugin.class.php:198
 #: utils/fixscripts/populate_template_project.php:188
-#: www/activity/index.php:107 www/stats/site_stats_utils.php:303
+#: www/activity/index.php:122 www/stats/site_stats_utils.php:303
 msgid "Commits"
 msgstr ""
 
@@ -7932,7 +7944,7 @@
 msgstr ""
 
 #: www/account/index.php:101 www/account/index.php:106
-#: www/include/html.php:931
+#: www/include/html.php:928
 msgid "Account Maintenance"
 msgstr ""
 
@@ -8400,28 +8412,36 @@
 "activated for normal logins."
 msgstr ""
 
-#: www/activity/index.php:90
+#: www/activity/index.php:89 www/project/stats/index.php:89
+msgid "Statistics"
+msgstr ""
+
+#: www/activity/index.php:91 www/project/stats/index.php:91
+msgid "-tooltip:stats"
+msgstr ""
+
+#: www/activity/index.php:105
 msgid "Forum Post"
 msgstr ""
 
-#: www/activity/index.php:95
+#: www/activity/index.php:110
 msgid "Tracker Opened"
 msgstr ""
 
-#: www/activity/index.php:97
+#: www/activity/index.php:112
 msgid "Tracker Closed"
 msgstr ""
 
-#: www/activity/index.php:112 www/activity/index.php:289
+#: www/activity/index.php:127 www/activity/index.php:304
 msgid "FRS Release"
 msgstr ""
 
-#: www/activity/index.php:153
+#: www/activity/index.php:168
 msgid "Invalid Data Passed to query"
 msgstr ""
 
-#: www/activity/index.php:165 www/frs/reporting/downloads.php:96
-#: www/project/stats/index.php:105 www/reporting/groupadded.php:61
+#: www/activity/index.php:180 www/frs/reporting/downloads.php:96
+#: www/project/stats/index.php:111 www/reporting/groupadded.php:61
 #: www/reporting/groupcum.php:60 www/reporting/projectact.php:65
 #: www/reporting/projecttime.php:76 www/reporting/siteact.php:65
 #: www/reporting/sitetime.php:73 www/reporting/sitetimebar.php:60
@@ -8431,8 +8451,8 @@
 msgid "Start"
 msgstr ""
 
-#: www/activity/index.php:166 www/frs/reporting/downloads.php:98
-#: www/project/stats/index.php:106 www/reporting/groupadded.php:62
+#: www/activity/index.php:181 www/frs/reporting/downloads.php:98
+#: www/project/stats/index.php:112 www/reporting/groupadded.php:62
 #: www/reporting/groupcum.php:61 www/reporting/projectact.php:66
 #: www/reporting/projecttime.php:77 www/reporting/siteact.php:66
 #: www/reporting/sitetime.php:74 www/reporting/sitetimebar.php:61
@@ -8442,46 +8462,46 @@
 msgid "End"
 msgstr ""
 
-#: www/activity/index.php:182 www/activity/index.php:245
+#: www/activity/index.php:197 www/activity/index.php:260
 msgid "No Activity Found"
 msgstr ""
 
-#: www/activity/index.php:249 www/reporting/projecttime.php:89
+#: www/activity/index.php:264 www/reporting/projecttime.php:89
 #: www/reporting/sitetime.php:88 www/reporting/sitetimebar.php:90
 msgid "Time"
 msgstr ""
 
-#: www/activity/index.php:251 www/pm/include/ProjectTaskHTML.class.php:207
-#: www/project/admin/project_admin_utils.php:152
-#: www/tracker/include/ArtifactHtml.class.php:87
-#: www/tracker/include/ArtifactTypeHtml.class.php:473
+#: www/activity/index.php:266 www/pm/include/ProjectTaskHTML.class.php:154
+#: www/project/admin/project_admin_utils.php:147
+#: www/tracker/include/ArtifactHtml.class.php:47
+#: www/tracker/include/ArtifactTypeHtml.class.php:202
 msgid "By"
 msgstr ""
 
-#: www/activity/index.php:274
+#: www/activity/index.php:289
 msgid "Commit for Tracker Item"
 msgstr ""
 
-#: www/activity/index.php:279 www/activity/index.php:284
-#: www/tracker/taskmgr.php:101 www/tracker/taskmgr.php:155
-#: www/tracker/tracker.php:313
+#: www/activity/index.php:294 www/activity/index.php:299
+#: www/tracker/taskmgr.php:103 www/tracker/taskmgr.php:157
+#: www/tracker/tracker.php:314
 msgid "Tracker Item"
 msgstr ""
 
-#: www/activity/index.php:279 www/stats/site_stats_utils.php:288
+#: www/activity/index.php:294 www/stats/site_stats_utils.php:288
 #: www/stats/site_stats_utils.php:290 www/stats/site_stats_utils.php:292
 #: www/stats/site_stats_utils.php:294 www/stats/site_stats_utils.php:298
 msgid "Opened"
 msgstr ""
 
-#: www/activity/index.php:284 www/reporting/usersummary.php:55
+#: www/activity/index.php:299 www/reporting/usersummary.php:55
 #: www/stats/site_stats_utils.php:289 www/stats/site_stats_utils.php:291
 #: www/stats/site_stats_utils.php:293 www/stats/site_stats_utils.php:295
 #: www/stats/site_stats_utils.php:299
 msgid "Closed"
 msgstr ""
 
-#: www/activity/index.php:294
+#: www/activity/index.php:309
 msgid "Forum Post "
 msgstr ""
 
@@ -8612,11 +8632,11 @@
 msgid "Reject"
 msgstr ""
 
-#: www/admin/approve-pending.php:171 www/admin/groupedit.php:189
+#: www/admin/approve-pending.php:171 www/admin/groupedit.php:202
 msgid "Home Box:"
 msgstr ""
 
-#: www/admin/approve-pending.php:175 www/admin/groupedit.php:199
+#: www/admin/approve-pending.php:175 www/admin/groupedit.php:212
 msgid "HTTP Domain:"
 msgstr ""
 
@@ -8624,7 +8644,7 @@
 msgid "Other Information"
 msgstr ""
 
-#: www/admin/approve-pending.php:184 www/admin/groupedit.php:176
+#: www/admin/approve-pending.php:184 www/admin/groupedit.php:189
 msgid "Unix Project Name:"
 msgstr ""
 
@@ -8721,7 +8741,7 @@
 #: www/admin/database.php:102 www/admin/massmail.php:137 www/frs/index.php:186
 #: www/people/editprofile.php:107 www/people/editprofile.php:282
 #: www/people/skills_utils.php:48 www/people/skills_utils.php:156
-#: www/project/stats/index.php:104 www/reporting/groupadded.php:60
+#: www/project/stats/index.php:110 www/reporting/groupadded.php:60
 #: www/reporting/groupcum.php:59 www/reporting/projectact.php:64
 #: www/reporting/projecttime.php:75 www/reporting/projecttime.php:88
 #: www/reporting/siteact.php:64 www/reporting/sitetime.php:72
@@ -8854,7 +8874,7 @@
 msgstr ""
 
 #: www/admin/globalroleedit.php:254 www/admin/globalroleedit.php:256
-#: www/project/admin/users.php:426
+#: www/project/admin/users.php:452
 msgid "Delete role"
 msgstr ""
 
@@ -8906,28 +8926,36 @@
 msgid "Holding (H)"
 msgstr ""
 
-#: www/admin/groupedit.php:136 www/admin/grouplist.php:93
+#: www/admin/groupedit.php:137
+#, php-format
+msgid ""
+"With PFO-RBAC, the “is_public” property is gone. Instead, to make a project "
+"public, <%1$s>link<%2$s> the global role “Anonymous/not logged in” then <"
+"%3$s>give<%4$s> it “Project visibility” permissions."
+msgstr ""
+
+#: www/admin/groupedit.php:148 www/admin/grouplist.php:93
 msgid "Public?"
 msgstr ""
 
-#: www/admin/groupedit.php:156 www/admin/grouplist.php:96
+#: www/admin/groupedit.php:169 www/admin/grouplist.php:96
 msgid "Template?"
 msgstr ""
 
-#: www/admin/groupedit.php:208
+#: www/admin/groupedit.php:221
 msgid "Registration Application:"
 msgstr ""
 
-#: www/admin/groupedit.php:218
+#: www/admin/groupedit.php:231
 msgid "SCM Box:"
 msgstr ""
 
-#: www/admin/groupedit.php:230
+#: www/admin/groupedit.php:243
 msgid "Resend New Project Instruction Email"
 msgstr ""
 
-#: www/admin/grouplist.php:27 www/include/Layout.class.php:1342
-#: www/themes/evolvis/Theme.class.php:539
+#: www/admin/grouplist.php:27 www/include/Layout.class.php:1348
+#: www/themes/evolvis/Theme.class.php:540
 msgid "Project List"
 msgstr ""
 
@@ -8995,7 +9023,7 @@
 msgid "Edit Role"
 msgstr ""
 
-#: www/admin/index.php:94 www/project/admin/users.php:440
+#: www/admin/index.php:94 www/project/admin/users.php:477
 msgid "Create Role"
 msgstr ""
 
@@ -9196,8 +9224,8 @@
 #: www/admin/massmail.php:136 www/admin/search.php:89 www/admin/search.php:167
 #: www/my/dashboard.php:61 www/pm/include/ProjectTaskHTML.class.php:114
 #: www/pm/index.php:99 www/project/admin/editimages.php:265
-#: www/tracker/admin/form-addcanned.php:41 www/tracker/browse.php:188
-#: www/tracker/browse.php:622 www/tracker/query.php:192
+#: www/tracker/admin/form-addcanned.php:41 www/tracker/browse.php:319
+#: www/tracker/browse.php:641 www/tracker/query.php:195
 msgid "ID"
 msgstr ""
 
@@ -9276,12 +9304,10 @@
 msgstr ""
 
 #: www/admin/pending-news.php:148 www/my/dashboard.php:73
-#: www/news/admin/index.php:135 www/pm/detail_task.php:39
-#: www/pm/include/ProjectTaskHTML.class.php:164 www/pm/mod_task.php:119
-#: www/pm/templates/detail_template.php:69
+#: www/news/admin/index.php:135 www/pm/templates/detail_template.php:64
 #: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:57
 #: www/search/include/renderers/TrackersHtmlSearchRenderer.class.php:50
-#: www/tracker/browse.php:638 www/tracker/item.php:204
+#: www/tracker/browse.php:657 www/tracker/item.php:211
 msgid "Submitted by"
 msgstr ""
 
@@ -9295,9 +9321,11 @@
 
 #: www/admin/pending-news.php:156 www/my/diary.php:185
 #: www/news/admin/index.php:145 www/news/submit.php:153
-#: www/pm/browse_task.php:483 www/pm/include/pm_columns.php:43
-#: www/pm/templates/detail_template.php:12
-#: www/pm/templates/detail_template.php:117 www/tracker/item.php:131
+#: www/pm/browse_task.php:424 www/pm/include/ProjectView.class.php:295
+#: www/pm/include/ProjectView.class.php:299
+#: www/pm/include/ProjectView.class.php:303
+#: www/pm/include/ProjectView.class.php:308 www/pm/include/pm_columns.php:43
+#: www/pm/templates/detail_template.php:7 www/tracker/item.php:138
 msgid "Details"
 msgstr ""
 
@@ -9352,8 +9380,8 @@
 
 #: www/admin/pluginman.php:119 www/people/people_utils.php:158
 #: www/people/people_utils.php:299 www/project/admin/users.php:316
-#: www/project/admin/users.php:396 www/project/admin/users.php:459
-#: www/project/admin/users.php:483
+#: www/project/admin/users.php:406 www/project/admin/users.php:494
+#: www/project/admin/users.php:518
 msgid "Action"
 msgstr ""
 
@@ -10027,7 +10055,6 @@
 msgstr ""
 
 #: www/export/rssAboTask.php:161 www/news/news_utils.php:183
-#: www/pm/include/ProjectTaskHTML.class.php:162
 msgid "Comment"
 msgstr ""
 
@@ -10222,9 +10249,8 @@
 msgid "No Monitoring Users"
 msgstr ""
 
-#: www/forum/admin/monitor.php:61 www/pm/mod_task.php:340
-#: www/pm/templates/time_tracking.php:8 www/reporting/useract.php:77
-#: www/reporting/usertime.php:88
+#: www/forum/admin/monitor.php:61 www/pm/templates/time_tracking.php:8
+#: www/reporting/useract.php:77 www/reporting/usertime.php:88
 msgid "User"
 msgstr ""
 
@@ -10253,7 +10279,7 @@
 
 #: www/forum/attachment.php:42 www/forum/attachment.php:126
 #: www/forum/attachment.php:154
-#: www/tracker/include/ArtifactTypeHtml.class.php:468
+#: www/tracker/include/ArtifactTypeHtml.class.php:196
 msgid "Attachments"
 msgstr ""
 
@@ -10269,7 +10295,7 @@
 msgid "You cannot edit this attachment"
 msgstr ""
 
-#: www/forum/attachment.php:149
+#: www/forum/attachment.php:149 www/include/helppage.php:42
 msgid "Close Window"
 msgstr ""
 
@@ -10920,7 +10946,7 @@
 msgid "File Release Reporting"
 msgstr ""
 
-#: www/frs/reporting/downloads.php:100 www/project/stats/index.php:107
+#: www/frs/reporting/downloads.php:100 www/project/stats/index.php:113
 #: www/reporting/groupadded.php:63 www/reporting/groupcum.php:62
 #: www/reporting/projectact.php:67 www/reporting/projecttime.php:78
 #: www/reporting/siteact.php:67 www/reporting/sitetime.php:77
@@ -10947,43 +10973,43 @@
 msgid "Release Name:"
 msgstr ""
 
-#: www/include/Layout.class.php:136
+#: www/include/Layout.class.php:137
 msgid "Can't find theme directory!"
 msgstr ""
 
-#: www/include/Layout.class.php:289 www/themes/evolvis/Theme.class.php:106
+#: www/include/Layout.class.php:290 www/themes/evolvis/Theme.class.php:106
 msgid "en"
 msgstr ""
 
-#: www/include/Layout.class.php:668
+#: www/include/Layout.class.php:673
 msgid "Quick Jump To..."
 msgstr ""
 
-#: www/include/Layout.class.php:1266
+#: www/include/Layout.class.php:1272
 msgid "Close"
 msgstr ""
 
-#: www/include/Layout.class.php:1268
+#: www/include/Layout.class.php:1274
 msgid "Maximise"
 msgstr ""
 
-#: www/include/Layout.class.php:1270
+#: www/include/Layout.class.php:1276
 msgid "Minimise"
 msgstr ""
 
-#: www/include/Layout.class.php:1330
+#: www/include/Layout.class.php:1336
 msgid "Tag cloud"
 msgstr ""
 
-#: www/include/Layout.class.php:1332
+#: www/include/Layout.class.php:1338
 msgid "Display all public projects by their tags"
 msgstr ""
 
-#: www/include/Layout.class.php:1338
+#: www/include/Layout.class.php:1344
 msgid "Display all public projects as trove tree"
 msgstr ""
 
-#: www/include/Layout.class.php:1344 www/themes/evolvis/Theme.class.php:540
+#: www/include/Layout.class.php:1350 www/themes/evolvis/Theme.class.php:541
 msgid "Display an alphabetically sorted list of all public projects"
 msgstr ""
 
@@ -11083,165 +11109,296 @@
 msgid "File does not exist. File %s is not in incoming FTP directory."
 msgstr ""
 
-#: www/include/html.php:348 www/include/html.php:500 www/include/html.php:762
-#: www/pm/browse_task.php:631 www/pm/browse_task.php:656
-#: www/pm/browse_task.php:667 www/tracker/browse.php:810
-#: www/tracker/browse.php:818 www/tracker/browse.php:827
-msgid "No Change"
+#: www/include/help.php:40
+msgid "Mehr Info…"
 msgstr ""
 
-#: www/include/html.php:357
+#: www/include/help.php:51
 msgid ""
 "This drop-down box represents the person to which a tracker item is assigned."
 msgstr ""
 
-#: www/include/html.php:359
+#: www/include/help.php:56
+msgid "This drop-down box represents the current status of a tracker item."
+msgstr ""
+
+#: www/include/help.php:57
 msgid ""
-"This drop-down box represents the current status of a tracker item.<br /"
-"><br />You can set the status to 'Pending' if you are waiting for a response "
-"from the tracker item author.  When the author responds the status is "
+"You can set the status to 'Pending' if you are waiting for a response from "
+"the tracker item author.  When the author responds the status is "
 "automatically reset to that of 'Open'. Otherwise, if the author doesn't "
 "respond with an admin-defined amount of time (default is 14 days) then the "
 "item is given a status of 'Deleted'."
 msgstr ""
 
-#: www/include/html.php:361
+#: www/include/help.php:62
 msgid "Tracker category"
 msgstr ""
 
-#: www/include/html.php:363
+#: www/include/help.php:66
 msgid "Tracker group"
 msgstr ""
 
-#: www/include/html.php:365
+#: www/include/help.php:71
 msgid ""
 "The Sort By option allows you to determine how the browse results are sorted."
-"<br /><br />  You can sort by ID, Priority, Summary, Open Date, Close Date, "
-"Submitter, or Assignee.  You can also have the results sorted in Ascending "
-"or Descending order."
 msgstr ""
 
-#: www/include/html.php:367
+#: www/include/help.php:72
 msgid ""
+"You can sort by ID, Priority, Summary, Open Date, Close Date, Submitter, or "
+"Assignee.  You can also have the results sorted in Ascending or Descending "
+"order."
+msgstr ""
+
+#: www/include/help.php:78
+msgid ""
 "The Data Type option determines the type of tracker item this is.  Since the "
 "tracker rolls into one the bug, patch, support, etc... managers you need to "
-"be able to determine which one of these an item should belong.<br /><br /"
-">This has the added benefit of enabling an admin to turn a support request "
+"be able to determine which one of these an item should belong."
+msgstr ""
+
+#: www/include/help.php:79
+msgid ""
+"This has the added benefit of enabling an admin to turn a support request "
 "into a bug."
 msgstr ""
 
-#: www/include/html.php:369
+#: www/include/help.php:85
 msgid ""
 "The priority option allows a user to define a tracker item priority (ranging "
-"from 1-Lowest to 5-Highest).<br /><br />This is especially helpful for bugs "
-"and support requests where a user might find a critical problem with a "
-"project."
+"from 1-Lowest to 5-Highest)."
 msgstr ""
 
-#: www/include/html.php:371 www/pm/ganttpage.php:159
+#: www/include/help.php:86
+msgid ""
+"This is especially helpful for bugs and support requests where a user might "
+"find a critical problem with a project."
+msgstr ""
+
+#: www/include/help.php:91 www/pm/ganttpage.php:159
 msgid "Resolution"
 msgstr ""
 
-#: www/include/html.php:373
+#: www/include/help.php:95
 msgid ""
 "The summary text-box represents a short tracker item summary. Useful when "
 "browsing through several tracker items."
 msgstr ""
 
-#: www/include/html.php:375
+#: www/include/help.php:100
 msgid ""
 "The canned response drop-down represents a list of project admin-defined "
-"canned responses to common support or bug submission.<br /><br /> If you are "
-"a project admin you can click the '(admin)' link to define your own canned "
-"responses"
+"canned responses to common support or bug submission."
 msgstr ""
 
-#: www/include/html.php:377
+#: www/include/help.php:101
 msgid ""
+"If you are a project admin you can click the '(admin)' link to define your "
+"own canned responses"
+msgstr ""
+
+#: www/include/help.php:107
+msgid ""
 "Anyone can add here comments to give additional information, answers and "
 "solutions. Please, be as precise as possible to avoid misunderstanding. If "
 "relevant, screenshots or documents can be added as attached files."
 msgstr ""
 
-#: www/include/html.php:379
+#: www/include/help.php:108 www/include/help.php:144
+msgid "Detailed formatting help is available in the notepad form."
+msgstr ""
+
+#: www/include/help.php:114
 msgid "Enter the complete description."
 msgstr ""
 
-#: www/include/html.php:380
-msgid ""
-"<div align=\"left\"><b>Editing tips:</b><br/><strong>http,https or ftp</"
-"strong>: Hyperlinks.<br/><strong>[#NNN]</strong>: Tracker id NNN.<br/"
-"><strong>[TNNN]</strong>: Task id NNN.<br/><strong>[wiki:<pagename>]</"
-"strong>: Wiki page.<br/><strong>[forum:<msg_id>]</strong>: Forum post."
-"</div>"
+#: www/include/help.php:116
+msgid "Editing tips:"
 msgstr ""
 
-#: www/include/html.php:383
+#: www/include/help.php:119
+msgid "http, https or ftp"
+msgstr ""
+
+#: www/include/help.php:120
+msgid "Hyperlinks"
+msgstr ""
+
+#: www/include/help.php:123
+msgid "[#NNN]"
+msgstr ""
+
+#: www/include/help.php:124
+msgid "Tracker ID NNN"
+msgstr ""
+
+#: www/include/help.php:127
+msgid "[TNNN]"
+msgstr ""
+
+#: www/include/help.php:128
+msgid "Task ID NNN"
+msgstr ""
+
+#: www/include/help.php:131
+msgid "[wiki:<pagename>]"
+msgstr ""
+
+#: www/include/help.php:132
+msgid "Wiki page"
+msgstr ""
+
+#: www/include/help.php:135
+msgid "[forum:<msg_id>]"
+msgstr ""
+
+#: www/include/help.php:136
+msgid "Forum post"
+msgstr ""
+
+#: www/include/help.php:148
 msgid ""
 "When you wish to attach a file to a tracker item you must check this "
 "checkbox before submitting changes."
 msgstr ""
 
-#: www/include/html.php:385
+#: www/include/help.php:153
 msgid ""
-"You can monitor or un-monitor this item by clicking the \"Monitor\" button. "
-"<br /><br /><strong>Note!</strong> this will send you additional email. If "
-"you add comments to this item, or submitted, or are assigned this item, you "
-"will also get emails for those reasons as well!"
+"You can monitor or un-monitor this item by clicking the \"Monitor\" button."
 msgstr ""
 
-#: www/include/html.php:765
+#: www/include/help.php:154
+msgid "Note!"
+msgstr ""
+
+#: www/include/help.php:155
+msgid ""
+"This will send you additional eMail. If you add comments to this item, or "
+"submitted, or are assigned this item, you will also get emails for those "
+"reasons as well!"
+msgstr ""
+
+#: www/include/help.php:158
+msgid "Browser, in dem der Fehler aufgetaucht ist (mit Version)."
+msgstr ""
+
+#: www/include/help.php:162
+msgid "Einzelne Komponenten des Projekts eintragen."
+msgstr ""
+
+#: www/include/help.php:166
+msgid "Hardware, mit der getestet wurde, als der Bug auftrat."
+msgstr ""
+
+#: www/include/help.php:170
+msgid "Betriebssystem, in dem der Fehler aufgetreten ist."
+msgstr ""
+
+#: www/include/help.php:174
+msgid "Projektname"
+msgstr ""
+
+#: www/include/help.php:178
+msgid "Bei Browseranwendungen die URL, auf der der Fehler auftrat."
+msgstr ""
+
+#: www/include/help.php:182
+msgid "Versionen des Projekts (wann ist der Bug behoben)"
+msgstr ""
+
+#: www/include/help.php:186
+msgid "Version des Projekts, in der der Bug aufgetreten ist."
+msgstr ""
+
+#: www/include/help.php:190
+msgid ""
+"Meldungsstatus eines Bugeintrags; siehe „Mehr Info…“ für Prozeßspezifikation."
+msgstr ""
+
+#: www/include/help.php:451
+msgid ""
+"Schweregrad eines Bugeintrags; siehe „Mehr Info…“ für Prozeßspezifikation."
+msgstr ""
+
+#: www/include/helppage.php:32
+msgid "Do not call me directly!"
+msgstr ""
+
+#: www/include/helppage.php:35
+#, php-format
+msgid "Forge Help Facility: %s"
+msgstr ""
+
+#: www/include/html.php:350 www/include/html.php:484 www/include/html.php:746
+#: www/pm/browse_task.php:550 www/pm/browse_task.php:575
+#: www/pm/browse_task.php:586 www/tracker/browse.php:829
+#: www/tracker/browse.php:837 www/tracker/browse.php:846
+msgid "No Change"
+msgstr ""
+
+#: www/include/html.php:749
 msgid "Lowest"
 msgstr ""
 
-#: www/include/html.php:769
+#: www/include/html.php:753
 msgid "Highest"
 msgstr ""
 
-#: www/include/html.php:862
+#: www/include/html.php:846
 #, php-format
 msgid "Project access problem: %s"
 msgstr ""
 
-#: www/include/html.php:864
+#: www/include/html.php:848
 #, php-format
 msgid "Project Problem: %s"
 msgstr ""
 
-#: www/include/html.php:917 www/my/bookmark_add.php:28
+#: www/include/html.php:901 www/my/bookmark_add.php:28
 msgid "My Personal Page"
 msgstr ""
 
-#: www/include/html.php:919 www/themes/evolvis/Theme.class.php:127
+#: www/include/html.php:903 www/themes/evolvis/Theme.class.php:127
 msgid "Manage projects, assigned tasks, bugs, etc."
 msgstr ""
 
-#: www/include/html.php:921
+#: www/include/html.php:911
+msgid ""
+"Select widgets to add to the User Summary page from a list of available "
+"widgets"
+msgstr ""
+
+#: www/include/html.php:915 www/include/project_home.php:82
+msgid "Customise number and sizes of columns to use for widgets"
+msgstr ""
+
+#: www/include/html.php:918
 msgid "Trackers dashboard"
 msgstr ""
 
-#: www/include/html.php:923
+#: www/include/html.php:920
 msgid "Have an overview about all tracker items related to you"
 msgstr ""
 
-#: www/include/html.php:926
+#: www/include/html.php:923
 msgid "Diary & Notes"
 msgstr ""
 
-#: www/include/html.php:928
+#: www/include/html.php:925
 msgid "-tooltip:diary-and-notes"
 msgstr ""
 
-#: www/include/html.php:933
+#: www/include/html.php:930
 msgid "Change the password, SSH keys; configure account settings"
 msgstr ""
 
-#: www/include/html.php:937 www/register/index.php:166
-#: www/themes/evolvis/Theme.class.php:535
+#: www/include/html.php:934 www/register/index.php:166
+#: www/themes/evolvis/Theme.class.php:536
 msgid "Register Project"
 msgstr ""
 
-#: www/include/html.php:939 www/themes/evolvis/Theme.class.php:536
+#: www/include/html.php:936 www/themes/evolvis/Theme.class.php:537
 msgid "Register a new Project on the forge"
 msgstr ""
 
@@ -11259,12 +11416,9 @@
 "widgets"
 msgstr ""
 
-#: www/include/project_home.php:82
-msgid "Customise number and sizes of columns to use for widgets"
-msgstr ""
-
-#: www/include/tool_reports.php:65 www/pm/index.php:102
-#: www/reporting/usersummary.php:54 www/tracker/ind.php:63
+#: www/include/tool_reports.php:65 www/pm/include/ProjectView.class.php:356
+#: www/pm/index.php:102 www/reporting/usersummary.php:54
+#: www/tracker/ind.php:63
 msgid "Open"
 msgstr ""
 
@@ -11698,7 +11852,7 @@
 msgid "Edit Bookmark"
 msgstr ""
 
-#: www/my/dashboard.php:37 www/my/index.php:40 www/widgets/widgets.php:57
+#: www/my/dashboard.php:37 www/my/index.php:50 www/widgets/widgets.php:57
 #, php-format
 msgid "Personal Page For %s"
 msgstr ""
@@ -11715,21 +11869,19 @@
 msgid "Changed"
 msgstr ""
 
-#: www/my/dashboard.php:69 www/pm/add_task.php:62 www/pm/browse_task.php:240
-#: www/pm/browse_task.php:471 www/pm/browse_task.php:657
-#: www/pm/detail_task.php:68 www/pm/include/pm_columns.php:37
-#: www/pm/mod_task.php:150 www/pm/templates/detail_template.php:25
-#: www/tracker/admin/form-customizelist.php:45 www/tracker/browse.php:189
-#: www/tracker/browse.php:634 www/tracker/browse.php:814
-#: www/tracker/item.php:156 www/tracker/query.php:193
+#: www/my/dashboard.php:69 www/pm/browse_task.php:218
+#: www/pm/browse_task.php:412 www/pm/browse_task.php:576
+#: www/pm/include/pm_columns.php:37 www/pm/templates/detail_template.php:20
+#: www/tracker/admin/form-customizelist.php:45 www/tracker/browse.php:320
+#: www/tracker/browse.php:653 www/tracker/browse.php:833
+#: www/tracker/item.php:163 www/tracker/query.php:196
 msgid "Priority"
 msgstr ""
 
-#: www/my/dashboard.php:71 www/pm/add_task.php:131 www/pm/browse_task.php:469
-#: www/pm/browse_task.php:664 www/pm/detail_task.php:125
-#: www/pm/mod_task.php:244 www/pm/templates/detail_template.php:35
-#: www/tracker/browse.php:636 www/tracker/browse.php:817
-#: www/tracker/item.php:170
+#: www/my/dashboard.php:71 www/pm/browse_task.php:410
+#: www/pm/browse_task.php:583 www/pm/templates/detail_template.php:30
+#: www/tracker/browse.php:655 www/tracker/browse.php:836
+#: www/tracker/item.php:177
 msgid "Assigned to"
 msgstr ""
 
@@ -11966,7 +12118,7 @@
 msgid "No News Items Found"
 msgstr ""
 
-#: www/news/news_utils.php:185 www/pm/include/ProjectView.class.php:303
+#: www/news/news_utils.php:185 www/pm/include/ProjectView.class.php:320
 #: www/survey/include/SurveyHTML.class.php:653
 msgid "Comments"
 msgstr ""
@@ -12024,10 +12176,86 @@
 msgid "For project"
 msgstr ""
 
-#: www/notepad.php:54
+#: www/notepad.php:48
 msgid "FusionForge Notepad"
 msgstr ""
 
+#: www/notepad.php:105
+msgid ""
+"You can apply basic formatting to the messages: by default, they are "
+"displayed as running text with automatic line breaks; manual line breaks "
+"(one newline) and paragraph breaks (two or more newlines) are also "
+"supported. Furthermore, the following formatting is supported:"
+msgstr ""
+
+#: www/notepad.php:107
+msgid "<tt>{{{</tt> on a line by itself switches to preformatted text"
+msgstr ""
+
+#: www/notepad.php:108
+msgid ""
+"<tt><<<b:</tt><i>sometext</i><tt>>>></tt> displays "
+"“sometext” in a <b>boldface</b> font"
+msgstr ""
+
+#: www/notepad.php:109
+msgid ""
+"<tt><<<i:</tt><i>sometext</i><tt>>>></tt> displays "
+"“sometext” in an <i>italic</i> font"
+msgstr ""
+
+#: www/notepad.php:110
+msgid ""
+"<tt><<<tt:</tt><i>sometext</i><tt>>>></tt> displays "
+"“sometext” in <tt>monospace</tt> (teletype font)"
+msgstr ""
+
+#: www/notepad.php:111
+msgid ""
+"<tt><<<ins:</tt><i>sometext</i><tt>>>></tt> displays "
+"“sometext” as <ins>insertion</ins> (with browser-defined rendering)"
+msgstr ""
+
+#: www/notepad.php:112
+msgid ""
+"<tt><<<del:</tt><i>sometext</i><tt>>>></tt> displays "
+"“sometext” as <del>deletion</del> (with browser-defined rendering)"
+msgstr ""
+
+#: www/notepad.php:114
+msgid ""
+"If the message contains three spaces in a row or a horizontal tabulator, "
+"it’s also assumed to be preformatted text unless it contains other "
+"formatting instructions, i.e. ‘>>>’ or ‘}}}’. You can switch out of "
+"preformatted text by ‘}}}’ on a line by itself. The following formatting "
+"instructions are recognised in both preformatted and running text:"
+msgstr ""
+
+#: www/notepad.php:116
+msgid ""
+"<b>[#<i>123</i>]</b> links to the Tracker Item with the number <i>123</i> "
+"(or, if unique, Task Item)"
+msgstr ""
+
+#: www/notepad.php:117
+msgid "<b>[T<i>123</i>]</b> links to the Task Item with the number <i>123</i>"
+msgstr ""
+
+#: www/notepad.php:118
+msgid ""
+"<b>[forum:<i>123</i>]</b> links to the Forum Message with the ID <i>123</i>"
+msgstr ""
+
+#: www/notepad.php:119
+msgid ""
+"<b>[wiki:<i>Some Page</i>]</b> links to the Wiki Page with the name "
+"<i>Some_Page</i>"
+msgstr ""
+
+#: www/notepad.php:120
+msgid "Almost any valid URI by itself is converted into a hyperlink"
+msgstr ""
+
 #: www/people/admin/index.php:52
 msgid " Error inserting value: "
 msgstr ""
@@ -12053,11 +12281,9 @@
 #: www/people/createjob.php:49 www/people/editjob.php:52
 #: www/people/editjob.php:74 www/people/editjob.php:163
 #: www/people/people_utils.php:350 www/people/people_utils.php:406
-#: www/pm/add_task.php:45 www/pm/browse_task.php:329
-#: www/pm/browse_task.php:467 www/pm/browse_task.php:654
-#: www/pm/detail_task.php:49 www/pm/ganttpage.php:157
-#: www/pm/include/pm_columns.php:35 www/pm/mod_task.php:128
-#: www/pm/mod_task.php:339 www/pm/templates/detail_template.php:30
+#: www/pm/browse_task.php:297 www/pm/browse_task.php:408
+#: www/pm/browse_task.php:573 www/pm/ganttpage.php:157
+#: www/pm/include/pm_columns.php:35 www/pm/templates/detail_template.php:25
 #: www/pm/templates/time_tracking.php:7 www/reporting/timeadd.php:142
 #: www/snippet/package.php:163 www/snippet/submit.php:131
 msgid "Category"
@@ -12354,24 +12580,21 @@
 msgstr ""
 
 #: www/people/editprofile.php:283 www/people/skills_utils.php:50
-#: www/people/skills_utils.php:157 www/pm/add_task.php:102
-#: www/pm/browse_task.php:237 www/pm/browse_task.php:461
-#: www/pm/detail_task.php:83 www/pm/ganttpage.php:70
-#: www/pm/include/pm_columns.php:32 www/pm/mod_task.php:217
-#: www/pm/templates/detail_template.php:47
+#: www/people/skills_utils.php:157 www/pm/browse_task.php:215
+#: www/pm/browse_task.php:402 www/pm/ganttpage.php:70
+#: www/pm/include/pm_columns.php:32 www/pm/templates/detail_template.php:42
 #: www/search/include/renderers/TasksHtmlSearchRenderer.class.php:50
-#: www/tracker/include/ArtifactTypeHtml.class.php:417
+#: www/tracker/include/ArtifactTypeHtml.class.php:145
 msgid "Start Date"
 msgstr ""
 
 #: www/people/editprofile.php:284 www/people/skills_utils.php:51
-#: www/people/skills_utils.php:158 www/pm/add_task.php:117
-#: www/pm/browse_task.php:238 www/pm/browse_task.php:463
-#: www/pm/detail_task.php:87 www/pm/ganttpage.php:71
-#: www/pm/include/pm_columns.php:33 www/pm/mod_task.php:231
-#: www/pm/templates/detail_template.php:52 www/reporting/usersummary.php:106
+#: www/people/skills_utils.php:158 www/pm/browse_task.php:216
+#: www/pm/browse_task.php:404 www/pm/ganttpage.php:71
+#: www/pm/include/pm_columns.php:33 www/pm/templates/detail_template.php:47
+#: www/reporting/usersummary.php:106
 #: www/search/include/renderers/TasksHtmlSearchRenderer.class.php:51
-#: www/tracker/include/ArtifactTypeHtml.class.php:418
+#: www/tracker/include/ArtifactTypeHtml.class.php:146
 msgid "End Date"
 msgstr ""
 
@@ -12536,8 +12759,8 @@
 
 #: www/people/viewjob.php:80 www/pm/include/ProjectTaskHTML.class.php:118
 #: www/project/report/index.php:137
-#: www/tracker/admin/form-customizelist.php:43 www/tracker/browse.php:191
-#: www/tracker/browse.php:628 www/tracker/query.php:195
+#: www/tracker/admin/form-customizelist.php:43 www/tracker/browse.php:322
+#: www/tracker/browse.php:647 www/tracker/query.php:198
 msgid "Open Date"
 msgstr ""
 
@@ -12569,60 +12792,6 @@
 msgid "User_id not found."
 msgstr ""
 
-#: www/pm/add_task.php:33
-msgid "Add a new Task"
-msgstr ""
-
-#: www/pm/add_task.php:48 www/pm/mod_task.php:129
-msgid "admin"
-msgstr ""
-
-#: www/pm/add_task.php:58 www/pm/browse_task.php:239
-#: www/pm/browse_task.php:465 www/pm/detail_task.php:63
-#: www/pm/ganttpage.php:72 www/pm/include/pm_columns.php:34
-#: www/pm/mod_task.php:145 www/pm/templates/detail_template.php:15
-msgid "Percent Complete"
-msgstr ""
-
-#: www/pm/add_task.php:69 www/pm/browse_task.php:236
-#: www/pm/browse_task.php:459 www/pm/detail_task.php:94
-#: www/pm/ganttpage.php:69 www/pm/include/ProjectTaskHTML.class.php:84
-#: www/pm/mod_task.php:164 www/pm/templates/detail_template.php:112
-#: www/tracker/include/ArtifactTypeHtml.class.php:416
-msgid "Task Summary"
-msgstr ""
-
-#: www/pm/add_task.php:76
-msgid "Task Details"
-msgstr ""
-
-#: www/pm/add_task.php:95 www/pm/add_task.php:156 www/pm/browse_task.php:485
-#: www/pm/detail_task.php:145 www/pm/include/pm_columns.php:44
-#: www/pm/mod_task.php:268 www/pm/mod_task.php:276 www/pm/mod_task.php:338
-#: www/pm/templates/detail_template.php:60
-msgid "Estimated Hours"
-msgstr ""
-
-#: www/pm/add_task.php:109 www/pm/mod_task.php:224
-msgid ""
-"The system will modify your start/end dates if you attempt to create a start "
-"date earlier than the end date of any tasks you depend on."
-msgstr ""
-
-#: www/pm/add_task.php:110 www/pm/include/ProjectView.class.php:409
-#: www/pm/include/ProjectView.class.php:411 www/pm/mod_task.php:225
-msgid "View Calendar"
-msgstr ""
-
-#: www/pm/add_task.php:137 www/pm/detail_task.php:138 www/pm/mod_task.php:254
-#: www/pm/templates/detail_template.php:159
-msgid "Dependent on task"
-msgstr ""
-
-#: www/pm/add_task.php:141
-msgid "Dependent note"
-msgstr ""
-
 #: www/pm/admin/index.php:62 www/pm/admin/index.php:95
 #: www/pm/admin/index.php:115 www/pm/admin/index.php:173
 #: www/pm/admin/index.php:236 www/pm/admin/index.php:247
@@ -12667,7 +12836,7 @@
 msgstr ""
 
 #: www/pm/admin/index.php:215 www/pm/admin/index.php:259
-#: www/pm/browse_task.php:491 www/pm/include/pm_columns.php:47
+#: www/pm/browse_task.php:432 www/pm/include/pm_columns.php:47
 #: www/reporting/timecategory.php:72 www/reporting/timecategory.php:91
 msgid "Category Name"
 msgstr ""
@@ -12707,7 +12876,7 @@
 msgstr ""
 
 #: www/pm/admin/index.php:309 www/pm/admin/index.php:374
-#: www/tracker/taskmgr.php:53
+#: www/tracker/taskmgr.php:55
 msgid "Could Not Get ProjectGroup"
 msgstr ""
 
@@ -12740,8 +12909,8 @@
 "all its related data!"
 msgstr ""
 
-#: www/pm/admin/index.php:403 www/pm/index.php:47 www/pm/task.php:83
-#: www/tracker/browse.php:92 www/tracker/taskmgr.php:136
+#: www/pm/admin/index.php:403 www/pm/index.php:47 www/pm/task.php:95
+#: www/tracker/browse.php:102 www/tracker/taskmgr.php:138
 msgid "Could Not Get Factory"
 msgstr ""
 
@@ -12771,156 +12940,155 @@
 msgid "Edit/Update Subproject"
 msgstr ""
 
-#: www/pm/browse_task.php:157
+#: www/pm/browse_task.php:135
 msgid "Browse tasks"
 msgstr ""
 
-#: www/pm/browse_task.php:216 www/pm/browse_task.php:227
-#: www/pm/browse_task.php:328 www/pm/ganttpage.php:56 www/pm/ganttpage.php:58
+#: www/pm/browse_task.php:194 www/pm/browse_task.php:205
+#: www/pm/browse_task.php:296 www/pm/ganttpage.php:56 www/pm/ganttpage.php:58
 #: www/pm/ganttpage.php:60 www/pm/ganttpage.php:62
-#: www/reporting/usersummary.php:53 www/tracker/browse.php:176
-#: www/tracker/browse.php:255 www/tracker/browse.php:262
-#: www/tracker/query.php:341
+#: www/reporting/usersummary.php:53 www/tracker/browse.php:307
+#: www/tracker/browse.php:386 www/tracker/browse.php:393
+#: www/tracker/query.php:344
 msgid "Any"
 msgstr ""
 
-#: www/pm/browse_task.php:218 www/pm/browse_task.php:628
-#: www/pm/ganttpage.php:58 www/tracker/browse.php:181
+#: www/pm/browse_task.php:196 www/pm/browse_task.php:547
+#: www/pm/ganttpage.php:58 www/tracker/browse.php:312
 msgid "Unassigned"
 msgstr ""
 
-#: www/pm/browse_task.php:235 www/pm/browse_task.php:457
+#: www/pm/browse_task.php:213 www/pm/browse_task.php:398
 #: www/pm/ganttpage.php:68 www/pm/include/ProjectTaskHTML.class.php:83
 msgid "Task Id"
 msgstr ""
 
-#: www/pm/browse_task.php:256
+#: www/pm/browse_task.php:214 www/pm/browse_task.php:400
+#: www/pm/ganttpage.php:69 www/pm/include/ProjectTaskHTML.class.php:84
+#: www/pm/templates/detail_template.php:99
+#: www/tracker/include/ArtifactTypeHtml.class.php:144
+msgid "Task Summary"
+msgstr ""
+
+#: www/pm/browse_task.php:217 www/pm/browse_task.php:406
+#: www/pm/ganttpage.php:72 www/pm/include/pm_columns.php:34
+#: www/pm/templates/detail_template.php:10
+msgid "Percent Complete"
+msgstr ""
+
+#: www/pm/browse_task.php:234
 msgid "Detailed"
 msgstr ""
 
-#: www/pm/browse_task.php:326
+#: www/pm/browse_task.php:294
 msgid "Subprojects"
 msgstr ""
 
-#: www/pm/browse_task.php:327 www/pm/ganttpage.php:155
-#: www/tracker/browse.php:194 www/tracker/browse.php:474
-#: www/tracker/query.php:198 www/tracker/query.php:338
+#: www/pm/browse_task.php:295 www/pm/ganttpage.php:155
+#: www/tracker/browse.php:325 www/tracker/browse.php:493
+#: www/tracker/query.php:201 www/tracker/query.php:341
 msgid "Assignee"
 msgstr ""
 
-#: www/pm/browse_task.php:330 www/pm/ganttpage.php:158
+#: www/pm/browse_task.php:298 www/pm/ganttpage.php:158
 msgid "Sort On"
 msgstr ""
 
-#: www/pm/browse_task.php:331
+#: www/pm/browse_task.php:299
 msgid "Detail View"
 msgstr ""
 
-#: www/pm/browse_task.php:337
+#: www/pm/browse_task.php:305
 msgid "Customise display:"
 msgstr ""
 
-#: www/pm/browse_task.php:338
+#: www/pm/browse_task.php:306
 msgid "Add/Remove Columns"
 msgstr ""
 
-#: www/pm/browse_task.php:387
+#: www/pm/browse_task.php:346
 msgid "No Matching Tasks found"
 msgstr ""
 
-#: www/pm/browse_task.php:389
+#: www/pm/browse_task.php:348
 msgid "Add tasks using the link above"
 msgstr ""
 
-#: www/pm/browse_task.php:400
+#: www/pm/browse_task.php:351
 #, php-format
-msgid "Displaying results %1$d‒%2$d."
+msgid "Displaying %d results."
 msgstr ""
 
-#: www/pm/browse_task.php:403 www/tracker/browse.php:401
-#, php-format
-msgid "Displaying %2$s results."
-msgstr ""
-
-#: www/pm/browse_task.php:405 www/top/topusers.php:67
-#: www/tracker/browse.php:403
-msgid "Change"
-msgstr ""
-
-#: www/pm/browse_task.php:475
+#: www/pm/browse_task.php:416
 msgid "Project Task Id"
 msgstr ""
 
-#: www/pm/browse_task.php:477 www/pm/include/pm_columns.php:40
-#: www/snippet/browse.php:83 www/tracker/query.php:336
+#: www/pm/browse_task.php:418 www/pm/include/pm_columns.php:40
+#: www/snippet/browse.php:83 www/tracker/query.php:339
 msgid "Creator"
 msgstr ""
 
-#: www/pm/browse_task.php:479 www/pm/include/pm_columns.php:41
+#: www/pm/browse_task.php:420 www/pm/include/pm_columns.php:41
 msgid "Duration"
 msgstr ""
 
-#: www/pm/browse_task.php:481 www/pm/include/pm_columns.php:42
+#: www/pm/browse_task.php:422 www/pm/include/pm_columns.php:42
 msgid "Parent Id"
 msgstr ""
 
-#: www/pm/browse_task.php:487 www/pm/include/pm_columns.php:45
+#: www/pm/browse_task.php:426 www/pm/include/pm_columns.php:44
+#: www/pm/templates/detail_template.php:55
+msgid "Estimated Hours"
+msgstr ""
+
+#: www/pm/browse_task.php:428 www/pm/include/pm_columns.php:45
 msgid "Status Id"
 msgstr ""
 
-#: www/pm/browse_task.php:489 www/pm/include/pm_columns.php:46
+#: www/pm/browse_task.php:430 www/pm/include/pm_columns.php:46
 msgid "Category Id"
 msgstr ""
 
-#: www/pm/browse_task.php:493 www/pm/include/pm_columns.php:48
+#: www/pm/browse_task.php:434 www/pm/include/pm_columns.php:48
 msgid "Last Modified Date"
 msgstr ""
 
-#: www/pm/browse_task.php:495 www/pm/include/pm_columns.php:49
+#: www/pm/browse_task.php:436 www/pm/include/pm_columns.php:49
 msgid "External Id"
 msgstr ""
 
-#: www/pm/browse_task.php:497 www/pm/include/pm_columns.php:50
+#: www/pm/browse_task.php:438 www/pm/include/pm_columns.php:50
 msgid "Sub-Project"
 msgstr ""
 
-#: www/pm/browse_task.php:593
-msgid "previous"
-msgstr ""
-
-#: www/pm/browse_task.php:602
-msgid "next"
-msgstr ""
-
-#: www/pm/browse_task.php:612 www/tracker/browse.php:771
+#: www/pm/browse_task.php:531 www/tracker/browse.php:790
 msgid "Mass Update"
 msgstr ""
 
-#: www/pm/browse_task.php:647
+#: www/pm/browse_task.php:566
 msgid "Check all"
 msgstr ""
 
-#: www/pm/browse_task.php:649
+#: www/pm/browse_task.php:568
 msgid "Clear all"
 msgstr ""
 
-#: www/pm/browse_task.php:651 www/tracker/browse.php:793
+#: www/pm/browse_task.php:570 www/tracker/browse.php:812
 msgid ""
 "<strong>Admin:</strong> If you wish to apply changes to all items selected "
 "above, use these controls to change their properties and click once on "
 "\"Mass Update\"."
 msgstr ""
 
-#: www/pm/browse_task.php:670 www/pm/mod_task.php:133
-#: www/pm/templates/detail_template.php:84
+#: www/pm/browse_task.php:589 www/pm/templates/detail_template.php:79
 msgid "Subproject"
 msgstr ""
 
-#: www/pm/browse_task.php:673 www/tracker/browse.php:834
+#: www/pm/browse_task.php:592 www/tracker/browse.php:853
 msgid "Mass update"
 msgstr ""
 
-#: www/pm/browse_task.php:721
+#: www/pm/browse_task.php:640
 msgid "* Denotes overdue tasks"
 msgstr ""
 
@@ -13095,20 +13263,7 @@
 msgid "Yes, I want to delete this task"
 msgstr ""
 
-#: www/pm/detail_task.php:32
-msgid "Task Detail"
-msgstr ""
-
-#: www/pm/detail_task.php:76 www/pm/include/ProjectView.class.php:480
-#: www/pm/include/ProjectView.class.php:482 www/pm/mod_task.php:178
-msgid "Subscribe to task"
-msgstr ""
-
-#: www/pm/detail_task.php:101 www/pm/mod_task.php:185
-msgid "Original Comment"
-msgstr ""
-
-#: www/pm/downloadcsv.php:96 www/pm/gantt.php:35 www/tracker/taskmgr.php:60
+#: www/pm/downloadcsv.php:96 www/pm/gantt.php:35 www/tracker/taskmgr.php:62
 msgid "Could Not Get ProjectTaskFactory"
 msgstr ""
 
@@ -13210,45 +13365,62 @@
 msgid "Tick an item and submit to remove the relation."
 msgstr ""
 
-#: www/pm/include/ProjectTaskHTML.class.php:188
-msgid "No Comments Have Been Added"
-msgstr ""
-
-#: www/pm/include/ProjectTaskHTML.class.php:204
-#: www/project/admin/project_admin_utils.php:149
-#: www/tracker/include/ArtifactHtml.class.php:84
+#: www/pm/include/ProjectTaskHTML.class.php:151
+#: www/project/admin/project_admin_utils.php:144
+#: www/tracker/include/ArtifactHtml.class.php:44
 msgid "Field"
 msgstr ""
 
-#: www/pm/include/ProjectTaskHTML.class.php:205
-#: www/project/admin/project_admin_utils.php:150
-#: www/tracker/include/ArtifactHtml.class.php:85
+#: www/pm/include/ProjectTaskHTML.class.php:152
+#: www/project/admin/project_admin_utils.php:145
+#: www/tracker/include/ArtifactHtml.class.php:45
 msgid "Old Value"
 msgstr ""
 
-#: www/pm/include/ProjectTaskHTML.class.php:247
+#: www/pm/include/ProjectTaskHTML.class.php:194
 msgid "No Changes Have Been Made"
 msgstr ""
 
-#: www/pm/include/ProjectView.class.php:311
+#: www/pm/include/ProjectView.class.php:328
 msgid "No comments have been written."
 msgstr ""
 
-#: www/pm/include/ProjectView.class.php:469 www/pm/mod_task.php:319
+#: www/pm/include/ProjectView.class.php:444
+msgid "View Calendar"
+msgstr ""
+
+#: www/pm/include/ProjectView.class.php:508
 #: www/tracker/admin/form-addextrafield.php:60
 msgid "Copy"
 msgstr ""
 
-#: www/pm/include/ProjectView.class.php:491
-#: www/pm/include/ProjectView.class.php:493 www/pm/mod_task.php:172
+#: www/pm/include/ProjectView.class.php:521
+#: www/pm/include/ProjectView.class.php:523
+msgid "Subscribe to task"
+msgstr ""
+
+#: www/pm/include/ProjectView.class.php:533
+#: www/pm/include/ProjectView.class.php:535
 msgid "Delete this task"
 msgstr ""
 
+#: www/pm/include/ProjectView.class.php:562
+msgid "Add category"
+msgstr ""
+
 #: www/pm/include/pm_columns.php:36
 #: www/tracker/admin/form-customizelist.php:46
 msgid "Assigned To"
 msgstr ""
 
+#: www/pm/include/pm_columns.php:84
+msgid "Select PM Display Columns"
+msgstr ""
+
+#: www/pm/include/pm_columns.php:90
+msgid "Select Columns"
+msgstr ""
+
 #: www/pm/index.php:57
 #, php-format
 msgid "Subprojects for %1$s"
@@ -13272,42 +13444,11 @@
 msgid "Choose a Subproject and you can browse/edit/add tasks to it."
 msgstr ""
 
-#: www/pm/mod_task.php:37 www/pm/pm_task.php:39
-msgid "Modify Task"
-msgstr ""
-
-#: www/pm/mod_task.php:197
-msgid "Add A Comment"
-msgstr ""
-
-#: www/pm/mod_task.php:262
-msgid ""
-"You should choose only tasks which must be completed before this task can "
-"start."
-msgstr ""
-
-#: www/pm/mod_task.php:317 www/pm/templates/detail_template.php:96
-msgid "Copy to another Subproject"
-msgstr ""
-
-#: www/pm/mod_task.php:332 www/pm/pm_task.php:67
-#: www/pm/templates/time_tracking.php:1 www/reporting/timeadd.php:102
+#: www/pm/pm_task.php:83 www/pm/templates/time_tracking.php:1
+#: www/reporting/timeadd.php:102
 msgid "Time tracking"
 msgstr ""
 
-#: www/pm/mod_task.php:336 www/reporting/sitetimebar.php:89
-msgid "Week"
-msgstr ""
-
-#: www/pm/mod_task.php:337 www/pm/templates/time_tracking.php:5
-#: www/stats/site_stats_utils.php:378
-msgid "Day"
-msgstr ""
-
-#: www/pm/mod_task.php:415 www/pm/templates/time_tracking.php:71
-msgid "Time tracking list"
-msgstr ""
-
 #: www/pm/reporting/index.php:53
 msgid "Task Reporting System"
 msgstr ""
@@ -13366,6 +13507,26 @@
 "will be counted for each of them.</p>"
 msgstr ""
 
+#: www/pm/select_columns.php:72
+msgid "Select which columns to display."
+msgstr ""
+
+#: www/pm/select_columns.php:79
+msgid "Columns"
+msgstr ""
+
+#: www/pm/select_columns.php:93
+msgid "Select/Deselect All"
+msgstr ""
+
+#: www/pm/select_columns.php:96
+msgid "Reset to Defaults"
+msgstr ""
+
+#: www/pm/select_columns.php:103
+msgid "Abort"
+msgstr ""
+
 #: www/pm/t_lookup.php:35
 msgid "Task ID"
 msgstr ""
@@ -13374,95 +13535,112 @@
 msgid "No Task with ID: "
 msgstr ""
 
-#: www/pm/task.php:66
+#: www/pm/task.php:78
 msgid "Group ID"
 msgstr ""
 
-#: www/pm/task.php:69
+#: www/pm/task.php:81
 msgid "Group Project ID"
 msgstr ""
 
-#: www/pm/task.php:101 www/pm/task.php:209 www/pm/task.php:366
-#: www/pm/task.php:388 www/pm/task.php:405 www/pm/task.php:445
+#: www/pm/task.php:113 www/pm/task.php:161 www/pm/task.php:232
+#: www/pm/task.php:389 www/pm/task.php:411 www/pm/task.php:428
+#: www/pm/task.php:468
 msgid "Could Not Get ProjectTask"
 msgstr ""
 
-#: www/pm/task.php:119
+#: www/pm/task.php:131
 msgid "Could Not Get Empty ProjectTask"
 msgstr ""
 
-#: www/pm/task.php:127 www/pm/task.php:217
+#: www/pm/task.php:139 www/pm/task.php:240
 msgid "Illegal format for hours: must be an integer or a float number."
 msgstr ""
 
-#: www/pm/task.php:149
+#: www/pm/task.php:156
 msgid "Task Created Successfully"
 msgstr ""
 
-#: www/pm/task.php:187
+#: www/pm/task.php:203
 msgid "Task Copied Successfully"
 msgstr ""
 
-#: www/pm/task.php:246 www/pm/task.php:350 www/pm/task.php:537
+#: www/pm/task.php:269 www/pm/task.php:373 www/pm/task.php:594
 msgid "Task Updated Successfully"
 msgstr ""
 
-#: www/pm/task.php:347
+#: www/pm/task.php:370
 msgid "No task selected"
 msgstr ""
 
-#: www/pm/task.php:373
+#: www/pm/task.php:396
 msgid "Successfully Added Tracker Relationship"
 msgstr ""
 
-#: www/pm/task.php:410
+#: www/pm/task.php:433
 msgid "Confirmation failed. Task not deleted"
 msgstr ""
 
-#: www/pm/task.php:416
+#: www/pm/task.php:439
 msgid "Task Successfully Deleted"
 msgstr ""
 
-#: www/pm/templates/detail_template.php:74 www/tracker/item.php:230
+#: www/pm/templates/detail_template.php:69 www/tracker/item.php:237
 msgid "Permalink"
 msgstr ""
 
-#: www/pm/templates/detail_template.php:79
+#: www/pm/templates/detail_template.php:74
 msgid "Task Detail Information"
 msgstr ""
 
-#: www/pm/templates/detail_template.php:140
+#: www/pm/templates/detail_template.php:129
 msgid "Related Commits"
 msgstr ""
 
-#: www/pm/templates/detail_template.php:144
+#: www/pm/templates/detail_template.php:133
 msgid "Group name"
 msgstr ""
 
-#: www/pm/templates/detail_template.php:145
+#: www/pm/templates/detail_template.php:134
 msgid "Revision"
 msgstr ""
 
-#: www/pm/templates/detail_template.php:150
+#: www/pm/templates/detail_template.php:139
 msgid "Link to version control repository"
 msgstr ""
 
-#: www/pm/templates/detail_template.php:171
+#: www/pm/templates/detail_template.php:149
+msgid "Dependent on task"
+msgstr ""
+
+#: www/pm/templates/detail_template.php:162
 msgid "Related Tracker Items"
 msgstr ""
 
-#: www/pm/templates/detail_template.php:181
+#: www/pm/templates/detail_template.php:172
+msgid "Copy to another Subproject"
+msgstr ""
+
+#: www/pm/templates/detail_template.php:185
 msgid "Change protocol"
 msgstr ""
 
-#: www/pm/templates/detail_template.php:184
+#: www/pm/templates/detail_template.php:188
 msgid "Task Change History"
 msgstr ""
 
+#: www/pm/templates/time_tracking.php:5 www/stats/site_stats_utils.php:378
+msgid "Day"
+msgstr ""
+
 #: www/pm/templates/time_tracking.php:6 www/reporting/timeadd.php:141
 msgid "Hours worked"
 msgstr ""
 
+#: www/pm/templates/time_tracking.php:73
+msgid "Time tracking list"
+msgstr ""
+
 #: www/pm/uploadcsv.php:36
 msgid "Warning!"
 msgstr ""
@@ -13543,8 +13721,8 @@
 msgid "ERROR - file must be > 20 bytes and < 256000 bytes in length"
 msgstr ""
 
-#: www/project/admin/editimages.php:59 www/tracker/tracker.php:147
-#: www/tracker/tracker.php:392
+#: www/project/admin/editimages.php:59 www/tracker/tracker.php:144
+#: www/tracker/tracker.php:393
 msgid "Invalid filename"
 msgstr ""
 
@@ -13765,9 +13943,8 @@
 msgid "Finish"
 msgstr ""
 
-#: www/project/admin/massfinish.php:53 www/reporting/timecategory.php:42
-#: www/reporting/timecategory.php:52
-msgid "Successful"
+#: www/project/admin/massfinish.php:53
+msgid "Members Added Successfully"
 msgstr ""
 
 #: www/project/admin/massfinish.php:58
@@ -13842,24 +14019,20 @@
 msgid "-tooltip:projadm:database"
 msgstr ""
 
-#: www/project/admin/project_admin_utils.php:86
-msgid "-tooltip:projadm:stats"
-msgstr ""
-
-#: www/project/admin/project_admin_utils.php:146
+#: www/project/admin/project_admin_utils.php:141
 msgid ""
 "This log will show who made significant changes to your project and when"
 msgstr ""
 
-#: www/project/admin/project_admin_utils.php:177
+#: www/project/admin/project_admin_utils.php:172
 msgid "No changes"
 msgstr ""
 
-#: www/project/admin/project_admin_utils.php:208
+#: www/project/admin/project_admin_utils.php:203
 msgid "Failed to find namespace for database"
 msgstr ""
 
-#: www/project/admin/project_admin_utils.php:222
+#: www/project/admin/project_admin_utils.php:217
 msgid ""
 "<strong>NOTE:</strong><dl><dt><strong>Project Admins (bold)</strong></"
 "dt><dd>can access this page and other project administration pages</"
@@ -13903,7 +14076,7 @@
 msgid "Could Not Get RoleObserver"
 msgstr ""
 
-#: www/project/admin/roleedit.php:141 www/project/admin/users.php:450
+#: www/project/admin/roleedit.php:141 www/project/admin/users.php:485
 msgid "Edit Observer"
 msgstr ""
 
@@ -14079,28 +14252,28 @@
 msgid "Edit Roles"
 msgstr ""
 
-#: www/project/admin/users.php:395 www/project/admin/users.php:458
-#: www/project/admin/users.php:482
+#: www/project/admin/users.php:404 www/project/admin/users.php:493
+#: www/project/admin/users.php:517
 msgid "Role name"
 msgstr ""
 
-#: www/project/admin/users.php:418
+#: www/project/admin/users.php:434
 msgid "Edit Permissions"
 msgstr ""
 
-#: www/project/admin/users.php:456
+#: www/project/admin/users.php:491
 msgid "Currently used external roles"
 msgstr ""
 
-#: www/project/admin/users.php:471
+#: www/project/admin/users.php:506
 msgid "Unlink Role"
 msgstr ""
 
-#: www/project/admin/users.php:480
+#: www/project/admin/users.php:515
 msgid "Available external roles"
 msgstr ""
 
-#: www/project/admin/users.php:501
+#: www/project/admin/users.php:536
 msgid "Link external role"
 msgstr ""
 
@@ -14201,7 +14374,7 @@
 msgstr ""
 
 #: www/project/report/index.php:237 www/reporting/usersummary.php:102
-#: www/tracker/taskmgr.php:106
+#: www/tracker/taskmgr.php:108
 msgid "Task"
 msgstr ""
 
@@ -14229,19 +14402,11 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: www/project/stats/index.php:83
+#: www/project/stats/index.php:94
 msgid "Project Statistics"
 msgstr ""
 
-#: www/project/stats/index.php:87
-msgid "Statistics"
-msgstr ""
-
-#: www/project/stats/index.php:89
-msgid "-tooltip:stats"
-msgstr ""
-
-#: www/project/stats/index.php:103 www/reporting/projectact.php:63
+#: www/project/stats/index.php:109 www/reporting/projectact.php:63
 #: www/reporting/siteact.php:63 www/reporting/useract.php:78
 msgid "Areas"
 msgstr ""
@@ -14632,6 +14797,10 @@
 msgid "Site-Wide Time Tracking"
 msgstr ""
 
+#: www/reporting/sitetimebar.php:89
+msgid "Week"
+msgstr ""
+
 #: www/reporting/timeadd.php:65
 msgid "INTERNAL ERROR: delete: "
 msgstr ""
@@ -14659,8 +14828,8 @@
 "choose a Task and category to record your time in."
 msgstr ""
 
-#: www/reporting/timeadd.php:197 www/tracker/taskmgr.php:102
-#: www/tracker/taskmgr.php:156
+#: www/reporting/timeadd.php:197 www/tracker/taskmgr.php:104
+#: www/tracker/taskmgr.php:158
 msgid "Tasks Project"
 msgstr ""
 
@@ -14686,6 +14855,10 @@
 msgid "Week Starting"
 msgstr ""
 
+#: www/reporting/timecategory.php:42 www/reporting/timecategory.php:52
+msgid "Successful"
+msgstr ""
+
 #: www/reporting/timecategory.php:71
 msgid "Time Code"
 msgstr ""
@@ -16239,9 +16412,9 @@
 msgid "Forge: %s"
 msgstr ""
 
-#: www/themes/evolvis/Theme.class.php:209
-#: www/themes/evolvis/Theme.class.php:212
-#: www/themes/evolvis/Theme.class.php:275
+#: www/themes/evolvis/Theme.class.php:210
+#: www/themes/evolvis/Theme.class.php:213
+#: www/themes/evolvis/Theme.class.php:276
 msgid "Toggle"
 msgstr ""
 
@@ -16326,6 +16499,10 @@
 msgid "Last Rank"
 msgstr ""
 
+#: www/top/topusers.php:67 www/tracker/browse.php:278
+msgid "Change"
+msgstr ""
+
 #: www/top/topusers.php:86
 msgid "N/A"
 msgstr ""
@@ -16504,7 +16681,7 @@
 msgstr ""
 
 #: www/tracker/admin/form-clonetracker.php:48
-#: www/tracker/include/ArtifactTypeHtml.class.php:1020
+#: www/tracker/include/ArtifactTypeHtml.class.php:835
 msgid "Clone Tracker"
 msgstr ""
 
@@ -16540,19 +16717,17 @@
 msgid "Submitted By"
 msgstr ""
 
-#: www/tracker/admin/form-customizelist.php:48 www/tracker/browse.php:192
-#: www/tracker/browse.php:630 www/tracker/query.php:196
+#: www/tracker/admin/form-customizelist.php:48 www/tracker/browse.php:323
+#: www/tracker/browse.php:649 www/tracker/query.php:199
 msgid "Close Date"
 msgstr ""
 
-#: www/tracker/admin/form-customizelist.php:49
-#: www/tracker/include/ArtifactHtml.class.php:57
-#: www/tracker/include/ArtifactHtml.class.php:62 www/tracker/item.php:325
-#: www/tracker/query.php:380
+#: www/tracker/admin/form-customizelist.php:49 www/tracker/item.php:322
+#: www/tracker/item.php:333 www/tracker/query.php:383
 msgid "Detailed description"
 msgstr ""
 
-#: www/tracker/admin/form-customizelist.php:50 www/tracker/browse.php:640
+#: www/tracker/admin/form-customizelist.php:50 www/tracker/browse.php:659
 msgid "Related tasks"
 msgstr ""
 
@@ -16805,7 +16980,7 @@
 msgstr ""
 
 #: www/tracker/admin/index.php:68 www/tracker/admin/updates.php:170
-#: www/tracker/download.php:43 www/tracker/tracker.php:49
+#: www/tracker/download.php:43 www/tracker/tracker.php:46
 msgid "ArtifactType could not be created"
 msgstr ""
 
@@ -16818,7 +16993,7 @@
 msgstr ""
 
 #: www/tracker/admin/tracker.php:31
-#: www/tracker/include/ArtifactTypeHtml.class.php:929
+#: www/tracker/include/ArtifactTypeHtml.class.php:744
 msgid "New Tracker"
 msgstr ""
 
@@ -16827,7 +17002,7 @@
 msgstr ""
 
 #: www/tracker/admin/tracker.php:36
-#: www/tracker/include/ArtifactTypeHtml.class.php:995
+#: www/tracker/include/ArtifactTypeHtml.class.php:810
 msgid "Update Settings"
 msgstr ""
 
@@ -16836,7 +17011,7 @@
 msgstr ""
 
 #: www/tracker/admin/tracker.php:41
-#: www/tracker/include/ArtifactTypeHtml.class.php:1000
+#: www/tracker/include/ArtifactTypeHtml.class.php:815
 msgid "Manage Custom Fields"
 msgstr ""
 
@@ -16848,7 +17023,7 @@
 msgstr ""
 
 #: www/tracker/admin/tracker.php:46
-#: www/tracker/include/ArtifactTypeHtml.class.php:1005
+#: www/tracker/include/ArtifactTypeHtml.class.php:820
 msgid "Manage Workflow"
 msgstr ""
 
@@ -16857,7 +17032,7 @@
 msgstr ""
 
 #: www/tracker/admin/tracker.php:51
-#: www/tracker/include/ArtifactTypeHtml.class.php:1010
+#: www/tracker/include/ArtifactTypeHtml.class.php:825
 msgid "Customize List"
 msgstr ""
 
@@ -16866,7 +17041,7 @@
 msgstr ""
 
 #: www/tracker/admin/tracker.php:56
-#: www/tracker/include/ArtifactTypeHtml.class.php:1015
+#: www/tracker/include/ArtifactTypeHtml.class.php:830
 msgid "Add/Update Canned Responses"
 msgstr ""
 
@@ -16987,149 +17162,159 @@
 msgid "Element deleted"
 msgstr ""
 
-#: www/tracker/browse.php:193 www/tracker/query.php:197
+#: www/tracker/browse.php:168
+msgid "Query Name"
+msgstr ""
+
+#: www/tracker/browse.php:172 www/tracker/browse.php:471
+msgid "Load"
+msgstr ""
+
+#: www/tracker/browse.php:184
+msgid "Deleted query successful."
+msgstr ""
+
+#: www/tracker/browse.php:224
+#, php-format
+msgid "Saved query with name \"%s\"."
+msgstr ""
+
+#: www/tracker/browse.php:273
+#, php-format
+msgid "Displaying results %1$d‒%2$d out of %3$d total."
+msgstr ""
+
+#: www/tracker/browse.php:276
+#, php-format
+msgid "Displaying %2$s results."
+msgstr ""
+
+#: www/tracker/browse.php:324 www/tracker/query.php:200
 msgid "Submitter"
 msgstr ""
 
-#: www/tracker/browse.php:210 www/tracker/query.php:214
+#: www/tracker/browse.php:341 www/tracker/query.php:217
 msgid "Ascending"
 msgstr ""
 
-#: www/tracker/browse.php:211 www/tracker/query.php:215
+#: www/tracker/browse.php:342 www/tracker/query.php:218
 msgid "Descending"
 msgstr ""
 
-#: www/tracker/browse.php:221 www/tracker/query.php:226
+#: www/tracker/browse.php:352 www/tracker/query.php:229
 msgid "Any changes"
 msgstr ""
 
-#: www/tracker/browse.php:222 www/tracker/query.php:227
+#: www/tracker/browse.php:353 www/tracker/query.php:230
 msgid "Last 24H"
 msgstr ""
 
-#: www/tracker/browse.php:223 www/tracker/query.php:228
+#: www/tracker/browse.php:354 www/tracker/query.php:231
 msgid "Last 7days"
 msgstr ""
 
-#: www/tracker/browse.php:224 www/tracker/query.php:229
+#: www/tracker/browse.php:355 www/tracker/query.php:232
 msgid "Last 2weeks"
 msgstr ""
 
-#: www/tracker/browse.php:225 www/tracker/query.php:230
+#: www/tracker/browse.php:356 www/tracker/query.php:233
 msgid "Last 1month"
 msgstr ""
 
-#: www/tracker/browse.php:280
+#: www/tracker/browse.php:411
 msgid "Advanced queries"
 msgstr ""
 
-#: www/tracker/browse.php:301
-msgid "Query Name"
+#: www/tracker/browse.php:431
+msgid "Select Query"
 msgstr ""
 
-#: www/tracker/browse.php:350
-msgid "Saved query with Name: "
-msgstr ""
-
-#: www/tracker/browse.php:398
-#, php-format
-msgid "Displaying results %1$d‒%2$d out of %3$d total."
-msgstr ""
-
-#: www/tracker/browse.php:413 www/tracker/query.php:286
-msgid "Load Query"
-msgstr ""
-
-#: www/tracker/browse.php:415
+#: www/tracker/browse.php:433
 msgid "Select One"
 msgstr ""
 
-#: www/tracker/browse.php:426
+#: www/tracker/browse.php:444
 msgid "Tracker Queries"
 msgstr ""
 
-#: www/tracker/browse.php:443
+#: www/tracker/browse.php:461
 msgid "Private Queries"
 msgstr ""
 
-#: www/tracker/browse.php:453
-msgid "Load"
-msgstr ""
-
-#: www/tracker/browse.php:467
+#: www/tracker/browse.php:486
 msgid "Simple Filtering and Sorting"
 msgstr ""
 
-#: www/tracker/browse.php:496 www/tracker/query.php:387
+#: www/tracker/browse.php:515 www/tracker/query.php:390
 msgid "Order by"
 msgstr ""
 
-#: www/tracker/browse.php:499
+#: www/tracker/browse.php:518
 msgid "Quick Browse"
 msgstr ""
 
-#: www/tracker/browse.php:531
+#: www/tracker/browse.php:550
 msgid "Default"
 msgstr ""
 
-#: www/tracker/browse.php:532
+#: www/tracker/browse.php:551
 msgid ""
 "Viewing only opened records by default, use 'Advanced queries' or 'Simple "
 "Filtering and Sorting' to change."
 msgstr ""
 
-#: www/tracker/browse.php:789
+#: www/tracker/browse.php:808
 msgid "Check  all"
 msgstr ""
 
-#: www/tracker/browse.php:791
+#: www/tracker/browse.php:810
 msgid "Clear  all"
 msgstr ""
 
-#: www/tracker/browse.php:818
-#: www/tracker/include/ArtifactTypeHtml.class.php:841
-#: www/tracker/include/ArtifactTypeHtml.class.php:873
+#: www/tracker/browse.php:837
+#: www/tracker/include/ArtifactTypeHtml.class.php:656
+#: www/tracker/include/ArtifactTypeHtml.class.php:688
 msgid "Nobody"
 msgstr ""
 
-#: www/tracker/browse.php:822
+#: www/tracker/browse.php:841
 msgid "Canned Response"
 msgstr ""
 
-#: www/tracker/browse.php:839 www/tracker/browse.php:841
+#: www/tracker/browse.php:858 www/tracker/browse.php:860
 msgid "Caption"
 msgstr ""
 
-#: www/tracker/browse.php:844
+#: www/tracker/browse.php:863
 #, php-format
 msgid "* Denotes requests > %1$s Days Old"
 msgstr ""
 
-#: www/tracker/browse.php:854
+#: www/tracker/browse.php:873
 msgid "No items found"
 msgstr ""
 
-#: www/tracker/deleteartifact.php:11
+#: www/tracker/deleteartifact.php:13
 msgid "Delete artifact"
 msgstr ""
 
-#: www/tracker/deleteartifact.php:21
+#: www/tracker/deleteartifact.php:23
 msgid "Confirm Deletion"
 msgstr ""
 
-#: www/tracker/deleteartifact.php:30
+#: www/tracker/deleteartifact.php:32
 msgid "Are you sure you want to delete this artifact?"
 msgstr ""
 
-#: www/tracker/deleteartifact.php:33
+#: www/tracker/deleteartifact.php:35
 msgid "Yes, I want to delete this artifact"
 msgstr ""
 
-#: www/tracker/download.php:51 www/tracker/taskmgr.php:34
-#: www/tracker/tracker.php:90 www/tracker/tracker.php:282
-#: www/tracker/tracker.php:456 www/tracker/tracker.php:473
-#: www/tracker/tracker.php:502 www/tracker/tracker.php:523
-#: www/tracker/tracker.php:572
+#: www/tracker/download.php:51 www/tracker/taskmgr.php:36
+#: www/tracker/tracker.php:87 www/tracker/tracker.php:283
+#: www/tracker/tracker.php:473 www/tracker/tracker.php:490
+#: www/tracker/tracker.php:519 www/tracker/tracker.php:540
+#: www/tracker/tracker.php:589
 msgid "Artifact Could Not Be Created"
 msgstr ""
 
@@ -17137,15 +17322,15 @@
 msgid "ArtifactFile Could Not Be Created"
 msgstr ""
 
-#: www/tracker/include/ArtifactHtml.class.php:78
+#: www/tracker/include/ArtifactHtml.class.php:38
 msgid "No Changes Have Been Made to This Item"
 msgstr ""
 
-#: www/tracker/include/ArtifactHtml.class.php:138
+#: www/tracker/include/ArtifactHtml.class.php:98
 msgid "Backward Relations"
 msgstr ""
 
-#: www/tracker/include/ArtifactHtml.class.php:149
+#: www/tracker/include/ArtifactHtml.class.php:109
 #, php-format
 msgid "%1$s: %2$s <%4$s>(Relation: %3$s)</%5$s>"
 msgstr ""
@@ -17157,128 +17342,130 @@
 msgstr ""
 
 #: www/tracker/include/ArtifactTypeFactoryHtml.class.php:45
-#: www/tracker/include/ArtifactTypeHtml.class.php:935
+#: www/tracker/include/ArtifactTypeHtml.class.php:750
 msgid "View Trackers"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:197
-#: www/tracker/include/ArtifactTypeHtml.class.php:204
-#: www/tracker/include/ArtifactTypeHtml.class.php:353
-#: www/tracker/include/ArtifactTypeHtml.class.php:360
-#: www/tracker/query.php:363
-#, php-format
-msgid "(%% for wildcards)"
-msgstr ""
-
-#: www/tracker/include/ArtifactTypeHtml.class.php:411
+#: www/tracker/include/ArtifactTypeHtml.class.php:139
 msgid "No related tasks."
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:421
+#: www/tracker/include/ArtifactTypeHtml.class.php:149
 msgid "Remove Relation"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:458
+#: www/tracker/include/ArtifactTypeHtml.class.php:186
 #, php-format
 msgid "Average completion rate: %d%%"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:807
+#: www/tracker/include/ArtifactTypeHtml.class.php:231
+msgid "Tick an attachment and submit to delete it."
+msgstr ""
+
+#: www/tracker/include/ArtifactTypeHtml.class.php:611
 #, php-format
 msgid "[#%d] (unknown)"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:821
+#: www/tracker/include/ArtifactTypeHtml.class.php:625
 msgid ""
 "Tip: Enter a space-separated list of artifact ids ([#NNN] also accepted)"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:931
+#: www/tracker/include/ArtifactTypeHtml.class.php:746
 msgid "Create a new Tracker"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:937
+#: www/tracker/include/ArtifactTypeHtml.class.php:752
 msgid "-tooltip:tracker:viewtrackers"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:943
+#: www/tracker/include/ArtifactTypeHtml.class.php:758
 msgid "Browse all items in the current Tracker"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:946
+#: www/tracker/include/ArtifactTypeHtml.class.php:761
 msgid "Download .csv"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:949
+#: www/tracker/include/ArtifactTypeHtml.class.php:764
 msgid "Download an overview over the items in the current Tracker as CSV file"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:952
+#: www/tracker/include/ArtifactTypeHtml.class.php:767
 msgid "Submit New"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:955
+#: www/tracker/include/ArtifactTypeHtml.class.php:770
 msgid "Enter a new item into the current Tracker"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:962
+#: www/tracker/include/ArtifactTypeHtml.class.php:777
 msgid "-tooltip:tracker:reporting"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:965
+#: www/tracker/include/ArtifactTypeHtml.class.php:780
 msgid "Stop Monitor"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:969
+#: www/tracker/include/ArtifactTypeHtml.class.php:784
 msgid "-tooltip:tracker:stopmonitor"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:978
+#: www/tracker/include/ArtifactTypeHtml.class.php:793
 msgid "-tooltip:tracker:startmonitor"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:988
+#: www/tracker/include/ArtifactTypeHtml.class.php:803
 msgid ""
 "Administrating that tracker; click here to return to the Tracker Admin "
 "overview page"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:990
+#: www/tracker/include/ArtifactTypeHtml.class.php:805
 msgid "Administrate the current tracker"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:998
+#: www/tracker/include/ArtifactTypeHtml.class.php:813
 msgid "-tooltip:tracker:updatesettings"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:1003
+#: www/tracker/include/ArtifactTypeHtml.class.php:818
 msgid "-tooltip:tracker:managecustomfields"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:1008
+#: www/tracker/include/ArtifactTypeHtml.class.php:823
 msgid "Assign Role permissions to state transitions"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:1013
+#: www/tracker/include/ArtifactTypeHtml.class.php:828
 msgid "-tooltip:tracker:customiselist"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:1018
+#: www/tracker/include/ArtifactTypeHtml.class.php:833
 msgid "-tooltip:tracker:cannedresp"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:1023
+#: www/tracker/include/ArtifactTypeHtml.class.php:838
 msgid "-tooltip:tracker:clonetracker"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:1025
+#: www/tracker/include/ArtifactTypeHtml.class.php:840
 msgid "Really delete the entire tracker"
 msgstr ""
 
-#: www/tracker/include/ArtifactTypeHtml.class.php:1028
+#: www/tracker/include/ArtifactTypeHtml.class.php:843
 msgid "Irrevocably delete this entire Tracker and all its contents"
 msgstr ""
 
+#: www/tracker/include/ArtifactTypeHtml.class.php:952
+#: www/tracker/include/ArtifactTypeHtml.class.php:957
+#: www/tracker/query.php:366
+#, php-format
+msgid "(%% for wildcards)"
+msgstr ""
+
 #: www/tracker/ind.php:46
 msgid "-tooltip:tracker:admin"
 msgstr ""
@@ -17303,169 +17490,169 @@
 msgid "Could Not Get Artifact Object"
 msgstr ""
 
-#: www/tracker/item.php:77
+#: www/tracker/item.php:83
 #, php-format
 msgid "%1$s %2$s: Submit New"
 msgstr ""
 
-#: www/tracker/item.php:192
+#: www/tracker/item.php:199
 msgid "New submission"
 msgstr ""
 
-#: www/tracker/item.php:195
+#: www/tracker/item.php:202
 msgid "Date Submitted"
 msgstr ""
 
-#: www/tracker/item.php:200
+#: www/tracker/item.php:207
 msgid "Date Closed"
 msgstr ""
 
-#: www/tracker/item.php:213
+#: www/tracker/item.php:220
 msgid "Data Type"
 msgstr ""
 
-#: www/tracker/item.php:241
+#: www/tracker/item.php:247
 msgid "Stop monitor"
 msgstr ""
 
-#: www/tracker/item.php:270 www/tracker/item.php:406 www/tracker/query.php:262
+#: www/tracker/item.php:275 www/tracker/item.php:397 www/tracker/query.php:265
 msgid "Save Changes"
 msgstr ""
 
-#: www/tracker/item.php:277
+#: www/tracker/item.php:282
 msgid "Debugging Functions"
 msgstr ""
 
-#: www/tracker/item.php:294
+#: www/tracker/item.php:299
 msgid "Item Description"
 msgstr ""
 
-#: www/tracker/item.php:342 www/tracker/query.php:382
+#: www/tracker/item.php:341 www/tracker/query.php:385
 msgid "Followups"
 msgstr ""
 
-#: www/tracker/item.php:343
+#: www/tracker/item.php:342
 msgid "No Followups Have Been Posted"
 msgstr ""
 
-#: www/tracker/item.php:355
+#: www/tracker/item.php:356
 msgid "Attach files to this submission"
 msgstr ""
 
-#: www/tracker/item.php:366
+#: www/tracker/item.php:364
 msgid "Create an attachment"
 msgstr ""
 
 #: www/tracker/item.php:379
-msgid "Write a comment"
-msgstr ""
-
-#: www/tracker/item.php:388
 msgid "OR use a canned response"
 msgstr ""
 
-#: www/tracker/item.php:403
+#: www/tracker/item.php:394
 msgid "indicates required fields."
 msgstr ""
 
-#: www/tracker/item.php:413
+#: www/tracker/item.php:404
 msgid "Item Relationships"
 msgstr ""
 
-#: www/tracker/item.php:422
+#: www/tracker/item.php:413
 msgid "You do not have sufficient privileges to view Task relations."
 msgstr ""
 
-#: www/tracker/item.php:424
+#: www/tracker/item.php:415
 msgid "This project does not use Tasks."
 msgstr ""
 
-#: www/tracker/item.php:430
+#: www/tracker/item.php:421
 msgid "Build Task Relation"
 msgstr ""
 
-#: www/tracker/item.php:431
+#: www/tracker/item.php:422
 msgid "Related Tasks"
 msgstr ""
 
-#: www/tracker/item.php:453
+#: www/tracker/item.php:444
 msgid "Instructions"
 msgstr ""
 
-#: www/tracker/item.php:456
+#: www/tracker/item.php:447
 msgid "DO NOT enter passwords or confidential information in your message!"
 msgstr ""
 
-#: www/tracker/query.php:64
+#: www/tracker/query.php:67
 msgid "Query Successfully Created"
 msgstr ""
 
-#: www/tracker/query.php:112
+#: www/tracker/query.php:115
 msgid "Query Updated"
 msgstr ""
 
-#: www/tracker/query.php:141
+#: www/tracker/query.php:144
 msgid "Query Deleted"
 msgstr ""
 
-#: www/tracker/query.php:153
+#: www/tracker/query.php:156
 msgid "Missing Build Query Action"
 msgstr ""
 
-#: www/tracker/query.php:249 www/tracker/query.php:253
+#: www/tracker/query.php:252 www/tracker/query.php:256
 msgid "Build Query"
 msgstr ""
 
-#: www/tracker/query.php:285 www/tracker/query.php:296
+#: www/tracker/query.php:288 www/tracker/query.php:299
 msgid "Name and Save Query"
 msgstr ""
 
 #: www/tracker/query.php:289
+msgid "Load Query"
+msgstr ""
+
+#: www/tracker/query.php:292
 msgid "Update Query"
 msgstr ""
 
-#: www/tracker/query.php:290
+#: www/tracker/query.php:293
 msgid "Delete Query"
 msgstr ""
 
-#: www/tracker/query.php:293
+#: www/tracker/query.php:296
 msgid "Run Query"
 msgstr ""
 
-#: www/tracker/query.php:316
+#: www/tracker/query.php:319
 #, php-format
 msgid "Note: The default project query is currently '%1$s'."
 msgstr ""
 
-#: www/tracker/query.php:319
+#: www/tracker/query.php:322
 msgid "Note: There is no default project query defined."
 msgstr ""
 
-#: www/tracker/query.php:324
+#: www/tracker/query.php:327
 msgid "Type of query"
 msgstr ""
 
-#: www/tracker/query.php:326
+#: www/tracker/query.php:329
 msgid "Private query"
 msgstr ""
 
-#: www/tracker/query.php:328
+#: www/tracker/query.php:331
 msgid "Project level query (query is public)"
 msgstr ""
 
-#: www/tracker/query.php:330
+#: www/tracker/query.php:333
 msgid "Default project query (for project level query only)"
 msgstr ""
 
-#: www/tracker/query.php:368
+#: www/tracker/query.php:371
 msgid "Last Modified Date range"
 msgstr ""
 
-#: www/tracker/query.php:370
+#: www/tracker/query.php:373
 msgid "Open Date range"
 msgstr ""
 
-#: www/tracker/query.php:372
+#: www/tracker/query.php:375
 msgid "Close Date range"
 msgstr ""
 
@@ -17478,112 +17665,112 @@
 msgstr ""
 
 #: www/tracker/reporting/trackeract_graph.php:49
-#: www/tracker/reporting/trackerpie_graph.php:63 www/tracker/tracker.php:295
+#: www/tracker/reporting/trackerpie_graph.php:63 www/tracker/tracker.php:296
 msgid "Error: "
 msgstr ""
 
-#: www/tracker/taskmgr.php:75 www/tracker/taskmgr.php:92
+#: www/tracker/taskmgr.php:77 www/tracker/taskmgr.php:94
 msgid "No Available Tasks Found"
 msgstr ""
 
-#: www/tracker/taskmgr.php:97 www/tracker/taskmgr.php:152
+#: www/tracker/taskmgr.php:99 www/tracker/taskmgr.php:154
 msgid "Build Relationship Between Tracker Items and Tasks"
 msgstr ""
 
-#: www/tracker/taskmgr.php:112
+#: www/tracker/taskmgr.php:114
 msgid "Add Relationship to Selected Task"
 msgstr ""
 
-#: www/tracker/taskmgr.php:146
+#: www/tracker/taskmgr.php:148
 msgid "No Existing Project Groups Found"
 msgstr ""
 
-#: www/tracker/taskmgr.php:163
+#: www/tracker/taskmgr.php:165
 msgid "Add Relation to Existing Task"
 msgstr ""
 
-#: www/tracker/taskmgr.php:164
+#: www/tracker/taskmgr.php:166
 msgid "Create New Task"
 msgstr ""
 
-#: www/tracker/tracker.php:139 www/tracker/tracker.php:386
+#: www/tracker/tracker.php:136 www/tracker/tracker.php:387
 msgid "Could Not Create File Object"
 msgstr ""
 
-#: www/tracker/tracker.php:153
+#: www/tracker/tracker.php:150
 msgid "Could Not Attach File to Item: "
 msgstr ""
 
-#: www/tracker/tracker.php:157
+#: www/tracker/tracker.php:155
 #, php-format
-msgid "Item %s successfully created"
+msgid "Item [#%d] successfully created"
 msgstr ""
 
-#: www/tracker/tracker.php:248
+#: www/tracker/tracker.php:249
 msgid "Updated Successfully"
 msgstr ""
 
-#: www/tracker/tracker.php:295
+#: www/tracker/tracker.php:296
 #, php-format
 msgid "Could not get Project Task for %d"
 msgstr ""
 
-#: www/tracker/tracker.php:323 www/tracker/tracker.php:342
+#: www/tracker/tracker.php:324 www/tracker/tracker.php:343
 msgid "Comment added"
 msgstr ""
 
-#: www/tracker/tracker.php:367
+#: www/tracker/tracker.php:368
 #, php-format
 msgid "ERROR: Skipping attachment %d: file is too large."
 msgstr ""
 
-#: www/tracker/tracker.php:371
+#: www/tracker/tracker.php:372
 #, php-format
 msgid "ERROR: Skipping attachment %d: transfer interrupted."
 msgstr ""
 
-#: www/tracker/tracker.php:395
+#: www/tracker/tracker.php:396
 msgid "File Upload: Error"
 msgstr ""
 
-#: www/tracker/tracker.php:398
+#: www/tracker/tracker.php:399
 msgid "File Upload: Successful"
 msgstr ""
 
-#: www/tracker/tracker.php:415
+#: www/tracker/tracker.php:416
 msgid "Could Not Create File Object::"
 msgstr ""
 
-#: www/tracker/tracker.php:420
+#: www/tracker/tracker.php:421
 msgid "File Delete:"
 msgstr ""
 
-#: www/tracker/tracker.php:423
+#: www/tracker/tracker.php:424
 msgid "File Delete: Successful"
 msgstr ""
 
-#: www/tracker/tracker.php:434
+#: www/tracker/tracker.php:436
 #, php-format
-msgid "Item %s successfully updated"
+msgid "Item [#%d] successfully updated"
 msgstr ""
 
-#: www/tracker/tracker.php:461 www/tracker/tracker.php:478
+#: www/tracker/tracker.php:478 www/tracker/tracker.php:495
 msgid "Monitoring Started"
 msgstr ""
 
-#: www/tracker/tracker.php:463 www/tracker/tracker.php:480
+#: www/tracker/tracker.php:480 www/tracker/tracker.php:497
 msgid "Monitoring Deactivated"
 msgstr ""
 
-#: www/tracker/tracker.php:528
+#: www/tracker/tracker.php:545
 msgid "Confirmation failed. Artifact not deleted"
 msgstr ""
 
-#: www/tracker/tracker.php:532
+#: www/tracker/tracker.php:549
 msgid "Artifact Delete Failed"
 msgstr ""
 
-#: www/tracker/tracker.php:534
+#: www/tracker/tracker.php:551
 msgid "Artifact Deleted Successfully"
 msgstr ""
 

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/univention/ldap2psql.sh
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/univention/ldap2psql.sh	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/univention/ldap2psql.sh	2011-12-23 17:24:04 UTC (rev 17935)
@@ -106,7 +106,7 @@
 	cmd="$cmd $Euid, $EmailPrimaryAddress, $EuserPassword, $Ern,"
 	cmd="$cmd $EgivenName, $Esn, '/lib/anonsvnsh', 11, 11,"
 	cmd="$cmd $(date -u +'%s'), $EmodifyTimestamp, 0, 'DE', $Ecryptpw,"
-	cmd="$cmd 'Europe/Berlin', 6, 1, 0, 'A', 'A', 'N', 1,"
+	cmd="$cmd 'Europe/Berlin', 1, 1, 0, 'A', 'A', 'N', 1,"
 	cmd="$cmd (SELECT theme_id FROM users WHERE user_id=101));"
 
 	cmd="$cmd UPDATE users"

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/admin/groupedit.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/admin/groupedit.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/admin/groupedit.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -132,6 +132,18 @@
 </td>
 </tr>
 <tr>
+<?php if (USE_PFO_RBAC) { ?>
+<td colspan="2"><?php
+printf(_('With PFO-RBAC, the “is_public” property is gone. Instead, to make a project public, <%1$s>link<%2$s> the global role “Anonymous/not logged in” then <%3$s>give<%4$s> it “Project visibility” permissions.'),
+	'a href="' . util_make_url('/project/admin/users.php?group_id=' .
+	    $group_id) . '"',
+	'/a',
+	'a href="' . util_make_url('/project/admin/roleedit.php?group_id=' .
+	    $group_id . '&role_id=' . RoleAnonymous::getInstance()->getID()) . '"',
+	'/a'
+);
+?></td>
+<?php } else { ?>
 <td>
 <?php echo _('Public?') ?>:
 </td>
@@ -149,6 +161,7 @@
 	'form_public', $group->isPublic(), false
 ); ?>
 </td>
+<?php } ?>
 </tr>
 
 <tr>

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/admin/pending-news.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/admin/pending-news.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/admin/pending-news.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -26,7 +26,6 @@
 
 require_once('../env.inc.php');
 require_once $gfcommon.'include/pre.php';
-require_once $gfwww.'include/note.php';
 require_once $gfwww.'news/admin/news_admin_utils.php';
 require_once $gfwww.'news/news_utils.php';
 //common forum tools which are used during the creation/editing of news items

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/frs/index.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/frs/index.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/frs/index.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -107,11 +107,11 @@
 		if($frsPackage->isMonitoring()) {
 			$title = db_result($res_package, $p, 'name') . " - " . _('Stop monitoring this package');
 			$url = '/frs/monitor.php?filemodule_id='. $cur_pkgid .'&group_id='.db_result($res_package,$p,'group_id').'&stop=1';
-			$package_monitor = util_make_link ( $url, $GLOBALS['HTML']->getMonitorPic($title));
+			$package_monitor = util_make_link ( $url, $GLOBALS['HTML']->getMonitorOPic(false, $title));
 		} else {
 			$title = db_result($res_package, $p, 'name') . " - " . _('Monitor this package');
 			$url = '/frs/monitor.php?filemodule_id='. $cur_pkgid . '&group_id='.db_result($res_package,$p,'group_id').'&start=1';
-			$package_monitor = util_make_link ( $url, $GLOBALS['HTML']->getMonitorPic($title));
+			$package_monitor = util_make_link ( $url, $GLOBALS['HTML']->getMonitorOPic(true, $title));
 		}
 
 		/* begin frs_p<package_id> */

Copied: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/images/tipsy.gif (from rev 17933, trunk/gforge_base/evolvisforge-5.1/src/www/images/tipsy.gif)
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/images/tipsy.gif	                        (rev 0)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/images/tipsy.gif	2011-12-23 17:24:04 UTC (rev 17935)
@@ -0,0 +1 @@
+GIF89a	 	 €       !ù   ,    	 	  Œ§ÀŠÜœoÂJe>×!U  ;
\ No newline at end of file

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/include/Layout.class.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/include/Layout.class.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/include/Layout.class.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -111,6 +111,7 @@
 	var $css_min = array();
 	var $stylesheets = array();
 	var $footer_hooks = array();
+	var $extra_js = array();
 
 	/**
 	 * Layout() - Constructor
@@ -344,6 +345,13 @@
 ?>
 	<script language="JavaScript" type="text/javascript">//<![CDATA[
 <?php
+		/* provide util_make_url equivalent for ECMAscript */
+		echo "\t\tvar sys_url_base = " .
+		    minijson_encode(util_make_url("/"), false) . ";\n";
+		/* emit extra initial ECMAscript, if any */
+		foreach ($this->extra_js as $line) {
+			echo "\t\t" . $line . "\n";
+		}
 		/* this hook comes before the files (why?) */
 		plugin_hook ("javascript",false);
 ?>
@@ -1180,8 +1188,9 @@
 		return $return;
 	}
 
-	function getMonitorPic($title = '', $alt = '') {
-		return $this->getPicto('ic/mail16w.png', $title, $alt);
+	function getMonitorOPic($on, $title='', $alt='') {
+		return $this->getPicto($on ? 'ic/mail16w.png' :
+		    'ic/xmail16w.png', $title, $alt);
 	}
 
 	function getReleaseNotesPic($title = '', $alt = '') {

Copied: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/include/help.php (from rev 17933, trunk/gforge_base/evolvisforge-5.1/src/www/include/help.php)
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/include/help.php	                        (rev 0)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/include/help.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -0,0 +1,521 @@
+<?php
+/*-
+ * Online Help for FusionForge
+ *
+ * Copyright 1999-2001 (c) VA Linux Systems
+ * Copyright 2010 (c) FusionForge Team
+ * Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
+ * Copyright © 2011
+ *	Thorsten Glaser <t.glaser at tarent.de>
+ * All rights reserved.
+ *
+ * This file is part of FusionForge. FusionForge is free software;
+ * you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the Licence, or (at your option)
+ * any later version.
+ *
+ * FusionForge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with FusionForge; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *-
+ * Provides online help as HTML tooltips
+ */
+
+function html_get_tooltip_extralink($element_name) {
+	if ($element_name != 'ef-Resolution' &&
+	    $element_name != 'ef-Severity') {
+		return "";
+	}
+
+	return " (" . html_e('a', array(
+		'href' => util_make_url('/include/helppage.php?kw=real' .
+		    str_replace(' ', '_', $element_name)),
+		'target' => '_blank',
+	    ), util_html_secure(_('Mehr Info…'))) . ")";
+}
+
+function html_get_tooltip_description($element_name) {
+	$t = "";
+	$r = false;
+	switch ($element_name) {
+
+/****************************************************************/
+
+case 'assigned_to':
+	$t = _('This drop-down box represents the person to which a tracker item is assigned.');
+	break;
+
+case 'status_id':
+	$t = array(
+		_('This drop-down box represents the current status of a tracker item.'),
+		_('You can set the status to \'Pending\' if you are waiting for a response from the tracker item author.  When the author responds the status is automatically reset to that of \'Open\'. Otherwise, if the author doesn\'t respond with an admin-defined amount of time (default is 14 days) then the item is given a status of \'Deleted\'.'),
+	    );
+	break;
+
+case 'category':
+	$t = _('Tracker category');
+	break;
+
+case 'group':
+	$t = _('Tracker group');
+	break;
+
+case 'sort_by':
+	$t = array(
+		_('The Sort By option allows you to determine how the browse results are sorted.'),
+		_('You can sort by ID, Priority, Summary, Open Date, Close Date, Submitter, or Assignee.  You can also have the results sorted in Ascending or Descending order.'),
+	    );
+	break;
+
+case 'new_artifact_type_id':
+	$t = array(
+		_('The Data Type option determines the type of tracker item this is.  Since the tracker rolls into one the bug, patch, support, etc... managers you need to be able to determine which one of these an item should belong.'),
+		_('This has the added benefit of enabling an admin to turn a support request into a bug.'),
+	    );
+	break;
+
+case 'priority':
+	$t = array(
+		_('The priority option allows a user to define a tracker item priority (ranging from 1-Lowest to 5-Highest).'),
+		_('This is especially helpful for bugs and support requests where a user might find a critical problem with a project.'),
+	    );
+	break;
+
+case 'resolution':
+	$t = _('Resolution');
+	break;
+
+case 'summary':
+	$t = _('The summary text-box represents a short tracker item summary. Useful when browsing through several tracker items.');
+	break;
+
+case 'canned_response':
+	$t = array(
+		_('The canned response drop-down represents a list of project admin-defined canned responses to common support or bug submission.'),
+		_('If you are a project admin you can click the \'(admin)\' link to define your own canned responses'),
+	    );
+	break;
+
+case 'comment':
+	$t = array(
+		_('Anyone can add here comments to give additional information, answers and solutions. Please, be as precise as possible to avoid misunderstanding. If relevant, screenshots or documents can be added as attached files.'),
+		_('Detailed formatting help is available in the notepad form.'),
+	    );
+	break;
+
+case 'description':
+	$r = html_e('div', array('style' => 'margin:0.5em 0;'),
+	    htmlspecialchars(_('Enter the complete description.'))) .
+	    html_eo('div', array('align' => 'left')) .
+	    html_e('b', array(), htmlspecialchars(_('Editing tips:')));
+	foreach (array(
+		array(
+			_('http, https or ftp'),
+			_('Hyperlinks'),
+		    ),
+		array(
+			_('[#NNN]'),
+			_('Tracker ID NNN'),
+		    ),
+		array(
+			_('[TNNN]'),
+			_('Task ID NNN'),
+		    ),
+		array(
+			_('[wiki:<pagename>]'),
+			_('Wiki page'),
+		    ),
+		array(
+			_('[forum:<msg_id>]'),
+			_('Forum post'),
+		    ),
+	    ) as $x) {
+		$r .= html_e('br') .
+		    html_e('b', array(), htmlspecialchars($x[0])) .
+		    " " . htmlspecialchars($x[1]);
+	}
+	$r .= '</div>' . html_e('div', array('style' => 'margin:0.5em 0;'),
+	    htmlspecialchars(_('Detailed formatting help is available in the notepad form.')));
+	break;
+
+case 'attach_file':
+	$t = _('When you wish to attach a file to a tracker item you must check this checkbox before submitting changes.');
+	break;
+
+case 'monitor':
+	$r = sprintf('<div style="margin:0.5em 0;">%s</div><strong>%s</strong> %s',
+	    htmlspecialchars(_('You can monitor or un-monitor this item by clicking the "Monitor" button.')),
+	    htmlspecialchars(_('Note!')),
+	    htmlspecialchars(_('This will send you additional eMail. If you add comments to this item, or submitted, or are assigned this item, you will also get emails for those reasons as well!')));
+
+case 'ef-Browser':
+	$t = _('Browser, in dem der Fehler aufgetaucht ist (mit Version).');
+	break;
+
+case 'ef-Component':
+	$t = _('Einzelne Komponenten des Projekts eintragen.');
+	break;
+
+case 'ef-Hardware':
+	$t = _('Hardware, mit der getestet wurde, als der Bug auftrat.');
+	break;
+
+case 'ef-Operating System':
+	$t = _('Betriebssystem, in dem der Fehler aufgetreten ist.');
+	break;
+
+case 'ef-Product':
+	$t = _('Projektname');
+	break;
+
+case 'ef-URL':
+	$t = _('Bei Browseranwendungen die URL, auf der der Fehler auftrat.');
+	break;
+
+case 'ef-Version Fixed':
+	$t = _('Versionen des Projekts (wann ist der Bug behoben)');
+	break;
+
+case 'ef-Version Found':
+	$t = _('Version des Projekts, in der der Bug aufgetreten ist.');
+	break;
+
+case 'ef-Resolution':
+	$t = _('Meldungsstatus eines Bugeintrags; siehe „Mehr Info…“ für Prozeßspezifikation.');
+	break;
+
+case 'realef-Resolution':
+	$r = '<h1>Meldungsstatus eines Bugeintrags</h1>' . "\n" .
+	'<h2>Lebenszyklus einer Meldung</h2>' . "\n" .
+	'<div style="margin:0.5em 0;">Während des Testlaufs kümmert sich der projektbeteiligte Prüfer um ALLE Bugs in seinem Projekt (auch, wenn sie von einem anderen Prüfer erstellt wurden). Das heißt, daß ein Bugeintrag nicht autoren-, sondern projektbezogen ist und somit gewährleistet wird, daß jeder Bugeintrag weiterbearbeitet wird. Im Lebenszyklus eines Bugs wird sichergestellt, daß die Bugeinträge auch vom entsprechenden Entwickler angenommen oder gegebenenfalls weitergeleitet werden. Spätestens eine Woche nach Einstellen des Bugeintrags wird dieser zur Bearbeitung angenommen. Ist dies nicht der Fall, wird zunächst die Resolution auf "Awaiting Response" gesetzt. Erfolgt noch immer keine Reaktion, wird zeitnah persönlich bei der zugeteilten Person nachgehakt. Darüber hinaus wird der Verlauf des Bugeintrags im Feld "Resolution" wie in der unten stehenden Tabelle beschrieben mitverfolgt.</div>' . "\n" .
+	'<div style="margin:0.5em 0;">Konkrete Zeitläufe können abweichend im einzelnen Projekt festgelegt sein. In diesem Falle ist dies im Projekthandbuch oder, falls nicht in diesem integriert, im QM Handbuch vermerkt.</div>' . "\n" .
+	'<hr />' . "\n" .
+	'<h2>Meldungsstatus (Resolution)</h2>' . "\n" .
+	'<div style="margin:0.5em 0;">Bei jeder Änderung zu einem Bugeintrag wird sichergestellt, daß die Angaben korrekt sind. Bevor z.B. ein Bugeintrag wiedereröffnet oder verifiziert wird, muß sichergestellt sein, daß beim Test der gleiche Pfad eingeschlagen wurde oder die gleichen Eingaben getätigt wurden.</div>' . "\n" .
+	'<table cellspacing="0" cellpadding="6" border="1">' . "\n" .
+	'<tr>' . "\n" .
+	'	<th>aktuelle Resolution</th>' . "\n" .
+	'	<th>aktueller Status</th>' . "\n" .
+	'	<th>Ausgangssituation /<br />handelnde Ressource</th>' . "\n" .
+	'	<th>Handlung / Ergebnis</th>' . "\n" .
+	'	<th>verantwortlich</th>' . "\n" .
+	'	<th>neue Resolution</th>' . "\n" .
+	'	<th>neuer Status</th>' . "\n" .
+	'</tr>' . "\n" .
+	'<tr>' . "\n" .
+	'	<td>Accepted As Bug</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'	<td>Bug war reproduzierbar und wurde akzeptiert (SWE, PL)</td>' . "\n" .
+	'	<td>Bugfixing → Bug wurde gefixt</td>' . "\n" .
+	'	<td>SWE</td>' . "\n" .
+	'	<td>Fixed</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'</tr>' . "\n" .
+	'<tr>' . "\n" .
+	'	<td>Accepted As Bug</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'	<td>Bug war reproduzierbar und wurde akzeptiert (SWE, PL)</td>' . "\n" .
+	'	<td>Bugfixing → Bug wird nicht gefixt / kann nicht gefixt werden</td>' . "\n" .
+	'	<td>PL, SWE</td>' . "\n" .
+	'	<td>Won’t Fix</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'</tr>' . "\n" .
+	'<tr>' . "\n" .
+	'	<td>Awaiting Response</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'	<td>Eine Rückfrage an den Zugewiesenen wurde gestellt</td>' . "\n" .
+	'	<td>Beantworten der Rückfrage; ggfls. Zuweisung an den Fragenden</td>' . "\n" .
+	'	<td>Zugewiesener</td>' . "\n" .
+	'	<td>Awaiting Response</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'</tr>' . "\n" .
+	'<tr>' . "\n" .
+	'	<td>Duplicate</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'	<td>Bugeintrag wurde als Duplikat zu einem anderen Bugeintrag erkannt (SWE, PL, QS)</td>' . "\n" .
+	'	<td>Verweis auf redundanten Bugeintrag vorhanden? → Bugeintrag schließen</td>' . "\n" .
+	'	<td>QS</td>' . "\n" .
+	'	<td>Duplicate</td>' . "\n" .
+	'	<td>Closed <a href="#fn1">(*)</a></td>' . "\n" .
+	'</tr>' . "\n" .
+	'<tr>' . "\n" .
+	'	<td>Duplicate</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'	<td>Bugeintrag wurde als Duplikat zu einem anderen Bugeintrag erkannt (SWE, PL, QS)</td>' . "\n" .
+	'	<td>Verweis auf redundanten Bugeintrag nicht vorhanden? → redundanten Bugeintrag suchen → Duplikat gefunden? → Verweis eintragen, Bugeintrag schließen</td>' . "\n" .
+	'	<td>QS</td>' . "\n" .
+	'	<td>Duplicate</td>' . "\n" .
+	'	<td>Closed <a href="#fn1">(*)</a></td>' . "\n" .
+	'</tr>' . "\n" .
+	'<tr>' . "\n" .
+	'	<td>Duplicate</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'	<td>Bugeintrag wurde als Duplikat zu einem anderen Bugeintrag erkannt (SWE, PL, QS)</td>' . "\n" .
+	'	<td>Verweis auf redundanten Bugeintrag nicht vorhanden? → redundanten Bugeintrag suchen → Kein Duplikat gefunden? → Rückfrage an entspr. Person</td>' . "\n" .
+	'	<td>QS</td>' . "\n" .
+	'	<td>Awaiting Response</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'</tr>' . "\n" .
+	'<tr>' . "\n" .
+	'	<td>Fixed</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'	<td>Bug wurde gefixt (SWE)</td>' . "\n" .
+	'	<td>Nach-Test des Bugs → Bug tritt nicht (mehr) auf. → Bugeintrag schließen</td>' . "\n" .
+	'	<td>QS</td>' . "\n" .
+	'	<td>Verified</td>' . "\n" .
+	'	<td>Closed <a href="#fn1">(*)</a></td>' . "\n" .
+	'</tr>' . "\n" .
+	'<tr>' . "\n" .
+	'	<td>Fixed</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'	<td>Bug wurde gefixt (SWE)</td>' . "\n" .
+	'	<td>Nach-Test des Bugs → Bug tritt nicht (mehr) auf. <a href="#fn2">(**)</a></td>' . "\n" .
+	'	<td>SWE</td>' . "\n" .
+	'	<td>Verified</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'</tr>' . "\n" .
+	'<tr>' . "\n" .
+	'	<td>Fixed</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'	<td>Bug wurde gefixt (SWE)</td>' . "\n" .
+	'	<td>Nach-Test des Bugs → Bug tritt weiterhin auf</td>' . "\n" .
+	'	<td>QS, SWE, PL</td>' . "\n" .
+	'	<td>None / New</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'</tr>' . "\n" .
+	'<tr>' . "\n" .
+	'	<td>Invalid</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'	<td>Bugeintrag ist ungültig (PL, SWE)</td>' . "\n" .
+	'	<td>Abgleich mit Prüfspezifikation → Eintrag wirklich ungültig. → Bugeintrag schließen</td>' . "\n" .
+	'	<td>QS</td>' . "\n" .
+	'	<td>Invalid</td>' . "\n" .
+	'	<td>Closed <a href="#fn1">(*)</a></td>' . "\n" .
+	'</tr>' . "\n" .
+	'<tr>' . "\n" .
+	'	<td>Invalid</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'	<td>Bugeintrag ist ungültig (PL, SWE)</td>' . "\n" .
+	'	<td>Abgleich mit Prüfspezifikation → Eintrag nicht ungültig → Rückfrage an entspr. Person</td>' . "\n" .
+	'	<td>QS</td>' . "\n" .
+	'	<td>Awaiting Response</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'</tr>' . "\n" .
+	'<tr>' . "\n" .
+	'	<td>None / New</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'	<td>Bugeintrag wurde neu angelegt oder muss neu bewertet werden</td>' . "\n" .
+	'	<td>Bewerten des Bugeintrags durch SWE oder PL → Bug reproduzierbar und akzeptiert</td>' . "\n" .
+	'	<td>SWE</td>' . "\n" .
+	'	<td>Accepted As Bug</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'</tr>' . "\n" .
+	'<tr>' . "\n" .
+	'	<td>None / New</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'	<td>Bugeintrag wurde neu angelegt oder muss neu bewertet werden</td>' . "\n" .
+	'	<td>Bewerten des Bugeintrags. → Bug nicht reproduzierbar</td>' . "\n" .
+	'	<td>SWE, PL</td>' . "\n" .
+	'	<td>Works For Me</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'</tr>' . "\n" .
+	'<tr>' . "\n" .
+	'	<td>None / New</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'	<td>Bugeintrag wurde neu angelegt oder muss neu bewertet werden</td>' . "\n" .
+	'	<td>Bewerten des Bugeintrags. → Bug wurde bereits in anderem Eintrag beschrieben. (Verweis auf redundanten Eintrag einfügen.)</td>' . "\n" .
+	'	<td>SWE, PL, QS</td>' . "\n" .
+	'	<td>Duplicate</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'</tr>' . "\n" .
+	'<tr>' . "\n" .
+	'	<td>None / New</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'	<td>Bugeintrag wurde neu angelegt oder muss neu bewertet werden</td>' . "\n" .
+	'	<td>Bewerten des Bugeintrags. → Das beschriebene Fehlverhalten ist kein Bug, sondern das spezifizierte SOLL-Verhalten ist nicht aktuell</td>' . "\n" .
+	'	<td>PL, SWE</td>' . "\n" .
+	'	<td>Spec Out Of Date</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'</tr>' . "\n" .
+	'<tr>' . "\n" .
+	'	<td>None / New</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'	<td>Bugeintrag wurde neu angelegt oder muss neu bewertet werden</td>' . "\n" .
+	'	<td>Bewerten des Bugeintrags. → Das beschriebene Fehlverhalten ist kein Bug, sondern entspricht dem spezifizierten Verhalten. Bugeintrag ist ungültig</td>' . "\n" .
+	'	<td>PL, SWE</td>' . "\n" .
+	'	<td>Invalid</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'</tr>' . "\n" .
+	'<tr>' . "\n" .
+	'	<td>None / New</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'	<td>Bugeintrag wurde neu angelegt oder muss neu bewertet werden</td>' . "\n" .
+	'	<td>Bewerten des Bugeintrags. → Zu dem Bugeintrag gibt es Rückfragen</td>' . "\n" .
+	'	<td>SWE, PL, QS</td>' . "\n" .
+	'	<td>Awaiting Response</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'</tr>' . "\n" .
+	'<tr>' . "\n" .
+	'	<td>Spec Out Of Date</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'	<td>Das beschriebene Fehlverhalten ist kein Bug, sondern das spezifizierte SOLL-Verhalten in der Prüfspezifikation ist nicht aktuell. Änderungen wurden noch nicht vorgenommen</td>' . "\n" .
+	'	<td>Bugeintrag ggfls. an den Prüfspezifikations-Verantwortlichen zuweisen</td>' . "\n" .
+	'	<td>QS</td>' . "\n" .
+	'	<td>Spec Out Of Date</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'</tr>' . "\n" .
+	'<tr>' . "\n" .
+	'	<td>Spec Out Of Date</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'	<td>Das beschriebene Fehlverhalten ist kein Bug, sondern das spezifizierte SOLL-Verhalten in der Spezifikation oder Funktionsreferenz ist nicht aktuell. Änderungen wurden noch nicht vorgenommen</td>' . "\n" .
+	'	<td>Bugeintrag ggfls. an den fachlichen Projektleiter zuweisen</td>' . "\n" .
+	'	<td>QS</td>' . "\n" .
+	'	<td>Spec Out Of Date</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'</tr>' . "\n" .
+	'<tr>' . "\n" .
+	'	<td>Spec Out Of Date</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'	<td>Das beschriebene Fehlverhalten ist kein Bug, sondern das spezifizierte SOLL-Verhalten ist nicht aktuell. Anpassungen oder Korrekturen wurden vorgenommen</td>' . "\n" .
+	'	<td>Änderungen wurden korrekt vorgenommen? → Bugeintrag schließen</td>' . "\n" .
+	'	<td>QS</td>' . "\n" .
+	'	<td>Spec Out Of Date</td>' . "\n" .
+	'	<td>Closed <a href="#fn1">(*)</a></td>' . "\n" .
+	'</tr>' . "\n" .
+	'<tr>' . "\n" .
+	'	<td>Verified</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'	<td>Bugfix wurde verifiziert (SWE, PL) (betrifft i.d.R. technische Bugs und Kundenbugs)</td>' . "\n" .
+	'	<td>Bugeintrag schließen</td>' . "\n" .
+	'	<td>QS</td>' . "\n" .
+	'	<td>Verified</td>' . "\n" .
+	'	<td>Closed <a href="#fn1">(*)</a></td>' . "\n" .
+	'</tr>' . "\n" .
+	'<tr>' . "\n" .
+	'	<td>Verified</td>' . "\n" .
+	'	<td>Closed</td>' . "\n" .
+	'	<td>Bug trat nicht mehr auf, Bugeintrag wurde geschlossen</td>' . "\n" .
+	'	<td>Bug taucht erneut auf. → Kommentar erstellen und Bug wieder-öffnen</td>' . "\n" .
+	'	<td>QS</td>' . "\n" .
+	'	<td>Reopened / None / New</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'</tr>' . "\n" .
+	'<tr>' . "\n" .
+	'	<td>Won’t Fix</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'	<td>Bug wird nicht gefixt (Entscheidung durch PL)</td>' . "\n" .
+	'	<td>Bugeintrag schließen</td>' . "\n" .
+	'	<td>QS</td>' . "\n" .
+	'	<td>Won’t Fix</td>' . "\n" .
+	'	<td>Closed <a href="#fn1">(*)</a></td>' . "\n" .
+	'</tr>' . "\n" .
+	'<tr>' . "\n" .
+	'	<td>Won’t Fix</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'	<td>Bug kann nicht gefixt werden (SWE)</td>' . "\n" .
+	'	<td>Rückfrage an PL, ob Bugeintrag wirklich nicht gefixt wird</td>' . "\n" .
+	'	<td>QS, SWE</td>' . "\n" .
+	'	<td>Awaiting Response</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'</tr>' . "\n" .
+	'<tr>' . "\n" .
+	'	<td>Works For Me</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'	<td>Bug kann nicht reproduziert werden (SWE)</td>' . "\n" .
+	'	<td>Nach-Test des Bugs → Bug tritt nicht (mehr) auf</td>' . "\n" .
+	'	<td>QS</td>' . "\n" .
+	'	<td>Verified</td>' . "\n" .
+	'	<td>Closed <a href="#fn1">(*)</a></td>' . "\n" .
+	'</tr>' . "\n" .
+	'<tr>' . "\n" .
+	'	<td>Works For Me</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'	<td>Bug kann nicht reproduziert werden (SWE)</td>' . "\n" .
+	'	<td>Nach-Test des Bugs → Bug tritt weiterhin auf</td>' . "\n" .
+	'	<td>QS</td>' . "\n" .
+	'	<td>None / New</td>' . "\n" .
+	'	<td>Open</td>' . "\n" .
+	'</tr>' . "\n" .
+	'</table>' . "\n" .
+	'<div style="margin:0.5em 0;" id="fn1">(*)<b>WICHTIG:</b> Closed darf derzeit <b>NUR</b> von der QS gesetzt werden!</div>' . "\n" .
+	'<div style="margin:0.5em 0;" id="fn2">(**) Falls ein Bugeintrag von einem Entwickler angelegt wurde und von der QS nicht genau nachvollzogen werden kann (technische Bugs), kann der Bug auch von einem Entwickler verifiziert werden. Die QS schließt anschließend den Bug.</div>';
+	break;
+
+case 'ef-Severity':
+	$t = _('Schweregrad eines Bugeintrags; siehe „Mehr Info…“ für Prozeßspezifikation.');
+	break;
+
+case 'realef-Severity':
+	$r = '<div style="margin:0.5em 0;">Der Schweregrad gibt Auskunft darüber, wie dramatisch der Bug ist. (Auch ein Schreibfehler kann P1/5 sein, obwohl Schweregrad = trivial). Den Schweregrad eines Bugs abzuschätzen ist mehr oder weniger Erfahrungssache.</div>' . "\n" .
+	'<h3>Severity</h3>' . "\n" .
+	'<table cellspacing="0" cellpadding="6" border="1">' . "\n" .
+	'<tr>' . "\n" .
+	'	<th>Bezeichnung</th>' . "\n" .
+	'	<th align="left">Beschreibung</th>' . "\n" .
+	'</tr>' . "\n" .
+	'<tr>' . "\n" .
+	'	<td>blocker</td>' . "\n" .
+	'	<td>Stürzt die gesamte Anwendung ab, friert die Anwendung ein oder wird das Fortführen eines Prozesses auf andere Art und Weise blockiert, ist der Bug als <b>blocker</b> einzustufen.</td>' . "\n" .
+	'</tr>' . "\n" .
+	'<tr>' . "\n" .
+	'	<td>critical</td>' . "\n" .
+	'	<td>Sind wesentliche Funktionen fehlerhaft, Anforderungen NICHT beachtet oder FALSCH umgesetzt worden oder ist das Testobjekt nur mit großen Einschränkungen einsetzbar, so sollte der Bug als <b>critical</b> eingestuft werden.</td>' . "\n" .
+	'</tr>' . "\n" .
+	'<tr>' . "\n" .
+	'	<td>major</td>' . "\n" .
+	'	<td>Wenn es sich um funktionale Abweichungen/Einschränkungen handelt oder eine Anforderung nur teilweise umgesetzt wurde, das System aber an sich nutzbar ist, wird der Bug als <b>major</b> eingestuft. Beispiele:<ul>' . "\n" .
+	'		<li>Pflichtfelder werden nicht als solche berücksichtigt</li>' . "\n" .
+	'		<li>Buttons können nach Betätigen unmittelbar noch mal betätigt werden</li>' . "\n" .
+	'	</ul></td>' . "\n" .
+	'</tr>' . "\n" .
+	'<tr>' . "\n" .
+	'	<td>normal</td>' . "\n" .
+	'	<td>Werden z.B. Umlaute und andere Zeichen nicht korrekt dargestellt oder sind die Ladezeiten zu lang, ist der Status <b>normal</b>.</td>' . "\n" .
+	'</tr>' . "\n" .
+	'<tr>' . "\n" .
+	'	<td>minor</td>' . "\n" .
+	'	<td>Bei geringfügigen Abweichungen, wenn das System ohne Einschränkungen nutzbar ist, ist der Status als <b>minor</b> zu bewerten. Beispiele:<ul>' . "\n" .
+	'		<li>Ausgegraute Felder sind zu unleserlich in der Farbgebung</li>' . "\n" .
+	'		<li>Deaktivierte Felder sind zwar befüllbar, aber nicht speicherbar</li>' . "\n" .
+	'	</ul></td>' . "\n" .
+	'</tr>' . "\n" .
+	'<tr>' . "\n" .
+	'	<td>trivial</td>' . "\n" .
+	'	<td>Wenn es sich um Schönheitsfehler handelt und das System ohne Einschränkung nutzbar ist, sollten diese Bugs als <b>trivial</b> markiert werden. Beispiele:<ul>' . "\n" .
+	'		<li>Es tauchen Rechtschreibfehler auf</li>' . "\n" .
+	'		<li>Die Aufteilung ist nicht sinnvoll oder Felder sind an einer suboptimalen Stelle platziert</li>' . "\n" .
+	'		<li>Eine Fehlermeldung ist zu unaussagekräftig</li>' . "\n" .
+	'		</ul>Änderungswünsche, die darüber hinausgehen, sind als <b>Change Requests</b> in die entsprechende Liste einzutragen.' . "\n" .
+	'	</td>' . "\n" .
+	'</tr>' . "\n" .
+	'</table>';
+	break;
+
+default:
+	return ("");
+}
+
+/****************************************************************/
+
+	if ($r === false) {
+		/* $t contains one or more paragraphs to be encoded */
+		if (is_array($t)) {
+			$r = "";
+			foreach ($t as $p) {
+				$r .= html_e('div', array('style' => 'margin:0.5em 0;'), htmlspecialchars($p));
+			}
+			return ($r);
+		} else {
+			$r = htmlspecialchars($t);
+		}
+	}
+	/* $r contains XHTML with encoded textual content */
+	/* now encode $r to be passed to jQuery-Tipsy */
+	return (htmlspecialchars($r));
+}

Copied: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/include/helppage.php (from rev 17933, trunk/gforge_base/evolvisforge-5.1/src/www/include/helppage.php)
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/include/helppage.php	                        (rev 0)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/include/helppage.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -0,0 +1,44 @@
+<?php
+/*-
+ * Online Help Extension for FusionForge Trackers
+ *
+ * Copyright © 2011
+ *	Thorsten Glaser <t.glaser at tarent.de>
+ * All rights reserved.
+ *
+ * This file is part of FusionForge. FusionForge is free software;
+ * you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the Licence, or (at your option)
+ * any later version.
+ *
+ * FusionForge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with FusionForge; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+require_once('../env.inc.php');
+require_once $gfcommon.'include/pre.php';
+
+$kw = getStringFromRequest('kw');
+$dsc = html_get_tooltip_description($kw);
+
+if (!$dsc) {
+	exit_error(_('Do not call me directly!'), 'tracker');
+}
+
+html_generic_fileheader(sprintf(_('Forge Help Facility: %s'), $kw));
+?>
+</head><body>
+
+<?php echo util_unconvert_htmlspecialchars($dsc); ?>
+
+<hr />
+<input type="button" value="<?php echo _('Close Window'); ?>"
+ onclick="javascript:window.close();" />
+</body></html>

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/include/html.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/include/html.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/include/html.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -24,6 +24,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+require_once($gfcommon."include/minijson.php");
+require_once $gfwww.'include/help.php';
+
 /**
  * html_generic_fileheader() - Output <html><head> and <meta/> inside.
  *
@@ -43,6 +46,10 @@
 	    ' xml:lang="en"' . ">\n<head>";
 	echo '<meta http-equiv="Content-Type" ' .
 	    'content="text/html; charset=utf-8" />' . "\n";
+	echo '<script language="JavaScript" type="text/javascript">//<![CDATA[' .
+	    "\n\tvar sys_url_base = " . minijson_encode(util_make_url("/"),
+	    false) . ";\n" .
+	    "//]]></script>\n";
 	$HTML->headerForgepluckerMeta();
 	echo html_e('title', array(), util_html_secure($title)) . "\n";
 }
@@ -351,54 +358,27 @@
 	return $return;
 }
 
-function html_get_tooltip_description($element_name) {
-	switch( $element_name ) {
-		case 'assigned_to':
-			return( _('This drop-down box represents the person to which a tracker item is assigned.'));
-		case 'status_id':
-			return( _('This drop-down box represents the current status of a tracker item.<br /><br />You can set the status to \'Pending\' if you are waiting for a response from the tracker item author.  When the author responds the status is automatically reset to that of \'Open\'. Otherwise, if the author doesn\'t respond with an admin-defined amount of time (default is 14 days) then the item is given a status of \'Deleted\'.'));
-		case 'category':
-			return( _('Tracker category'));
-		case 'group':
-			return(  _('Tracker group'));
-		case 'sort_by':
-			return( _('The Sort By option allows you to determine how the browse results are sorted.<br /><br />  You can sort by ID, Priority, Summary, Open Date, Close Date, Submitter, or Assignee.  You can also have the results sorted in Ascending or Descending order.'));
-		case 'new_artifact_type_id':
-			return( _('The Data Type option determines the type of tracker item this is.  Since the tracker rolls into one the bug, patch, support, etc... managers you need to be able to determine which one of these an item should belong.<br /><br />This has the added benefit of enabling an admin to turn a support request into a bug.'));
-		case 'priority':
-			return( _('The priority option allows a user to define a tracker item priority (ranging from 1-Lowest to 5-Highest).<br /><br />This is especially helpful for bugs and support requests where a user might find a critical problem with a project.'));
-		case 'resolution':
-			return( _('Resolution'));
-		case 'summary':
-			return( _('The summary text-box represents a short tracker item summary. Useful when browsing through several tracker items.'));
-		case 'canned_response':
-			return( _('The canned response drop-down represents a list of project admin-defined canned responses to common support or bug submission.<br /><br /> If you are a project admin you can click the \'(admin)\' link to define your own canned responses'));
-		case 'comment':
-			return( _('Anyone can add here comments to give additional information, answers and solutions. Please, be as precise as possible to avoid misunderstanding. If relevant, screenshots or documents can be added as attached files.'));
-		case 'description':
-			return( htmlentities(_('Enter the complete description.').'<br/><br/>'.
-			_("<div align=\"left\"><b>Editing tips:</b><br/><strong>http,https or ftp</strong>: Hyperlinks.<br/><strong>[#NNN]</strong>: Tracker id NNN.<br/><strong>[TNNN]</strong>: Task id NNN.<br/><strong>[wiki:<pagename>]</strong>: Wiki page.<br/><strong>[forum:<msg_id>]</strong>: Forum post.</div>"),
-				ENT_COMPAT, 'UTF-8'));
-		case 'attach_file':
-			return( _('When you wish to attach a file to a tracker item you must check this checkbox before submitting changes.'));
-		case 'monitor':
-			return( htmlentities(_('You can monitor or un-monitor this item by clicking the "Monitor" button. <br /><br /><strong>Note!</strong> this will send you additional email. If you add comments to this item, or submitted, or are assigned this item, you will also get emails for those reasons as well!'),
-				ENT_COMPAT, 'UTF-8'));
-		default:
-			return('');
-	}
-}
-
 function html_use_jquery() {
 	use_javascript('/scripts/jquery/jquery.js');
 	use_javascript('/js/jquery_noconflict.js');
 }
 
-function html_use_tooltips() {
+function html_use_tooltips($defaults=false) {
+	global $gfcommon, $HTML;
+
+	if ($defaults === false) {
+		$defaults = array(
+			'html' => true,
+			'delayIn' => 1000,
+			'delayOut' => 500,
+			'fade' => true,
+		    );
+	}
+	$HTML->extra_js[] = 'var tooltip_defaults = ' .
+	    minijson_encode($defaults, false) . ';';
+
 	html_use_jquery();
-	use_javascript('/scripts/jquery-tipsy/jquery.tipsy.js');
 	use_javascript('/js/tooltips.js');
-	use_stylesheet('/scripts/jquery-tipsy/stylesheets/tipsy.css');
 }
 
 function html_use_jqueryui() {
@@ -432,8 +412,10 @@
  * @param		bool	Whether or not to show the 'Any row'
  * @param		string	What to call the 'Any row' defaults to any
  * @param		array	Array of all allowed values from the full list.
+ * @param		string	Override id attribute (default: false)
+ * @param		string	Override title attribute (default: false)
  */
-function html_build_select_box_from_arrays ($vals,$texts,$select_name,$checked_val='xzxz',$show_100=true,$text_100='none',$show_any=false,$text_any='any', $allowed=false) {
+function html_build_select_box_from_arrays ($vals,$texts,$select_name,$checked_val='xzxz',$show_100=true,$text_100='none',$show_any=false,$text_any='any',$allowed=false,$override_id=false,$override_title=false) {
 	$have_a_subelement = false;
 
 	if ($text_100=='none'){
@@ -455,7 +437,13 @@
 		}
 	}
 
-	$title = html_get_tooltip_description($select_name);
+	if ($override_id !== false) {
+		$id = ' id="' . $override_id . '"';
+	}
+	if ($override_title !== false) {
+		$title = $override_title;
+	}
+
 	$return .= '
 		<select'.$id.' name="'.$select_name.'" title="'.util_html_secure($title).'">';
 
@@ -918,6 +906,19 @@
 	$arr_l[] = '/my/' ;
 	$arr_p[] = _('Manage projects, assigned tasks, bugs, etc.') ;
 
+	if (($layout_id = util_ifsetor($params['layout_id']))) {
+		$baseurl = '/widgets/widgets.php?owner=u' .
+		    user_getid() . '&layout_id=' . $layout_id;
+
+		$arr_t[] = _("Add widgets");
+		$arr_l[] = $baseurl;
+		$arr_p[] = _('Select widgets to add to the User Summary page from a list of available widgets');
+
+		$arr_t[] = _("Customize layout");
+		$arr_l[] = $baseurl . '&update=layout';
+		$arr_p[] = _('Customise number and sizes of columns to use for widgets');
+	}
+
 	$arr_t[] = _('Trackers dashboard') ;
 	$arr_l[] = '/my/dashboard.php' ;
 	$arr_p[] = _('Have an overview about all tracker items related to you') ;
@@ -1084,7 +1085,10 @@
 function html_ao($name, $attrs=array()) {
 	global $html_autoclose_pos, $html_autoclose_stack;
 
-	$html_autoclose_stack[$html_autoclose_pos++] = $name;
+	$html_autoclose_stack[$html_autoclose_pos++] = array(
+		'name' => $name,
+		'attr' => $attrs,
+	    );
 	return html_eo($name, $attrs);
 }
 
@@ -1138,14 +1142,60 @@
 	$rv = "";
 	while ($html_autoclose_pos > $spos) {
 		--$html_autoclose_pos;
-		$rv .= '</' . $html_autoclose_stack[$html_autoclose_pos] . '>';
+		$rv .= '</' . $html_autoclose_stack[$html_autoclose_pos]['name'] . '>';
 		unset($html_autoclose_stack[$html_autoclose_pos]);
 	}
 	return $rv;
 }
 
+/**
+ * html_a_copy() - Return a copy of part of the autoclose stack
+ *
+ * @param	integer	$spos
+ *			stack position caller will return to
+ * @return	opaque
+ *		argument suitable for html_a_apply()
+ */
+function html_a_copy($spos) {
+	global $html_autoclose_pos, $html_autoclose_stack;
 
+	if ($spos === false) {
+		return array();
+	}
+
+	if ($spos > $html_autoclose_pos) {
+		$e = "html_autoclose stack underflow; closing down to " .
+		    $spos . " but we're down to " . $html_autoclose_pos .
+		    " already!";
+		throw new Exception($e);
+	}
+
+	$rv = array();
+	while ($spos < $html_autoclose_pos) {
+		$rv[] = $html_autoclose_stack[$spos++];
+	}
+	return $rv;
+}
+
 /**
+ * html_a_apply() - Reopen tags based on an autoclose stack copy
+ *
+ * @param	opaque	$scopy
+ *			return value from html_a_copy()
+ * @return	string
+ *		XHTML string suitable for echo'ing
+ */
+function html_a_apply($scopy) {
+	/* array_reduce() would be useful here... IF IT WORKED, FFS! */
+	$rv = "";
+	foreach ($scopy as $value) {
+		$rv .= html_ao($value['name'], $value['attr']);
+	}
+	return $rv;
+}
+
+
+/**
  *	html_build_textbox() - Render textbox control
  *
  *	@param name - name of control
@@ -1221,9 +1271,20 @@
 }
 
 
+function notepad_button($form, $kind="") {
+	return html_e('a', array(
+		'href' => 'javascript:notepad_window(' .
+		    minijson_encode($form, false) . ', ' .
+		    minijson_encode($kind, false) . ');',
+		'title' => _('FusionForge Notepad'),
+	    ), html_image('ic/msg.png', '12', '14', array(
+		'alt' => 'Notepad',
+		'border' => '0',
+	    )));
+}
+
+
 // Local Variables:
 // mode: php
 // c-file-style: "bsd"
 // End:
-
-?>

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/js/common.js
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/js/common.js	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/js/common.js	2011-12-23 17:24:04 UTC (rev 17935)
@@ -23,17 +23,6 @@
  */
 
 
-function admin_window(adminurl) {
-	AdminWin = window.open(adminurl, 'AdminWindow', 'scrollbars=yes, resizable=yes, toolbar=yes, height=400, width=400, top=2, left=2');
-	AdminWin.focus();
-}
-
-function help_window(helpurl) {
-	HelpWin = window.open(helpurl, 'HelpWindow', 'scrollbars=yes, resizable=yes, toolbar=no, height=400, width=600');
-	HelpWin.focus();
-}
-
-
 function MM_goToURL() { //v3.0
 	var i, args=MM_goToURL.arguments; document.MM_returnValue = false;
 	for (i=0; i<(args.length-1); i+=2) eval(args[i]+".location='"+args[i+1]+"'");
@@ -273,3 +262,12 @@
 		    "; expires=Thu, 01-Jan-70 00:00:01 GMT";
 	}
 }
+
+function notepad_window(form, kind) {
+	var notepad_url = sys_url_base + "notepad.php?form=" + form +
+	    "&kind=" + kind + "&rows=32&cols=80";
+	var notepad_title = "FusionForge Notepad";
+	var notepad_winopt = "scrollbars=yes,resizable=yes,toolbar=no," +
+	    "height=700,width=620";
+	NotepadWin = window.open(notepad_url, notepad_title, notepad_winopt);
+}

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/js/tooltips.js
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/js/tooltips.js	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/js/tooltips.js	2011-12-23 17:24:04 UTC (rev 17935)
@@ -1,40 +1,261 @@
-/**
- * FusionForge Tooltip
- *
- * Copyright 2010, Alain Peyrat
- * Copyright 2011, Franck Villaume - Capgemini
- * http://fusionforge.org
- *
- * This file is part of FusionForge.
- *
- * FusionForge is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * FusionForge is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+/*-
+ * Original in src/lib/vendor/jquery-tipsy (cf. licence)
+ * BEGIN modified embedded copy {{{
  */
 
+// tipsy, facebook style tooltips for jquery
+// version 1.0.0a
+// (c) 2008-2010 jason frame [jason at onehackoranother.com]
+// releated under the MIT license
+
+(function($) {
+
+    function fixTitle($ele) {
+        if ($ele.attr('title') || typeof($ele.attr('original-title')) != 'string') {
+            $ele.attr('original-title', $ele.attr('title') || '').removeAttr('title');
+        }
+    }
+
+    function Tipsy(element, options) {
+        this.$element = $(element);
+        this.options = options;
+        this.enabled = true;
+        fixTitle(this.$element);
+    }
+
+    Tipsy.prototype = {
+        show: function() {
+            var title = this.getTitle();
+            if (title && this.enabled) {
+                var $tip = this.tip();
+
+                $tip.find('.tipsy-inner')[this.options.html ? 'html' : 'text'](title);
+                $tip[0].className = 'tipsy'; // reset classname in case of dynamic gravity
+                $tip.remove().css({top: 0, left: 0, visibility: 'hidden', display: 'block'}).appendTo(document.body);
+
+                var pos = $.extend({}, this.$element.offset(), {
+                    width: this.$element[0].offsetWidth,
+                    height: this.$element[0].offsetHeight
+                });
+
+                var actualWidth = $tip[0].offsetWidth, actualHeight = $tip[0].offsetHeight;
+                var gravity = (typeof this.options.gravity == 'function')
+                                ? this.options.gravity.call(this.$element[0])
+                                : this.options.gravity;
+
+                var tp;
+                switch (gravity.charAt(0)) {
+                    case 'n':
+                        tp = {top: pos.top + pos.height + this.options.offset, left: pos.left + pos.width / 2 - actualWidth / 2};
+                        break;
+                    case 's':
+                        tp = {top: pos.top - actualHeight - this.options.offset, left: pos.left + pos.width / 2 - actualWidth / 2};
+                        break;
+                    case 'e':
+                        tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth - this.options.offset};
+                        break;
+                    case 'w':
+                        tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width + this.options.offset};
+                        break;
+                }
+
+                if (gravity.length == 2) {
+                    if (gravity.charAt(1) == 'w') {
+                        tp.left = pos.left + pos.width / 2 - 15;
+                    } else {
+                        tp.left = pos.left + pos.width / 2 - actualWidth + 15;
+                    }
+                }
+
+		/* ensure visibility of content */
+		if (tp.left < 0) {
+			tp.left = 0;
+		}
+		if (tp.top < 0) {
+			tp.top = 0;
+		}
+
+                $tip.css(tp).addClass('tipsy-' + gravity);
+
+                if (this.options.fade) {
+                    $tip.stop().css({opacity: 0, display: 'block', visibility: 'visible'}).animate({opacity: this.options.opacity});
+                } else {
+                    $tip.css({visibility: 'visible', opacity: this.options.opacity});
+                }
+            }
+        },
+
+        hide: function() {
+            if (this.options.fade) {
+                this.tip().stop().fadeOut(function() { $(this).remove(); });
+            } else {
+                this.tip().remove();
+            }
+        },
+
+        getTitle: function() {
+            var title, $e = this.$element, o = this.options;
+            fixTitle($e);
+            var title, o = this.options;
+            if (typeof o.title == 'string') {
+                title = $e.attr(o.title == 'title' ? 'original-title' : o.title);
+            } else if (typeof o.title == 'function') {
+                title = o.title.call($e[0]);
+            }
+            title = ('' + title).replace(/(^\s*|\s*$)/, "");
+            return title || o.fallback;
+        },
+
+        tip: function() {
+            if (!this.$tip) {
+                this.$tip = $('<div class="tipsy"></div>').html('<div class="tipsy-arrow"></div><div class="tipsy-inner"/></div>');
+            }
+            return this.$tip;
+        },
+
+        validate: function() {
+            if (!this.$element[0].parentNode) this.hide();
+        },
+
+        enable: function() { this.enabled = true; },
+        disable: function() { this.enabled = false; },
+        toggleEnabled: function() { this.enabled = !this.enabled; }
+    };
+
+    $.fn.tipsy = function(options) {
+
+        if (options === true) {
+            return this.data('tipsy');
+        } else if (typeof options == 'string') {
+            return this.data('tipsy')[options]();
+        }
+
+        options = $.extend({}, $.fn.tipsy.defaults, options);
+
+        function get(ele) {
+            var tipsy = $.data(ele, 'tipsy');
+            if (!tipsy) {
+                tipsy = new Tipsy(ele, $.fn.tipsy.elementOptions(ele, options));
+                $.data(ele, 'tipsy', tipsy);
+            }
+            return tipsy;
+        }
+
+        function enter() {
+            var tipsy = get(this);
+            tipsy.hoverState = 'in';
+            if (options.delayIn == 0) {
+                tipsy.show();
+            } else {
+                setTimeout(function() { if (tipsy.hoverState == 'in') tipsy.show(); }, options.delayIn);
+            }
+        };
+
+        function leave() {
+            var tipsy = get(this);
+            tipsy.hoverState = 'out';
+            if (options.delayOut == 0) {
+                tipsy.hide();
+            } else {
+                setTimeout(function() { if (tipsy.hoverState == 'out') tipsy.hide(); }, options.delayOut);
+            }
+        };
+
+        if (!options.live) {
+		if (options.trigger == 'autofocus') {
+			var hasaneach = false;
+			var isinaform = true;
+			this.each(function() {
+				var n = get(this).$element.prop("nodeName").toLowerCase();
+				if (n != 'select' &&
+				    n != 'textarea' &&
+				    n != 'input') {
+					isinaform = false;
+				}
+				hasaneach = true;
+			});
+			options.trigger = (hasaneach && isinaform) ?
+			    'focus' : 'hover';
+		} else {
+			this.each(function() { get(this); });
+		}
+	}
+
+        if (options.trigger != 'manual') {
+            var binder   = options.live ? 'live' : 'bind',
+                eventIn  = options.trigger == 'hover' ? 'mouseenter' : 'focus',
+                eventOut = options.trigger == 'hover' ? 'mouseleave' : 'blur';
+            this[binder](eventIn, enter)[binder](eventOut, leave);
+        }
+
+        return this;
+
+    };
+
+    $.fn.tipsy.defaults = {
+        delayIn: 0,
+        delayOut: 0,
+        fade: false,
+        fallback: '',
+        gravity: 'n',
+        html: false,
+        live: false,
+        offset: 0,
+        opacity: 0.8,
+        title: 'title',
+        trigger: 'hover'
+    };
+
+    // Overwrite this method to provide options on a per-element basis.
+    // For example, you could store the gravity in a 'tipsy-gravity' attribute:
+    // return $.extend({}, options, {gravity: $(ele).attr('tipsy-gravity') || 'n' });
+    // (remember - do not modify 'options' in place!)
+    $.fn.tipsy.elementOptions = function(ele, options) {
+        return $.metadata ? $.extend({}, options, $(ele).metadata()) : options;
+    };
+
+    $.fn.tipsy.autoNS = function() {
+        return $(this).offset().top > ($(document).scrollTop() + $(window).height() / 2) ? 's' : 'n';
+    };
+
+    $.fn.tipsy.autoWE = function() {
+        return $(this).offset().left > ($(document).scrollLeft() + $(window).width() / 2) ? 'e' : 'w';
+    };
+
+})(jQuery);
+
+/* }}} END (possibly) modified copy of jquery-tipsy */
+
+
+/* EvolvisForge tooltip glue */
+
 jQuery(function() {
-	if ( typeof(jQuery(window).tipsy) == 'function') {
-		jQuery('#tracker-monitor').tipsy({gravity: 'e', html: true, delayIn: 1000, delayOut: 500, fade: true});
-		jQuery('#tracker-summary').tipsy({gravity: 'w', delayIn: 1000, delayOut: 500, fade: true});
-		jQuery('#tracker-assigned_to').tipsy({gravity: 'w', delayIn: 1000, delayOut: 500, fade: true});
-		jQuery('#tracker-priority').tipsy({gravity: 'w', html: true, delayIn: 1000, delayOut: 500, fade: true});
-		jQuery('#tracker-status_id').tipsy({gravity: 'w', html: true, delayIn: 1000, delayOut: 500, fade: true});
-		jQuery('#tracker-description').tipsy({gravity: 'w', html: true, delayIn: 1000, delayOut: 500, fade: true});
-		jQuery('#tracker-canned_response').tipsy({gravity: 'e', html: true, delayIn: 1000, delayOut: 500, fade: true});
-		jQuery('#tracker-comment').tipsy({gravity: 'w', delayIn: 1000, delayOut: 500, fade: true});
-		jQuery('#tracker-new_artifact_type_id').tipsy({gravity: 'e', html:true, delayIn: 1000, delayOut: 500, fade: true});
+	dleft = jQuery.extend({}, {"gravity": "e"}, tooltip_defaults);
+	dright = jQuery.extend({}, {"gravity": "w"}, tooltip_defaults);
+	dup = jQuery.extend({}, {"gravity": "s"}, tooltip_defaults);
+	ddown = jQuery.extend({}, {"gravity": "n"}, tooltip_defaults);
 
-		jQuery('select.trove-nodes').tipsy({gravity: 'w', html:true, delayIn: 1000, delayOut: 500, fade: true});
-		jQuery('span.trove-nodes').tipsy({gravity: 'n', html:true, delayIn: 1000, delayOut: 500, fade: true});
-	}
+	/* mostly theming */
+	jQuery('#tracker-monitor').tipsy(dleft);
+	jQuery('#tracker-summary').tipsy(dright);
+	jQuery('#tracker-assigned_to').tipsy(dright);
+	jQuery('#tracker-priority').tipsy(dright);
+	jQuery('#tracker-status_id').tipsy(dright);
+	jQuery('#tracker-description').tipsy(dright);
+	jQuery('#tracker-canned_response').tipsy(dleft);
+	jQuery('#tracker-comment').tipsy(dleft);
+	jQuery('#tracker-new_artifact_type_id').tipsy(dleft);
+	jQuery('#tracker-ef-Browser').tipsy(dleft);
+	jQuery('#tracker-ef-Component').tipsy(dleft);
+	jQuery('#tracker-ef-Hardware').tipsy(dleft);
+	jQuery('#tracker-ef-Operating_System').tipsy(dleft);
+	jQuery('#tracker-ef-Product').tipsy(dleft);
+	jQuery('#tracker-ef-URL').tipsy(dleft);
+	jQuery('#tracker-ef-Version_Fixed').tipsy(dleft);
+	jQuery('#tracker-ef-Version_Found').tipsy(dleft);
+	jQuery('#tracker-ef-Resolution').tipsy(dright);
+	jQuery('#tracker-ef-Severity').tipsy(dright);
+
+	jQuery('select.trove-nodes').tipsy(dright);
+	jQuery('span.trove-nodes').tipsy(ddown);
 });

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/my/index.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/my/index.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/my/index.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -36,9 +36,6 @@
 	exit_not_logged_in();
 }
 
-use_javascript('/tabber/tabber.js');
-site_user_header(array('title'=>sprintf(_('Personal Page For %s'), user_getname())));
-
 $sql = "SELECT l.*
 		FROM layouts AS l INNER JOIN owner_layouts AS o ON(l.id = o.layout_id)
 		WHERE o.owner_type = $1
@@ -48,14 +45,12 @@
 $res = db_query_params($sql,array('u', user_getid()));
 $layout_id = db_result($res, 0 , 'id');
 
-echo '<ul class="widget_toolbar">';
-$url = "/widgets/widgets.php?owner=u".user_getid().
-	"&layout_id=".$layout_id;
-echo '	<li ><a href="'. $url .'">'. _("Add widgets") .'</a></li>';
-echo '	<li><a href="'. $url.'&update=layout' .'">'. _("Customize layout") .'</a></li>';
-echo '</ul>';
+use_javascript('/tabber/tabber.js');
+site_user_header(array(
+	'title' => sprintf(_('Personal Page For %s'), user_getname()),
+	'layout_id' => $layout_id,
+    ));
 
-
 $lm = new WidgetLayoutManager();
 $lm->displayLayout(user_getid(), WidgetLayoutManager::OWNER_TYPE_USER);
 

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/news/admin/index.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/news/admin/index.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/news/admin/index.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -25,7 +25,6 @@
 
 require_once('../../env.inc.php');
 require_once $gfcommon.'include/pre.php';
-require_once $gfwww.'include/note.php';
 require_once $gfwww.'news/admin/news_admin_utils.php';
 require_once $gfwww.'news/news_utils.php';
 //common forum tools which are used during the creation/editing of news items
@@ -122,7 +121,6 @@
 		
 		$group = group_get_object($group_id);
 		
-		echo notepad_func();
 		echo '
 		<p />
 		<form id="newsadminform" action="'.getStringFromServer('PHP_SELF').'" method="post">

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/news/submit.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/news/submit.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/news/submit.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -48,7 +48,6 @@
 
 require_once('../env.inc.php');
 require_once $gfcommon.'include/pre.php';
-require_once $gfwww.'include/note.php';
 require_once $gfwww.'news/news_utils.php';
 require_once $gfcommon.'forum/Forum.class.php';
 require_once $gfcommon.'include/TextSanitizer.class.php'; // to make the HTML input by the user safe to store
@@ -135,11 +134,9 @@
 	$group = group_get_object($group_id);
 	news_header(array('title'=>_('Submit News for Project: ').' '.$group->getPublicName()));
 
-	$jsfunc = notepad_func();
-
 	echo '
 		<p>
-		'. sprintf(_('You can post news about your project if you are an admin on your project. You may also post "help wanted" notes if your project needs help.</p><p>All posts <b>for your project</b> will appear instantly on your project summary page. Posts that are of special interest to the community will have to be approved by a member of the %1$s news team before they will appear on the %1$s home page.</p><p>You may include URLs, but not HTML in your submissions.</p><p>URLs that start with http:// are made clickable.'), forge_get_config ('forge_name')) .'</p>' . $jsfunc . 
+		'. sprintf(_('You can post news about your project if you are an admin on your project. You may also post "help wanted" notes if your project needs help.</p><p>All posts <b>for your project</b> will appear instantly on your project summary page. Posts that are of special interest to the community will have to be approved by a member of the %1$s news team before they will appear on the %1$s home page.</p><p>You may include URLs, but not HTML in your submissions.</p><p>URLs that start with http:// are made clickable.'), forge_get_config ('forge_name')) .'</p>' .
 		'
 		<form id="newssubmitform" action="'.getStringFromServer('PHP_SELF').'" method="post">
 		<input type="hidden" name="group_id" value="'.$group_id.'" />

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/notepad.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/notepad.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/notepad.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * FusionForge Notepad Facility
  *
@@ -27,19 +26,14 @@
 
 /*
  *  form:       Input form name
- *  wrap:       Wrap attribute
  *  rows:       Rows
  *  cols:       Colums
  */
 
 $form = getStringFromRequest('form');
-$wrap = getStringFromRequest('wrap');
 $rows = getIntFromRequest('rows');
 $cols = getIntFromRequest('cols');
 
-if (!$wrap) {
-        $wrap = htmlspecialchars("SOFT");
-}
 if (!is_int($rows)) {
         $rows = 30;
 }
@@ -104,15 +98,34 @@
         </tr>
       </table>
     </form>
+<?php
+$kind = getStringFromRequest("kind");
+if ($kind == "messformat") {
+	echo "<hr />\n<p>" .
+	    _('You can apply basic formatting to the messages: by default, they are displayed as running text with automatic line breaks; manual line breaks (one newline) and paragraph breaks (two or more newlines) are also supported. Furthermore, the following formatting is supported:') .
+	    "</p><ul>\n" .
+		"<li>" . _('<tt>{{{</tt> on a line by itself switches to preformatted text') . "</li>\n" .
+		"<li>" . _('<tt><<<b:</tt><i>sometext</i><tt>>>></tt> displays “sometext” in a <b>boldface</b> font') . "</li>\n" .
+		"<li>" . _('<tt><<<i:</tt><i>sometext</i><tt>>>></tt> displays “sometext” in an <i>italic</i> font') . "</li>\n" .
+		"<li>" . _('<tt><<<tt:</tt><i>sometext</i><tt>>>></tt> displays “sometext” in <tt>monospace</tt> (teletype font)') . "</li>\n" .
+		"<li>" . _('<tt><<<ins:</tt><i>sometext</i><tt>>>></tt> displays “sometext” as <ins>insertion</ins> (with browser-defined rendering)') . "</li>\n" .
+		"<li>" . _('<tt><<<del:</tt><i>sometext</i><tt>>>></tt> displays “sometext” as <del>deletion</del> (with browser-defined rendering)') . "</li>\n" .
+	    "</ul><p>\n" .
+	    _('If the message contains three spaces in a row or a horizontal tabulator, it’s also assumed to be preformatted text unless it contains other formatting instructions, i.e. ‘>>>’ or ‘}}}’. You can switch out of preformatted text by ‘}}}’ on a line by itself. The following formatting instructions are recognised in both preformatted and running text:') .
+	    "</p><ul>\n" .
+		"<li>" . _('<b>[#<i>123</i>]</b> links to the Tracker Item with the number <i>123</i> (or, if unique, Task Item)') . "</li>\n" .
+		"<li>" . _('<b>[T<i>123</i>]</b> links to the Task Item with the number <i>123</i>') . "</li>\n" .
+		"<li>" . _('<b>[forum:<i>123</i>]</b> links to the Forum Message with the ID <i>123</i>') . "</li>\n" .
+		"<li>" . _('<b>[wiki:<i>Some Page</i>]</b> links to the Wiki Page with the name <i>Some_Page</i>') . "</li>\n" .
+		"<li>" . _('Almost any valid URI by itself is converted into a hyperlink') . "</li>\n" .
+	    "</ul>\n";
+}
+?>
   </body>
 </html>
-
-
 <?php
 
 // Local Variables:
 // mode: php
 // c-file-style: "bsd"
 // End:
-
-?>

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/pm/browse_task.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/pm/browse_task.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/pm/browse_task.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -280,16 +280,6 @@
 		} else
 			top.location.href = "/pm/task.php?group_id='.$group_id.'&group_project_id='.$group_project_id.'&func=browse&showAll=showAllSubProjects";
 	}
-
-	function openWinSelectColumns() {
-		url = "/pm/task.php?group_id='.$group_id.'&group_project_id='.$group_project_id.'&func=browse";
-		if(gup("showAll"))
-			url += "&showAll="+gup("showAll");
-		top.location.href = url;
-		selectColumnsWindow = window.open("/pm/select_columns.php",null, "height=650,width=300,status=yes,toolbar=no,menubar=no,location=no");
-		selectColumnsWindow.focus();
-
-	}
 //]]></script>';
 
 /*
@@ -313,7 +303,7 @@
 	<tr>
 	<td colspan="8">
 		' . _("Customise display:") . '
-		<input type="button" name="selectColumns" onclick="openWinSelectColumns();" value="'._('Add/Remove Columns').'" />
+		<input type="submit" name="selectcolumns" value="'._('Add/Remove Columns').'" />
 	</td>
 	</tr>
 	</table>
@@ -342,8 +332,6 @@
 			allLinks[i].onclick = function(){return false;}	//disable link
 			allLinks[i].style.color="darkgray";		//make it greyed out
 		}
-
-		//document.write(allLinks[i].href+"<BR/>");
 	}
 }
 
@@ -482,7 +470,7 @@
 			($IS_ADMIN ? '<input type="checkbox"'. (($pt_arr[$i]->getStatusId() == 7) ? ' disabled="disabled" onclick="return false;"':'') .' name="project_task_id_list[]" value="'. $pt_arr[$i]->getID() .'" /> ':'').
 			$pt_arr[$i]->getID() .'</td>';
 		if ($display_col['summary'])
-			echo '<td class="separateRowsForPrinting"><a href="'.$url.'">'.$pt_arr[$i]->getSummary() .'</a></td>';
+			echo '<td class="separateRowsForPrinting"><a href="'.$url.'">'.util_html_secure($pt_arr[$i]->getSummary()) .'</a></td>';
 		if ($display_col['start_date']) 
 			echo '<td class="separateRowsForPrinting">'.date(_('Y-m-d H:i'), $pt_arr[$i]->getStartDate() ).'</td>';
 		if ($display_col['end_date']) 
@@ -509,7 +497,7 @@
 		if ($display_col['parent_id'])
 			echo '<td>'. $pt_arr[$i]->getParentID() .'</td>';
 		if ($display_col['details'])
-			echo '<td>'. $pt_arr[$i]->getDetails() .'</td>';
+			echo '<td>'. util_html_secure($pt_arr[$i]->getDetails()) .'</td>';
 		if ($display_col['hours'])
 			echo '<td>'. $pt_arr[$i]->getHours() .'</td>';
 		if ($display_col['status_id'])

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/pm/include/ProjectGroupHTML.class.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/pm/include/ProjectGroupHTML.class.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/pm/include/ProjectGroupHTML.class.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -152,8 +152,8 @@
                 echo '
                         <select name="'.$name.'" onchange="switch(this.selectedIndex){
                                                         case 0: '.$status_select.'.selectedIndex = 0; break;
-                                                        case 20: '.$status_select.'.selectedIndex = 5; break;
-                                                        default: '.$status_select.'.selectedIndex = 4;
+                                                        case 20: '.$status_select.'.selectedIndex = 4; break;
+                                                        default: '.$status_select.'.selectedIndex = 2;
                         }">';
                 echo '
 		<option value="0">'._('Not Started'). '</option>';

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/pm/include/ProjectTaskHTML.class.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/pm/include/ProjectTaskHTML.class.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/pm/include/ProjectTaskHTML.class.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -137,59 +137,6 @@
 		    _('Tick an item and submit to remove the relation.')) . "\n";
 	}
 
-	function showMessages($asc=true,$whereto='/') {
-		/*
-			Show the details rows from task_history
-		*/
-		$result=$this->getMessages($asc);
-		$rows=db_numrows($result);
-
-		if ($rows > 0) {
-			echo '<br />';
-
-			if ($asc) {
-				echo '<a href="' .
-					util_make_url($whereto . '&commentsort=anti') .
-					'">' . _('Sort comments antichronologically') . '</a>';
-			} else {
-				echo '<a href="' .
-					util_make_url($whereto . '&commentsort=chrono') .
-					'">' . _('Sort comments chronologically') . '</a>';
-			}
-			echo "<br />\n";
-
-			$title_arr=array();
-			$title_arr[]=_('Comment');
-			$title_arr[]=_('Date');
-			$title_arr[]=_('Submitted by');
-		
-			echo $GLOBALS['HTML']->listTableTop ($title_arr);
-
-			for ($i=0; $i < $rows; $i++) {
-				echo '
-				<tr '. $GLOBALS['HTML']->boxGetAltRowStyle($i) .'>
-				<td>';
-				$sanitizer = new TextSanitizer();
-				$body = $sanitizer->SanitizeHtml(db_result($result, $i, 'body'));
-				if (strpos($body,'<') === false) {
-					echo nl2br(db_result($result, $i, 'body'));
-				} else {
-					echo $body;
-				}
-
-				echo '</td>
-					<td valign="top">'.date(_('Y-m-d H:i'),db_result($result, $i, 'postdate')).'</td>
-					<td valign="top">'.db_result($result, $i, 'realname').'</td></tr>';
-			}
-
-			echo $GLOBALS['HTML']->listTableBottom();
-		} else {
-			echo '
-			<h3>'._('No Comments Have Been Added').'</h3>';
-		}
-	
-	}
-
 	function showHistory() {
 		/*
 			show the project_history rows that are 
@@ -216,11 +163,11 @@
 
 				if ($field == 'status_id') {
 //tdP - convert to actual status name
-					echo db_result($result, $i, 'old_value');
+					echo util_html_secure(db_result($result, $i, 'old_value'));
 
 				} else if ($field == 'category_id') {
 //tdP convert to actual category_name
-					echo db_result($result, $i, 'old_value');
+					echo util_html_secure(db_result($result, $i, 'old_value'));
 
 				} else if ($field == 'start_date') {
 
@@ -232,7 +179,7 @@
 
 				} else {
 
-					echo db_result($result, $i, 'old_value');
+					echo util_html_secure(db_result($result, $i, 'old_value'));
 
 				}
 				echo '</td>

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/pm/include/ProjectView.class.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/pm/include/ProjectView.class.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/pm/include/ProjectView.class.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -24,11 +24,9 @@
 
 /* Loads the template and includes the data from the controller and postmodtaskel into the template */
 
-// require_once $gfwww.'include/html.php';
-// require_once $gfcommon.'include/TextSanitizer.class.php';
 require_once $gfcommon.'include/datepick.php';
 require_once $gfcommon.'include/utils.php';
-require_once $gfcommon.'include/showmess.php';
+require_once $gfcommon.'include/descriptive.php';
 
 class ProjectView {
 
@@ -154,20 +152,23 @@
 		$this->_[$key] = $value;
 	}
 
-	public function isThirdDetailColumnLayer() {
+	public function isPostAddTask() {
 		switch ($this->getPageView()) {
 		case 'postmodtask':
-			return true;
+		case 'copytask':
+			return false;
 		case 'detailtask':
+			return false;
+		case 'postaddtask':
 			return true;
-		case 'postaddtask':
-			return false;
+		default: return '';	
 		}
 	}
 
 	public function showStartForm() {
 		switch ($this->getPageView()) {
 		case 'postmodtask':
+		case 'copytask':
 			return html_build_form_start_tag(
 			    $this->getUri() . '?group_id=' .
 			    $this->getProjectTaskHTML()->getProjectGroup()->getGroup()->getID() .
@@ -179,41 +180,55 @@
 		case 'detailtask':
 			return '';
 		case 'postaddtask':
-			return '';
+				return html_build_form_start_tag(
+				$this->getUri() . '?group_id=' .
+				$this->getProjectTaskHTML()->getProjectGroup()->getGroup()->getID() .
+				'&group_project_id=' .
+				$this->getProjectTaskHTML()->getProjectGroup()->getID(),
+				'addtaskform');
+		default: return '';		
 		}
 	}
 
 	public function showEndForm() {
 		switch ($this->getPageView()) {
 		case 'postmodtask':
+		case 'copytask':
 			return '</form>';
 		case 'detailtask':
 			return '';
 		case 'postaddtask':
-			return '';
+			return '</form>';
+		default: return '';
 		}
 	}
 
 	public function showSubmitButton() {
 		switch ($this->getPageView()) {
 		case 'postmodtask':
+		case 'copytask':
 			return html_build_submit_button('submit', _('Submit'));
 		case 'detailtask':
 			return '';
 		case 'postaddtask':
-			return '';
+			return html_build_submit_button('submit', _('Submit'));
+		default: return '';
 		}
 	}
 
 	public function showHiddenBox() {
 		switch ($this->getPageView()) {
 		case 'postmodtask':
+		case 'copytask':
 			$nameFunc = array('func' => 'postmodtask', 'project_task_id' => $this->getProjectTaskHTML()->getID());
 			break;
 		case 'detailtask':
 			$nameFunc = null;
 			break;
 		case 'postaddtask':
+			$nameFunc = array('func' => 'postaddtask', 'showFunc' => 'postmodtask');
+			break;
+		default:
 			$nameFunc = null;
 			break;
 		}
@@ -235,78 +250,73 @@
 		return $this->getProjectTaskHTML()->getID();
 	}
 
-	public function showSummaryTxt() {
+	public function showSummary() {
 		switch ($this->getPageView()) {
 		case 'postmodtask':
-			return $this->getProjectTaskHTML()->getSummary();
+		case 'copytask':
+			return emit_summary_field($this->getProjectTaskHTML(),
+			    'summary', 'summary', 'summary');
 		case 'detailtask':
-			return $this->getProjectTaskHTML()->getSummary();
+			return emit_summary($this->getProjectTaskHTML());
 		case 'postaddtask':
-			return;
+			return emit_summary_field(NULL,
+			    'summary', 'summary', 'summary');
+		default:
+			return '';	    
 		}
 	}
 
-	public function showSummary() {
+	public function showAddCommentBox() {
 		switch ($this->getPageView()) {
 		case 'postmodtask':
-			return html_build_textbox('summary', $this->getProjectTaskHTML()->getSummary(), 'summary', 'summary');
+		case 'copytask':
+			$formname = 'modtaskform';
+			break;
+		case 'postaddtask':
+			$formname = 'addtaskform';
+			break;
 		case 'detailtask':
-			return $this->getProjectTaskHTML()->getSummary();
-		case 'postaddtask':
-			return;
+		default:
+			$formname = 'adddefaultform';
+			break;
 		}
+		return emit_comment_box($formname, 'comment');
 	}
 
-	public function showAddCommentBox() {
-		$GLOBALS['editor_was_set_up'] = false;
-		$params = array(
-			'name' => 'details',
-			'width' => '800',
-			'height' => '300',
-			'body' => '',
-			'group' => $this->getProjectTaskHTML()->getProjectGroup()->getGroup()->getID(),
-		    );
-		plugin_hook('text_editor',$params);
-		if (!$GLOBALS['editor_was_set_up']) {
-			return '<div class="small">' .
-			    html_build_textarea('comment', 7, 60) .
-			    "</div>\n";
-		}
-		unset($GLOBALS['editor_was_set_up']);
-	}
-
 	public function showDetails() {
-
-		$sanitizer = new TextSanitizer();
-		$body = $sanitizer->SanitizeHtml($this->getProjectTaskHTML()->getDetails());
-
 		switch ($this->getPageView()) {
 		case 'postmodtask':
-
-			if (strpos($body,'<') !== false) {
-				$body = nl2br($this->getProjectTaskHTML()->getDetails());
-			}
-			return '<div class="small">' .
-			    html_build_textarea('details', 24, 60, $body) .
-			    "</div>\n";
-
+		case 'copytask':
+			return html_e('div', array(
+				'id' => 'edit',
+				'style' => 'display:none;',
+			    ), html_e('span', array(
+				'class' => 'taskHeading',
+			    ), _('Details') . ': ') . notepad_button('document.forms.modtaskform.details',
+			    "messformat") . html_e('br') .
+			    emit_details_field($this->getProjectTaskHTML(),
+			    'details')) . emit_details($this->getProjectTaskHTML(),
+			    _('Details'), true);
 		case 'detailtask':
-
-			if (strpos($body,'<') === false) {
-				return nl2br($this->getProjectTaskHTML()->getDetails());
-			} else {
-				return $body;
-			}
-
+			return html_e('span', array(
+				'class' => 'taskHeading',
+			    ), _('Details') . ':') . html_e('br') .
+			    emit_details($this->getProjectTaskHTML());
 		case 'postaddtask':
+			return html_e('span', array(
+				'class' => 'taskHeading',
+			    ), _('Details') . ':') . html_e('br') .
+			    emit_details_field(NULL, 'details');
+		default:
 			return '';
 		}
 	}
 
 	public function renderComments() {
 		switch ($this->getPageView()) {
+		case 'postmodtask':
+		case 'copytask':
 		case 'detailtask':
-		case 'postmodtask':
 			showmess(_('Comments'), util_make_url(
 			    '/pm/task.php?func=detailtask&group_id=' .
 			    $this->getProjectTaskHTML()->getProjectGroup()->getGroup()->getID() .
@@ -317,117 +327,138 @@
 			    $this->getProjectTaskHTML(),
 			    _('No comments have been written.'), true);
 		case 'postaddtask':
-			return;
+			return '';
+		default: return '';
 		}
 	}
 
 	public function showPercentComplete() {
 		switch ($this->getPageView()) {
 		case 'postmodtask':
+		case 'copytask':
 			return $this->getProjectGroupHTML()->percentCompleteBox('percent_complete',$this->getProjectTaskHTML()->getPercentComplete());
 		case 'detailtask':
 			return $this->getProjectTaskHTML()->getPercentComplete();
 		case 'postaddtask':
-			return '';
+			return $this->getProjectGroupHTML()->percentCompleteBox();
+		default: return '';	
 		}
 	}
 
 	public function showStatus() {
 		switch ($this->getPageView()) {
 		case 'postmodtask':
+		case 'copytask':
 			return $this->getProjectGroupHTML()->statusBox('status_id', $this->getProjectTaskHTML()->getStatusID(), false);
 		case 'detailtask':
 			return $this->getProjectTaskHTML()->getStatusName();
 		case 'postaddtask':
-			return '';
+			return _('Open');
+		default: return '';
 		}
 	}
 
 	public function showPriority() {
 		switch ($this->getPageView()) {
 		case 'postmodtask':
+		case 'copytask':
 			return build_priority_select_box('priority',$this->getProjectTaskHTML()->getPriority());
 		case 'detailtask':
 			return $this->getProjectTaskHTML()->getPriority();
 		case 'postaddtask':
-			return;
+			return build_priority_select_box('priority',$this->getProjectTaskHTML()->getPriority());
+		default: return '';
 		}
 	}
 
-	//needs to be redesigned in html.php?
 	public function showAssignedTo() {
 		switch ($this->getPageView()) {
 		case 'postmodtask':
+		case 'copytask':
 			return $this->getProjectTaskHTML()->multipleAssignedBox('assigned_to[]', 'checkbox', 'depentAssignee');
 		case 'detailtask':
 			return ShowResultSet($this->getProjectModel()->getAssignedTo(),'',false, false);
 		case 'postaddtask':
-			return '';
+			return $this->getProjectTaskHTML()->multipleAssignedBox('assigned_to[]', 'checkbox', 'depentAssignee');
+		default: return '';
 		}
 	}
 
 	public function showDependentTaskBox() {
 		switch ($this->getPageView()) {
 		case 'postmodtask':
+		case 'copytask':
 			return $this->getProjectTaskHTML()->multipleDependBox('dependent_on[]', 'checkbox', 'depentTask');
 		case 'detailtask':
 			return $this->getProjectTaskHTML()->showDependentTasks();
 		case 'postaddtask':
-			return;
+			return $this->getProjectTaskHTML()->multipleDependBox('dependent_on[]', 'checkbox', 'depentTask');
+		default: return '';
 		}
 	}
 
 	public function showRelatedTrackerItems() {
 		switch ($this->getPageView()) {
 		case 'postmodtask':
+		case 'copytask':
 			return $this->getProjectTaskHTML()->showRelatedArtifacts();
 		case 'detailtask':
 			return $this->getProjectTaskHTML()->showRelatedArtifacts();
 		case 'postaddtask':
-			return;
+			return '';
+		default: return '';
 		}
 	}
 
 	public function showStartDate() {
 		switch ($this->getPageView()) {
 		case 'postmodtask':
+		case 'copytask':
 			return datepick_emit('start_dt', datepick_format($this->getProjectTaskHTML()->getStartDate(), true), true);
 		case 'detailtask':
 			return datepick_format($this->getProjectTaskHTML()->getStartDate());
 		case 'postaddtask':
-			return;
+			return datepick_emit('start_dt', datepick_format(time(), true), true);
+		default: return '';
 		}
 	}
 
 	public function showEndDate() {
 		switch ($this->getPageView()) {
 		case 'postmodtask':
+		case 'copytask':
 			return datepick_emit('end_dt', datepick_format($this->getProjectTaskHTML()->getEndDate(),true), true);
 		case 'detailtask':
 			return datepick_format($this->getProjectTaskHTML()->getEndDate());
 		case 'postaddtask':
-			return;
+			return datepick_emit('end_dt', datepick_format(time(),true), true);
+		default: return '';
 		}
 	}
 
 	public function showCalendar() {
 		switch ($this->getPageView()) {
 		case 'postmodtask':
+		case 'copytask':
 		case 'detailtask':
 			return util_make_link('/pm/calendar.php?group_id='.$this->getProjectTaskHTML()->getProjectGroup()->getGroup()->getID().'&group_project_id='.$this->getProjectTaskHTML()->getProjectGroup()->getID(), _('View Calendar'), array('target' => '_blank'));
 		case 'postaddtask':
-			return;
+			return '';
+		default: return '';
 		}
 	}
 
 	public function showEstimatedHours() {
 		switch ($this->getPageView()) {
 		case 'postmodtask':
+		case 'copytask':
 			return html_build_textbox('hours', $this->getProjectTaskHTML()->getHours(), 'hours', 'hours');
 		case 'detailtask':
 			return $this->getProjectTaskHTML()->getHours();
 		case 'postaddtask':
-			return;
+			return html_build_textbox('hours', '1', 'hours', 'hours');;
+		default:
+			return '';
 		}
 	}
 
@@ -444,22 +475,26 @@
 	public function showTaskDetailInfo() {
 		switch ($this->getPageView()) {
 		case 'postmodtask':
+		case 'copytask':
 		case 'detailtask':
 			return util_make_link('/pm/t_lookup.php?tid='.$this->getProjectTaskHTML()->getID(),'application/json') . ' / ' .
 			    util_make_link('/pm/t_lookup.php?text=1&tid='.$this->getProjectTaskHTML()->getID(),'text/plain');
 		case 'postaddtask':
 			return;
+		default: return '';
 		}
 	}
 
 	public function showSubproject() {
 		switch ($this->getPageView()) {
 		case 'postmodtask':
+		case 'copytask':
 			return $this->getProjectGroupHTML()->groupProjectBox('new_group_project_id', $this->getProjectTaskHTML()->getProjectGroup()->getID(), false);
 		case 'detailtask':
 			return $this->getProjectTaskHTML()->getProjectGroup()->getName();
 		case 'postaddtask':
 			return '';
+		default: return '';
 		}
 	}
 
@@ -469,23 +504,27 @@
 	public function showCopyTaskFunc() {
 		switch ($this->getPageView()) {
 		case 'postmodtask':
+		case 'copytask':
 			return $this->getProjectGroupHTML()->groupProjectBox('copy_group_project_id', $this->getProjectTaskHTML()->getProjectGroup()->getID(), false). ' ' .
-			    '<input type="submit" name="CopySubproject" value="'._('Copy').'" onclick="document.forms[0].func.value = \'copytask\';" />';
+			    '<input type="submit" name="CopySubproject" value="'._('Copy').'" />';
 		case 'detailtask':
 			return '';
 		case 'postaddtask':
 			return;
+		default: return '';
 		}
 	}
 
 	public function showSubscribeLink() {
 		switch ($this->getPageView()) {
 		case 'postmodtask':
+		case 'copytask':
 			return util_make_link('/export/rssAboTask.php?tid='.$this->getProjectTaskHTML()->getID(), html_image('ic/rss.png',16, 16, array('border' => '0')) . '' . _('Subscribe to task'));
 		case 'detailtask':
 			return util_make_link('/export/rssAboTask.php?tid='.$this->getProjectTaskHTML()->getID(), html_image('ic/rss.png',16, 16, array('border' => '0')) . '' . _('Subscribe to task'));
 		case 'postaddtask':
 			return '';
+		default: return '';
 		}
 	}
 
@@ -497,6 +536,7 @@
 			return util_make_link($this->getUri().'?func=deletetask&group_id='.$this->getProjectTaskHTML()->getProjectGroup()->getGroup()->getID().'&group_project_id='.$this->getProjectTaskHTML()->getProjectGroup()->getID().'&project_task_id='.$this->getProjectTaskHTML()->getID(), html_image('ic/trash.png',16, 16, array('border' => '0')) . '' . _('Delete this task'));
 		case 'postaddtask':
 			return;
+		default: return '';		
 		}
 	}
 
@@ -507,9 +547,23 @@
 		case 'detailtask':
 			return $this->getProjectTaskHTML()->getCategoryName();
 		case 'postaddtask':
-			return;
+			return $this->getProjectGroupHTML()->categoryBox('category_id');
+		default: return '';
 		}
 	}
+	
+	public function showAddCategory() {
+		switch ($this->getPageView()) {
+		case 'postmodtask':
+			return '';
+		case 'detailtask':
+			return '';
+		case 'postaddtask':
+		return util_make_link ('/pm/admin/?group_id='.$this->getProjectTaskHTML()->getProjectGroup()->getGroup()->getID().
+			'&add_cat=1&group_project_id='.$this->getProjectTaskHTML()->getProjectGroup()->getID(),'('._('Add category').')');
+		default: return '';
+		}
+	}
 
 	public function showProtocol() {
 		switch ($this->getPageView()) {
@@ -518,7 +572,8 @@
 		case 'detailtask':
 			return $this->getProjectTaskHTML()->showHistory();
 		case 'postaddtask':
-			return;
+			return '';
+		default: return '';	
 		}
 	}
 
@@ -529,11 +584,9 @@
 			include $file;
 			$output = ob_get_contents();
 			ob_end_clean();
-
-			// Output zurückgeben.
 			return $output;
 		} else {
-			echo 'Error';
+			exit_error('Template is missing');
 		}
 	}
 }

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/pm/include/pm_columns.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/pm/include/pm_columns.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/pm/include/pm_columns.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -33,7 +33,7 @@
 	array("end_date", 1, _('End Date')),
 	array("perComplet", 1, _('Percent Complete')),
 	array("category", 0, _('Category')),
-	array("assignedTo", 0, _('Assigned To')),
+	array("assignedTo", 1, _('Assigned To')),
 	array("priority", 1, _('Priority')),
 	array("status", 1, _('Status')),
 //	array("projectTaskId", 0, _('Project Task Id')),
@@ -79,3 +79,18 @@
 	/* don't need to repeat */
 	pm_prefset("seen", 1);
 }
+
+$subidname = 'group_project_id';
+$pm_columns_title = _('Select PM Display Columns');
+$pm_columns_retf = "/pm/task.php?func=post_select_columns&";
+
+function pm_columns_header() {
+	global $group_project_id;
+
+	pm_header(array('title' => _('Select Columns'),
+	    'group_project_id' => $group_project_id));
+}
+
+function pm_columns_footer() {
+	pm_footer(array());
+}

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/pm/pm_task.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/pm/pm_task.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/pm/pm_task.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -28,7 +28,6 @@
 
 //require_once('../env.inc.php'); //Page gets included from task.php. The files are available in task.php
 //require_once $gfcommon.'include/pre.php'; //Page gets included from task.php. The files are available in task.php
-require_once $gfwww.'include/note.php'; //Used by add_task.php and mod_task.php AND NOT by detail_task.php
 require_once $gfcommon.'reporting/report_utils.php';
 require_once $gfcommon.'reporting/Report.class.php';
 
@@ -36,9 +35,22 @@
 require_once $gfcommon.'pm/ProjectModel.class.php';
 
 datepick_prepare();
-pm_header(array('title'=>_('Modify Task'),'pagename'=>'pm_modtask','group_project_id'=>$group_project_id));
 
-echo notepad_func(); //Needed in mod_task.php and add_task.php but NOT IN detail_task.php
+$pageView = getStringFromRequest('func');
+
+$headerArray = array(
+	'title' => sprintf('[#%d] %s', $pt->getID(), $pt->getSummary()),
+	'pagename' => 'pm_modtask',
+	'group_project_id' => $group_project_id
+    );
+
+if($pageView == 'addtask') {
+	$pageView = 'postaddtask';
+	$headerArray['title'] = '';
+}
+
+pm_header($headerArray);
+
 session_require_login(); //Needed for?
 
 $boolManager = false;
@@ -51,9 +63,10 @@
  */
 
 $uri = getStringFromServer('PHP_SELF');
-$pageView = getStringFromRequest('func');
+$showPageView = getStringFromRequest('showFunc');
+
 if (($pageView == 'detailtask' && $boolManager == true) ||
-    ($pageView == 'postaddtask')) {
+		($pageView == 'postaddtask' && $showPageView == 'postmodtask' && $boolManager == true)) {
 	$pageView = 'postmodtask';
 }
 

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/pm/select_columns.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/pm/select_columns.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/pm/select_columns.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -4,6 +4,7 @@
  *
  * Copyright © 2010
  *	Umer Kayani <u.kayani at tarent.de>
+ * Copyright © 2010, 2011
  *	Thorsten Glaser <t.glaser at tarent.de>
  * All rights reserved.
  *
@@ -31,43 +32,23 @@
 require_once('../env.inc.php');
 require_once $gfwww.'include/pre.php';
 
+$group_id = getIntFromRequest('group_id');
+$subid = getIntFromRequest($subidname);
+
 $u =& session_get_user();
 if (!$u) {
 	require_once $gfcommon.'include/NotUser.class.php';
 	$u = new NotUser();
 }
 
-require_once $gfwww.'pm/include/pm_columns.php';
+pm_columns_header();
 
-$intro = "<p>Select which columns to display.</p>";
-if (isset($_POST['Submit'])) {
-	/*
-	 * Add/Remove values from session based on user selections.
-	 * Only called when submit button is pressed.
-	 */
-
-	foreach ($pm_columns_list as $v)
-		pm_prefset($v[0], util_ifsetor($_POST[$v[0]]));
-
-	if (util_ifsetor($_POST["resetval"])) {
-		pm_prefset("seen", 0);
-		pm_columns_initprefs();
-		$intro = "<p>Preferences restored to default.</p>";
-	} else {
-		pm_prefset("seen", 1);
-		$intro = "<p>Preferences saved.</p>";
-	}
-}
-
-echo '<' . '?xml version="1.0" encoding="utf-8" ?' . ">\n" .
-    $sysDTDs['transitional']['doctype']; ?>
-<html <?php echo $sysXMLNSs; ?> xml:lang="en">
- <head>
-  <script language="JavaScript" type="text/javascript">//<![CDATA[
+?>
+<script language="JavaScript" type="text/javascript">//<![CDATA[
 	function selectDeselectAllCheckFields(selectDeselect) {
 <?php
 	foreach ($pm_columns_list as $v)
-		echo "		document.forms[0]." . $v[0] .
+		echo "		document.forms.scform." . $v[0] .
 		    ".checked = selectDeselect.checked;\n";
 ?>
 	}
@@ -76,7 +57,7 @@
 		if (<?php
 			$i = "";
 			foreach ($pm_columns_list as $v) {
-				echo $i . "document.forms[0]." . $v[0] .
+				echo $i . "document.forms.scform." . $v[0] .
 				    ".checked";
 				$i = " &&\n	    ";
 			}
@@ -86,17 +67,18 @@
 			return false;
 		}
 	}
-  //]]></script>
-  <title>Select Columns: </title>
- </head>
- <body onload="document.forms[0].selectDeselect.checked = areAllCheckFieldsSelected()">
-<h1>Modify columns</h1>
-<?php echo $intro; ?>
-	<form action="/pm/select_columns.php" method="post">
-		<table>
-		<tr> <th> Columns </th> <th> Add </th> </tr>
-		<tr> <td colspan="2"> </td></tr>
+	document.forms.scform.selectDeselect.checked = areAllCheckFieldsSelected();
+//]]></script>
+<p><?php echo _('Select which columns to display.'); ?></p>
+<form name="scform" action="<?php echo util_make_url($pm_columns_retf . "group_id=$group_id&$subidname=$subid"); ?>" method="post">
 <?php
+	echo "<input type=\"hidden\" name=\"group_id\" value=\"$group_id\" />\n";
+	echo "<input type=\"hidden\" name=\"$subidname\" value=\"$subid\" />\n";
+?>
+	<table>
+		<tr><th><?php echo _('Columns'); ?></th><th><?php echo _('Add'); ?></th></tr>
+		<tr><td colspan="2"> </td></tr>
+<?php
 	foreach ($pm_columns_list as $v) {
 		echo "		<tr><td>" . $v[2] . "</td><td>" .
 		    '<input type="checkbox" name="' . $v[0] .
@@ -106,14 +88,19 @@
 		echo "/></td></tr>\n";
 	}
 ?>
-		<tr> <td colspan="2"> </td></tr>
-		<tr> <td> Select/Deselect All: </td> <td> <input type="checkbox" name="selectDeselect" onclick="selectDeselectAllCheckFields(this);" /> </td> </tr>
-		<tr> <td> Reset to Defaults: </td> <td> <input type="checkbox" name="resetval" /> </td> </tr>
-		</table>
-		<br />
+		<tr><td colspan="2"> </td></tr>
+		<tr>
+			<td><?php echo _('Select/Deselect All'); ?></td>
+			<td><input type="checkbox" name="selectDeselect" onclick="selectDeselectAllCheckFields(this);" /></td>
+		</tr><tr>
+			<td><?php echo _('Reset to Defaults'); ?></td>
+			<td><input type="checkbox" name="resetval" /></td>
+		</tr>
+	</table>
+	<br />
 
-		<input type="submit" name="Submit" value="Save" onclick="document.forms[0].sumbit();" />
-		<input type="button" value="Close" onclick="window.opener.location.reload();window.close();" />
-	</form>
- </body>
-</html>
+	<input type="submit" name="SaveColumns" value="<?php echo _('Save'); ?>" />
+	<input type="submit" name="cancel" value="<?php echo _('Abort'); ?>" />
+</form>
+
+<?php pm_columns_footer(); ?>

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/pm/task.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/pm/task.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/pm/task.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -56,7 +56,19 @@
 $duration = getStringFromRequest('duration');
 $parent_id = getIntFromRequest('parent_id');
 $func = getStringFromRequest('func');
+$copyTaskSubmitted = getStringFromRequest('CopySubproject');
 
+if(!empty($copyTaskSubmitted)) {
+	$func = 'copytask';
+}
+if (getStringFromRequest('selectcolumns')) {
+	$func = 'select_columns';
+}
+
+if (getStringFromRequest('cancel')) {
+	$func = '';
+}
+
 if (!$group_id || !$group_project_id) {
     $redirect_url = '';
     if (isset($_SERVER['HTTP_REFERER']))
@@ -88,13 +100,13 @@
 /*
 	Figure out which function we're dealing with here
 */
-switch (getStringFromRequest('func')) {
+switch ($func) {
 
 	//
 	//	Show blank form to add new task
 	//
 	case 'addtask' : {
-		session_require_perm ('pm', $pg->getID(), 'manager') ;
+		session_require_perm ('pm', $pg->getID(), 'manager');
 
 		$pt=new ProjectTaskHTML($pg);
 		if (!$pt || !is_object($pt)) {
@@ -102,7 +114,7 @@
 		} elseif ($pt->isError()) {
 			exit_error($pt->getErrorMessage(),'pm');
 		}
-		include $gfwww.'pm/add_task.php';
+		include $gfwww.'pm/pm_task.php';
 		break;
 	}
 
@@ -131,13 +143,8 @@
 		{
 			$dependent_on=array();
 		}
-		$start_date=mktime($start_hour,$start_minute,0,$start_month,$start_day,$start_year);
-		$end_date=mktime($end_hour,$end_minute,0,$end_month,$end_day,$end_year);
-
-
-		$sanitizer = new TextSanitizer();
-		$details = $sanitizer->purify($details);
-
+		$start_date = datepick_parse($start_dt);
+		$end_date = datepick_parse($end_dt);
 		if (!$pt->create($summary,$details,$priority,$hours,$start_date,$end_date,$category_id,$percent_complete,$assigned_to,$pt->convertDependentOn($dependent_on),$duration,$parent_id)) {
 			exit_error($pt->getErrorMessage(),'pm');
 		} else {
@@ -147,7 +154,6 @@
 				}
 			}
 			$feedback=_('Task Created Successfully');
-			//include $gfwww.'pm/browse_task.php';
 
 			$project_task_id = $pt->getID();
 			$pt=new ProjectTaskHTML($pg,$project_task_id);
@@ -166,12 +172,12 @@
 	//     Copy a task from subproject A to subproject B.
 	//     The status of the task in subproject A is modified to Copy&Closed
 	//     while the status of the copied task in subproject B is set to Open.
-        //
+
 	case 'copytask' : {
 		$copy_group_project_id = getStringFromRequest('copy_group_project_id');
 		$details = getStringFromRequest('details');
 
-		$pg = creatProjectGroupHTML($g, $copy_group_project_id);
+		$pg = createProjectGroupHTML($g, $copy_group_project_id);
 
 		session_require_perm ('pm', $pg->getID(), 'manager');
 
@@ -182,8 +188,8 @@
 		if (!$dependent_on) {
 			$dependent_on = array();
 		}
-		$start_date = mktime($start_hour,$start_minute,0,$start_month,$start_day,$start_year);
-		$end_date = mktime($end_hour,$end_minute,0,$end_month,$end_day,$end_year);
+		$start_date = datepick_parse($start_dt);
+		$end_date = datepick_parse($end_dt);
 
 
 		if (!$pt->create($summary,$details,$priority,$hours,$start_date,$end_date,$category_id,$percent_complete,$assigned_to,$pt->convertDependentOn($dependent_on),$duration,$parent_id)) {
@@ -195,9 +201,16 @@
 				}
 			}
 			$feedback=_('Task Copied Successfully');
-			$pg = creatProjectGroupHTML($g, $group_project_id);
+			$pg = createProjectGroupHTML($g, $group_project_id);
 			updateCopiedTask($pg,$project_task_id,$summary,$details,$priority,$hours,$start_date,$end_date,7,$category_id,$percent_complete,$assigned_to,$dependent_on,$new_group_project_id,$duration,$parent_id);
-			include $gfwww.'pm/browse_task.php';
+			
+			$pt=new ProjectTaskHTML($pg,$project_task_id);
+			if (!$pt || !is_object($pt)) {
+				exit_error('Error: ' . 'Could Not Get ProjectTask', 'pm');
+			} elseif ($pt->isError()) {
+				exit_error('Error: ' . $pt->getErrorMessage(), 'pm');
+			}
+			include $gfwww.'pm/pm_task.php';
 		}
 		break;
 	}
@@ -345,7 +358,7 @@
 				$mass_parent_id=$pt->getParentID();
 
 				if (!$pt->update($mass_summary,$mass_details,$mass_priority,$mass_hours,$mass_start_date,$mass_end_date,
-						 $mass_status_id,$mass_category_id,$mass_percent_complete,$mass_assigned_to,$mass_dependent_on,$mass_new_group_project_id,$mass_duration,$mass_parent_id)) {
+						 $mass_status_id,$mass_category_id,$mass_percent_complete,$mass_assigned_to,$mass_dependent_on,$mass_new_group_project_id,$mass_duration,$mass_parent_id, '', true)) {
 					$was_error=true;
 					$feedback .= ' ID: '.$project_task_id_list[$i].'::'.$pt->getErrorMessage();
 
@@ -461,6 +474,40 @@
 		break;
 	}
 
+	//
+	//	Show the task view columns selection page
+	//
+	case 'select_columns' : {
+		require_once $gfwww.'pm/include/pm_columns.php';
+		include $gfwww.'pm/select_columns.php';
+		break;
+	}
+
+	case 'post_select_columns': {
+		$u =& session_get_user();
+		if (!$u) {
+			require_once $gfcommon.'include/NotUser.class.php';
+			$u = new NotUser();
+		}
+
+		require_once $gfwww.'pm/include/pm_columns.php';
+
+		foreach ($pm_columns_list as $v)
+			pm_prefset($v[0], util_ifsetor($_POST[$v[0]]));
+
+		if (util_ifsetor($_POST["resetval"])) {
+			pm_prefset("seen", 0);
+			pm_columns_initprefs();
+			$feedback = "Preferences restored to default.";
+		} else {
+			pm_prefset("seen", 1);
+			$feedback = "Preferences saved.";
+		}
+
+		include $gfwww.'pm/browse_task.php';
+		break;
+	}
+
 	default : {
 		include $gfwww.'pm/browse_task.php';
 		break;
@@ -520,8 +567,9 @@
 }
 
 function updateCopiedTask($pg,$project_task_id,$summary,$details,$priority,$hours,$start_date,$end_date,$status_id,$category_id,$percent_complete,$assigned_to,$dependent_on,$new_group_project_id,$duration,$parent_id){
-
-	if ($pg->userIsAdmin()) {
+if (forge_check_perm ('pm', $pg->getID(), 'manager')) {
+	
+		$func = getStringFromRequest('func');
 		$rem_artifact_id = getStringFromRequest('rem_artifact_id');
 
 		if(!$rem_artifact_id){
@@ -533,10 +581,9 @@
 		if (!$dependent_on)     {
 			$dependent_on=array();
 		}
-		$start_date=mktime($start_hour,$start_minute,0,$start_month,$start_day,$start_year);
-		$end_date=mktime($end_hour,$end_minute,0,$end_month,$end_day,$end_year);
+
 		if (!$pt->update($summary,$details,$priority,$hours,$start_date,$end_date,
-				 $status_id,$category_id,$percent_complete,$assigned_to,$pt->convertDependentOn($dependent_on),$new_group_project_id,$duration,$parent_id)) {
+				 $status_id,$category_id,$percent_complete,$assigned_to,$pt->convertDependentOn($dependent_on),$new_group_project_id,$duration,$parent_id)) { 	
 			exit_error('ERROR: ' . 'update():: '.$pt->getErrorMessage(), 'pm');
 		} else {
 			if (count($rem_artifact_id) > 0) {
@@ -551,18 +598,10 @@
 			} elseif ($pt->isError()) {
 				exit_error('Error: ' . $pt->getErrorMessage(), 'pm');
 			}
-
-			if (session_loggedin() && $pg->userIsAdmin()) {
-				include $gfwww.'pm/mod_task.php';
-			} else {
-				include $gfwww.'pm/detail_task.php';
-			}
-
-				}
+			return;
+		}
 	} else {
 		exit_permission_denied();
 	}
-
-        return;
-
+      return;
 }

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/pm/templates/detail_template.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/pm/templates/detail_template.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/pm/templates/detail_template.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -3,11 +3,6 @@
 <?php echo $this->showStartForm(); ?>
 <?php echo $this->showHiddenBox(); ?>
 
-<div id="taskHeader">
-[#<?php echo $this->showTaskId(); ?>] <?php echo $this->showSummaryTxt(); ?>
-</div>
-<br />
-
 <div id="detailTaskContainer">
 	<?php echo $this->getHTML()->boxTop(_('Details'), 'details', false, 'pm_item_details'); ?>
 		<div class="bigTaskContainer bigDetailTaskContainer">
@@ -29,7 +24,7 @@
 			<div class="smallTaskContainer">
 				<span class="taskHeading"><?php echo _('Category'); ?>:</span>
 					<br />
-				<?php echo $this->showCategory(); ?>
+				<?php echo $this->showCategory();?> <?php echo $this->showAddCategory();?>
 			</div>
 			<div class="smallTaskContainer">
 				<span class="taskHeading"><?php echo _('Assigned to'); ?>:</span>
@@ -63,7 +58,7 @@
 			</div>
 		</div>
 
-		<?php if($this->isThirdDetailColumnLayer()) {?>
+		<?php if(!$this->isPostAddTask()) {?>
 			<div class="bigTaskContainer bigDetailTaskContainer">
 				<div class="smallTaskContainer">
 					<span class="taskHeading"><?php echo _('Submitted by'); ?>:</span>
@@ -106,12 +101,11 @@
 				<?php echo $this->showSummary(); ?>
 			</div>
 			<div class="smallTaskContainer">
-				<span class="taskHeading"><?php echo _('Details'); ?>:</span>
-					<br />
 				<?php echo $this->showDetails(); ?>
 			</div>
 		</div>
 
+	<?php if (!$this->isPostAddTask()) { ?>
 		<div class="bigTaskContainer bigDescriptionTaskContainer">
 			<div class="smallTaskContainer">
 				<?php $this->renderComments(); ?>
@@ -121,30 +115,34 @@
 				<?php echo $this->showAddCommentBox(); ?>
 			</div>
 		</div>
+	<?php } ?>
+
 		<div class="taskSubmitButtonContainer"><?php echo $this->showSubmitButton(); ?></div>
 	<?php echo $this->getHTML()->boxBottom(); ?>
 </div>
 
 <div id="linkTaskContainer">
 	<?php echo $this->getHTML()->boxTop(_('Link'), 'link', false, 'pm_item_link'); ?>
-		<div class="bigTaskContainer bigLinkTaskContainer">
-			<div class="smallTaskContainer">
-				<span class="taskHeading"><?php echo _('Related Commits'); ?>:</span>
-					<br /><br />
-					<table cellspacing ="0" cellpadding ="0">
-						<tr>
-							<td class="taskHeading"><?php echo _('Group name'); ?></td>
-							<td class="taskHeading"><?php echo _('Revision'); ?></td>
-						</tr>
-					<?php foreach($this->_['commits'] as $commit) {?>
-						<tr>
-							<td><?php echo $commit['group_name']; ?></td>
-							<td><a href="<?php echo $commit['href']; ?>" target="_blank" title="<?php _('Link to version control repository')?>" /><?php echo $commit['revision']; ?></a></td>
-						</tr>
-					<?php }?>
+		<?php if(!$this->isPostAddTask()) {?>
+			<div class="bigTaskContainer bigLinkTaskContainer">
+				<div class="smallTaskContainer">
+					<span class="taskHeading"><?php echo _('Related Commits'); ?>:</span>
+						<br /><br />
+						<table cellspacing="0" cellpadding="0" width="100%">
+							<tr>
+								<td class="taskHeading"><?php echo _('Group name'); ?></td>
+								<td class="taskHeading"><?php echo _('Revision'); ?></td>
+							</tr>
+						<?php foreach($this->_['commits'] as $commit) { ?>
+							<tr>
+								<td><?php echo $commit['group_name']; ?></td>
+								<td><a href="<?php echo $commit['href']; ?>" target="_blank" title="<?php _('Link to version control repository')?>" /><?php echo $commit['revision']; ?></a></td>
+							</tr>
+						<?php } ?>
 					</table>
+				</div>
 			</div>
-		</div>
+		<?php }?>
 
 		<div class="bigTaskContainer bigLinkTaskContainer">
 			<div class="smallTaskContainer">
@@ -158,6 +156,7 @@
 			</div>
 		</div>
 
+	<?php if(!$this->isPostAddTask()) {?>
 		<div class="bigTaskContainer bigLinkTaskContainer">
 			<div class="smallTaskContainer">
 				<span class="taskHeading"><?php echo _('Related Tracker Items'); ?>:</span>
@@ -165,6 +164,7 @@
 				<?php echo $this->showRelatedTrackerItems(); ?>
 			</div>
 		</div>
+	<?php }?>
 
 <?php if ($this->getPageView() == 'postmodtask') { ?>
 		<div class="bigTaskContainer bigLinkTaskContainer">
@@ -180,17 +180,19 @@
 	<?php echo $this->getHTML()->boxBottom(); ?>
 </div>
 
-<div id="protocolTaskContainer">
-	<?php echo $this->getHTML()->boxTop(_('Change protocol'), 'protocol', false, 'pm_item_history'); ?>
-		<div class="bigTaskContainer bigProtocolTaskContainer">
-			<div class="smallTaskContainer">
-				<span class="taskHeading"><?php echo _('Task Change History'); ?>:</span>
-					<br /><br />
-				<?php echo $this->showProtocol(); ?>
+<?php if(!$this->isPostAddTask()) {?>
+	<div id="protocolTaskContainer">
+		<?php echo $this->getHTML()->boxTop(_('Change protocol'), 'protocol', false, 'pm_item_history'); ?>
+			<div class="bigTaskContainer bigProtocolTaskContainer">
+				<div class="smallTaskContainer">
+					<span class="taskHeading"><?php echo _('Task Change History'); ?>:</span>
+						<br /><br />
+					<?php echo $this->showProtocol(); ?>
+				</div>
 			</div>
-		</div>
-	<?php echo $this->getHTML()->boxBottom(); ?>
-</div>
+		<?php echo $this->getHTML()->boxBottom(); ?>
+	</div>
+<?php }?>
 
 <?php echo $this->showEndForm(); ?>
 </div>

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/project/admin/massfinish.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/project/admin/massfinish.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/project/admin/massfinish.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -50,8 +50,8 @@
 			$params[1] = $group_id;
 			plugin_hook('change_cal_permission',$params);
 	}
-    $feedback = _('Successful');
-	session_redirect('/project/admin/index.php?group_id='.$group_id.'&feedback='.urlencode($feedback));
+	$feedback = _("Members Added Successfully");
+	session_redirect('/project/admin/users.php?group_id='.$group_id.'&feedback='.urlencode($feedback));
 }
 
 if (!$accumulated_ids) {

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/project/admin/project_admin_utils.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/project/admin/project_admin_utils.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/project/admin/project_admin_utils.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -156,10 +156,10 @@
 				if (preg_match("/[Uu]ser/i", $field)) {
 					echo user_getname(db_result($result, $i, 'old_value'));
 				} else {
-					echo db_result($result, $i, 'old_value');
+					echo util_html_secure(db_result($result, $i, 'old_value'));
 				}
 			} else {
-				echo db_result($result, $i, 'old_value');
+				echo util_html_secure(db_result($result, $i, 'old_value'));
 			}			
 			echo '</td>'.
 				'<td>'.date(_('Y-m-d H:i'),db_result($result, $i, 'adddate')).'</td>'.

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/project/admin/users.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/project/admin/users.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/project/admin/users.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -391,58 +391,93 @@
 		//
 		echo $HTML->boxTop(_("Edit Roles"));
 
-echo '<table width="100%"><thead><tr>';
-echo '<th>'._('Role name').'</th>';
-echo '<th style="text-align:right">'._('Action').'</th>';
-echo '</tr></thead><tbody>';
+$roles = $group->getRoles();
+sortRoleList($roles, $group, 'composite');
 
-$roles = $group->getRoles() ;
-sortRoleList ($roles, $group, 'composite') ;
-
+$i = 0;
+$spos0 = html_ap();
+echo html_ao('table', array(
+	'width' => '100%',
+    ));
+$spos1 = html_ap();
+echo html_ao('thead') . html_ao('tr') . html_e('th', array(),
+    _('Role name')) . html_e('th', array(
+	'style' => 'text-align:right;',
+    ), _('Action')) . html_ac($spos1) . html_ao('tbody') . "\n";
 foreach ($roles as $r) {
-	/* this would work, but only here, not below the foreach */
-	//echo '<tr>
-	//	<td>'.$r->getDisplayableName($group).'</td>
-	//	<td><form action="roleedit.php?group_id='. $group_id .'" method="post">
-	//		<input type="hidden" name="role_id" value="'.$r->getID().'" />
-	//		<input type="submit" name="edit" value="'._("Edit Permissions").'" />
-	//	</form></td>
-	//</tr>';
-	/* but doesn't look as well as using the same method everywhere */
-	echo '<tr><td colspan="2">
-	<form action="roleedit.php?group_id='. $group_id .'" method="post">
-	<div style="float:left;">
-		'.$r->getDisplayableName($group).'
-	</div><div style="float:right;">
-		<input type="hidden" name="role_id" value="'.$r->getID().'" />
-		<input type="submit" name="edit" value="'._("Edit Permissions").'" />
-	</div>
-	</form>';
-	
-	if ($r->getHomeProject() != NULL && $r->getHomeProject()->getId() == $group_id) {
-		echo '<form action="roledelete.php?group_id='. $group_id .'" method="post">
-        <div style="float:right;">
-		<input type="hidden" name="role_id" value="'.$r->getID().'" />
-		<input type="submit" name="delete" value="'._("Delete role").'" />
-	</div>
-	</form>';
+	$spos1 = html_ap();
+	$p = array(); $HTML->boxApplyAltRowStyle($i++, $p);
+	echo html_ao('tr', $p) . html_ao('td', array(
+		'colspan' => 2,
+	    )) . html_ao('table', array(
+		'border' => 0,
+		'cellspacing' => 2,
+		'cellpadding' => 0,
+		'width' => '100%',
+	    )) . html_ao('tr') . html_e('td', array(
+		'align' => 'left',
+		'valign' => 'middle',
+	    ), $r->getDisplayableName($group)) . html_e('td', array(
+		'align' => 'right',
+		'valign' => 'middle',
+		'width' => '1%',
+	    ), html_e('form', array(
+		'action' => 'roleedit.php?group_id=' . $group_id,
+		'method' => 'post',
+	    ), html_e('input', array(
+		'type' => 'hidden',
+		'name' => 'role_id',
+		'value' => $r->getID(),
+	    )) . html_e('input', array(
+		'type' => 'submit',
+		'name' => 'edit',
+		'value' => _("Edit Permissions"),
+	    ))));
+	if ($r->getHomeProject() != NULL &&
+	    $r->getHomeProject()->getId() == $group_id) {
+		echo html_e('td', array(
+			'align' => 'right',
+			'valign' => 'middle',
+			'width' => '1%',
+		    ), html_e('form', array(
+			'action' => 'roledelete.php?group_id=' . $group_id,
+			'method' => 'post',
+		    ), html_e('input', array(
+			'type' => 'hidden',
+			'name' => 'role_id',
+			'value' => $r->getID(),
+		    )) . html_e('input', array(
+			'type' => 'submit',
+			'name' => 'delete',
+			'value' => _("Delete role"),
+		    ))));
 	}
-
-	echo '</td></tr>';
+	echo html_ac($spos1) . "\n";
 }
 
-/* note: we cannot put the form outside of a td here */
-echo '<tr><td colspan="2">
-	<form action="roleedit.php?group_id='. $group_id .'" method="post">
-	<div style="float:left;">
-		<input type="text" name="role_name" size="10" value="" />
-	</div><div style="float:right;">
-		<input type="submit" name="add" value="'._("Create Role").'" />
-	</div>
-	</form>
-</td></tr>';
+//$spos1 = html_ap();
+$p = array(); $HTML->boxApplyAltRowStyle($i++, $p);
+echo html_ao('tr', $p) . html_ao('td', array(
+	'colspan' => 2,
+    )) . html_ao('form', array(
+	'action' => 'roleedit.php?group_id=' . $group_id,
+	'method' => 'post',
+    )) . html_e('div', array(
+	'style' => 'float:left;',
+    ), html_e('input', array(
+	'type' => 'text',
+	'name' => 'role_name',
+	'size' => 15,
+	'value' => "",
+    ))) . html_e('div', array(
+	'style' => 'float:right;',
+    ), html_e('input', array(
+	'type' => 'submit',
+	'name' => 'add',
+	'value' => _("Create Role"),
+    )));
+echo html_ac($spos0) . "\n";
 
-echo '</tbody></table>' ;
 
 if (!USE_PFO_RBAC) {
 		echo '

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/project/stats/index.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/project/stats/index.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/project/stats/index.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -91,7 +91,7 @@
 $activity_submenu[2][] = _('-tooltip:stats');
 
 site_project_header(array(
-	'title' => _('Project Statistics');
+	'title' => _('Project Statistics'),
 	'group' => $group_id,
 	'toptab' => 'activity',
 	'submenu' => $activity_submenu,

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/survey/include/SurveyHTML.class.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/survey/include/SurveyHTML.class.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/survey/include/SurveyHTML.class.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -25,7 +25,6 @@
  */
 
 require_once $gfcommon.'include/pre.php';
-require_once $gfwww.'include/note.php';
 
 /**
  * Survey HTML related functions

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/themes/css/fusionforge.css
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/themes/css/fusionforge.css	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/themes/css/fusionforge.css	2011-12-23 17:24:04 UTC (rev 17935)
@@ -1,4 +1,4 @@
-/* 
+/*
  * Common stylesheet for *all* FusionForge themes
  *
  * Copyright 2009 Matthieu Faure // Open-s.com
@@ -20,19 +20,19 @@
  * You should have received a copy of the GNU General Public License along
  * with FusionForge; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- * 
+ *
  * Note to Forge developpers:
  * 		- put as less code here as possible
- * 
+ *
  * Note to Themes developpers:
  * 		- don't add CSS to this file;
  * 		- use your own's theme CSS file(s) instead
- * 
+ *
  * Final note: this CSS file should be ideally called:
  * 		- after YUI's reset,fonts and base
  * 		- before the theme's own CSS file
  * 		- Warning: font-size must be expressed in % according to YUI's font table http://developer.yahoo.com/yui/fonts/#chart
- * 
+ *
 */
 
 /* From old gforge-compat */
@@ -276,8 +276,8 @@
 }
 
 .active {
-	background-color: #99ff99; 
-	text-decoration: none; 
+	background-color: #99ff99;
+	text-decoration: none;
 	font-weight: normal;
 }
 
@@ -336,12 +336,12 @@
 	margin-top: 1em;
 	empty-cells: show;
 	width: 50%;
-	margin-left: 25%; 
+	margin-left: 25%;
 	margin-right: 25%;
 }
 table.progress_legend {
 	width: 50%;
-	margin-left: 25%; 
+	margin-left: 25%;
 	margin-right: 25%;
 }
 table.progress a, table.progress :link, table.progress :visited,
@@ -822,8 +822,31 @@
 	margin-bottom: 1px;
 }
 
+.showmess_fmt {
+	font-size:small;
+}
+
+/* jquery-tipsy stylesheet (modified) */
+
+.tipsy { padding: 5px; font-size: 10px; position: absolute; z-index: 100000; }
+  .tipsy-inner { padding: 5px 8px 4px 8px; background-color: black; color: white; max-width: 200px; text-align: center; }
+  .tipsy-inner { border-radius: 3px; -moz-border-radius:3px; -webkit-border-radius:3px; }
+  .tipsy-arrow { position: absolute; background: url(../../images/tipsy.gif) no-repeat top left; width: 9px; height: 5px; }
+  .tipsy-n .tipsy-arrow { top: 0; left: 50%; margin-left: -4px; }
+    .tipsy-nw .tipsy-arrow { top: 0; left: 10px; }
+    .tipsy-ne .tipsy-arrow { top: 0; right: 10px; }
+  .tipsy-s .tipsy-arrow { bottom: 0; left: 50%; margin-left: -4px; background-position: bottom left; }
+    .tipsy-sw .tipsy-arrow { bottom: 0; left: 10px; background-position: bottom left; }
+    .tipsy-se .tipsy-arrow { bottom: 0; right: 10px; background-position: bottom left; }
+  .tipsy-e .tipsy-arrow { top: 50%; margin-top: -4px; right: 0; width: 5px; height: 9px; background-position: top right; }
+  .tipsy-w .tipsy-arrow { top: 50%; margin-top: -4px; left: 0; width: 5px; height: 9px; }
+
 /* styles for newly themed Tasks area */
 
+.item_details {
+	margin:3px 3px 0px 3px;
+}
+
 #taskContainer #taskHeader {
 	font-size:2em;
 }
@@ -931,9 +954,6 @@
 	text-indent:-1.5em;
 }
 
-.dependentContainer {
-}
-
 .smallTaskContainer {
 	padding:1em;
 	background-color:#F4F4F4;

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/themes/evolvis/Theme.class.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/themes/evolvis/Theme.class.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/themes/evolvis/Theme.class.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -194,7 +194,8 @@
 		echo "<div id=\"ev_content\">\n\n";
 		/* argh! */
 		if (util_ifsetor($params['h1'])) {
-			echo "<h1>" . $params['h1'] . "</h1>\n\n";
+			echo "<h1>" . util_html_secure($params['h1']) .
+			    "</h1>\n\n";
 		}
 	}
 

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/browse.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/browse.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/browse.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -28,6 +28,16 @@
 require_once $gfcommon.'advanced_search/ASFusionForgeParser.class.php';
 require_once $gfcommon.'advanced_search/AdvancedSearch.class.php';
 
+html_use_tooltips(array(
+	/* stock defaults */
+	'html' => true,
+	'delayIn' => 1000,
+	'delayOut' => 500,
+	'fade' => true,
+	/* we want them on the top, all of them */
+	'gravity' => 's',
+    ));
+
 //
 //  make sure this person has permission to view artifacts
 //
@@ -159,7 +169,7 @@
 $oldArt    = $art_arr;
 
 if (getIntFromRequest('load_request')) {
-
+	if (getStringFromRequest('load_query') === _('Load')) {
 		$sql = "SELECT query, name FROM AdvancedQuery WHERE id = $1;";
 		$result = db_query_params($sql, array(getIntFromRequest('saved_advanced_querys')));
 
@@ -167,6 +177,13 @@
 
 		$curSearch = $curSearchArr['query'];
 		$queryName = $curSearchArr['name'];
+	} else if (getStringFromRequest('load_query') === _('Delete')) {
+		if (AdvancedSearch::deleteUserQuery(user_getid(),
+		    getIntFromRequest('saved_advanced_querys'),
+		    getIntFromRequest('atid'))) {
+			$feedback .= _('Deleted query successful.');
+		}
+	}
 }
 
 if (getStringFromRequest('search') == 'true') {
@@ -314,8 +331,8 @@
 $order_arr[]='summary';
 $order_arr[]='open_date';
 $order_arr[]='close_date';
-$order_arr[]='submitted_by';
-$order_arr[]='assigned_to';
+$order_arr[]='submitted_unixname';
+$order_arr[]='assigned_unixname';
 
 //
 //	custom sort arrays to build pop-up box
@@ -411,7 +428,7 @@
 ?>
 
 <form id="load_query_form" name="load_query_form" method="post" action="<?php echo getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&atid='.$ath->getID().'&search=true'; ?>">
-<?php echo _('Load Query'); ?>:
+<?php echo _('Select Query'); ?>:
 <select name="saved_advanced_querys">
 	<option value="100"><?php echo _('Select One'); ?></option>
 <?php
@@ -452,6 +469,7 @@
 <input type="hidden" name="load_request" id="load_request" value="1" />
 <input type="hidden" name="set" value="advanced" />
 <input type="submit" name="load_query" id="load_query" value="<?php echo _('Load'); ?>" />
+<input type="submit" name="load_query" id="delete_query" value="<?php echo _('Delete'); ?>" />
 </form>
 <?php
 

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/deleteartifact.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/deleteartifact.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/deleteartifact.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -8,6 +8,8 @@
  *
  */
 
+html_use_tooltips();
+
 $ath->header(array ('title'=>_('Delete artifact').': [#'. $ah->getID(). '] ' . $ah->getSummary(), 'atid'=>$ath->getID()));
 
 // $atid, $aid and $group_id are set in tracker.php

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/include/ArtifactHtml.class.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/include/ArtifactHtml.class.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/include/ArtifactHtml.class.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -10,7 +10,6 @@
  *
  */
 
-
 require_once $gfcommon.'tracker/Artifact.class.php';
 require_once $gfcommon.'include/EvolvisTable.class.php';
 
@@ -29,45 +28,6 @@
 		return $this->Artifact($ArtifactType,$artifact_id);
 	}
 
-	/**
-	 * show details preformatted (like followups)
-	 */
-	function showDetails($editable = false) {
-		global $group_id;
-
-		$result = $this->getDetails();
-		if (isset($group_id)) {
-			$sgid = $group_id;
-			$sgidx = true;
-		} else {
-			$sgidx = false;
-		}
-		$group_id = $this->ArtifactType->Group->getID();
-		$result = util_uri_grabber($result, true);
-		if ($sgidx) {
-			$group_id = $sgid;
-		} else {
-			unset($group_id);
-		}
-		$result = "<pre style=\"font-size:small;\">\n" . $result . "</pre>\n";
-
-		$title_arr = array();
-		if ($editable === true) {
-			$title_arr[] = '<div style="width:100%;">' .
-				'<div style="float:left">' . _('Detailed description') . '</div>' .
-				'<div style="float:right">' . html_image('ic/forum_edit.gif','37','15',array('title'=>"Click to edit", 'alt'=>"Click to edit", 'onclick'=>"switch2edit(this, 'show', 'edit')")) . '</div>' .
-				'</div>';
-		}
-		else {
-			$title_arr[] = _('Detailed description');
-		}
-		echo $GLOBALS['HTML']->listTableTop ($title_arr);
-
-		echo '<tr ' . $GLOBALS['HTML']->boxGetAltRowStyle(0) .'><td>'. $result. '</td></tr>';
-
-		echo $GLOBALS['HTML']->listTableBottom();
-	}
-
 	function showHistory() {
 		global $artifact_cat_arr,$artifact_grp_arr,$artifact_res_arr;
 		$result = $this->getHistory();
@@ -171,5 +131,3 @@
 // mode: php
 // c-file-style: "bsd"
 // End:
-
-?>

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/include/ArtifactTypeHtml.class.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/include/ArtifactTypeHtml.class.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/include/ArtifactTypeHtml.class.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -95,151 +95,7 @@
 		$template = $intable ?
 		    $this->getRenderHTML($types, $mode) :
 		    $this->generateEfRendering($efarr, $mode);
-
-		if ($mode=='QUERY') {
-			$keys=array_keys($efarr);
-			for ($k=0; $k<count($keys); $k++) {
-				$i=$keys[$k];
-				if ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_SELECT ||
-					$efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_CHECKBOX ||
-					$efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_RADIO ||
-					$efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_STATUS ||
-					$efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_MULTISELECT) {
-					$efarr[$i]['field_type'] = ARTIFACT_EXTRAFIELDTYPE_MULTISELECT;
-				} else {
-					$efarr[$i]['field_type'] = ARTIFACT_EXTRAFIELDTYPE_TEXT;
-				}
-			}
-		}
-		
-		// 'DISPLAY' mode is for renderding in 'read-only' mode (for detail view).
-		if ($mode === 'DISPLAY') {
-			$keys=array_keys($efarr);
-			for ($k=0; $k<count($keys); $k++) {
-				$i=$keys[$k];
-
-				if (!isset($selected[$efarr[$i]['extra_field_id']]))
-					$selected[$efarr[$i]['extra_field_id']] = '';
-
-				$value = @$selected[$efarr[$i]['extra_field_id']];
-
-				if ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_SELECT ||
-					$efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_CHECKBOX ||
-					$efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_RADIO ||
-					$efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_STATUS ||
-					$efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_MULTISELECT) {
-					if ($value == 100) {
-						$value = 'None';
-					} else {
-						$arr = $this->getExtraFieldElements($efarr[$i]['extra_field_id']);
-						
-						// Convert the values (ids) to names in the ids order.
-						$new = array();
-						for ($j=0; $j<count($arr); $j++) {
-							if (is_array($value)) {
-								if (in_array($arr[$j]['element_id'],$value))
-									$new[]= $arr[$j]['element_name'];
-							} elseif ($arr[$j]['element_id'] === $value) {
-									$new[] = $arr[$j]['element_name'];
-							}
-						}
-						$value = join('<br />', $new);
-					}
-				} else if ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_TEXT ||
-					$efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_TEXTAREA) {
-					$value = preg_replace('/((http|https|ftp):\/\/\S+)/', 
-								"<a href=\"\\1\" target=\"_blank\">\\1</a>", $value);
-				} else if ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_RELATION) {
-					// Convert artifact id to links.
-					$r = "";
-					foreach (preg_split("/\D+/", $value) as $v) {
-						$v = (int)$v;
-						if (!$v) {
-							continue;
-						}
-						$r .= html_e('a', array(
-							'href' => util_make_url('/tracker/t_follow.php/' . $v),
-						    ), sprintf('[#%d]', $v)) . "\n";
-					}
-					$value = $r;
-				}
-				$template = str_replace('{$PostName:'.$efarr[$i]['field_name'].'}',"",$template);
-				$template = str_replace('{$'.$efarr[$i]['field_name'].'}',$value,$template);		
-			}
-			echo $template;
-			return ;
-		}
-		
-		$keys=array_keys($efarr);
-		for ($k=0; $k<count($keys); $k++) {
-			$i=$keys[$k];
-			$post_name = '';
-
-			if (!isset($selected[$efarr[$i]['extra_field_id']])) 
-				$selected[$efarr[$i]['extra_field_id']] = '';
-
-			if ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_SELECT) {
-				$str = $this->renderSelect($efarr[$i]['extra_field_id'],$selected[$efarr[$i]['extra_field_id']],$show_100,$text_100,$show_any,$text_any);
-
-			} elseif ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_CHECKBOX) {
-
-				$str = $this->renderCheckbox($efarr[$i]['extra_field_id'],$selected[$efarr[$i]['extra_field_id']],$show_100,$text_100);
-
-			} elseif ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_RADIO) {
-
-				$str = $this->renderRadio($efarr[$i]['extra_field_id'],$selected[$efarr[$i]['extra_field_id']],$show_100,$text_100,$show_any,$text_any);
-
-			} elseif ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_TEXT ||
-					$efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_INTEGER) {
-
-				$str = $this->renderTextField($efarr[$i]['extra_field_id'],$selected[$efarr[$i]['extra_field_id']],$efarr[$i]['attribute1'],$efarr[$i]['attribute2']);
-				if ($mode == 'QUERY') {
-					$post_name =  ' <i>'._('(%% for wildcards)').'</i>   ';
-				}
-				
-			} elseif ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_TEXTAREA) {
-
-				$str = $this->renderTextArea($efarr[$i]['extra_field_id'],$selected[$efarr[$i]['extra_field_id']],$efarr[$i]['attribute1'],$efarr[$i]['attribute2']);
-				if ($mode == 'QUERY') {
-					$post_name =  ' <i>'._('(%% for wildcards)').'</i>   ';
-				}
-				
-			} elseif ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_MULTISELECT) {
-
-				$str = $this->renderMultiSelectBox ($efarr[$i]['extra_field_id'],$selected[$efarr[$i]['extra_field_id']],$show_100,$text_100);
-
-			} elseif ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_STATUS) {
-
-				// Get the allowed values from the workflow.
-				$atw = new ArtifactWorkflow($this, $efarr[$i]['extra_field_id']);
-
-				// Special treatement for the initial step (Submit).
-				// In this case, the initial value is the first value.
-				if ($selected === true) {
-					$selected_node = 100;
-				} elseif (isset($selected[$efarr[$i]['extra_field_id']]) && $selected[$efarr[$i]['extra_field_id']]) {
-					$selected_node = $selected[$efarr[$i]['extra_field_id']];
-				} else {
-					$selected_node = 100;
-				}
-
-				$allowed = $atw->getNextNodes($selected_node);
-				$allowed[] = $selected_node;
-				$str = $this->renderSelect($efarr[$i]['extra_field_id'],$selected_node,$status_show_100,$text_100,$show_any,$text_any, $allowed);
-
-			} elseif ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_RELATION) {
-
-				$str = $this->renderRelationField($efarr[$i]['extra_field_id'],$selected[$efarr[$i]['extra_field_id']],$efarr[$i]['attribute1'],$efarr[$i]['attribute2']);
-				if ($mode == 'UPDATE') {
-					$post_name = html_image('ic/forum_edit.gif','37','15',array('title'=>"Click to edit", 'alt'=>"Click to edit", 'onclick'=>"switch2edit(this, 'show$i', 'edit$i')"));
-				}
-			}
-			$template = str_replace('{$PostName:'.$efarr[$i]['field_name'].'}',$post_name,$template);
-			$template = str_replace('{$'.$efarr[$i]['field_name'].'}',$str,$template);
-		}
-		if($template != NULL){
-			echo $template;
-		}
+		$this->_substExtraFields($mode, $efarr, $selected, $show_100, $text_100, $show_any, $text_any, $status_show_100, $template);
 	}
 
 	function renderExtraField($selected,$show_100,$text_100,$show_any,$text_any,$types,$status_show_100,$mode,$whichone) {
@@ -267,135 +123,7 @@
 
 		$efarr = array($found => $ofarr[$found]);
 		$template = $this->generateEfRender($ofarr[$found], $mode);
-
-		// 'DISPLAY' mode is for renderding in 'read-only' mode (for detail view).
-		if ($mode === 'DISPLAY') {
-			$keys=array_keys($efarr);
-			for ($k=0; $k<count($keys); $k++) {
-				$i=$keys[$k];
-
-				if (!isset($selected[$efarr[$i]['extra_field_id']]))
-					$selected[$efarr[$i]['extra_field_id']] = '';
-
-				$value = @$selected[$efarr[$i]['extra_field_id']];
-
-				if ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_SELECT ||
-					$efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_CHECKBOX ||
-					$efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_RADIO ||
-					$efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_STATUS ||
-					$efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_MULTISELECT) {
-					if ($value == 100) {
-						$value = 'None';
-					} else {
-						$arr = $this->getExtraFieldElements($efarr[$i]['extra_field_id']);
-						
-						// Convert the values (ids) to names in the ids order.
-						$new = array();
-						for ($j=0; $j<count($arr); $j++) {
-							if (is_array($value)) {
-								if (in_array($arr[$j]['element_id'],$value))
-									$new[]= $arr[$j]['element_name'];
-							} elseif ($arr[$j]['element_id'] === $value) {
-									$new[] = $arr[$j]['element_name'];
-							}
-						}
-						$value = join('<br />', $new);
-					}
-				} else if ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_TEXT ||
-					$efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_TEXTAREA) {
-					$value = preg_replace('/((http|https|ftp):\/\/\S+)/', 
-								"<a href=\"\\1\" target=\"_blank\">\\1</a>", $value);
-				} else if ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_RELATION) {
-					// Convert artifact id to links.
-					$r = "";
-					foreach (preg_split("/\D+/", $value) as $v) {
-						$v = (int)$v;
-						if (!$v) {
-							continue;
-						}
-						$r .= html_e('a', array(
-							'href' => util_make_url('/tracker/t_follow.php/' . $v),
-						    ), sprintf('[#%d]', $v)) . "\n";
-					}
-					$value = $r;
-				}
-				$template = str_replace('{$PostName:'.$efarr[$i]['field_name'].'}',"",$template);
-				$template = str_replace('{$'.$efarr[$i]['field_name'].'}',$value,$template);		
-			}
-			echo $template;
-			return ;
-		}
-		
-		$keys=array_keys($efarr);
-		for ($k=0; $k<count($keys); $k++) {
-			$i=$keys[$k];
-			$post_name = '';
-
-			if (!isset($selected[$efarr[$i]['extra_field_id']])) 
-				$selected[$efarr[$i]['extra_field_id']] = '';
-
-			if ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_SELECT) {
-				$str = $this->renderSelect($efarr[$i]['extra_field_id'],$selected[$efarr[$i]['extra_field_id']],$show_100,$text_100,$show_any,$text_any);
-
-			} elseif ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_CHECKBOX) {
-
-				$str = $this->renderCheckbox($efarr[$i]['extra_field_id'],$selected[$efarr[$i]['extra_field_id']],$show_100,$text_100);
-
-			} elseif ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_RADIO) {
-
-				$str = $this->renderRadio($efarr[$i]['extra_field_id'],$selected[$efarr[$i]['extra_field_id']],$show_100,$text_100,$show_any,$text_any);
-
-			} elseif ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_TEXT ||
-					$efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_INTEGER) {
-
-				$str = $this->renderTextField($efarr[$i]['extra_field_id'],$selected[$efarr[$i]['extra_field_id']],$efarr[$i]['attribute1'],$efarr[$i]['attribute2']);
-				if ($mode == 'QUERY') {
-					$post_name =  ' <i>'._('(%% for wildcards)').'</i>   ';
-				}
-				
-			} elseif ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_TEXTAREA) {
-
-				$str = $this->renderTextArea($efarr[$i]['extra_field_id'],$selected[$efarr[$i]['extra_field_id']],$efarr[$i]['attribute1'],$efarr[$i]['attribute2']);
-				if ($mode == 'QUERY') {
-					$post_name =  ' <i>'._('(%% for wildcards)').'</i>   ';
-				}
-				
-			} elseif ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_MULTISELECT) {
-
-				$str = $this->renderMultiSelectBox ($efarr[$i]['extra_field_id'],$selected[$efarr[$i]['extra_field_id']],$show_100,$text_100);
-
-			} elseif ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_STATUS) {
-
-				// Get the allowed values from the workflow.
-				$atw = new ArtifactWorkflow($this, $efarr[$i]['extra_field_id']);
-
-				// Special treatement for the initial step (Submit).
-				// In this case, the initial value is the first value.
-				if ($selected === true) {
-					$selected_node = 100;
-				} elseif (isset($selected[$efarr[$i]['extra_field_id']]) && $selected[$efarr[$i]['extra_field_id']]) {
-					$selected_node = $selected[$efarr[$i]['extra_field_id']];
-				} else {
-					$selected_node = 100;
-				}
-
-				$allowed = $atw->getNextNodes($selected_node);
-				$allowed[] = $selected_node;
-				$str = $this->renderSelect($efarr[$i]['extra_field_id'],$selected_node,$status_show_100,$text_100,$show_any,$text_any, $allowed);
-
-			} elseif ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_RELATION) {
-
-				$str = $this->renderRelationField($efarr[$i]['extra_field_id'],$selected[$efarr[$i]['extra_field_id']],$efarr[$i]['attribute1'],$efarr[$i]['attribute2']);
-				if ($mode == 'UPDATE') {
-					$post_name = html_image('ic/forum_edit.gif','37','15',array('title'=>"Click to edit", 'alt'=>"Click to edit", 'onclick'=>"switch2edit(this, 'show$i', 'edit$i')"));
-				}
-			}
-			$template = str_replace('{$PostName:'.$efarr[$i]['field_name'].'}',$post_name,$template);
-			$template = str_replace('{$'.$efarr[$i]['field_name'].'}',$str,$template);
-		}
-		if($template != NULL){
-			echo $template;
-		}
+		$this->_substExtraFields($mode, $efarr, $selected, $show_100, $text_100, $show_any, $text_any, $status_show_100, $template);
 	}
 
 	function renderRelatedTasks($group, $ah) {
@@ -468,6 +196,7 @@
 		echo '<h3>' . _('Attachments') . ":</h3>\n";
 
 		$t = new EvolvisTable(array(
+			'',
 			_('Name'),
 			_('Date'),
 			_('By'),
@@ -484,14 +213,22 @@
 			}
 
 			$r =& $t->tr();
+			$r->td()->setraw(html_e('input', array(
+				'type' => 'checkbox',
+				'name' => 'delete_file[]',
+				'value' => $file->getID(),
+			    )));
 			$r->td()->setraw(html_e('a', $fla,
 			    htmlspecialchars($fln)));
 			$r->td()->set(date(_('Y-m-d H:i'), $file->getDate()));
-			$r->td(array(), -1, $file->getSubmittedUnixName());
+			$r->td(array(
+				'title' => $file->getSubmittedRealName(),
+			    ), -1, $file->getSubmittedUnixName());
 			$r->td()->set(human_readable_bytes($file->getSize()));
-//				<td><input type="checkbox" name="delete_file[]" value="'. $file->getID() .'">'._("Delete").' </td>
 		}
 		echo $t->emit();
+		echo html_e('p', array(),
+		    _('Tick an attachment and submit to delete it.'));
 	}
 
 	/**
@@ -501,7 +238,7 @@
 	 */
 	function getRenderHTML($types=array(), $mode='') {
 		// Use template only for the browse (not for query or mass update)
-		if (($mode === 'DISPLAY' || $mode === 'DETAIL' || $mode === 'UPDATE') 
+		if (($mode === 'DISPLAY' || $mode === 'DETAIL' || $mode === 'UPDATE')
 			&& $this->data_array['custom_renderer']) {
 			return preg_replace('/<!--(\S+.*?)-->/','{$\\1}',$this->data_array['custom_renderer']);
 		} else {
@@ -526,7 +263,7 @@
 		$keys=array_keys($efarr);
 		$count=count($keys);
 		if ($count == 0) return '';
-		
+
 		for ($k=0; $k<$count; $k++) {
 			$i=$keys[$k];
 
@@ -534,7 +271,7 @@
 			$is_required = ($mode == 'QUERY' || $mode == 'DISPLAY') ?	0 : $efarr[$i]['is_required'];
 			$name = $efarr[$i]['field_name'].($is_required ? utils_requiredField() : '').': ';
 			$name = '<strong>'.$name.'</strong>';
-			
+
 			if ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_SELECT) {
 
 				$return .= '
@@ -557,7 +294,7 @@
 				if (($col_count == 1) && ($efarr[$i]['attribute1'] > 30)) {
 					$colspan=2;
 					$return .= '
-					<td> </td>
+					<td> </td>
 			</tr>
 			<tr>';
 				} else {
@@ -572,7 +309,7 @@
 				if (($col_count == 1) && ($efarr[$i]['attribute2'] > 30)) {
 					$colspan=2;
 					$return .= '
-					<td> </td>
+					<td> </td>
 			</tr>
 			<tr>';
 				} else {
@@ -597,7 +334,7 @@
 				if (($col_count == 1) && ($efarr[$i]['attribute1'] > 30)) {
 					$colspan=2;
 					$return .= '
-					<td> </td>
+					<td> </td>
 			</tr>
 			<tr>';
 				} else {
@@ -618,7 +355,7 @@
 		}
 		if ($col_count == 1) {
 			$return .= '
-					<td> </td>';
+					<td> </td>';
 		}
 		$return .= '
 			</tr>
@@ -644,6 +381,16 @@
 		return ($rv);
 	}
 
+	function geteftipid($v) {
+		return ('tracker-' . str_replace(' ', '_',
+		    $this->geteftipname($v)));
+	}
+
+	function geteftipname($v) {
+		return ($v['field_type'] == ARTIFACT_EXTRAFIELDTYPE_STATUS ?
+		    'status_id' : ('ef-' . $v['field_name']));
+	}
+
 	function generateEfRender($v, $mode) {
 		$name = $v['field_name'];
 		/*
@@ -656,6 +403,7 @@
 		}
 
 		return "\n\t<div><strong>" . $name . ":</strong>" .
+		    html_get_tooltip_extralink($this->geteftipname($v)) .
 		    "\n\t\t" . '{$PostName:' . $v['field_name'] . '}' .
 		    "<br />\n\t\t" . '{$' . $v['field_name'] . '}' .
 		    "\n\t</div>";
@@ -664,16 +412,20 @@
 	/**
 	 *	renderSelect - this function builds pop up
 	 *	box with choices.
-	 *	
+	 *
 	 *	@param		int 	The ID of this field.
 	 *	@param 		string	The item that should be checked
 	 *	@param		string	Whether to show the '100 row'
 	 *	@param		string	What to call the '100 row'
-	 *	@return		box and choices	
-	 */	
-	function renderSelect ($extra_field_id,$checked='xzxz',$show_100=false,$text_100='none',$show_any=false,$text_any='Any', $allowed=false) {
-		if ($text_100 == 'none'){
-			$text_100=_('None');
+	 *	@param		?
+	 *	@param		?
+	 *	@param		?
+	 *	@param		array	extra field, for tooltip
+	 *	@return		box and choices
+	 */
+	function renderSelect($extra_field_id,$checked='xzxz',$show_100=false,$text_100='none',$show_any=false,$text_any='Any',$allowed=false,$efv=false) {
+		if ($text_100 == 'none') {
+			$text_100 = _('None');
 		}
 		$arr = $this->getExtraFieldElements($extra_field_id);
 		$keys = array();
@@ -682,19 +434,29 @@
 			$keys[$i]=$arr[$i]['element_id'];
 			$vals[$i]=$arr[$i]['element_name'];
 		}
-		return html_build_select_box_from_arrays ($keys,$vals,'extra_fields['.$extra_field_id.']',$checked,$show_100,$text_100,$show_any,$text_any, $allowed);
+		if ($efv !== false) {
+			$oid = $this->geteftipid($efv);
+			$otitle = html_get_tooltip_description($this->geteftipname($efv));
+		} else {
+			$oid = false;	
+			$otitle = false;
+		}
+		return html_build_select_box_from_arrays($keys,$vals,'extra_fields['.$extra_field_id.']',htmlspecialchars($checked),$show_100,$text_100,$show_any,$text_any,$allowed,$oid,$otitle);
 	}
 
 	/**
 	 *	renderRadio - this function builds radio buttons.
-	 *	
+	 *
 	 *	@param		int 	The ID of this field.
 	 *	@param 		string	The item that should be checked
 	 *	@param		string	Whether to show the '100 row'
 	 *	@param		string	What to call the '100 row'
+	 *	@param		?
+	 *	@param		?
+	 *	@param		array	extra field, for tooltip
 	 *	@return		radio buttons
-	 */	
-	function renderRadio ($extra_field_id,$checked='xzxz',$show_100=false,$text_100='none',$show_any=false,$text_any='Any') {
+	 */
+	function renderRadio($extra_field_id,$checked='xzxz',$show_100=false,$text_100='none',$show_any=false,$text_any='Any',$efv=false) {
 		$arr = $this->getExtraFieldElements($extra_field_id);
 		$keys = array();
 		$vals = array();
@@ -702,57 +464,75 @@
 			$keys[$i]=$arr[$i]['element_id'];
 			$vals[$i]=$arr[$i]['element_name'];
 		}
-		return html_build_radio_buttons_from_arrays ($keys,$vals,'extra_fields['.$extra_field_id.']',$checked,$show_100,$text_100,$show_any,$text_any);
+		$r = html_build_radio_buttons_from_arrays($keys,$vals,'extra_fields['.$extra_field_id.']',htmlspecialchars($checked),$show_100,$text_100,$show_any,$text_any);
+		if ($efv !== false) {
+			$r = html_e('span', array(
+				'id' => $this->geteftipid($efv),
+				'title' => util_unconvert_htmlspecialchars(html_get_tooltip_description($this->geteftipname($efv))),
+			    ), $r);
+		}
+		return $r;
 	}
 
 	/**
 	 *	renderCheckbox - this function builds checkboxes.
-	 *	
+	 *
 	 *	@param		int 	The ID of this field.
 	 *	@param 		array	The items that should be checked
 	 *	@param		string	Whether to show the '100 row'
 	 *	@param		string	What to call the '100 row'
+	 *	@param		array	extra field, for tooltip
 	 *	@return		radio buttons
-	 */	
-	function renderCheckbox ($extra_field_id,$checked=array(),$show_100=false,$text_100='none') {
+	 */
+	function renderCheckbox($extra_field_id,$checked=array(),$show_100=false,$text_100='none',$efv=false) {
 		if ($text_100 == 'none'){
-			$text_100=_('None');
+			$text_100 = _('None');
 		}
 		if (!$checked || !is_array($checked)) {
-			$checked=array();
+			$checked = array();
 		}
 		$arr = $this->getExtraFieldElements($extra_field_id);
 		$return = '';
+		if ($efv !== false) {
+			$return .= html_eo('span', array(
+				'id' => $this->geteftipid($efv),
+				'title' => util_unconvert_htmlspecialchars(html_get_tooltip_description($this->geteftipname($efv))),
+			    ));
+		}
 		if ($show_100) {
 			$return .= '
 				<input type="checkbox" name="extra_fields['.$extra_field_id.'][]" value="100" '.
-			((in_array(100,$checked)) ? 'checked="checked"' : '').'/> '.$text_100.'<br />';
+			((in_array(100,$checked)) ? 'checked="checked"' : '').'/> '.$text_100.'<br />';
 		}
 		for ($i=0; $i<count($arr); $i++) {
 			$return .= '
 				<input type="checkbox" name="extra_fields['.$extra_field_id.'][]" value="'.$arr[$i]['element_id'].'" '.
-			((in_array($arr[$i]['element_id'],$checked)) ? 'checked="checked"' : '').'/> '.$arr[$i]['element_name'].'<br />';
+			((in_array($arr[$i]['element_id'],$checked)) ? 'checked="checked"' : '').'/> '.$arr[$i]['element_name'].'<br />';
 		}
+		if ($efv !== false) {
+			$return .= "</span>\n";
+		}
 		return $return;
 	}
 
 	/**
 	 *	renderMultiSelectBox - this function builds checkboxes.
-	 *	
+	 *
 	 *	@param		int 	The ID of this field.
 	 *	@param 		array	The items that should be checked
 	 *	@param		string	Whether to show the '100 row'
 	 *	@param		string	What to call the '100 row'
+	 *	@param		array	extra field, for tooltip
 	 *	@return		radio multiselectbox
-	 */	
-	function renderMultiSelectBox ($extra_field_id,$checked=array(),$show_100=false,$text_100='none') {
+	 */
+	function renderMultiSelectBox($extra_field_id,$checked=array(),$show_100=false,$text_100='none',$efv=false) {
 		$arr =$this->getExtraFieldElements($extra_field_id);
 		if (!$checked) {
 			$checked=array();
 		}
 		if (!is_array($checked)) {
 			$checked = explode(',',$checked);
-		}	
+		}
 		$keys=array();
 		$vals=array();
 		$arr = $this->getExtraFieldElements($extra_field_id);
@@ -761,29 +541,53 @@
 			$vals[]=$arr[$i]['element_name'];
 		}
 		$size = min( count($arr)+1, 15);
-			return html_build_multiple_select_box_from_arrays($keys,$vals,"extra_fields[$extra_field_id][]",$checked,$size,$show_100,$text_100);
+		$r = html_build_multiple_select_box_from_arrays($keys,$vals,"extra_fields[$extra_field_id][]",$checked,$size,$show_100,$text_100);
+		if ($efv !== false) {
+			$t = '<select id="' . $this->geteftipid($efv) .
+			    '" title="' .
+			    html_get_tooltip_description($this->geteftipname($efv)) .
+			    '"';
+			$r = str_replace('<select', $t, $r);
+		}
+		return $r;
 	}
 
 	/**
 	 *	renderTextField - this function builds a text field.
-	 *	
+	 *
 	 *	@param		int 	The ID of this field.
 	 *	@param 		string	The data for this field.
+	 *	@param		?
+	 *	@param		?
+	 *	@param		array	extra field, for tooltip
 	 *	@return		text area and data.
-	 */	
-	function renderTextField ($extra_field_id,$contents,$size,$maxlength) {
-		return '
-			<input type="text" name="extra_fields['.$extra_field_id.']" value="'.$contents.'" size="'.$size.'" maxlength="'.$maxlength.'"/>';
+	 */
+	function renderTextField($extra_field_id,$contents,$size,$maxlength,$efv=false) {
+		$p = array(
+			'type' => 'text',
+			'name' => 'extra_fields[' . $extra_field_id . ']',
+			'value' => $contents,
+			'size' => $size,
+			'maxlength' => $maxlength,
+		    );
+		if ($efv !== false) {
+			$p['id'] = $this->geteftipid($efv);
+			$p['title'] = util_unconvert_htmlspecialchars(html_get_tooltip_description($this->geteftipname($efv)));
+		}
+		return html_e('input', $p);
 	}
 
 	/**
 	 *	renderRelationField - this function builds a relation field.
-	 *	
+	 *
 	 *	@param		int 	The ID of this field.
 	 *	@param 		string	The data for this field.
+	 *	@param		?
+	 *	@param		?
+	 *	@param		array	extra field, for tooltip
 	 *	@return		text area and data.
-	 */	
-	function renderRelationField ($extra_field_id,$contents,$size,$maxlength) {
+	 */
+	function renderRelationField($extra_field_id,$contents,$size,$maxlength,$efv=false) {
 		$arr = $this->getExtraFieldElements($extra_field_id);
 		for ($i=0; $i<count($arr); $i++) {
 			$keys[$i]=$arr[$i]['element_id'];
@@ -817,7 +621,7 @@
 				'href' => util_make_url('/tracker/t_follow.php/' . $v),
 			    ), util_html_secure($row['summary'])) . html_e('br');
 		}
-		$edit_contents = $this->renderTextField ($extra_field_id,$contents,$size,$maxlength);
+		$edit_contents = $this->renderTextField($extra_field_id,$contents,$size,$maxlength,$efv);
 		$edit_tips = '<br/><span class="tips">'._('Tip: Enter a space-separated list of artifact ids ([#NNN] also accepted)').'</span>';
 		return '
 			<div id="edit'.$extra_field_id.'" style="display: none;">'.$edit_contents.$edit_tips.'</div>
@@ -826,14 +630,25 @@
 
 	/**
 	 *	renderTextArea - this function builds a text area.
-	 *	
+	 *
 	 *	@param		int 	The ID of this field.
 	 *	@param 		string	The data for this field.
+	 *	@param		?
+	 *	@param		?
+	 *	@param		array	extra field, for tooltip
 	 *	@return		text area and data.
-	 */	
-	function renderTextArea ($extra_field_id,$contents,$rows,$cols) {
-		return '
-			<textarea name="extra_fields['.$extra_field_id.']" rows="'.$rows.'" cols="'.$cols.'">'.$contents.'</textarea>';
+	 */
+	function renderTextArea($extra_field_id,$contents,$rows,$cols,$efv=false) {
+		$p = array(
+			'name' => 'extra_fields[' . $extra_field_id . ']',
+			'rows' => $rows,
+			'cols' => $cols,
+		    );
+		if ($efv !== false) {
+			$p['id'] = $this->geteftipid($efv);
+			$p['title'] = util_unconvert_htmlspecialchars(html_get_tooltip_description($this->geteftipname($efv)));
+		}
+		return html_e('textarea', $p, util_html_encode($contents), false);
 	}
 
 	function technicianBox ($name='assigned_to[]',$checked='xzxz',$show_100=true,$text_100='none',$extra_id='-1',$extra_name='',$multiple=false) {
@@ -856,7 +671,7 @@
 			$ids[]=$extra_id;
 			$names[]=$extra_name;
 		}
-			
+
 		if ($multiple) {
 			if (!is_array($checked)) {
 				$checked = explode(',',$checked);
@@ -873,7 +688,7 @@
 			$text_100=_('Nobody');
 		}
 		$result = $this->getArtifactCreators();
-		//	this was a bad hack to allow you to mass-update to unassigned, which is ID=100, which 
+		//	this was a bad hack to allow you to mass-update to unassigned, which is ID=100, which
 		//	conflicted with the "No Change" ID of 100.
 		$ids =& util_result_column_to_array($result,0);
 		$names =& util_result_column_to_array($result,1);
@@ -881,7 +696,7 @@
 			$ids[]=$extra_id;
 			$names[]=$extra_name;
 		}
-			
+
 		if ($multiple) {
 			if (!is_array($checked)) {
 				$checked = explode(',',$checked);
@@ -891,7 +706,7 @@
 			return html_build_select_box_from_arrays ($ids,$names,$name,$checked,$show_100,$text_100);
 		}
 	}
-        
+
 	function cannedResponseBox ($name='canned_response',$checked='xzxz') {
 		return html_build_select_box ($this->getCannedResponses(),$name,$checked);
 	}
@@ -899,7 +714,7 @@
 	/**
 	 *	statusBox - show the statuses - automatically shows the "custom statuses" if they exist
 	 *
-	 *	
+	 *
 	 */
 	function statusBox ($name='status_id',$checked='xzxz',$show_100=false,$text_100='none') {
 		if ($text_100=='none'){
@@ -1035,11 +850,146 @@
 			plugin_hook("blocks", "tracker_" . $this->getName());
 	}
 
+	function _substExtraFields($mode, $efarr, $selected, $show_100, $text_100, $show_any, $text_any, $status_show_100, $template) {
+		if ($mode == 'QUERY') {
+			$keys = array_keys($efarr);
+			for ($k = 0; $k < count($keys); $k++) {
+				$i = $keys[$k];
+				if ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_SELECT ||
+				    $efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_CHECKBOX ||
+				    $efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_RADIO ||
+				    $efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_STATUS ||
+				    $efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_MULTISELECT) {
+					$efarr[$i]['field_type'] = ARTIFACT_EXTRAFIELDTYPE_MULTISELECT;
+				} else {
+					$efarr[$i]['field_type'] = ARTIFACT_EXTRAFIELDTYPE_TEXT;
+				}
+			}
+		}
+
+		// 'DISPLAY' mode is for renderding in 'read-only' mode (for detail view).
+		if ($mode === 'DISPLAY') {
+			$keys = array_keys($efarr);
+			for ($k = 0; $k < count($keys); $k++) {
+				$i = $keys[$k];
+
+				$value = util_ifsetor($selected[$efarr[$i]['extra_field_id']]);
+				if (!is_array($value)) {
+					$value = htmlspecialchars_decode($value);
+				}
+
+				if ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_SELECT ||
+				    $efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_CHECKBOX ||
+				    $efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_RADIO ||
+				    $efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_STATUS ||
+				    $efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_MULTISELECT) {
+					if ($value == 100) {
+						$value = 'None';
+					} else {
+						$arr = $this->getExtraFieldElements($efarr[$i]['extra_field_id']);
+
+						// Convert the values (ids) to names in the ids order.
+						$new = array();
+						for ($j = 0; $j < count($arr); $j++) {
+							if (is_array($value)) {
+								if (in_array($arr[$j]['element_id'],$value))
+									$new[] = $arr[$j]['element_name'];
+							} elseif ($arr[$j]['element_id'] === $value) {
+									$new[] = $arr[$j]['element_name'];
+							}
+						}
+						$value = join('<br />', $new);
+					}
+				} else if ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_TEXT ||
+				    $efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_TEXTAREA) {
+					$value = preg_replace('/((http|https|ftp):\/\/\S+)/',
+					    "<a href=\"\\1\" target=\"_blank\">\\1</a>", $value);
+				} else if ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_RELATION) {
+					// Convert artifact id to links.
+					$r = "";
+					foreach (preg_split("/\D+/", $value) as $v) {
+						$v = (int)$v;
+						if (!$v) {
+							continue;
+						}
+						$r .= html_e('a', array(
+							'href' => util_make_url('/tracker/t_follow.php/' . $v),
+						    ), sprintf('[#%d]', $v)) . "\n";
+					}
+					$value = $r;
+				}
+				/*XXX what to do with empty values? */
+				$value = html_e('span', array(
+					'id' => $this->geteftipid($efarr[$i]),
+					'title' => util_unconvert_htmlspecialchars(html_get_tooltip_description($this->geteftipname($efarr[$i]))),
+				    ), $value);
+
+				$template = str_replace('{$PostName:'.$efarr[$i]['field_name'].'}',"",$template);
+				$template = str_replace('{$'.$efarr[$i]['field_name'].'}',$value,$template);
+			}
+			echo $template;
+			return;
+		}
+
+		$keys = array_keys($efarr);
+		for ($k = 0; $k < count($keys); $k++) {
+			$i = $keys[$k];
+			$post_name = '';
+
+			$value = htmlspecialchars_decode(util_ifsetor($selected[$efarr[$i]['extra_field_id']]));
+
+			if ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_SELECT) {
+				$str = $this->renderSelect($efarr[$i]['extra_field_id'],$value,$show_100,$text_100,$show_any,$text_any,false,$efarr[$i]);
+			} elseif ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_CHECKBOX) {
+				$str = $this->renderCheckbox($efarr[$i]['extra_field_id'],$value,$show_100,$text_100,$efarr[$i]);
+			} elseif ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_RADIO) {
+				$str = $this->renderRadio($efarr[$i]['extra_field_id'],$value,$show_100,$text_100,$show_any,$text_any,$efarr[$i]);
+			} elseif ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_TEXT ||
+			    $efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_INTEGER) {
+				$str = $this->renderTextField($efarr[$i]['extra_field_id'],$value,$efarr[$i]['attribute1'],$efarr[$i]['attribute2'],$efarr[$i]);
+				if ($mode == 'QUERY') {
+					$post_name =  ' <i>'._('(%% for wildcards)').'</i>   ';
+				}
+			} elseif ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_TEXTAREA) {
+				$str = $this->renderTextArea($efarr[$i]['extra_field_id'],$value,$efarr[$i]['attribute1'],$efarr[$i]['attribute2'],$efarr[$i]);
+				if ($mode == 'QUERY') {
+					$post_name =  ' <i>'._('(%% for wildcards)').'</i>   ';
+				}
+			} elseif ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_MULTISELECT) {
+				$str = $this->renderMultiSelectBox($efarr[$i]['extra_field_id'],$value,$show_100,$text_100,$efarr[$i]);
+			} elseif ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_STATUS) {
+				// Get the allowed values from the workflow.
+				$atw = new ArtifactWorkflow($this, $efarr[$i]['extra_field_id']);
+
+				// Special treatement for the initial step (Submit).
+				// In this case, the initial value is the first value.
+				if ($selected === true) {
+					$selected_node = 100;
+				} elseif ($value) {
+					$selected_node = $value;
+				} else {
+					$selected_node = 100;
+				}
+
+				$allowed = $atw->getNextNodes($selected_node);
+				$allowed[] = $selected_node;
+				$str = $this->renderSelect($efarr[$i]['extra_field_id'],$selected_node,$status_show_100,$text_100,$show_any,$text_any,$allowed,$efarr[$i]);
+			} elseif ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_RELATION) {
+				$str = $this->renderRelationField($efarr[$i]['extra_field_id'],$value,$efarr[$i]['attribute1'],$efarr[$i]['attribute2'],$efarr[$i]);
+				if ($mode == 'UPDATE') {
+					$post_name = html_image('ic/forum_edit.gif','37','15',array('title'=>"Click to edit", 'alt'=>"Click to edit", 'onclick'=>"switch2edit(this, 'show$i', 'edit$i')"));
+				}
+			}
+			$template = str_replace('{$PostName:'.$efarr[$i]['field_name'].'}',$post_name,$template);
+			$template = str_replace('{$'.$efarr[$i]['field_name'].'}',$str,$template);
+		}
+		if ($template) {
+			echo $template;
+		}
+	}
 }
 
 // Local Variables:
 // mode: php
 // c-file-style: "bsd"
 // End:
-
-?>

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/index.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/index.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/index.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -25,7 +25,6 @@
 
 require_once('../env.inc.php');
 require_once $gfcommon.'include/pre.php';
-require_once $gfwww.'include/note.php';
 require_once $gfcommon.'tracker/Artifact.class.php';
 require_once $gfcommon.'tracker/ArtifactFile.class.php';
 require_once $gfwww.'tracker/include/ArtifactFileHtml.class.php';

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/item.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/item.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/item.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -36,7 +36,6 @@
  *	provides $group_id, $atid (≠ 0), $aid
  *	sets and checks $group
  * www/tracker/tracker.php (func='detail' or 'add')
- *	enables tooltips
  *	sets and checks $ath ($group, $atid)
  *	calls form submission actions
  *	sets and checks $ah ($ath, $aid) for 'detail'
@@ -52,8 +51,15 @@
 define('TRK_TECH', 1);
 define('TRK_FULL', 2);
 
-require_once $gfcommon.'include/showmess.php';
+html_use_tooltips(array(
+	/* part of defaults */
+	'html' => true,
+	/* use form fields */
+	'trigger' => 'autofocus',
+    ));
 
+require_once $gfcommon.'include/descriptive.php';
+
 if (forge_check_perm('tracker', $atid, 'manager')) {
 	$accesslevel = TRK_FULL;
 } else if (forge_check_perm('tracker', $atid, 'tech')) {
@@ -85,7 +91,6 @@
 		'atid' => $atid,
 	    ));
 }
-echo notepad_func();
 
 function getselfhref($p=array(),$return_encoded=true) {
 	global $group_id, $atid, $aid, $is_add;
@@ -111,9 +116,10 @@
 }
 
 function gettipspan($idpart, $content) {
-	return '<span id="tracker-' . $idpart . '" title="' .
-	    util_html_secure(html_get_tooltip_description($idpart)) .
-	    '">' . $content . '</span>';
+	$id = 'tracker-' . str_replace(' ', '_', $idpart);
+	return '<span id="' . $id . '" title="' .
+	    html_get_tooltip_description($idpart) . '">' .
+	    $content . '</span>';
 }
 
 $data_extrafields = $is_add ? array() : $ah->getExtraFieldData();
@@ -235,19 +241,17 @@
 <?php } ?>
 <?php if (!$is_add && session_loggedin()) { ?>
 	<p><?php
-	if ($ah->isMonitoring()) {
-		$img = "xmail16w.png";
+	if (($dostop = $ah->isMonitoring())) {
 		$key = "monitorstop";
 		$txt = _('Stop monitor');
 	} else {
-		$img = "mail16w.png";
 		$key = "monitor";
 		$txt = _('Monitor');
 	}
 	echo gettipspan('monitor', '<a href="' .
 	    getselfhref(array('func' => 'monitor')) . '"><strong>' .
 	    '<span style="width:30px;">' .
-	    html_image('ic/' . $img, '20', '20') . '</span>' . $txt .
+	    $HTML->getMonitorOPic(!$dostop) . '</span>' . $txt .
 	    '</strong></a>');
 ?></p>
 <?php
@@ -297,42 +301,36 @@
 <table width="100%" cellspacing="12" style="table-layout:fixed;">
 <tr align="left" valign="top">
 <td <?php echo $HTML->boxGetAltRowStyle(0); ?> width="50%">
-	<div><strong><?php echo _('Summary') .
+	<div style="margin-bottom:1em;"><strong><?php echo _('Summary') .
 	    utils_requiredField(); ?>:</strong><br /><?php
-$x = '<input type="text" name="summary" size="60" maxlength="255"';
-if ($is_add) {
-	$x .= ' />';
+if ($is_add || $accesslevel >= TRK_FULL) {
+	echo emit_summary_field($is_add ? NULL : $ah, 'summary',
+	    'tracker-summary', false,
+	    util_unconvert_htmlspecialchars(html_get_tooltip_description('summary')));
 } else {
-	if ($accesslevel >= TRK_FULL) {
-		$x .= ' value="';
-	} else {
-		$x = '';
-	}
-	$x .= $ah->getSummary();
-	if ($accesslevel >= TRK_FULL) {
-		$x .= '" />';
-	}
+	echo gettipspan('summary', emit_summary($ah));
 }
-echo gettipspan('summary', $x);
 echo "</div>\n";
 
 if ($is_add || $accesslevel >= TRK_FULL) {
-	$ndsc = $is_add ? "details" : "description";
+	$fieldname = $is_add ? "details" : "description";
 	echo '<div';
 	if (!$is_add) {
 		echo ' id="edit" style="display:none;"';
 	}
 	echo '><strong>' . _('Detailed description') .
-	    utils_requiredField() . ':</strong><br />';
-	echo gettipspan('description', '<textarea class="small" rows="24" cols="60" name="' .
-	    $ndsc . '">' . ($is_add ? "" : $ah->getDetails()) . '</textarea>');
+	    utils_requiredField() . ': ' .
+	    notepad_button('document.forms.trackeritemform.' . $fieldname,
+	    "messformat") . '</strong><br />';
+	echo emit_details_field($is_add ? NULL : $ah,
+	    $fieldname, 'tracker-description',
+	    util_unconvert_htmlspecialchars(html_get_tooltip_description('description')));
 	echo "</div>\n";
 }
 
 if (!$is_add) {
-	echo '	<div id="show" style="display:block;">' . "\n";
-	echo $ah->showDetails($accesslevel >= TRK_FULL);
-	echo "</div>\n";
+	echo emit_details($ah, _('Detailed description'),
+	    ($accesslevel >= TRK_FULL));
 }
 ?>
 </td>
@@ -354,10 +352,7 @@
 	$ath->renderFiles($group_id, $ah);
 }
 if ($is_add) {
-	echo '<h3>' . _('Attach files to this submission') . ': <a href="' .
-	    "javascript:help_window('" .
-	    util_make_url('/help/tracker.php?helpname=attach_file') .
-	    "');" . '"><strong>(?)</strong></a>' . "</h3>\n";
+	echo '<h3>' . _('Attach files to this submission') . ":</h3>\n";
 	echo '<input type="file" name="input_file0" size="42" />' . "\n";
 	echo '<input type="file" name="input_file1" size="42" />' . "\n";
 	echo '<input type="file" name="input_file2" size="42" />' . "\n";
@@ -365,10 +360,7 @@
 	echo '<input type="file" name="input_file4" size="42" />' . "\n";
 } else if ($accesslevel >= TRK_TECH ||
     (session_loggedin() && ($ah->getSubmittedBy() == user_getid()))) {
-	echo '<h3>' . _('Create an attachment') . ': <a href="' .
-	    "javascript:help_window('" .
-	    util_make_url('/help/tracker.php?helpname=attach_file') .
-	    "');" . '"><strong>(?)</strong></a>' . "</h3>\n";
+	echo '<h3>' . _('Create an attachment') . ":</h3>\n";
 	echo '<input type="file" name="input_file0" size="42" />' . "\n";
 }
 ?>
@@ -378,13 +370,9 @@
 if (!$is_add) {
 	if ($accesslevel >= TRK_TECH || $ath->allowsAnon() ||
 	    session_loggedin()) {
-		echo '<h3>' . _('Write a comment') . ': ' .
-		    notepad_button('document.forms.trackeritemform.details') .
-		    "</h3>\n";
-		echo "<div>\n";
-		echo gettipspan('comment',
-		    '<textarea name="details" class="small" rows="7" cols="60"></textarea>');
-		echo "</div>\n";
+		echo emit_comment_box('trackeritemform', 'details',
+		    'tracker-comment',
+		    util_unconvert_htmlspecialchars(html_get_tooltip_description('comment')));
 	}
 	if ($accesslevel >= TRK_FULL) {
 		echo '<h3>' . _('OR use a canned response') . ":</h3>\n";

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/query.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/query.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/query.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -19,9 +19,12 @@
  * with FusionForge; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+
 require_once $gfcommon.'tracker/ArtifactFactory.class.php';
 require_once $gfcommon.'tracker/ArtifactQuery.class.php';
 
+html_use_tooltips();
+
 if (!session_loggedin()) {
 	exit_not_logged_in();
 }

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/taskmgr.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/taskmgr.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/taskmgr.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -25,6 +25,8 @@
 require_once $gfcommon.'pm/ProjectGroupFactory.class.php';
 require_once $gfcommon.'pm/ProjectTaskFactory.class.php';
 
+html_use_tooltips();
+
 $group_project_id = getIntFromRequest('group_project_id');
 $project_task_id = getIntFromRequest('project_task_id');
 $aid = getIntFromRequest('aid');

Modified: branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/tracker.php
===================================================================
--- branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/tracker.php	2011-12-23 17:23:24 UTC (rev 17934)
+++ branches/QA-2011Q4:evolvis-qs.lan.tarent.de/src/www/tracker/tracker.php	2011-12-23 17:24:04 UTC (rev 17935)
@@ -22,9 +22,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-
-html_use_tooltips();
-
 //
 //	get the Group object
 //
@@ -442,6 +439,18 @@
 				//include $gfwww.'tracker/browse.php';
 
 				$is_add = false;
+				/* in case the Data Type was changed */
+				$new_atid = $ah->getArtifactType()->getID();
+				if ($new_atid != $atid) {
+					$new_ath = new ArtifactTypeHtml($group,
+					    $new_atid);
+					if ($new_ath && is_object($new_ath) &&
+					    !$new_ath->isError()) {
+						$ath = $new_ath;
+					}
+					/* used by the form field */
+					$atid = $new_atid;
+				}		
 				include $gfwww.'tracker/item.php';
 				break;
 			}



More information about the evolvis-commits mailing list