diff -urN mantis/bug_reminder.php mantisInsiders/bug_reminder.php
--- mantis/bug_reminder.php	2005-07-25 18:34:10.000000000 +0200
+++ mantisInsiders/bug_reminder.php	2006-01-26 14:59:38.400453000 +0100
@@ -23,13 +23,17 @@
 ?>
 <?php
 	$f_bug_id		= gpc_get_int( 'bug_id' );
-	$f_to			= gpc_get_int_array( 'to' );
+	$f_to			= gpc_get_int_array( 'to' , '[]');
 	$f_body			= gpc_get_string( 'body' );
+	$f_remove = gpc_get_bool( 'removeOld' );
 
-	if ( bug_is_readonly( $f_bug_id ) ) {
-		error_parameters( $f_bug_id );
-		trigger_error( ERROR_BUG_READ_ONLY_ACTION_DENIED, ERROR );
-	}
+	#Mal schaun, ob auch echter Text in der Nachricht ist..
+	$hasRealText = strlen($f_body) > 0;
+
+	#if ( bug_is_readonly( $f_bug_id ) ) {
+	#	error_parameters( $f_bug_id );
+	#	trigger_error( ERROR_BUG_READ_ONLY_ACTION_DENIED, ERROR );
+	#}
 
 	access_ensure_bug_level( config_get( 'bug_reminder_threshold' ), $f_bug_id );
 
@@ -39,20 +43,82 @@
 		# ... override the current project. This to avoid problems with categories and handlers lists etc.
 		$g_project_override = $t_bug->project_id;
 	}
+	
+	#Rausfinden, wer ehedem monitor war..
+	$t_bug_monitor_table = config_get( 'mantis_bug_monitor_table' );
+			$query = "SELECT DISTINCT user_id
+					  FROM $t_bug_monitor_table
+					  WHERE bug_id=$f_bug_id";
+			$result = db_query( $query );
+
+			$count = db_num_rows( $result );
+			for ( $i=0 ; $i < $count ; $i++ ) {
+				$t_user_id = db_result( $result, $i );
+				$t_recipients_original[$i] = $t_user_id;
+		}
+	
+	# Rausfinden, wer jetzt neu ist und wer weg soll
+	$count = 0;
+	if (count($f_to) > 0){
+		foreach ( $f_to as $t_recipient ){
+			$newEntry = true;
+			#Wenn der Recipient noch nicht in der Liste war, ist er wohl neu
+			foreach ( $t_recipients_original as $t_recipientOrig ){
+				if ($t_recipientOrig == $t_recipient){
+					$newEntry = false;
+				}
+			}
+			if ($newEntry){
+				$new[$count] = $t_recipient;
+				$count = $count + 1;
+			}
+		}
+	}
+
+	
+	if ($f_remove){
+		$f_remove_text = '<i>Zustndigkeit/Beobachter entfernt: ';
+
+		foreach ( $t_recipients_original as $t_recipientOrig ){
+			$removeEntry = true;
+			foreach ( $f_to as $t_recipient ){
+				if ($t_recipientOrig == $t_recipient){
+					$removeEntry = false;
+				}
+			}
+			if ($removeEntry){
+				bug_unmonitor( $f_bug_id, $t_recipientOrig);
+				$f_remove_text = $f_remove_text . prepare_user_name( $t_recipientOrig ) . ' ';
+			}
+		}
+		$f_remove_text = $f_remove_text . '</i><br>';
+	}
+	
+	
+
+	if (count($new) != 0 || strlen($f_body) > 0){
 
 	# Automically add recipients to monitor list if they are above the monitor
 	# threshold, option is enabled, and not reporter or handler.
-	foreach ( $f_to as $t_recipient )
-	{
-		if ( ON == config_get( 'reminder_recipents_monitor_bug' ) &&
-			access_has_bug_level( config_get( 'monitor_bug_threshold' ), $f_bug_id ) &&
-			!bug_is_user_handler( $f_bug_id, $t_recipient ) &&
-			!bug_is_user_reporter( $f_bug_id, $t_recipient ) ) {
-			bug_monitor( $f_bug_id, $t_recipient );
+	if (count($new) != 0) {
+		foreach ( $new as $t_recipient )
+		{
+			if ( ON == config_get( 'reminder_recipents_monitor_bug' ) &&
+				access_has_bug_level( config_get( 'monitor_bug_threshold' ), $f_bug_id ) ) {
+				bug_monitor( $f_bug_id, $t_recipient );
+			}
 		}
 	}
-
-	$result = email_bug_reminder( $f_to, $f_bug_id, $f_body );
+	
+	#Nur Mails verschicken, wenn auch echter Text drin ist, oder ein neuer eingetragen wurde..
+	if ($hasRealText){
+		# An alle schicken
+		$result = email_bug_reminder( $f_to, $f_bug_id, $f_body );
+	} else if (count($new) > 0){
+		# Nur an die neuen schicken
+		$result = email_bug_reminder( $new, $f_bug_id, $f_body );
+	}
+		
 
 	# Add reminder as bugnote if store reminders option is ON.
 	if ( ON == config_get( 'store_reminders' ) ) {
@@ -64,8 +130,10 @@
 			$f_to = $t_to;
 		}
 		$t_attr = '|' . implode( '|', $f_to ) . '|';
-		bugnote_add( $f_bug_id, $f_body, config_get( 'default_reminder_view_status' ) == VS_PRIVATE, REMINDER, $t_attr );
+		$f_full_text = $f_remove_text . $f_body;
+		bugnote_add( $f_bug_id, $f_full_text, config_get( 'default_reminder_view_status' ) == VS_PRIVATE, REMINDER, $t_attr );
 	}
+}
 
 	html_page_top1();
 	html_meta_redirect( string_get_bug_view_url( $f_bug_id ) );
diff -urN mantis/bug_reminder_page.php mantisInsiders/bug_reminder_page.php
--- mantis/bug_reminder_page.php	2005-07-25 18:34:10.000000000 +0200
+++ mantisInsiders/bug_reminder_page.php	2006-01-26 14:30:06.267592600 +0100
@@ -19,10 +19,10 @@
 <?php
 	$f_bug_id = gpc_get_int( 'bug_id' );
 
-	if ( bug_is_readonly( $f_bug_id ) ) {
-		error_parameters( $f_bug_id );
-		trigger_error( ERROR_BUG_READ_ONLY_ACTION_DENIED, ERROR );
-	}
+	#if ( bug_is_readonly( $f_bug_id ) ) {
+	#	error_parameters( $f_bug_id );
+	#	trigger_error( ERROR_BUG_READ_ONLY_ACTION_DENIED, ERROR );
+	#}
 
 	access_ensure_bug_level( config_get( 'bug_reminder_threshold' ), $f_bug_id );
 
@@ -48,7 +48,7 @@
 		<?php echo lang_get( 'bug_reminder' ) ?>
 	</td>
 </tr>
-<tr>
+<tr >
 	<td class="category">
 		<?php echo lang_get( 'to' ) ?>
 	</td>
@@ -57,40 +57,30 @@
 	</td>
 </tr>
 <tr <?php echo helper_alternate_class() ?>>
-	<td>
-		<select name="to[]" multiple="multiple" size="10">
-			<?php echo print_project_user_option_list( bug_get_field( $f_bug_id, 'project_id' ) ) ?>
+	<td rowspan='2'>
+		<select name="to[]" multiple="multiple" size="18">
+			<?php echo print_project_user_option_list( bug_get_field( $f_bug_id, 'project_id' ), $f_bug_id ) ?>
 		</select>
 	</td>
 	<td class="center">
-		<textarea name="body" cols="65" rows="10" wrap="virtual"></textarea>
+		<textarea name="body" cols="80" rows="15" wrap="virtual"></textarea>
 	</td>
 </tr>
 <tr>
+	<td>
+		<input type="checkbox" name="removeOld" value="true"> Alte Zustndigkeiten durch neue Liste ersetzen
+	</td>
+<tr>
 	<td class="center" colspan="2">
 		<input type="submit" class="button" value="<?php echo lang_get( 'bug_send_button' ) ?>">
 	</td>
 </tr>
 </form>
 </table>
-<br />
-<table class="width75" cellspacing="1">
-<tr>
-	<td>
-		<?php
-			echo lang_get( 'reminder_explain' ) . ' ';
-			if ( ON == config_get( 'reminder_recipents_monitor_bug' ) ) {
-				echo lang_get( 'reminder_monitor' ) . ' ';
-			}
-			if ( ON == config_get( 'store_reminders' ) ) {
-				echo lang_get( 'reminder_store' );
-			}
-		?>
-	</td>
-</tr>
-</table>
+
 </div>
 
+
 <br />
 <?php include( dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'bug_view_inc.php' ) ?>
 <?php include( dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'bugnote_view_inc.php' ) ?>
diff -urN mantis/bug_report.php mantisInsiders/bug_report.php
--- mantis/bug_report.php	2005-08-09 02:30:52.000000000 +0200
+++ mantisInsiders/bug_report.php	2006-01-26 17:36:46.088787400 +0100
@@ -131,7 +131,13 @@
 		# Send the email notification
 		email_relationship_added( $f_master_bug_id, $t_bug_id, relationship_get_complementary_type( $f_rel_type ) );
 	}
-
+	# Need to add the monitors
+	# MattB
+	$t_monitors = gpc_get_int_array( 'monitors', null );
+	foreach ($t_monitors as $t_recipient)
+	{
+	   bug_monitor( $t_bug_id, $t_recipient );
+	}
 	email_new_bug( $t_bug_id );
 
 	helper_call_custom_function( 'issue_create_notify', array( $t_bug_id ) );
@@ -139,7 +145,9 @@
 	html_page_top1();
 
 	if ( ! $f_report_stay ) {
-		html_meta_redirect( 'view_all_bug_page.php' );
+		html_meta_redirect( string_get_bug_view_url( $t_bug_id ) );
+	} else {
+		html_meta_redirect( 'bug_report_advanced_page.php' );
 	}
 
 	html_page_top2();
@@ -151,7 +159,7 @@
 	print_bracket_link( string_get_bug_view_url( $t_bug_id ), lang_get( 'view_submitted_bug_link' ) . " $t_bug_id" );
 	print_bracket_link( 'view_all_bug_page.php', lang_get( 'view_bugs_link' ) );
 
