diff --git a/mozilla/calendar/locales/en-US/chrome/calendar/wcap.properties b/mozilla/calendar/locales/en-US/chrome/calendar/wcap.properties
index 64c01d976fa..c87c94f0714 100644
--- a/mozilla/calendar/locales/en-US/chrome/calendar/wcap.properties
+++ b/mozilla/calendar/locales/en-US/chrome/calendar/wcap.properties
@@ -41,10 +41,7 @@
 accessingServerFailedError.text=Cannot access server %1$S!
 
 # args: host
-mandatoryHttpsError.text=Server %1$S needs to support HTTPS!
-
-# args: host
-noHttpsConfirmation.text=Insecure login on %1$S! Server does not support HTTPS.\nContinue?
+noHttpsConfirmation.text=Insecure login on %1$S!\nContinue?
 noHttpsConfirmation.check.text=Don't ask again.
 noHttpsConfirmation.label=Warning!
 
@@ -56,10 +53,10 @@ reconnectConfirmation.label=Session TimeOut
 insufficientWcapVersionConfirmation.text=Server %1$S (%2$S, v%3$S, WCAP v%4$S) doesn't support a sufficient WCAP version! The required version is at least 3.0.0.\nContinue?
 insufficientWcapVersionConfirmation.label=Insufficient WCAP version!
 
-# args: host, prodId, serverVersion, wcapVersion
-loginDialog.text=Server: %1$S (%2$S, v%3$S, WCAP v%4$S)
-loginDialog.check.text=Save Password
-loginDialog.label=Sun Java System Calendar Server WCAP login
+# args: host
+loginDialog.text=Enter your username and password for %1$S.
+loginDialog.check.text=Use Password Manager to remember this password.
+loginDialog.label=Calendar Server Password Required
 
 privateItem.title.text=Private
 confidentialItem.title.text=Confidential