diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
index 1060f605d..4e677a021 100644
--- a/chrome/content/zotero/xpcom/zotero.js
+++ b/chrome/content/zotero/xpcom/zotero.js
@@ -643,12 +643,17 @@ Components.utils.import("resource://gre/modules/Services.jsm");
 						var ps = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
 							.getService(Components.interfaces.nsIPromptService);
 						var buttonFlags = (ps.BUTTON_POS_0) * (ps.BUTTON_TITLE_IS_STRING)
-							+ (ps.BUTTON_POS_1) * (ps.BUTTON_TITLE_OK)
+							+ (ps.BUTTON_POS_1) * (ps.BUTTON_TITLE_CANCEL)
 							+ ps.BUTTON_POS_0_DEFAULT;
 						
-						var index = ps.confirmEx(null, "", Zotero.startupError, buttonFlags,
-							Zotero.getString('general.checkForUpdate'), null, null,
-							null, {});
+						var index = ps.confirmEx(
+							null,
+							Zotero.getString('general.error'),
+							Zotero.startupError,
+							buttonFlags,
+							Zotero.getString('general.checkForUpdate'),
+							null, null, null, {}
+						);
 						
 						// "Check for updates" button
 						if(index === 0) {
@@ -667,7 +672,11 @@ Components.utils.import("resource://gre/modules/Services.jsm");
 										addon.applyBackgroundUpdates = AddonManager.AUTOUPDATE_DISABLE;
 										addon.findUpdates({
 												onNoUpdateAvailable: function() {
-													ps.alert(null, '', Zotero.getString('zotero.preferences.update.upToDate'));
+													ps.alert(
+														null,
+														Zotero.getString('general.noUpdatesFound'),
+														Zotero.getString('general.isUpToDate', 'Zotero')
+													);
 												},
 												onUpdateAvailable: function() {
 													// Show available update
diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties
index 9f999aff1..5d62311b0 100644
--- a/chrome/locale/en-US/zotero/zotero.properties
+++ b/chrome/locale/en-US/zotero/zotero.properties
@@ -20,10 +20,12 @@ general.tryAgainLater 				= Please try again in a few minutes.
 general.serverError					= The server returned an error. Please try again.
 general.restartFirefox				= Please restart %S.
 general.restartFirefoxAndTryAgain	= Please restart %S and try again.
-general.checkForUpdate				= Check for update
+general.checkForUpdate				= Check for Update
 general.actionCannotBeUndone		= This action cannot be undone.
 general.install						= Install
 general.updateAvailable				= Update Available
+general.noUpdatesFound             = No Updates Found
+general.isUpToDate                 = %S is up to date.
 general.upgrade						= Upgrade
 general.yes							= Yes
 general.no							= No