-	if ( $f_report_stay ) {
+	if ( false ) {
 ?>
 	<p>
 	<form method="post" action="<?php echo string_get_bug_report_url() ?>">
diff -urN mantis/bug_report_advanced_page.php mantisInsiders/bug_report_advanced_page.php
--- mantis/bug_report_advanced_page.php	2005-08-10 19:11:48.000000000 +0200
+++ mantisInsiders/bug_report_advanced_page.php	2006-01-20 09:46:47.159727700 +0100
@@ -149,7 +149,12 @@
 	</td>
 </tr>
 
-
+<!-- HRI -->
+<!-- Default = immer -->
+<input type="hidden" name="reproducibility" value="10">
+<!-- Default = Minor -->
+<input type="hidden" name="severity" value="50">
+<?php if (false) { ?>
 <!-- Reproducibility -->
 <tr <?php echo helper_alternate_class() ?>>
 	<td class="category">
@@ -161,7 +166,8 @@
 		</select>
 	</td>
 </tr>
-
+<?php } ?>
+<?php if (false) { ?>
 <!-- Severity -->
 <tr <?php echo helper_alternate_class() ?>>
 	<td class="category">
@@ -173,7 +179,7 @@
 		</select>
 	</td>
 </tr>
-
+<?php } ?>
 
 <!-- Priority (if permissions allow) -->
 <?php if ( access_has_project_level( config_get( 'handle_bug_threshold' ) ) ) { ?>
@@ -189,13 +195,13 @@
 </tr>
 <?php } ?>
 
-
+<!-- HRI -->
+<?php if (false) { ?>
 <!-- spacer -->
 <tr>
 	<td class="spacer" colspan="2">&nbsp;</td>
 </tr>
 
-
 <!-- Profile -->
 <tr <?php echo helper_alternate_class() ?>>
 	<td class="category">
@@ -208,7 +214,6 @@
 	</td>
 </tr>
 
-
 <!-- instructions -->
 <tr>
 	<td colspan="2">
@@ -249,11 +254,11 @@
 	</td>
 </tr>
 
-
 <!-- spacer -->
 <tr>
 	<td class="spacer" colspan="2">&nbsp;</td>
 </tr>
+<?php } ?>
 
 
 <?php
@@ -277,6 +282,8 @@
 	}
 ?>
 
+<!-- HRI -->
+<?php if (false) { ?>
 <!-- Product Build -->
 <tr <?php echo helper_alternate_class() ?>>
 	<td class="category">
@@ -286,10 +293,12 @@
 		<input tabindex="10" type="text" name="build" size="32" maxlength="32" value="<?php echo $f_build ?>" />
 	</td>
 </tr>
-
+<?php } ?>
 
 <!-- Handler (if permissions allow) -->
-<?php if ( access_has_project_level( config_get( 'update_bug_assign_threshold' ) ) ) { ?>
+<!-- HRI -->
+<?php if (false) { ?>
+<!-- ( access_has_project_level( config_get( 'update_bug_assign_threshold' ) ) ) { -->
 <!-- spacer -->
 <tr>
 	<td class="spacer" colspan="2">&nbsp;</td>
@@ -306,13 +315,27 @@
 	</td>
 </tr>
 <?php } ?>
+<!-- Monitors of this bug -->
+<!-- HRI-->
+<tr <?php echo helper_alternate_class() ?>>
+        <td class="category">
+                <?php echo lang_get( 'monitored_by') ?>
+        </td>
+        <td>
+                <select name="monitors[]" multiple="multiple" size="10">
+                        <?php echo print_project_user_option_list( $t_project_id ) ?>
+                </select>
+        </td>
+</tr>
 
 
+<!-- HRI -->
+<?php if (false) { ?>
 <!-- spacer -->
 <tr>
 	<td class="spacer" colspan="2">&nbsp;</td>
 </tr>
-
+<?php } ?>
 
 <!-- Summary -->
 <tr <?php echo helper_alternate_class() ?>>
@@ -335,7 +358,8 @@
 	</td>
 </tr>
 
-
+<!-- HRI -->
+<?php if (false) { ?>
 <!-- Steps to Reproduce -->
 <tr <?php echo helper_alternate_class() ?>>
 	<td class="category">
@@ -361,7 +385,7 @@
 <tr>
 	<td class="spacer" colspan="2">&nbsp;</td>
 </tr>
-
+<?php } ?>
 
 <!-- Custom Fields -->
 <?php
@@ -413,11 +437,14 @@
 
 
 <!-- View Status -->
+<!-- HRI -->
+<?php if (false) { ?>
 <tr <?php echo helper_alternate_class() ?>>
 	<td class="category">
 		<?php echo lang_get( 'view_status' ) ?>
 	</td>
 	<td>
+	<?php } ?>
 <?php
 	if ( access_has_project_level( config_get( 'set_view_status_threshold' ) ) ) {
 ?>
@@ -425,7 +452,7 @@
 		<input tabindex="10" type="radio" name="view_state" value="<?php echo VS_PRIVATE ?>" <?php check_checked( $f_view_state, VS_PRIVATE ) ?> /> <?php echo lang_get( 'private' ) ?>
 <?php
 	} else {
-		echo get_enum_element( 'project_view_state', $f_view_state );
+		#echo get_enum_element( 'project_view_state', $f_view_state );
 	}
 ?>
 	</td>
diff -urN mantis/bug_update_page.php mantisInsiders/bug_update_page.php
--- mantis/bug_update_page.php	2005-06-12 23:04:44.000000000 +0200
+++ mantisInsiders/bug_update_page.php	2006-01-25 13:52:33.897253200 +0100
@@ -83,10 +83,10 @@
 		<?php echo lang_get( 'category' ) ?>
 	</td>
 	<td width="15%">
-		<?php echo lang_get( 'severity' ) ?>
+		<?php echo lang_get( 'reporter' ) ?>
 	</td>
 	<td width="20%">
-		<?php echo lang_get( 'reproducibility' ) ?>
+		<?php echo lang_get( 'assigned_to' ) ?>
 	</td>
 	<td width="15%">
 		<?php echo lang_get( 'date_submitted' ) ?>
@@ -114,18 +114,25 @@
 		</select>
 	</td>
 
-	<!-- Severity -->
 	<td>
-		<select name="severity">
-			<?php print_enum_string_option_list( 'severity', $t_bug->severity ) ?>
+			<select name="reporter_id">
+			<?php print_reporter_option_list( $t_bug->reporter_id, $t_bug->project_id ) ?>
 		</select>
 	</td>
 
 	<!-- Reproducibility -->
 	<td>
-		<select name="reproducibility">
-			<?php print_enum_string_option_list( 'reproducibility', $t_bug->reproducibility ) ?>
+	<?php if ( access_has_project_level( config_get( 'update_bug_assign_threshold', config_get( 'update_bug_threshold' ) ) ) ) {
+	?>
+		<select name="handler_id">
+			<option value="0"></option>
+			<?php print_assign_to_option_list( $t_bug->handler_id, $t_bug->project_id ) ?>
 		</select>
+	<?php
+		} else {
+			echo user_get_name( $t_bug->handler_id );
+		}
+	?>
 	</td>
 
 	<!-- Date Submitted -->
@@ -141,69 +148,10 @@
 </tr>
 
 
-<!-- spacer -->
-<tr>
-	<td class="spacer" colspan="6">&nbsp;</td>
-</tr>
-
-
-
-<tr <?php echo helper_alternate_class() ?>>
-
-	<!-- Reporter -->
-	<td class="category">
-		<?php echo lang_get( 'reporter' ) ?>
-	</td>
-	<td>
-		<select name="reporter_id">
-			<?php print_reporter_option_list( $t_bug->reporter_id, $t_bug->project_id ) ?>
-		</select>
-	</td>
-
-	<!-- View Status -->
-	<td class="category">
-		<?php echo lang_get( 'view_status' ) ?>
-	</td>
-	<td>
-<?php
-		if ( access_has_project_level( config_get( 'change_view_status_threshold' ) ) ) { ?>
-			<select name="view_state">
-				<?php print_enum_string_option_list( 'view_state', $t_bug->view_state) ?>
-			</select>
-<?php
-		} else {
-			echo get_enum_element( 'project_view_state', $t_bug->view_state );
-		}
-?>
-	</td>
-
-	<!-- spacer -->
-	<td colspan="2">&nbsp;</td>
-</tr>
-
-
-<tr <?php echo helper_alternate_class() ?>>
-
-	<!-- Assigned To -->
-	<td class="category">
-		<?php echo lang_get( 'assigned_to' ) ?>
-	</td>
-	<td colspan="5">
-	<?php if ( access_has_project_level( config_get( 'update_bug_assign_threshold', config_get( 'update_bug_threshold' ) ) ) ) {
-	?>
-		<select name="handler_id">
-			<option value="0"></option>
-			<?php print_assign_to_option_list( $t_bug->handler_id, $t_bug->project_id ) ?>
-		</select>
-	<?php
-		} else {
-			echo user_get_name( $t_bug->handler_id );
-		}
-	?>
-	</td>
-
-</tr>
-
+<!-- Default = immer -->
+<input type="hidden" name="reproducibility" value="10">
+<!-- Default = Minor -->
+<input type="hidden" name="severity" value="50">
 
 <tr <?php echo helper_alternate_class() ?>>
 
@@ -228,8 +176,32 @@
 	</td>
 
 	<!-- spacer -->
-	<td colspan="2">&nbsp;</td>
+<!-- Zugewiesen / Beobachtend -->
+<?php
+	$c_bug_id = db_prepare_int( $f_bug_id );
+	$t_bug_monitor_table = config_get( 'mantis_bug_monitor_table' );
+	$t_user_table = config_get( 'mantis_user_table' );
+
+	# get the bugnote data
+	$query = "SELECT user_id, enabled, username
+			FROM $t_bug_monitor_table m, $t_user_table u
+			WHERE m.bug_id=$c_bug_id AND m.user_id = u.id
+			ORDER BY u.realname, u.username";
+	$result = db_query($query);
+	$num_users = db_num_rows($result);
 
+	echo '<a name="monitors" id="monitors" /><br />';
+?>
+		<td class="category"><?php echo lang_get( 'users_monitoring_bug' ); ?></td>
+			<td><b><font color="blue">
+<?php
+ 		for ( $i = 0; $i < $num_users; $i++ ) {
+ 			$row = db_fetch_array( $result );
+			echo ($i > 0) ? ', ' : '';
+			echo print_user( $row['user_id'] );
+			}
+?>
+	</font></b></td>
 </tr>
 
 
@@ -245,21 +217,8 @@
 								( ON == config_get( 'allow_reporter_close' ) ) ), $t_bug->project_id ) ?>
 	</td>
 
-	<?php
-		# Duplicate Id
 
-		# MASC RELATIONSHIP
-		if ( OFF == config_get( 'enable_relationship' ) ) {
-			# Duplicate ID
-			echo '<td class="category">', lang_get( 'duplicate_id' ), '&nbsp;</td>';
-			echo '<td>';
-			echo '<input type="text" name="duplicate_id" value="', $t_bug->duplicate_id, '" maxlength="7" />&nbsp;';
-			echo '</td>';
-		} else {
-			# spacer
-			echo '<td colspan="2">&nbsp;</td>';
-		}
-	?>
+
 <?php
 	$t_show_version = ( ON == config_get( 'show_product_version' ) )
 			|| ( ( AUTO == config_get( 'show_product_version' ) )
@@ -275,7 +234,46 @@
 			<?php print_version_option_list( $t_bug->version, $t_bug->project_id, VERSION_RELEASED ) ?>
 		</select>
 	</td>
+
+		<!-- FIXED in Version -->
+	<td class="category">
+		<?php
+			$t_show_version = ( ON == config_get( 'show_product_version' ) )
+					|| ( ( AUTO == config_get( 'show_product_version' ) )
+								&& ( count( version_get_all_rows( $t_bug->project_id ) ) > 0 ) );
+			if ( $t_show_version ) {
+				echo lang_get( 'fixed_in_version' );
+			}
+		?>
+	</td>
+	<td>
+		<?php
+			if ( $t_show_version ) {
+		?>
+		<select name="fixed_in_version">
+			<?php print_version_option_list( $t_bug->fixed_in_version, $t_bug->project_id, VERSION_ALL ) ?>
+		</select>
+		<?php
+			}
+		?>
+	</td>
 </tr>
+	<?php
+		# Duplicate Id
+
+		# MASC RELATIONSHIP
+		if ( OFF == config_get( 'enable_relationship' ) ) {
+			# Duplicate ID
+			echo '<tr>';
+			echo '<td class="category">', lang_get( 'duplicate_id' ), '&nbsp;</td>';
+			echo '<td>';
+			echo '<input type="text" name="duplicate_id" value="', $t_bug->duplicate_id, '" maxlength="7" />&nbsp;';
+			echo '</td></tr>';
+		} else {
+			# spacer
+			echo '<td colspan="2">&nbsp;</td>';
+		}
+	?>
 
 <?php
 	}
diff -urN mantis/bug_view_inc.php mantisInsiders/bug_view_inc.php
--- mantis/bug_view_inc.php	2005-02-12 21:01:06.000000000 +0100
+++ mantisInsiders/bug_view_inc.php	2006-01-25 13:31:19.900743400 +0100
@@ -42,10 +42,10 @@
 		<?php echo lang_get( 'category' ) ?>
 	</td>
 	<td width="15%">
-		<?php echo lang_get( 'severity' ) ?>
+		<?php echo lang_get( 'reporter' ) ?>
 	</td>
 	<td width="20%">
-		<?php echo lang_get( 'reproducibility' ) ?>
+		<?php echo lang_get( 'assigned_to' ) ?>
 	</td>
 	<td width="15%">
 		<?php echo lang_get( 'date_submitted' ) ?>
@@ -68,14 +68,17 @@
 		<?php echo $t_bug->category ?>
 	</td>
 
-	<!-- Severity -->
+<!-- REPORTER HRI -->
 	<td>
-		<?php echo get_enum_element( 'severity', $t_bug->severity ) ?>
+		<?php print_user_with_subject( $t_bug->reporter_id, $f_bug_id ) ?>
 	</td>
-
-	<!-- Reproducibility -->
-	<td>
-		<?php echo get_enum_element( 'reproducibility', $t_bug->reproducibility ) ?>
+	<!-- ASSIGNED HRI -->
+		<td>
+		<?php 
+			if ( access_has_bug_level( config_get( 'view_handler_threshold' ), $f_bug_id ) ) {
+				print_user_with_subject( $t_bug->handler_id, $f_bug_id ); 
+			}
+		?>
 	</td>
 
 	<!-- Date Submitted -->
@@ -96,41 +99,6 @@
 	<td colspan="6"></td>
 </tr>
 
-
-<tr <?php echo helper_alternate_class() ?>>
-
-	<!-- Reporter -->
-	<td class="category">
-		<?php echo lang_get( 'reporter' ) ?>
-	</td>
-	<td>
-		<?php print_user_with_subject( $t_bug->reporter_id, $f_bug_id ) ?>
-	</td>
-
-	<!-- View Status -->
-	<td class="category">
-		<?php echo lang_get( 'view_status' ) ?>
-	</td>
-	<td>
-		<?php echo get_enum_element( 'project_view_state', $t_bug->view_state ) ?>
-	</td>
-
-	<!-- spacer -->
-	<td colspan="2">&nbsp;</td>
-
-</tr>
-
-
-<!-- Handler -->
-<tr <?php echo helper_alternate_class() ?>>
-	<td class="category">
-		<?php echo lang_get( 'assigned_to' ) ?>
-	</td>
-	<td colspan="5">
-		<?php print_user_with_subject( $t_bug->handler_id, $f_bug_id ) ?>
-	</td>
-</tr>
-
 <tr <?php echo helper_alternate_class() ?>>
 
 	<!-- Priority -->
@@ -149,8 +117,32 @@
 		<?php echo get_enum_element( 'resolution', $t_bug->resolution ) ?>
 	</td>
 
-	<!-- spacer -->
-	<td colspan="2">&nbsp;</td>
+	<!-- Zugewiesen / Beobachtend -->
+<?php
+	$c_bug_id = db_prepare_int( $f_bug_id );
+	$t_bug_monitor_table = config_get( 'mantis_bug_monitor_table' );
+	$t_user_table = config_get( 'mantis_user_table' );
+
+	# get the bugnote data
+	$query = "SELECT user_id, enabled, username
+			FROM $t_bug_monitor_table m, $t_user_table u
+			WHERE m.bug_id=$c_bug_id AND m.user_id = u.id
+			ORDER BY u.realname, u.username";
+	$result = db_query($query);
+	$num_users = db_num_rows($result);
+
+	echo '<a name="monitors" id="monitors" /><br />';
+?>
+		<td class="category"><?php echo lang_get( 'users_monitoring_bug' ); ?></td>
+			<td><b><font color="blue">
+<?php
+ 		for ( $i = 0; $i < $num_users; $i++ ) {
+ 			$row = db_fetch_array( $result );
+			echo ($i > 0) ? ', ' : '';
+			echo print_user( $row['user_id'] );
+			}
+?>
+	</font></b></td>
 </tr>
 
 
@@ -164,25 +156,52 @@
 		<?php echo get_enum_element( 'status', $t_bug->status ) ?>
 	</td>
 
-	<!-- Duplicate ID -->
+
+	<!-- Product Version -->
+	<?php
+		$t_show_version = ( ON == config_get( 'show_product_version' ) )
+			|| ( ( AUTO == config_get( 'show_product_version' ) )
+					&& ( count( version_get_all_rows( $t_bug->project_id ) ) > 0 ) );
+		if ( $t_show_version ) {
+	?>
 	<td class="category">
+		<?php echo lang_get( 'product_version' ) ?>
+	</td>
+	<td>
+		<?php echo $t_bug->version ?>
+	</td>
+	<?php
+		} else {
+	?>
+	<td>
+	</td>
+	<td>
+	</td>
+	<?php
+		}
+	?>
+	
+	<!-- fixed in version -->
 		<?php
-			if ( ! config_get( 'enable_relationship' ) ) {
-				echo lang_get( 'duplicate_id' );
-			} # MASC RELATIONSHIP
-		?>&nbsp;
+			$t_show_version = ( ON == config_get( 'show_product_version' ) )
+					|| ( ( AUTO == config_get( 'show_product_version' ) )
+								&& ( count( version_get_all_rows( $t_bug->project_id ) ) > 0 ) );
+			if ( $t_show_version ) {
+		?>
+	<td class="category">
+		<?php echo lang_get( 'fixed_in_version' ) ?>
 	</td>
 	<td>
+		<?php echo $t_bug->fixed_in_version ?>
+	</td>
 		<?php
-			if ( !config_get( 'enable_relationship' ) ) {
-				print_duplicate_id( $t_bug->duplicate_id );
-			} # MASC RELATIONSHIP
-		?>&nbsp;
+			} else {
+		?>
+	<td>
 	</td>
-
-	<!-- spacer -->
-	<td colspan="2">&nbsp;</td>
-
+	<td>
+	</td>
+	<?php } ?>
 </tr>
 
 
diff -urN mantis/bug_view_page.php mantisInsiders/bug_view_page.php
--- mantis/bug_view_page.php	2006-01-01 03:58:50.000000000 +0100
+++ mantisInsiders/bug_view_page.php	2006-01-26 14:29:35.914552400 +0100
@@ -53,6 +53,21 @@
 <?php html_page_top2() ?>
 
 <br />
+
+	<!-- prev/next links -->
+	<?php if( $t_bugslist ) { ?>
+	<span class="small">
+		<?php
+			$t_bugslist = explode( ',', $t_bugslist );
+			$t_index = array_search( $f_bug_id, $t_bugslist );
+			if( false !== $t_index ) {
+				if( isset( $t_bugslist[$t_index-1] ) ) print_bracket_link( 'bug_view_page.php?bug_id='.$t_bugslist[$t_index-1], '&lt;&lt;' );
+				if( isset( $t_bugslist[$t_index+1] ) ) print_bracket_link( 'bug_view_page.php?bug_id='.$t_bugslist[$t_index+1], '&gt;&gt;' );
+			}
+		?>
+	</span>
+	<?php } ?>
+	<br />
 <table class="width100" cellspacing="1">
 
 
@@ -67,7 +82,7 @@
 
 		<!-- Send Bug Reminder -->
 	<?php
-		if ( !current_user_is_anonymous() && !bug_is_readonly( $f_bug_id ) &&
+		if ( !current_user_is_anonymous()  &&
 			  access_has_bug_level( config_get( 'bug_reminder_threshold' ), $f_bug_id ) ) {
 	?>
 		<span class="small">
@@ -78,19 +93,7 @@
 	?>
 	</td>
 
-	<!-- prev/next links -->
-	<?php if( $t_bugslist ) { ?>
-	<td class="center"><span class="small">
-		<?php
-			$t_bugslist = explode( ',', $t_bugslist );
-			$t_index = array_search( $f_bug_id, $t_bugslist );
-			if( false !== $t_index ) {
-				if( isset( $t_bugslist[$t_index-1] ) ) print_bracket_link( 'bug_view_page.php?bug_id='.$t_bugslist[$t_index-1], '&lt;&lt;' );
-				if( isset( $t_bugslist[$t_index+1] ) ) print_bracket_link( 'bug_view_page.php?bug_id='.$t_bugslist[$t_index+1], '&gt;&gt;' );
-			}
-		?>
-	</span></td>
-	<?php } ?>
+
 
 	<!-- Links -->
 	<td class="right" colspan="2">
@@ -121,12 +124,14 @@
 	<td>
 		<?php echo lang_get( 'category' ) ?>
 	</td>
-	<td>
-		<?php echo lang_get( 'severity' ) ?>
+	<!-- HRI -->
+	<td class="category">
+		<?php echo lang_get( 'reporter' ) ?>
 	</td>
-	<td>
-		<?php echo lang_get( 'reproducibility' ) ?>
+		<td class="category">
+		<?php echo lang_get( 'assigned_to' ) ?>
 	</td>
+
 	<td>
 		<?php echo lang_get( 'date_submitted' ) ?>
 	</td>
@@ -150,15 +155,17 @@
 			echo "[$t_project_name] $t_bug->category";
 		?>
 	</td>
-
-	<!-- Severity -->
+<!-- REPORTER HRI -->
 	<td>
-		<?php echo get_enum_element( 'severity', $t_bug->severity ) ?>
+		<?php print_user_with_subject( $t_bug->reporter_id, $f_bug_id ) ?>
 	</td>
-
-	<!-- Reproducibility -->
-	<td>
-		<?php echo get_enum_element( 'reproducibility', $t_bug->reproducibility ) ?>
+	<!-- ASSIGNED HRI -->
+		<td>
+		<?php 
+			if ( access_has_bug_level( config_get( 'view_handler_threshold' ), $f_bug_id ) ) {
+				print_user_with_subject( $t_bug->handler_id, $f_bug_id ); 
+			}
+		?>
 	</td>
 
 	<!-- Date Submitted -->
@@ -179,45 +186,6 @@
 	<td colspan="6"></td>
 </tr>
 
-
-<tr <?php echo helper_alternate_class() ?>>
-
-	<!-- Reporter -->
-	<td class="category">
-		<?php echo lang_get( 'reporter' ) ?>
-	</td>
-	<td>
-		<?php print_user_with_subject( $t_bug->reporter_id, $f_bug_id ) ?>
-	</td>
-
-	<!-- View Status -->
-	<td class="category">
-		<?php echo lang_get( 'view_status' ) ?>
-	</td>
-	<td>
-		<?php echo get_enum_element( 'project_view_state', $t_bug->view_state ) ?>
-	</td>
-
-	<!-- spacer -->
-	<td colspan="2">&nbsp;</td>
-</tr>
-
-
-<!-- Handler -->
-<tr <?php echo helper_alternate_class() ?>>
-	<td class="category">
-		<?php echo lang_get( 'assigned_to' ) ?>
-	</td>
-	<td colspan="5">
-		<?php 
-			if ( access_has_bug_level( config_get( 'view_handler_threshold' ), $f_bug_id ) ) {
-				print_user_with_subject( $t_bug->handler_id, $f_bug_id ); 
-			}
-		?>
-	</td>
-</tr>
-
-
 <tr <?php echo helper_alternate_class() ?>>
 
 	<!-- Priority -->
@@ -236,8 +204,32 @@
 		<?php echo get_enum_element( 'resolution', $t_bug->resolution ) ?>
 	</td>
 
-	<!-- spacer -->
-	<td colspan="2">&nbsp;</td>
+	<!-- Zugewiesen / Beobachtend -->
+<?php
+	$c_bug_id = db_prepare_int( $f_bug_id );
+	$t_bug_monitor_table = config_get( 'mantis_bug_monitor_table' );
+	$t_user_table = config_get( 'mantis_user_table' );
+
+	# get the bugnote data
+	$query = "SELECT user_id, enabled, username
+			FROM $t_bug_monitor_table m, $t_user_table u
+			WHERE m.bug_id=$c_bug_id AND m.user_id = u.id
+			ORDER BY u.realname, u.username";
+	$result = db_query($query);
+	$num_users = db_num_rows($result);
+
+	echo '<a name="monitors" id="monitors" /><br />';
+?>
+		<td class="category"><?php echo lang_get( 'users_monitoring_bug' ); ?></td>
+			<td><b><font color="blue">
+<?php
+ 		for ( $i = 0; $i < $num_users; $i++ ) {
+ 			$row = db_fetch_array( $result );
+			echo ($i > 0) ? ', ' : '';
+			echo print_user( $row['user_id'] );
+			}
+?>
+	</font></b></td>
 </tr>
 
 
@@ -251,19 +243,6 @@
 		<?php echo get_enum_element( 'status', $t_bug->status ) ?>
 	</td>
 
-	<?php
-		# MASC RELATIONSHIP
-		if ( OFF == config_get( 'enable_relationship' ) ) {
-			# Duplicate ID
-			echo '<td class="category">', lang_get( 'duplicate_id' ), '&nbsp;</td>';
-			echo '<td>';
-			print_duplicate_id( $t_bug->duplicate_id );
-			echo '</td>';
-		} else {
-			# spacer
-			echo '<td colspan="2">&nbsp;</td>';
-		}
-	?>
 
 	<!-- Product Version -->
 	<?php
@@ -288,8 +267,43 @@
 	<?php
 		}
 	?>
+	
+	<!-- fixed in version -->
+		<?php
+			$t_show_version = ( ON == config_get( 'show_product_version' ) )
+					|| ( ( AUTO == config_get( 'show_product_version' ) )
+								&& ( count( version_get_all_rows( $t_bug->project_id ) ) > 0 ) );
+			if ( $t_show_version ) {
+		?>
+	<td class="category">
+		<?php echo lang_get( 'fixed_in_version' ) ?>
+	</td>
+	<td>
+		<?php echo $t_bug->fixed_in_version ?>
+	</td>
+		<?php
+			} else {
+		?>
+	<td>
+	</td>
+	<td>
+	</td>
+	<?php } ?>
 </tr>
 
+	<?php
+		# MASC RELATIONSHIP
+		if ( OFF == config_get( 'enable_relationship' ) ) {
+			# Duplicate ID
+			echo '<tr><td class="category">', lang_get( 'duplicate_id' ), '&nbsp;</td>';
+			echo '<td>';
+			print_duplicate_id( $t_bug->duplicate_id );
+			echo '</td></tr>';
+		} else {
+			//ZIlch
+		}
+	?>
+
 
 <!-- spacer -->
 <tr height="5" class="spacer">
@@ -318,7 +332,9 @@
 	</td>
 </tr>
 
-
+	<!-- HRI -->
+	<?php if (false) { ?>
+	
 <!-- Additional Information -->
 <tr <?php echo helper_alternate_class() ?>>
 	<td class="category">
@@ -334,7 +350,7 @@
 <tr height="5" class="spacer">
 	<td colspan="6"></td>
 </tr>
-
+<?php } ?>
 
 <!-- Custom Fields -->
 <?php
@@ -400,38 +416,31 @@
 
 <?php
 	$t_mantis_dir = dirname( __FILE__ ) . DIRECTORY_SEPARATOR;
+	# Bugnotes
+	include( $t_mantis_dir . 'bugnote_view_inc.php' );
+	include( $t_mantis_dir . 'bugnote_add_inc.php' );
 
 	# User list sponsoring the bug
 	include( $t_mantis_dir . 'bug_sponsorship_list_view_inc.php' );
+	# User list monitoring the bug - Ist jetzt oben
+	#include( $t_mantis_dir . 'bug_monitor_list_view_inc.php' );
+
 
-	# Bug Relationships
-	# MASC RELATIONSHIP
-	if ( ON == config_get( 'enable_relationship' ) ) {
-		relationship_view_box ( $f_bug_id );
-	}
-	# MASC RELATIONSHIP
 
 	# File upload box
 	if ( !bug_is_readonly( $f_bug_id ) ) {
 		include( $t_mantis_dir . 'bug_file_upload_inc.php' );
 	}
+		# Bug Relationships
+	# MASC RELATIONSHIP
+	if ( ON == config_get( 'enable_relationship' ) ) {
+		relationship_view_box ( $f_bug_id );
+	}
+	# MASC RELATIONSHIP
 
-	# User list monitoring the bug
-	include( $t_mantis_dir . 'bug_monitor_list_view_inc.php' );
 
-	# Bugnotes
-	include( $t_mantis_dir . 'bugnote_add_inc.php' );
-	include( $t_mantis_dir . 'bugnote_view_inc.php' );
-?>
-	<!-- Jump to Bugnote add form -->
-<?php
-	if ( ( $t_bug->status < config_get( 'bug_resolved_status_threshold' ) ) &&
-		( access_has_bug_level( config_get( 'add_bugnote_threshold' ), $f_bug_id ) ) )
-	{
 ?>
-	<span class="small"><?php print_bracket_link( "#addbugnote", lang_get( 'add_bugnote_button' ) ) ?></span>
-	<br />
-<?php } ?>
+
 <?php
 	# History
 	if ( $f_history ) {
diff -urN mantis/bugnote_add.php mantisInsiders/bugnote_add.php
--- mantis/bugnote_add.php	2005-07-25 18:34:10.000000000 +0200
+++ mantisInsiders/bugnote_add.php	2006-01-26 13:29:48.637842600 +0100
@@ -45,6 +45,40 @@
 	if ( !is_blank( $f_bugnote_text ) ) {
 		bugnote_add( $f_bug_id, $f_bugnote_text, $f_private );
 		email_bugnote_add( $f_bug_id );
+		
+		#Rausfinden, wer ehedem monitor war..
+	$t_bug_monitor_table = config_get( 'mantis_bug_monitor_table' );
+			# get user information
+		if ( $p_user_id === null ) {
+			$c_user_id = auth_get_current_user_id();
+		} else {
+			$c_user_id = db_prepare_int( $p_user_id );
+		}
+			$query = "SELECT DISTINCT user_id
+					  FROM $t_bug_monitor_table
+					  WHERE bug_id=$f_bug_id AND user_id=$c_user_id";
+			$result = db_query( $query );
+
+			$count = db_num_rows( $result );
+			if ($count == 0){
+				# Er ist fr den Bug nicht zustndig
+				$zuordnung = config_get( 'Zuordnung_User_Zuschauer' );
+				# Er hat einen Zuschauer
+				$Zuschauer = $zuordnung[$c_user_id];
+				if ($Zuschauer){
+					$query = "SELECT DISTINCT user_id
+					FROM $t_bug_monitor_table
+					WHERE bug_id=$f_bug_id AND user_id=$Zuschauer";
+					$result = db_query( $query );
+					$count = db_num_rows( $result );
+					#Zuschauer schaut noch nicht zu
+					if ($count == 0){
+						#disabled for now
+							#bug_monitor( $f_bug_id, $Zuschauer );
+					}
+				}
+		}
+		
 	}
 
 	print_successful_redirect_to_bug( $f_bug_id );
diff -urN mantis/config_defaults_inc.php mantisInsiders/config_defaults_inc.php
--- mantis/config_defaults_inc.php	2006-01-10 12:38:08.000000000 +0100
+++ mantisInsiders/config_defaults_inc.php	2006-01-23 14:09:36.010945900 +0100
@@ -574,7 +574,7 @@
 
 	# --- viewing defaults ------------
 	# site defaults for viewing preferences
-	$g_default_limit_view	= 50;
+	$g_default_limit_view	= 200;
 	$g_default_show_changed	= 6;
 	$g_hide_status_default 	= CLOSED;
 	$g_show_sticky_issues   = 'on';
diff -urN mantis/core/custom_function_api.php mantisInsiders/core/custom_function_api.php
--- mantis/core/custom_function_api.php	2005-07-23 14:01:48.000000000 +0200
+++ mantisInsiders/core/custom_function_api.php	2006-01-24 10:42:44.678935800 +0100
@@ -199,9 +199,10 @@
 			}
 
 			$t_columns[] = 'category';
-			$t_columns[] = 'severity';
+			#$t_columns[] = 'severity';
 			$t_columns[] = 'status';
 			$t_columns[] = 'last_updated';
+			$t_columns[] = 'Zustndig';
 			$t_columns[] = 'summary';
 		}
 
@@ -240,6 +241,10 @@
 			if ( COLUMNS_TARGET_CSV_PAGE != $p_columns_target ) {
 				echo '</td>';
 			}
+		} else if ( strpos( $p_column, 'Zustndig') === 0) {
+				echo '<td>';
+				echo $p_column;
+				echo '</td>';
 		} else {
 			$t_function = 'print_column_title_' . $p_column;
 			if ( function_exists( $t_function ) ) {
@@ -291,6 +296,33 @@
 				}
 			}
 			echo $t_column_end;
