--- loncom/homework/structuretags.pm	2013/12/14 01:44:31	1.512.2.5
+++ loncom/homework/structuretags.pm	2013/09/05 12:07:29	1.515
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.512.2.5 2013/12/14 01:44:31 raeburn Exp $
+# $Id: structuretags.pm,v 1.515 2013/09/05 12:07:29 goltermann Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -710,7 +710,7 @@ sub problem_web_to_edit_header {
 ".&mt("Problem Type:")."
 <select name='problemtype'>
   <option value=''></option>
-  ".&option('exam'   ,'problemtype').&mt("Exam Problem")."</option>
+  ".&option('exam'   ,'problemtype').&mt("Bubblesheet Exam Problem")."</option>
   ".&option('problem','problemtype').&mt("Homework Problem")."</option>
   ".&option('survey' ,'problemtype').&mt("Survey Question")."</option>
   ".&option('surveycred' ,'problemtype').&mt("Survey Question (with credit)")."</option>
@@ -966,8 +966,8 @@ sub checkout_msg {
 		'resource'=>'The resource needs to be checked out',
 		'id_expln'=>'As a resource gets checked out, a unique timestamped ID is given to it, and a permanent record is left in the system.',
                 'warning'=>'Checking out resources is subject to course policies, and may exclude future credit even if done erroneously.',
-                'checkout'=>'Check out Exam for Viewing',
-		'checkout?'=>'Check out Exam?');
+                'checkout'=>'Check out Bubblesheet Exam for Viewing',
+		'checkout?'=>'Check out Bubblesheet Exam?');
     my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
     return (<<ENDCHECKOUT);
 <h2>$lt{'resource'}</h2>
@@ -2057,15 +2057,9 @@ sub end_while {
 	    }
 	    $return = &Apache::run::run($code,$safeeval);
 	}
-        if ($error) {
-            &Apache::lonxml::error(
-                '<pre>'
-               .&mt('Code ran too long. It ran for more than [_1] seconds.',
-                        $Apache::lonnet::perlvar{'lonScriptTimeout'})
-               .&mt('This occurred while running &lt;while&gt; on line [_1].',
-                        $line)
-               .'</pre>');
-        }
+	if ($error) {
+	    &Apache::lonxml::error('<pre>'.&mt('Code ran too long. It ran for more than').' '.$Apache::lonnet::perlvar{'lonScriptTimeout'}.' '.&mt('seconds occurred while running &lt;while&gt; on line').' '.$line.'</pre>');
+	}
     } elsif ($target eq "edit") {
 	$result.= &Apache::edit::tag_end($target,$token,'');
     }
@@ -2502,7 +2496,7 @@ sub start_problemtype {
 					    ['hide','Hide']]
 					   ,$token);
 	$result .=&Apache::edit::checked_arg('When used as type(s):','for',
-					     [ ['exam','Exam/Quiz Problem'],
+					     [ ['exam','Bubblesheet Exam/Quiz Problem'],
 					       ['survey','Survey'],
                                                ['surveycred','Survey (with credit)'],
                                                ['anonsurvey','Anonymous Survey'],