[LON-CAPA-cvs] cvs: loncom /homework grades.pm /localize/localize de.pm

[raeburn]

raeburn		Mon Oct 10 16:36:07 2011 EDT

  Modified files:              
    /loncom/homework	grades.pm 
    /loncom/localize/localize	de.pm 
  Log:
  - Remove extra word.
  - Consistent wording: "bubble sheet" -> "bubblesheet"
  
  
Index: loncom/homework/grades.pm
diff -u loncom/homework/grades.pm:1.658 loncom/homework/grades.pm:1.659
--- loncom/homework/grades.pm:1.658	Mon Oct 10 10:13:17 2011
+++ loncom/homework/grades.pm	Mon Oct 10 16:35:59 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.658 2011/10/10 10:13:17 bisitz Exp $
+# $Id: grades.pm,v 1.659 2011/10/10 16:35:59 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4837,12 +4837,12 @@
    from the file that we are parsing that represents one entire sheet
 
    'bubble line' refers to the data
-   representing the line of bubbles that are on the physical bubble sheet
+   representing the line of bubbles that are on the physical bubblesheet
 
 
-The overall process is that a scanned in bubble sheet data is uploaded
+The overall process is that a scanned in bubblesheet data is uploaded
 into a course. When a user wants to grade, they select a
-sequence/folder of resources, a file of bubble sheet info, and pick
+sequence/folder of resources, a file of bubblesheet info, and pick
 one of the predefined configurations for what each scanline looks
 like.
 
@@ -4858,14 +4858,14 @@
 
 During the validation phase the instructor can choose to skip scanlines. 
 
-After the validation phase, there are now 3 bubble sheet files
+After the validation phase, there are now 3 bubblesheet files
 
   scantron_original_filename (unmodified original file)
   scantron_corrected_filename (file where the corrected information has replaced the original information)
   scantron_skipped_filename (contains the exact text of scanlines that where skipped)
 
 Also there is a separate hash nohist_scantrondata that contains extra
-correction information that isn't representable in the bubble sheet
+correction information that isn't representable in the bubblesheet
 file (see &scantron_getfile() for more information)
 
 After all scanlines are either valid, marked as valid or skipped, then
@@ -5160,7 +5160,7 @@
 
 =item scantron_selectphase
 
-  Generates the initial screen to start the bubble sheet process.
+  Generates the initial screen to start the bubblesheet process.
   Allows for - starting a grading run.
              - downloading existing scan data (original, corrected
                                                 or skipped info)
@@ -6182,7 +6182,7 @@
 =item check_for_error
 
     Checks if there was an error when attempting to remove a specific
-    scantron_.. bubble sheet data file. Prints out an error if
+    scantron_.. bubblesheet data file. Prints out an error if
     something went wrong.
 
 =cut
@@ -6316,7 +6316,7 @@
 
 =item scantron_validate_file
 
-    Dispatch routine for doing validation of a bubble sheet data file.
+    Dispatch routine for doing validation of a bubblesheet data file.
 
     Also processes any necessary information resets that need to
     occur before validation begins (ignore previous corrections,
@@ -6427,7 +6427,7 @@
 
 =item scantron_remove_file
 
-   Removes the requested bubble sheet data file, makes sure that
+   Removes the requested bubblesheet data file, makes sure that
    scantron_original_<filename> is never removed
 
 
@@ -6452,7 +6452,7 @@
 
 =item scantron_remove_scan_data
 
-   Removes all scan_data correction for the requested bubble sheet
+   Removes all scan_data correction for the requested bubblesheet
    data file.  (In the case that both the are doing skipped records we need
    to remember the old skipped lines for the time being so that element
    persists for a while.)
@@ -6489,7 +6489,7 @@
 
 =item scantron_getfile
 
-    Fetches the requested bubble sheet data file (all 3 versions), and
+    Fetches the requested bubblesheet data file (all 3 versions), and
     the scan_data hash
   
   Arguments:
@@ -6589,7 +6589,7 @@
 
 =item scantron_putfile
 
-    Stores the current version of the bubble sheet data files, and the
+    Stores the current version of the bubblesheet data files, and the
     scan_data hash. (Does not modify the original version only the
     corrected and skipped versions.
 
@@ -6683,7 +6683,7 @@
 
 =item scantron_put_line
 
-    Updates the 'corrected' or 'skipped' versions of the bubble sheet
+    Updates the 'corrected' or 'skipped' versions of the bubblesheet
     data file.
 
  Arguments:
@@ -6957,7 +6957,7 @@
 	    $r->print("
     <label>
         <input type='radio' name='scantron_CODE_resolution' value='use_unfound'$checked />
-       ".&mt("Use the CODE [_1] that is was on the paper, ignoring the error.",
+       ".&mt("Use the CODE [_1] that was on the paper, ignoring the error.",
 	     "<b><tt>".$$scan_record{'scantron.CODE'}."</tt></b>")."
     </label>");
 	    $r->print("\n<br />");
@@ -9641,7 +9641,7 @@
 
 =item  scantron_process_students() : 
 
-   Routine that does the actual grading of the bubble sheet information.
+   Routine that does the actual grading of the bubblesheet information.
 
    The parsed scanline hash is added to %env 
 
@@ -9661,7 +9661,7 @@
 
 =item  scantron_upload_scantron_data() :
 
-    Creates the screen for adding a new bubble sheet data file to a course.
+    Creates the screen for adding a new bubblesheet data file to a course.
 
 =item  scantron_upload_scantron_data_save() : 
 
@@ -9675,7 +9675,7 @@
 =item  scantron_download_scantron_data() : 
 
    Shows a list of the three internal files (original, corrected,
-   skipped) for a specific bubble sheet data file that exists in the
+   skipped) for a specific bubblesheet data file that exists in the
    course.
 
 =item  scantron_validate_ID() : 
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.435 loncom/localize/localize/de.pm:1.436
--- loncom/localize/localize/de.pm:1.435	Mon Oct 10 15:39:58 2011
+++ loncom/localize/localize/de.pm	Mon Oct 10 16:36:06 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # German Localization Lexicon
 #
-# $Id: de.pm,v 1.435 2011/10/10 15:39:58 raeburn Exp $
+# $Id: de.pm,v 1.436 2011/10/10 16:36:06 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -21320,7 +21320,7 @@
    'Use the similar CODE [_1] instead.'
 => 'Stattdessen ähnlichen CODE [_1] verwenden.',
 
-   'Use the CODE [_1] that is was on the paper, ignoring the error.'
+   'Use the CODE [_1] that was on the paper, ignoring the error.'
 => 'Den CODE [_1] verwenden, der auf der Seite war und den Fehler ignorieren.',
 
    '[_1]Select[_2] a CODE from the list of all CODEs and use it.'