[or-cvs] r15707: Bump version. Update changelog. Merge in latest translations (in torbutton/trunk/src: . chrome/locale/pt-BR)

[mikeperry at seul.org]

Author: mikeperry
Date: 2008-07-06 19:57:38 -0400 (Sun, 06 Jul 2008)
New Revision: 15707

Modified:
   torbutton/trunk/src/CHANGELOG
   torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd
   torbutton/trunk/src/install.rdf
Log:

Bump version. Update changelog. Merge in latest translations.



Modified: torbutton/trunk/src/CHANGELOG
===================================================================
--- torbutton/trunk/src/CHANGELOG	2008-07-06 23:36:33 UTC (rev 15706)
+++ torbutton/trunk/src/CHANGELOG	2008-07-06 23:57:38 UTC (rev 15707)
@@ -1,11 +1,11 @@
 1.2.0rc5
-  XX Jul 2008
+  06 Jul 2008
   * bugfix: bug 734: Fix exception with clearing history on toggle
   * bugfix: bug 735: Fix exception with blocking Non-Tor history writes
   * bugfix: bug 720: FF3 cookie jar fix submitted by arno
   * misc: translation updates for French, Farsi, and others
   * misc: demote "mapper check" log message to info
-  * new: Option to not write cookies and jars to disk submitted by arno
+  * new: Option to not write cookie jars to disk submitted by arno
 
 1.2.0rc4
   27 Jun 2008

Modified: torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd	2008-07-06 23:36:33 UTC (rev 15706)
+++ torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd	2008-07-06 23:57:38 UTC (rev 15707)
@@ -51,7 +51,7 @@
 <!ENTITY torbutton.prefs.shutdown "Shutdown">
 <!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
 <!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
+<!ENTITY torbutton.prefs.no_shutdown "Não limpar meus cookies ao desligar">
 <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers "Headers">
 <!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">

Modified: torbutton/trunk/src/install.rdf
===================================================================
--- torbutton/trunk/src/install.rdf	2008-07-06 23:36:33 UTC (rev 15706)
+++ torbutton/trunk/src/install.rdf	2008-07-06 23:57:38 UTC (rev 15707)
@@ -6,7 +6,7 @@
         <em:name>Torbutton</em:name>
         <em:creator>Mike Perry &amp; Scott Squires</em:creator>
         <em:id>{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}</em:id>
-        <em:version>1.2.0rc4-dev</em:version>
+        <em:version>1.2.0rc5</em:version>
         <em:homepageURL>https://torbutton.torproject.org/dev/</em:homepageURL>
         <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL>
         <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>