diff --git a/api/boinc_api.cpp b/api/boinc_api.cpp
index f64dabc9e4..af0b759b68 100644
--- a/api/boinc_api.cpp
+++ b/api/boinc_api.cpp
@@ -415,7 +415,12 @@ int boinc_init_options_general(BOINC_OPTIONS& opt) {
             windows_error_string(buf, 256);
             fprintf(stderr, "%s Error: %s\n", boinc_msg_prefix(), buf);
 #endif
-            boinc_exit(0);           // status=0 means recoverable
+            // if we can't acquire the lock file there must be
+            // another app instance running in this slot.
+            // If we exit(0), the client will keep restarting us.
+            // Instead, tell the client not to restart us for 10 min.
+            //
+            boinc_temporary_exit(600);
         }
     }
 
diff --git a/checkin_notes b/checkin_notes
index a8251c46c7..1e36f65735 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -270,3 +270,24 @@ David  10 Jan 2010
 
     py/Boinc/
         tools.py
+
+David  11 Jan 2010
+    - API: if app can't acquire lock file, tell the client not
+        to restart app for 10 minutes.
+        Hopefully what will happen is:
+        - another instance of app is running in slot dir
+            (shouldn't happen, but sometimes does)
+        - that app will eventually finish, and will write
+            a checkpoint file saying so.
+            It will call boinc_finish(0), but the client won't notice
+            that it has exited.
+        - the next time the client starts the app,
+            it will acquire lock, see that it's done,
+            and call boinc_finish(0).
+            This time the client will notice,
+            and the job will be reported as correct.
+        The downside to all this is that the client won't know
+        that the CPU is in use, and will schedule NCPUS jobs.
+
+    api/
+        boinc_api.cpp
diff --git a/doc/docutil.php b/doc/docutil.php
index af4592666b..bfc8849fa3 100644
--- a/doc/docutil.php
+++ b/doc/docutil.php
@@ -98,7 +98,7 @@ function page_tail($translatable=false, $is_main=false) {
     if (!$is_main) {
         echo "
             <center>
-            <a href=\"/\">Return to BOINC main page</a>
+            <a href=\"/\">".tra("Return to BOINC main page")."</a>
             </center><p>
         ";
     }
@@ -107,8 +107,13 @@ function page_tail($translatable=false, $is_main=false) {
         <font color=#888888>
     ";
     if ($translatable) {
-        echo "
-            This page is <a href=\"trac/wiki/TranslateIntro\">translatable</a>.<br>
+        echo 
+            sprintf(
+                tra("This page is %stranslatable%s."),
+                "<a href=\"trac/wiki/TranslateIntro\">",
+                "</a>"
+            ),
+            "<br>
         ";
     }
     echo "
diff --git a/doc/download.php b/doc/download.php
index 9dcd7f938e..1c59824c53 100644
--- a/doc/download.php
+++ b/doc/download.php
@@ -123,7 +123,7 @@ function show_download($pname) {
         | <a href=\"wiki/Release_Notes\"><span class=nobr>".tra("Release notes")."</span></a>
         | <a href=\"wiki/BOINC_Help\"><span class=nobr>".tra("Help")."</span></a>
         | <a href=download_all.php><span class=nobr>".tra("All versions")."</span></a>
-        | <a href=\"trac/wiki/VersionHistory\">Version history</a>
+        | <a href=\"trac/wiki/VersionHistory\">".tra("Version history")."</a>
         </center>
         </td><td valign=top>
     ";
diff --git a/locale/templates/BOINC-Web.pot b/locale/templates/BOINC-Web.pot
index cb1a1a1a7c..e16ecd4d73 100644
--- a/locale/templates/BOINC-Web.pot
+++ b/locale/templates/BOINC-Web.pot
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: BOINC $Id$\n"
 "Report-Msgid-Bugs-To: BOINC translation team <boinc_loc@ssl.berkeley.edu>\n"
-"POT-Creation-Date: 2010-01-10 14:46 PST\n"
+"POT-Creation-Date: 2010-01-11 12:46 PST\n"
 "Last-Translator: Generated automatically from source files\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -20,6 +20,15 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
+#: docutil.php:101
+msgid "Return to BOINC main page"
+msgstr ""
+
+#: docutil.php:112
+#, php-format
+msgid "This page is %stranslatable%s."
+msgstr ""
+
 #: download.php:40
 msgid "Download BOINC"
 msgstr ""
@@ -66,6 +75,10 @@ msgstr ""
 msgid "All versions"
 msgstr ""
 
+#: download.php:126
+msgid "Version history"
+msgstr ""
+
 #: download.php:143
 msgid "BOINC: compute for science"
 msgstr ""