+		} else if ( strpos( $p_column, 'Zustndig') === 0) {
+			echo '<td>';
+				$c_bug_id = db_prepare_int( $p_issue_row['id'] );
+				$t_bug_monitor_table = config_get( 'mantis_bug_monitor_table' );
+				$t_user_table = config_get( 'mantis_user_table' );
+			
+				# get the bugnote data
+				$query = "SELECT user_id, enabled, username
+						FROM $t_bug_monitor_table m, $t_user_table u
+						WHERE m.bug_id=$c_bug_id AND m.user_id = u.id
+						ORDER BY u.realname, u.username";
+				$result = db_query($query);
+				$num_users = db_num_rows($result);
+
+		$print = 0;
+ 		for ( $i = 0; $i < $num_users; $i++ ) {
+ 			$row = db_fetch_array( $result );
+	 			if (strlen(prepare_user_name( $row['user_id'] )) < 5) {
+	 				if ($print === 1){
+	 					echo ' ';
+	 				}
+					echo print_user( $row['user_id'] );
+					$print = 1;
+				}
+			}
+			echo '</td>';
+			
 		} else {
 			if ( $p_columns_target != COLUMNS_TARGET_CSV_PAGE ) {
 				$t_function = 'print_column_' . $p_column;
diff -urN mantis/core/email_api.php mantisInsiders/core/email_api.php
--- mantis/core/email_api.php	2005-08-04 22:57:50.000000000 +0200
+++ mantisInsiders/core/email_api.php	2006-01-26 13:29:34.077195800 +0100
@@ -266,16 +266,40 @@
 		# @@@ we could optimize by modifiying user_cache() to take an array
 		#  of user ids so we could pull them all in.  We'll see if it's necessary
 		$t_final_recipients = array();
+		
+		#Wenn der User ne mail bekommt, sollte der Zuschauer keine mehr bekommen
+		$zuordnung = config_get( 'Zuordnung_User_Zuschauer' );
+		foreach ( $zuordnung as $zug_key => $zug_value) {
+			# Wenn der User ne mail bekommt..
+			if ($t_recipients[$zug_key]){
+				#Bekommt der Zuschauer keine mehr
+				$t_recipients[$zug_value] = false;
+			}
+		}
+		
 		# Check whether users should receive the emails
 		# and put email address to $t_recipients[user_id]
 		foreach ( $t_recipients as $t_id => $t_ignore ) {
 
+			# Wenn false der Wert ist, dann keine Mail schicken
+			if ($t_ignore == false){
+				continue;
+			}
+			
+			
 			# Possibly eliminate the current user
 			if ( ( auth_get_current_user_id() == $t_id ) &&
 				 ( OFF == config_get( 'email_receive_own' ) ) ) {
 				log_event( LOG_EMAIL_RECIPIENT, "bug= $p_bug_id, drop $t_id (own)" );
 				continue;
 			}
+			# Current User sendet auch keine Mails an current_users_Zuschauer
+			if ( ( $zuordnung[auth_get_current_user_id()] == $t_id ) &&
+				 ( OFF == config_get( 'email_receive_own' ) ) ) {
+				log_event( LOG_EMAIL_RECIPIENT, "bug= $p_bug_id, drop $t_id (own)" );
+				continue;
+			}
+			
 
 			# Eliminate users who don't exist anymore or who are disabled
 			if ( !user_exists( $t_id ) ||
@@ -311,6 +335,8 @@
 					continue;
 				}
 			}
+			
+			
 
 			# Finally, let's get their emails, if they've set one
 			$t_email = user_get_email( $t_id );
@@ -782,7 +808,7 @@
 		# padd the bug id with zeros
 		$p_bug_id = bug_format_id( $p_bug_id );
 
-		return '['.$p_project_name.' '.$p_bug_id.']: '.$p_subject;
+		return '['.$p_project_name.' Erinnerung '.$p_bug_id.']: '.$p_subject;
 	}
 	# --------------------
 	# clean up LF to CRLF
@@ -859,15 +885,19 @@
 		if ( ON !== config_get( 'enable_email_notification' ) || is_blank( $t_user_email ) ) {
 			return true;
 		}
+		
+			# build message
+
+		$t_message = lang_get_defaulted( $p_message_id, null );
 
 		# build subject
 		$t_subject = '['.$p_visible_bug_data['email_project'].' '
+						.$t_message.' '
 						.bug_format_id( $p_visible_bug_data['email_bug'] )
 					.']: '.$p_visible_bug_data['email_summary'];
 
-		# build message
-
-		$t_message = lang_get_defaulted( $p_message_id, null );
+		#Message kann jetzt anders anfangen
+		$t_message = '';
 
 		if ( is_array( $p_header_optional_params ) ) {
 			$t_message = vsprintf( $t_message, $p_header_optional_params );
diff -urN mantis/core/html_api.php mantisInsiders/core/html_api.php
--- mantis/core/html_api.php	2006-01-10 12:38:08.000000000 +0100
+++ mantisInsiders/core/html_api.php	2006-01-20 13:18:29.217459300 +0100
@@ -281,9 +281,9 @@
 				$t_align = 'left';
 			}
 
-			echo '<div align="', $t_align, '">';
-			echo '<a href="http://www.mantisbt.org" title="Mantis Bugtracker"><img border="0" width="238" height="78" alt="Mantis Bugtracker" src="images/mantis_logo.gif" /></a>';
-			echo '</div>';
+			#echo '<div align="', $t_align, '">';
+			#echo '<a href="http://www.mantisbt.org" title="Mantis Bugtracker"><img border="0" width="265" height="45" alt="Mantis Bugtracker" src="images/mantis_logo.gif" /></a>';
+			#echo '</div>';
 		}
 	}
 
