* sync on quit is now also skipped when there is a forced restart of the browser (e.g. updates, extension installs, etc.)

* formatting tweaks and cleanup for modal sync UI

services/sync/locales/en-US/status.dtd

@@ -1,2 +1 @@
 <!ENTITY dialog.title         "Syncing with Weave">
-<!ENTITY status.idle          "Weave sync on quit">

services/sync/locales/en-US/status.properties

@@ -4,6 +4,7 @@ status.success = Sync Complete
 status.error = Sync Failed
 status.cancel = Cancelling Sync, Please Wait
 status.cancelled = Sync Cancelled
+status.closing = Closing...
 
 status.engine_start = Starting Sync
 

services/sync/modules/service.js

@@ -529,6 +529,13 @@ WeaveSvc.prototype = {
     if (!this.enabled || !this._loggedIn)
       return;
 
+    // Don't quit on exit if this is a forced restart due to application update
+    // or extension install.
+    var prefBranch = Cc["@mozilla.org/preferences-service;1"].
+                                        getService(Ci.nsIPrefBranch);
+    if(prefBranch.getBoolPref("browser.sessionstore.resume_session_once"))
+      return;
+
     this.isQuitting = true;
 
     let ww = Cc["@mozilla.org/embedcomp/window-watcher;1"].