diff --git a/checkin_notes b/checkin_notes
index 06e196c562..2d0601d55f 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -4533,3 +4533,13 @@ David  14 May 2009
     sched/
         sched_config.cpp,h
         sched_result.cpp
+
+David  14 May 2009
+    - web: check for mismatched "'s in translation files
+    - build_po.php: add LANG_NAME strings
+
+    html/
+        inc/
+            translation.inc
+        ops/
+            build_po.php
diff --git a/html/inc/translation.inc b/html/inc/translation.inc
index 38aede9ffd..a5a006220d 100644
--- a/html/inc/translation.inc
+++ b/html/inc/translation.inc
@@ -81,9 +81,9 @@ function buildLanguages($langdir,$transdir,$compdir,$append=false){
                         );
                         exit;
                     }
-                    if (!$append) {
+                    //if (!$append) {
                         fwrite($fh, "<?php\n");                    
-                    }
+                    //}
                     foreach ($language as $key => $value){
                         if ($value !== "") {
                             //Skip if the msgstr is empty
@@ -159,7 +159,13 @@ function parseLanguage($file){
 function getPOLineContent($line){
     $start = strpos($line, '"')+1;
     $stop = strrpos($line, '"');
-    return substr($line, $start, $stop-$start);
+    $x =  substr($line, $start, $stop-$start);
+    $n = ereg("[^\\]\"", $x);
+    if ($n) {
+        echo "ERROR - MISMATCHED QUOTES\n";
+        return "";
+    }
+    return $x;
 }
 
 /**
diff --git a/html/ops/build_po.php b/html/ops/build_po.php
index 4687cdc94d..cac544b502 100755
--- a/html/ops/build_po.php
+++ b/html/ops/build_po.php
@@ -43,6 +43,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\\n"
 "X-Poedit-SourceCharset: utf-8\\n"
 
+msgid "LANG_NAME_NATIVE"
+msgstr "English"
+
+msgid "LANG_NAME_INTERNATIONAL"
+msgstr "English"
 
 HDR;