diff -urN mantis/core/my_view_inc.php mantisInsiders/core/my_view_inc.php
--- mantis/core/my_view_inc.php	2005-08-07 15:42:04.000000000 +0200
+++ mantisInsiders/core/my_view_inc.php	2006-01-26 14:27:09.647147200 +0100
@@ -28,6 +28,7 @@
 
 	$t_icon_path = config_get( 'icon_path' );
 	$t_update_bug_threshold = config_get( 'update_bug_threshold' );
+	$t_bug_new_status_threshold = config_get( 'bug_assigned_status' );
 	$t_bug_resolved_status_threshold = config_get( 'bug_resolved_status_threshold' );
 	$t_hide_status_default = config_get( 'hide_status_default' );
 	$t_default_show_changed = config_get( 'default_show_changed' );
@@ -105,10 +106,10 @@
 		'show_resolution'	=> Array ( '0' => META_FILTER_ANY ),
 		'show_build'		=> Array ( '0' => META_FILTER_ANY ),
 		'show_version'		=> Array ( '0' => META_FILTER_ANY ),
-		'hide_status'		=> Array ( '0' => $t_hide_status_default ),
+		'hide_status'		=> Array ( '0' => $t_bug_new_status_threshold ),
 		'user_monitor'		=> Array ( '0' => META_FILTER_ANY )
 	);
