Merge

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

@@ -59,7 +59,7 @@
 
 <!ENTITY captcha.label                    "Type the characters you see in the image below:">
 <!ENTITY reloadCaptcha.text               "Reload">
-<!ENTITY captchaHint.label                "Letters are not case-sensitive.">
+<!ENTITY captchaHint.label                "Letters are not case-sensitive, spaces are optional.">
 
 <!ENTITY terms.label                      "Terms of Service">
 <!ENTITY acceptTerms.label                "I agree to the ">

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

@@ -3,8 +3,8 @@ verify-error.label              = Invalid username and password
 verify-success.label            = Username and password verified
 
 
-serverError.label               = Server Error
-serverTimeoutError.label        = Server Error
+serverError.label               = Server Error 
+serverTimeoutError.label        = Server Timeout 
 
 
 createUsername-progress.label   = Checking username