Merge branch 'master' of git://git.assembla.com/httpse

Seth Schoen · Seth Schoen · commit 3ab30b4f8811 · 2012-03-08T18:24:16.000-08:00
Conflicts:
	src/chrome/content/rules/Nokia.xml
diff --git a/src/chrome/locale/pt/ssl-observatory.dtd b/src/chrome/locale/pt/ssl-observatory.dtd
@@ -44,8 +44,8 @@ to turn it on?">-->
 <!ENTITY ssl-observatory.prefs.done "Completo">
 
 <!ENTITY ssl-observatory.prefs.explanation 
-"HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
-sends copies of HTTPS certificates to the Observatory, to help us
+"HTTPS Everywhere pode usar o SSL Observatory da EFF.  Isso tem dois resultados:
+(1) Envia cópias de certificados HTTPS ao Observatory, para ajudar-nos
 detect 'man in the middle' attacks and improve the Web's security; and (2)
 lets us warn you about insecure connections or attacks on your browser.">
 