-	$url_link_parameters['unassigned'] = 'handler_id=[none]' . '&amp;hide_status=' . $t_hide_status_default;
+	$url_link_parameters['unassigned'] = 'handler_id=[none]' . '&amp;hide_status=' . $t_bug_new_status_threshold;
 
 	$c_filter['monitored'] = array(
 		'show_category'		=> Array ( '0' => META_FILTER_ANY ),
@@ -120,10 +121,12 @@
 		'show_resolution'	=> Array ( '0' => META_FILTER_ANY ),
 		'show_build'		=> Array ( '0' => META_FILTER_ANY ),
 		'show_version'		=> Array ( '0' => META_FILTER_ANY ),
-		'hide_status'		=> Array ( '0' => $t_hide_status_default ),
-		'user_monitor'		=> Array ( '0' => $t_current_user_id )
+		'hide_status'		=> Array ( '0' => $t_bug_resolved_status_threshold ),
+		'user_monitor'		=> Array ( '0' => $t_current_user_id ),
+		'sort'              => 'priority,last_updated',
+			'dir'               => 'DESC,DESC'
 	);
-	$url_link_parameters['monitored'] = 'user_monitor=' . $t_current_user_id . '&amp;hide_status=' . $t_hide_status_default;
+	$url_link_parameters['monitored'] = 'user_monitor=' . $t_current_user_id . '&amp;hide_status=' . $t_bug_resolved_status_threshold . '&amp;sort_0=priority&amp;dir_0=DESC&amp;sort_1=last_updated&amp;dir_1=DESC';
 
 
 	$c_filter['feedback'] = array(
@@ -146,15 +149,38 @@
 		'show_severity'		=> Array ( '0' => META_FILTER_ANY ),
 		'show_status'		=> Array ( '0' => $t_bug_resolved_status_threshold ),
 		'highlight_changed'	=> $t_default_show_changed,
-		'reporter_id'		=> Array ( '0' => $t_current_user_id ),
+		'reporter_id'		=> Array ( '0' => META_FILTER_ANY ),
 		'handler_id'		=> Array ( '0' => META_FILTER_ANY ),
 		'show_resolution'	=> Array ( '0' => META_FILTER_ANY ),
 		'show_build'		=> Array ( '0' => META_FILTER_ANY ),
 		'show_version'		=> Array ( '0' => META_FILTER_ANY ),
 		'hide_status'		=> Array ( '0' => $t_hide_status_default ),
-		'user_monitor'		=> Array ( '0' => META_FILTER_ANY )
+		'user_monitor'		=> Array ( '0' => META_FILTER_ANY ),
+		'sort'              => 'priority,last_updated',
+			'dir'               => 'DESC,DESC'
+	);
+	$url_link_parameters['verify'] = 'show_status=' . $t_bug_resolved_status_threshold . '&amp;sort_0=priority&amp;dir_0=DESC&amp;sort_1=last_updated&amp;dir_1=DESC';
+	
+	$zuordnung = config_get( 'Zuordnung_User_Zuschauer' );
+	
+	
+		$c_filter['zuschauer'] = array(
+		'show_category'		=> Array ( '0' => META_FILTER_ANY ),
+		'show_severity'		=> Array ( '0' => META_FILTER_ANY ),
+		'show_status'		=> Array ( '0' => META_FILTER_ANY ),
+		'highlight_changed'	=> $t_default_show_changed,
+		'reporter_id'		=> Array ( '0' => META_FILTER_ANY ),
+		'handler_id'		=> Array ( '0' => META_FILTER_ANY ),
+		'show_resolution'	=> Array ( '0' => META_FILTER_ANY ),
+		'show_build'		=> Array ( '0' => META_FILTER_ANY ),
+		'show_version'		=> Array ( '0' => META_FILTER_ANY ),
+		'hide_status'		=> Array ( '0' => META_FILTER_ANY ),
+		'user_monitor'		=> Array ( '0' => $zuordnung[$t_current_user_id] ),
+		'sort'              => 'priority,last_updated',
+			'dir'               => 'DESC,DESC'
 	);
