[Pkg-privacy-commits] [xul-ext-monkeysphere] 116/296: merged locale business

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch debian
in repository xul-ext-monkeysphere.

commit c6fede145a56722486189e47d3ea0c267e1e0087
Merge: d4b5dd1 6f3eeb3
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Sat Mar 6 13:16:46 2010 -0500

    merged locale business

 chrome/locale/en-US/messages | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --cc chrome/locale/en-US/messages
index f37701d,d5f84e1..3555cc8
--- a/chrome/locale/en-US/messages
+++ b/chrome/locale/en-US/messages
@@@ -1,20 -1,10 +1,11 @@@
  internalError=Monkeysphere: internal error: %1$S
  
- # notification messages
- needsPermission=Query Monkeysphere validation agent for security information for this site?
- verificationSuccess=Monkeysphere has verified the security of your connection to this website and has bypassed Firefox's security error page.
- unableToVerify=Monkeysphere was unable to verify the security of your connection to this website.
- agentError=Monkeysphere validation agent error!
+ # default status messages
 -statusError=Monkeysphere: validation agent error!
 -statusNeutral=
 -statusInProgress=Monkeysphere: querying validation agent...
 -statusValid=Monkeysphere: verified the security of your connection to this website and has bypassed Firefox's security error page.
 -statusNotValid=Monkeysphere: unable to verify the security of your connection to this website.
++statusERROR=Monkeysphere: validation agent error!
++statusNEUTRAL=
++statusINPROGRESS=Monkeysphere: querying validation agent...
++statusVALID=Monkeysphere: verified the security of your connection to this website and has bypassed Firefox's security error page.
++statusNOTVALID=Monkeysphere: unable to verify the security of your connection to this website.
  
- # notification button messages
- yesQuery=Yes, query validation agent
- learnMore=Learn more
+ xulError="Monkeysphere error: could not determine status message.
 +
- # status messages
- statusNoHost=Monkeysphere: missing URL host name
- statusNoData=Monkeysphere: browser provided an empty URI for this connection. Try hitting refresh.
- statusNonHTTPS=Monkeysphere: non-https website (scheme is '%1$S').
- statusNoCert=Monkeysphere: unable to retrieve a certificate for %1$S
- statusAlreadyValid=Monkeysphere: site already trusted.
- statusNeedsPermission=Monkeysphere: permission required to query validation agent.
- statusINPROGRESS=Monkeysphere: querying validation agent...

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/xul-ext-monkeysphere.git