merge upstream changes

This commit is contained in:
Dan Mills 2008-07-11 18:55:58 -07:00
commit 84e9eed2ab
2 changed files with 5 additions and 2 deletions

View File

@ -6,6 +6,9 @@ status.cancel = Cancelling Sync, Please Wait
status.cancelled = Sync Cancelled
status.closing = Closing...
status.locked = Server Busy
status.tryagain = Please try again in a few minutes.
status.engine_start = Starting Sync
status.downloading-status = Downloading Status from Server

View File

@ -20,5 +20,5 @@ error.logout.title = Error While Signing Out
error.logout.description = Weave encountered an error while signing you out. It's probably ok, and you don't have to do anything about it (then why are we bugging you with this info?).
error.sync.title = Error While Syncing
error.sync.description = Weave encountered an error while syncing. You might want to try syncing manually to make sure you are up-to-date.
error.sync.tryAgainButton.label = Try Again
error.sync.tryAgainButton.accesskey = T
error.sync.tryAgainButton.label = Sync Now...
error.sync.tryAgainButton.accesskey = S