-	$url_link_parameters['verify'] = 'reporter_id=' . $t_current_user_id . '&amp;show_status=' . $t_bug_resolved_status_threshold;
+	$url_link_parameters['zuschauer'] = 'user_monitor=' . $zuordnung[$t_current_user_id] . '&amp;sort_0=priority&amp;dir_0=DESC&amp;sort_1=last_updated&amp;dir_1=DESC';
+
 
         $rows = filter_get_bug_rows ( $f_page_number, $t_per_page, $t_page_count, $t_bug_count, $c_filter[$t_box_title]  );
 
@@ -190,7 +216,6 @@
 		?>
 	</td>
 </tr>
-
 <?php mark_time( 'begin loop' ); ?>
 <?php # -- Loop over bug rows and create $v_* variables -- ?>
 <?php
@@ -263,6 +288,10 @@
 				echo '] ';
 			}
 			echo string_display( $v_category );
+			if ($v_version){
+				echo '&nbsp;-&nbsp;';
+				echo string_display( $v_version );
+			}
 
 			if ( $v_last_updated > strtotime( '-'.$t_filter['highlight_changed'].' hours' ) ) {
 				echo ' - <b>' . $t_last_updated . '</b>';
@@ -278,7 +307,6 @@
 	}
 ?>
 <?php # -- ====================== end of BUG LIST ========================= -- ?>
-
 </table>
 
 <?php mark_time( 'end loop' ); ?>
diff -urN mantis/core/print_api.php mantisInsiders/core/print_api.php
--- mantis/core/print_api.php	2005-12-08 23:28:16.000000000 +0100
+++ mantisInsiders/core/print_api.php	2006-01-24 14:08:15.789411700 +0100
@@ -163,7 +163,7 @@
 	# This populates an option list with the appropriate users by access level
 	#
 	# @@@ from print_reporter_option_list
