Index: gp-includes/things/translation.php
===================================================================
--- gp-includes/things/translation.php	(revision 586)
+++ gp-includes/things/translation.php	(working copy)
@@ -99,7 +99,13 @@
 		} elseif ( 'no' == gp_array_get( $filters, 'warnings' ) ) {
 			$where[] = 't.warnings IS NULL';
 		}
-	
+		if ( 'yes' == gp_array_get( $filters, 'with_context' ) ) {
+			$where[] = 'o.context IS NOT NULL';
+		}
+		if ( 'yes' == gp_array_get( $filters, 'with_comment' ) ) {
+			$where[] = 'o.comment IS NOT NULL AND o.comment <> ""';
+		}
+
 		if ( gp_array_get( $filters, 'user_login' ) ) {
 			$user = GP::$user->by_login( $filters['user_login'] );
 			// do not return any entries if the user doesn't exist
Index: gp-templates/translations.php
===================================================================
--- gp-templates/translations.php	(revision 586)
+++ gp-templates/translations.php	(working copy)
@@ -68,7 +68,12 @@
 				), gp_array_get( $filters, 'translated', 'either' ) );
 			?>
 		</dd>
- 		
+
+		<dd>
+			<input type="checkbox" name="filters[with_comment]" value="yes" id="filters[with_comment][yes]" <?php gp_checked( 'yes' == gp_array_get( $filters, 'with_comment' ) ); ?>><label for='filters[with_comment][yes]'><?php _e( 'With comment' ); ?></label><br />
+			<input type="checkbox" name="filters[with_context]" value="yes" id="filters[with_context][yes]" <?php gp_checked( 'yes' == gp_array_get( $filters, 'with_context' ) ); ?>><label for='filters[with_context][yes]'><?php _e( 'With context' ); ?></label>
+		</dd>
+
  		<dt><label><?php _e('Status:'); ?></label></dt>
 		<dd>
 			<?php echo gp_radio_buttons('filters[status]', //TODO: show only these, which user is allowed to see afterwards