-	function print_user_option_list( $p_user_id, $p_project_id = null, $p_access = ANYBODY ) {
+	function print_user_option_list( $p_user_id, $p_project_id = null, $p_access = ANYBODY, $p_bug_id = null ) {
 		$t_users = array();
 
 		if ( null === $p_project_id ) {
@@ -192,11 +192,40 @@
 			$t_sort[] = $t_sort_name;
 		}
 		array_multisort( $t_sort, SORT_ASC, SORT_STRING, $t_users, $t_display );
-		for ($i = 0; $i < count( $t_sort ); $i++ ) {
-			$t_row = $t_users[$i];
-			PRINT '<option value="' . $t_row['id'] . '" ';
-			check_selected( $p_user_id, $t_row['id'] );
-			PRINT '>' . $t_display[$i] . '</option>';
+		
+		#Sollen wir die leute markieren, die den Bug monitoren?
+		if ($p_bug_id) { 
+					$c_bug_id = db_prepare_int( $p_bug_id );
+					$t_bug_monitor_table = config_get( 'mantis_bug_monitor_table' );
+					$t_user_table = config_get( 'mantis_user_table' );
+				
+					# get the bugnote data
+					$query = "SELECT user_id, enabled, username
+							FROM $t_bug_monitor_table m, $t_user_table u
+							WHERE m.bug_id=$c_bug_id AND m.user_id = u.id
+							ORDER BY u.realname, u.username";
+					$result = db_query($query);
+					$num_users = db_num_rows($result);
+				
+					for ( $i = 0; $i < $num_users; $i++ ) {
+				 			$row = db_fetch_array( $result );
+							$monitors[$i] = prepare_user_name( $row['user_id'] );
+						}
+ 					for ($i = 0; $i < count( $t_sort ); $i++ ) {
+						$t_row = $t_users[$i];
+						PRINT '<option value="' . $t_row['id'] . '" ';
+						check_selected( $monitors, $t_display[$i] );
+						PRINT '>' . $t_display[$i] . '</option>';
+					}
+
+			} else {
+		
+			for ($i = 0; $i < count( $t_sort ); $i++ ) {
+				$t_row = $t_users[$i];
+				PRINT '<option value="' . $t_row['id'] . '" ';
+			check_selected( $p_user_id, $t_row['id'] );
+				PRINT '>' . $t_display[$i] . '</option>';
+			}
 		}
 	}
 
@@ -700,8 +729,8 @@
 	# --------------------
 	# prints the list of a project's users
 	# if no project is specified uses the current project
-	function print_project_user_option_list( $p_project_id=null ) {
- 		print_user_option_list( 0, $p_project_id );
+	function print_project_user_option_list( $p_project_id=null, $p_bug_id = null ) {
+ 		print_user_option_list( 0, $p_project_id, ANYBODY, $p_bug_id );
 	}
 	# --------------------
 	# prints the list of access levels exluding ADMINISTRATOR
diff -urN mantis/lang/strings_german.txt mantisInsiders/lang/strings_german.txt
--- mantis/lang/strings_german.txt	2005-08-11 13:33:04.000000000 +0200
+++ mantisInsiders/lang/strings_german.txt	2006-01-25 16:21:35.704734800 +0100
@@ -33,7 +33,7 @@
 $s_actiongroup_menu_update_priority = 'Prioritt ndern';
 $s_actiongroup_menu_update_status = 'Status ndern';
 $s_actiongroup_menu_update_view_status = 'Anzeigestatus ndern';
-$s_actiongroup_menu_update_category = 'Kategorie ndern';
+$s_actiongroup_menu_update_category = 'Komponente ndern';
 $s_actiongroup_menu_set_sticky = 'Fixierung setzen/lsen';
 $s_actiongroup_menu_update_field = 'Aktualisiere %s';
 $s_actiongroup_bugs = 'Ausgewhlte Probleme';
@@ -43,7 +43,7 @@
 $s_move_bugs = 'Problem verschieben';
 $s_operation_successful = 'Aktion erfolgreich.';
 $s_date_order = 'Sortieren nach Datum';
-$s_print_all_bug_page_link = 'Berichte drucken';
+$s_print_all_bug_page_link = 'Berichte_drucken';
 $s_csv_export = 'CSV-Export';
 $s_login_anonymously = 'Anonym anmelden';
 $s_anonymous = 'Anonymous';
@@ -57,8 +57,8 @@
 $s_print = 'Drucken';
 $s_jump = 'Zu Problem springen';
 $s_copy_users = 'Benutzer kopieren';
-$s_copy_categories_from = 'Kategorien kopieren von';
-$s_copy_categories_to = 'Kategorien kopieren nach';
+$s_copy_categories_from = 'Komponenten kopieren von';
+$s_copy_categories_to = 'Komponenten kopieren nach';
 $s_copy_users_from = 'Benutzer kopieren von';
 $s_copy_users_to = 'Benutzer kopieren nach';
 $s_bug_history = 'Problem-Historie';
@@ -69,8 +69,8 @@
 $s_bugnote = 'Problemnotiz';
 $s_change = 'nderung';
 $s_bugnote_view_state = 'Problemnotiz Anzeigestatus';
-$s_bug_monitor = 'Problem beobachten';
-$s_bug_end_monitor = 'Problembeobachtung beendet';
+$s_bug_monitor = 'zustndig eingetragen';
+$s_bug_end_monitor = 'Zustndigkeit beendet';
 $s_announcement = 'Ankndigung';
 $s_stays_on_top = 'Im Vordergrund bleiben';
 $s_delete_bugnote_button = 'Problemnotiz lschen';
@@ -154,7 +154,7 @@
 $s_resolution_link = 'nach Lsung';
 $s_legend_still_open = 'Noch offen';
 $s_legend_resolved = 'Erledigt';
-$s_legend_assigned = 'Zugewiesen';
+$s_legend_assigned = 'Offen';
 $s_legend_total = 'Gesamt';
 $s_legend_opened = 'Geffnet';
 $s_legend_closed = 'Geschlossen';
@@ -286,10 +286,10 @@
 $s_project_view_state_enum_string = '10:ffentlich,50:privat';
 $s_view_state_enum_string = '10:ffentlich,50:privat';
 
-$s_priority_enum_string = '10:keine,20:niedrig,30:normal,40:hoch,50:dringend,60:sofort';
+$s_priority_enum_string = '10:keine,20:keine Aktion,30:4 - niedrig,40:3 - normal,50:2 - hoch,60:1 - sofort';
 $s_severity_enum_string = '10:Feature-Wunsch,20:Trivial,30:Fehler im Text,40:Unschnheit,50:kleinerer Fehler,60:schwerer Fehler,70:Absturz,80:Blocker';
 $s_reproducibility_enum_string = '10:immer,30:manchmal,50:zufllig,70:nicht getestet,90:nicht reproduzierbar,100:N/A';
-$s_status_enum_string = '10:neu,20:Rckmeldung,30:anerkannt,40:besttigt,50:zugewiesen,80:erledigt,90:geschlossen';
+$s_status_enum_string = '10:neu,20:feedback,30:anerkannt,40:besttigt,50:offen,80:erledigt,90:geschlossen';
 $s_resolution_enum_string = '10:offen,20:erledigt,30:wiedererffnet,40:nicht reproduzierbar,50:unlsbar,60:doppelt,70:kein Fehler,80:aufgeschoben,90:wird nicht behoben';
 $s_projection_enum_string = '10:keine,30:Kleinigkeit,50:kleinere nderung,70:grere nderung,90:Neuentwicklung';
 $s_eta_enum_string = '10:keine,20:< 1 Tag,30:2-3 Tage,40:< 1 Woche,50:< 1 Monat,60:> 1 Monat';
@@ -309,39 +309,39 @@
 $s_reset_request_msg = 'Jemand (vermutlich Sie) hat einen Passwortwechsel durch E-Mail-Besttigung angefordert. Wenn Sie es nicht waren, ignorieren Sie diese Nachricht, es wird nichts passieren.' . "\n\n" . 'Wenn Sie die Besttigung angefordert haben, besuchen Sie die folgende URL, um ihr Passwort zu ndern:';
 $s_reset_request_in_progress_msg = 'Wenn Sie Benutzernamen und E-Mail-Adresse fr Ihr Konto richtig angegeben haben, senden wir Ihnen jetzt eine Besttigungsmail an diese Adresse. Nach dem Erhalt der Meldung befolgen Sie bitte die Anweisungen, um das Passwort Ihres Kontos zu ndern.';
 
-$s_email_notification_title_for_status_bug_new = 'Das folgende Problem hat (erneut) den Status NEU';
-$s_email_notification_title_for_status_bug_feedback = 'Das folgende Problem bentigt Ihre Rckmeldung.';
+$s_email_notification_title_for_status_bug_new = 'NEU';
+$s_email_notification_title_for_status_bug_feedback = 'Feedback';
 $s_email_notification_title_for_status_bug_acknowledged = 'Das folgende Problem wurde anerkannt.';
 $s_email_notification_title_for_status_bug_confirmed = 'Das folgende Problem wurde besttigt.';
-$s_email_notification_title_for_status_bug_assigned = 'Das folgende Problem wurde zugewiesen.';
-$s_email_notification_title_for_status_bug_resolved = 'Das folgende Problem wurde erledigt.';
-$s_email_notification_title_for_status_bug_closed = 'Das folgende Problem wurde geschlossen.';
-
-$s_email_notification_title_for_action_bug_submitted = 'Das folgende Problem wurde mitgeteilt.';
-$s_email_notification_title_for_action_bug_assigned = 'Das folgende Problem wurde zugewiesen.';
-$s_email_notification_title_for_action_bug_reopened = 'Das folgende Problem wurde wiedererffnet.';
-$s_email_notification_title_for_action_bug_deleted = 'Das folgende Problem wurde gelscht.';
-$s_email_notification_title_for_action_bug_updated = 'Das folgende Problem wurde aktualisiert.';
+$s_email_notification_title_for_status_bug_assigned = 'Offen';
+$s_email_notification_title_for_status_bug_resolved = 'Erledigt';
+$s_email_notification_title_for_status_bug_closed = 'Geschlossen';
+
+$s_email_notification_title_for_action_bug_submitted = 'Mitgeteilt';
+$s_email_notification_title_for_action_bug_assigned = 'Offen';
+$s_email_notification_title_for_action_bug_reopened = 'Wiedererffnet';
+$s_email_notification_title_for_action_bug_deleted = 'Gelscht';
+$s_email_notification_title_for_action_bug_updated = 'Aktualisiert';
 $s_email_notification_title_for_action_sponsorship_added = 'Das folgende Problem hat einen Sponsor.';
 $s_email_notification_title_for_action_sponsorship_updated = 'Die Sponsorenschaft des folgenden Problems wurde gendert.';
 $s_email_notification_title_for_action_sponsorship_deleted = 'Die Sponsorenschaft des folgenden Problems wurde zurckgezogen.';
 
-$s_email_notification_title_for_action_bugnote_submitted = 'Eine Notiz wurde zu diesem Problem hinzugefgt.';
-$s_email_notification_title_for_action_duplicate_of_relationship_added = "Das folgende Problem wurde als DUPLIKAT VON Problem %s bestimmt.";
-$s_email_notification_title_for_action_has_duplicate_relationship_added = "Das Problem %s wurde als DUPLIKAT VON des folgenden Problems bestimmt.";
-$s_email_notification_title_for_action_related_to_relationship_added = "Das folgende Problem wurde als VERWANDT MIT Problem %s bestimmt.";
-$s_email_notification_title_for_action_dependant_on_relationship_added = "Das folgende Problem wurde als ABHNGIG VON Problem %s bestimmt.";
-$s_email_notification_title_for_action_blocks_relationship_added = "Das folgende Problem wurde als VORAUSSETZUNG FR Problem %s bestimmt.";
-$s_email_notification_title_for_action_duplicate_of_relationship_deleted = "Die Beziehung des folgenden Problems als DUPLIKAT VON Problem %s wurde aufgehoben.";
-$s_email_notification_title_for_action_has_duplicate_relationship_deleted = "Die Beziehung des Problems %s als DUPLIKAT VON des folgenden Problems wurde aufgehoben.";
-$s_email_notification_title_for_action_related_to_relationship_deleted = "Die Beziehung des folgenden Problems als VERWANDT MIT Problem %s wurde aufgehoben.";
-$s_email_notification_title_for_action_dependant_on_relationship_deleted = "Das folgende Problem ist nicht mehr ABHNGIG VON Problem %s.";
-$s_email_notification_title_for_action_blocks_relationship_deleted = "Das folgende Problem ist nicht mehr VORAUSSETZUNG FR Problem %s..";
-$s_email_notification_title_for_action_relationship_child_resolved = "Das VERWANDTE Problem %s wurde ERLEDIGT.";
-$s_email_notification_title_for_action_relationship_child_closed = "Das VERWANDTE Problem %s wurde GESCHLOSSEN.";
+$s_email_notification_title_for_action_bugnote_submitted = 'Notiz';
+$s_email_notification_title_for_action_duplicate_of_relationship_added = "Duplikat";
+$s_email_notification_title_for_action_has_duplicate_relationship_added = "Duplikat";
+$s_email_notification_title_for_action_related_to_relationship_added = "Verwandt";
+$s_email_notification_title_for_action_dependant_on_relationship_added = "Abhngig";
+$s_email_notification_title_for_action_blocks_relationship_added = "Voraussetzungen";
+$s_email_notification_title_for_action_duplicate_of_relationship_deleted = "Nicht Duplikat";
+$s_email_notification_title_for_action_has_duplicate_relationship_deleted = "Nicht Duplikat";
+$s_email_notification_title_for_action_related_to_relationship_deleted = "Nicht verwandt";
+$s_email_notification_title_for_action_dependant_on_relationship_deleted = "Nicht abhngig";
+$s_email_notification_title_for_action_blocks_relationship_deleted = "Nicht vorraussetzung";
+$s_email_notification_title_for_action_relationship_child_resolved = "Verwandt erledigt";
+$s_email_notification_title_for_action_relationship_child_closed = "Verwandt geschlossen";
 
 $s_email_reporter = 'Berichtet von';
-$s_email_handler = 'Zugewiesen an';
+$s_email_handler = 'Reserviert fr';
 $s_email_project = 'Projekt';
 $s_email_bug = 'Problem ID';
 $s_email_category = 'Kategorie';
@@ -471,16 +471,16 @@
 $s_multiple_projects = 'Die von Ihnen ausgewhlten Probleme gehren zu verschiedenen Projekten.  Die unten stehenden Parameter bercksichtigen die Einstellungen aller Projekte. Falls das falsch ist, versuchen Sie eine nderung mit weniger ausgewhlten Problemen.';
 
 # bug_assign.php
-$s_bug_assign_msg = 'Das Problem wurde zugewiesen...';
+$s_bug_assign_msg = 'Das Problem wurde reserviert...';
 
 # bug_change_status_page.php
 $s_new_bug_title = 'Neues Problem';
-$s_feedback_bug_title = 'Rckmeldung zum Problem machen';
+$s_feedback_bug_title = 'Feedback anfordern';
 $s_acknowledged_bug_title = 'Problem anerkennen';
 $s_confirmed_bug_title = 'Problem besttigen';
 $s_assigned_bug_title = 'Problem zuweisen';
 $s_new_bug_button = 'Neues Problem';
-$s_feedback_bug_button = 'Rckmeldung machen';
+$s_feedback_bug_button = 'Feedback anfordern';
 $s_acknowledged_bug_button = 'Problem anerkennen';
 $s_confirmed_bug_button = 'Problem besttigen';
 $s_assigned_bug_button = 'Problem zuweisen';
@@ -500,8 +500,8 @@
 $s_delete_bug_button = 'Problem lschen';
 
 # bug_monitor.php
-$s_monitor_bug_button = 'Problem beobachten';
-$s_unmonitor_bug_button = 'Beobachtung beenden';
+$s_monitor_bug_button = 'mich als zustndig eintragen';
+$s_unmonitor_bug_button = 'meine Zustndigkeit beenden';
 
 # bug_file_add.php
 $s_file_upload_msg = 'Dateitransfer erfolgreich';
@@ -531,7 +531,7 @@
 $s_to = 'An:';
 $s_on = 'Am';
 $s_sent_you_this_reminder_about = 'hat Ihnen diese Erinnerung bezglich des folgenden Problems gesandt:';
-$s_bug_reminder = 'Erinnerung senden';
+$s_bug_reminder = 'Erinnerung_senden_/_als_Zustndig_markieren';
 $s_reminder_sent_to = 'Erinnerung gesendet an';
 $s_bug_send_button = 'Absenden';
 $s_reminder = 'Erinnerung';
@@ -550,13 +550,13 @@
 $s_update_simple_link = 'einfache Aktualisierung';
 $s_updating_bug_advanced_title = 'Probleminformation aktualisieren';
 $s_id = 'ID';
-$s_category = 'Kategorie';
+$s_category = 'Komponente';
 $s_severity = 'Auswirkung';
 $s_reproducibility = 'Reproduzierbar';
 $s_date_submitted = 'Meldungsdatum';
 $s_last_update = 'Letzte Aktualisierung';
 $s_reporter = 'Reporter';
-$s_assigned_to = 'Bearbeitung durch';
+$s_assigned_to = 'Reserviert fr';
 $s_priority = 'Prioritt';
 $s_resolution = 'Lsung';
 $s_status = 'Status';
@@ -572,7 +572,7 @@
 $s_summary = 'Zusammenfassung';
 $s_description = 'Beschreibung';
 $s_steps_to_reproduce = 'Schritte zur Reproduktion';
-$s_update_information_button = 'Information aktualisieren';
+$s_update_information_button = 'nderungen bernehmen';
 $s_sticky_issue = 'Fixiertes Problem';
 $s_profile = 'Profil';
 
@@ -636,7 +636,7 @@
 $s_lost_password_confirm_hash_OK = "Ihr Besttigung wurde akzeptiert. Bitte aktualisieren Sie Ihr Passwort.";
 
 # main_page.php
-$s_open_and_assigned_to_me = 'Offen und mir zugewiesen';
+$s_open_and_assigned_to_me = 'Offen und fr mich reserviert';
 $s_open_and_reported_to_me = 'Offen und von mir berichtet';
 $s_newer_news_link = 'Neuere Nachrichten';
 $s_older_news_link = 'ltere Nachrichten';
@@ -687,7 +687,7 @@
 $s_colour_project = 'Projekteinstellungen berschreiben andere.';
 $s_colour_global = 'Alle Projekteinstellungen berschreiben die Standardwerte.';
 $s_issue_reporter = 'Benutzer, der das Problem gemeldet hat';
-$s_issue_handler = 'Benutzer, dem das Problem zugewiesen wurde';
+$s_issue_handler = 'Benutzer, fr den das Problem reserviert wurde';
 $s_users_added_bugnote = 'Benutzer, die Notizen eingegeben haben';
 $s_change_configuration = 'Konfiguration ndern';
 $s_message = 'Meldung';
@@ -732,7 +732,7 @@
 $s_allow_user_edit = 'Benutzer drfen eigene Notizen bearbeiten';
 $s_limit_access = 'Begrenze zu Zugriff der Berichterstatter auf ihre eigenen Probleme';
 $s_submit_status = 'Status fr neu eingegebene Probleme';
-$s_assigned_status = 'Status, auf den automatisch zugewiesene Probleme gesetzt werden';
+$s_assigned_status = 'Status, auf den automatisch reservierte Probleme gesetzt werden';
 $s_resolved_status = 'Status, bei dem ein Problem als erledigt angesehen wird';
 $s_readonly_status = 'Status, bei dem ein Problem schreibgeschtzt wird.';
 $s_reopen_status = 'Status, auf den ein wiedererffnetes Problem gesetzt wird';
@@ -856,29 +856,30 @@
 
 # menu_inc.php
 $s_main_link = 'Startseite';
-$s_view_bugs_link = 'Probleme anzeigen';
-$s_report_bug_link = 'Probleme eingeben';
+$s_view_bugs_link = 'Bugliste';
+$s_report_bug_link = 'Bugs eingeben';
 $s_changelog_link = 'nderungsprotokoll';
-$s_summary_link = 'Zusammenfassung';
+$s_summary_link = 'Statistiken';
 $s_account_link = 'Konto';
 $s_users_link = 'Benutzer';
 $s_manage_link = 'Verwaltung';
 $s_edit_news_link = 'Nachrichten bearbeiten';
 $s_docs_link = 'Dokumentation';
 $s_logout_link = 'Abmelden';
-$s_my_view_link = 'bersicht';
+$s_my_view_link = 'Mein Mantis';
 
 # meta_inc.php
 
 # my_view_page.php
-$s_my_view_title_unassigned = 'Nicht zugewiesen';
-$s_my_view_title_recent_mod = 'Vor kurzem bearbeitet';
-$s_my_view_title_reported = 'Von mir berichtet';
-$s_my_view_title_assigned = 'Mir zugewiesen (noch nicht erledigt)';
-$s_my_view_title_resolved = 'Erledigt';
-$s_my_view_title_monitored = 'Von mir beobachtet';
-$s_my_view_title_feedback = 'Warte auf Rckmeldung von MIR';
-$s_my_view_title_verify = 'Warte auf Besttigung der Lsung durch MICH';
+$s_my_view_title_unassigned = 'Neu';
+$s_my_view_title_recent_mod = 'Krzlich bearbeitet';
+$s_my_view_title_reported = 'Von mir gemeldet';
+$s_my_view_title_assigned = 'Fr mich reserviert';
+$s_my_view_title_resolved = 'Krzlich erledigt';
+$s_my_view_title_monitored = 'Dafr bin ich zustndig';
+$s_my_view_title_feedback = 'Wartet auf Feedback von MIR';
+$s_my_view_title_verify = 'Wartet auf Besttigung der Lsung';
+$s_my_view_title_zuschauer = 'Beobachtet mein Zuschauer';
 
 # news_add.php
 $s_news_added_msg = 'Nachricht hinzugefgt...';
@@ -971,7 +972,7 @@
 
 # report_bug_advanced_page.php
 $s_simple_report_link = 'Einfacher Bericht';
-$s_enter_report_details_title = 'Berichtdetails eingeben';
+$s_enter_report_details_title = 'Bugdetails eingeben';
 $s_required = 'erforderlich';
 $s_select_category = 'Kategorie whlen';
 $s_select_reproducibility = 'Reproduzierbarkeit whlen';
@@ -979,7 +980,7 @@
 $s_or_fill_in = 'ODER ausfllen';
 $s_assign_to = 'Zuordnung an ';
 $s_additional_information = 'Zustzliche Information';
-$s_submit_report_button = 'Bericht absenden';
+$s_submit_report_button = 'Bug eintragen';
 $s_check_report_more_bugs = 'auswhlen, um weitere Probleme zu melden';
 
 # report_bug_page.php
@@ -1022,7 +1023,7 @@
 $s_by_date = 'Nach Datum';
 $s_by_severity = 'Nach Schweregrad';
 $s_by_resolution = 'Nach Lsung';
-$s_by_category = 'Nach Kategorie';
+$s_by_category = 'Nach Komponente';
 $s_by_priority = 'Nach Prioritt';
 $s_by_developer = 'Nach Entwickler';
 $s_by_reporter ='Nach Reporter';
@@ -1046,7 +1047,7 @@
 $s_any = 'alle';
 $s_show = 'Zeige';
 $s_changed = 'gendert (Std.)';
-$s_viewing_bugs_title = 'Probleme anzeigen';
+$s_viewing_bugs_title = 'Bugliste';
 $s_updated = 'Aktualisiert';
 $s_sticky = 'Fixierte Probleme anzeigen';
 $s_sort = 'Sortieren nach';
@@ -1089,8 +1090,8 @@
 $s_viewing_bug_advanced_details_title = 'Erweiterte Problemanzeige';
 $s_product_build = 'Produktbuild';
 $s_system_profile = 'Systembeschreibung';
-$s_update_bug_button = 'Aktualisieren';
-$s_bug_assign_to_button = 'Zuordnen zu';
+$s_update_bug_button = 'Bearbeiten';
+$s_bug_assign_to_button = 'Reservieren fr';
 $s_bug_status_to_button = 'Status wechseln zu:';
 $s_reopen_bug_button = 'Wiedererffnen';
 $s_move_bug_button = 'Verschieben';
@@ -1106,7 +1107,7 @@
 
 # bug_monitor_list_view_inc.php
 $s_no_users_monitoring_bug = 'Keine Benutzer beobachten dieses Problem.';
-$s_users_monitoring_bug = 'Benutzer, die dieses Problem beobachten';
+$s_users_monitoring_bug = 'Zustndig / Beob.';
 $s_monitoring_user_list = 'Benutzer';
 
 # bug_sponsorship_list_view_inc.php
@@ -1162,7 +1163,7 @@
 $s_and_above = 'und darber';
 $s_advanced_filters = 'Erweiterte Filter';
 $s_simple_filters = 'Einfache Filter';
-$s_monitored_by = 'Beobachtet von';
+$s_monitored_by = 'Zustndig / Zuschauer';
 
 $s_attachments = 'Angehngte Datei(en)';
 $s_attachment_alt = 'D';
diff -urN mantis/manage_user_create_page.php mantisInsiders/manage_user_create_page.php
--- mantis/manage_user_create_page.php	2005-03-21 21:48:56.000000000 +0100
+++ mantisInsiders/manage_user_create_page.php	2006-01-25 12:00:18.586674000 +0100
@@ -99,6 +99,7 @@
 		<input type="checkbox" name="protected" />
 	</td>
 </tr>
+<tr><td colspan = "2"><b><font color="red">Denke daran, dass fr neue Benutzer auch ein Zuschauer-Account erstellt werden sollte und die ID des Users + Zuschauers dann in die Config kommt! Fragen? --> HRi</font></b></td></tr>
 <tr>
 	<td class="center" colspan="2">
 		<input type="submit" class="button" value="<?php echo lang_get( 'create_user_button' ) ?>" />
diff -urN mantis/my_view_page.php mantisInsiders/my_view_page.php
--- mantis/my_view_page.php	2005-08-07 15:42:04.000000000 +0200
+++ mantisInsiders/my_view_page.php	2006-01-20 10:49:14.587345900 +0100
@@ -75,7 +75,7 @@
 		}
 
 		# don't display "Assigned to Me" bugs to users that bugs can't be assigned to
-		else if ( $t_box_title == 'assigned' && ( current_user_is_anonymous() OR user_get_assigned_open_bug_count( $t_current_user_id, $t_project_id ) == 0 ) ) {
+		else if ( $t_box_title == 'assigned' && ( current_user_is_anonymous()) ) {
 			$t_number_of_boxes = $t_number_of_boxes - 1;
 		}
 
diff -urN mantis/print_all_bug_page_word.php mantisInsiders/print_all_bug_page_word.php
--- mantis/print_all_bug_page_word.php	2005-08-18 17:33:28.000000000 +0200
+++ mantisInsiders/print_all_bug_page_word.php	2006-01-23 16:36:13.010693000 +0100
@@ -265,11 +265,27 @@
 </tr>
 <tr class="print">
 	<td class="print-category">
-		<?php echo lang_get( 'eta' ) ?>:
+		<?php echo lang_get( 'users_monitoring_bug') ?>:
 	</td>
 	<td class="print">
-		<?php echo get_enum_element( 'eta', $v_eta ) ?>
-	</td>
+	<?php 
+		# get the bugnote data
+			$c_bug_id = db_prepare_int( $f_bug_id );
+	$t_bug_monitor_table = config_get( 'mantis_bug_monitor_table' );
+	$t_user_table = config_get( 'mantis_user_table' );
+	$queryHRI = "SELECT user_id, enabled
+			FROM $t_bug_monitor_table m, $t_user_table u
+			WHERE m.bug_id=$v_id AND m.user_id = u.id
+			ORDER BY u.realname, u.username";
+	$resultHRI = db_query($queryHRI);
+	$num_usersHRI = db_num_rows($resultHRI);
+
+ 		for ( $i = 0; $i < $num_usersHRI; $i++ ) {
+ 			$rowHRI = db_fetch_array( $resultHRI );
+			echo ($i > 0) ? ', ' : '';
+			echo print_user( $rowHRI['user_id'] );
+ 		}
+?>	</td>
 	<td class="print" colspan="4">&nbsp;</td>
 </tr>
 <?php
diff -urN mantis/view_all_inc.php mantisInsiders/view_all_inc.php
--- mantis/view_all_inc.php	2005-07-18 20:57:00.000000000 +0200
+++ mantisInsiders/view_all_inc.php	2006-01-23 16:41:14.144694100 +0100
@@ -109,9 +109,9 @@
 </tr>
 
 <?php # -- Spacer row -- ?>
-<tr>
+<!-- <tr>
 	<td class="spacer" colspan="<?php echo $col_count; ?>"> &nbsp; </td>
-</tr>
+</tr> -->
 <?php
 	function write_bug_rows ( $p_rows )
 	{
