[or-cvs] r16240: Bump version, update changelog, hack in some temporary frenc (in torbutton/trunk/src: . chrome/locale/fr-FR)

[mikeperry at seul.org]

Author: mikeperry
Date: 2008-07-29 21:58:31 -0400 (Tue, 29 Jul 2008)
New Revision: 16240

Modified:
   torbutton/trunk/src/CHANGELOG
   torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd
   torbutton/trunk/src/chrome/locale/fr-FR/torbutton.properties
   torbutton/trunk/src/install.rdf
Log:

Bump version, update changelog, hack in some temporary
french translations from mfr (until we can sort out 
adding strings in pootle).



Modified: torbutton/trunk/src/CHANGELOG
===================================================================
--- torbutton/trunk/src/CHANGELOG	2008-07-29 22:11:30 UTC (rev 16239)
+++ torbutton/trunk/src/CHANGELOG	2008-07-30 01:58:31 UTC (rev 16240)
@@ -1,3 +1,13 @@
+1.2.0
+  29 Jul 2008
+  * bugfix: bug 777: Fix issue with locale spoofing breaking translations.
+  * bugfix: bug 778: Preserve locale in spoofed version if user does not want
+    locale spoofing.
+  * bugfix: bug 780: Keep session cookies during Tor toggle.
+  * bugfix: Potential fix for some PKCS#12 issues.
+  * bugfix: Fix crash recovery and uninstall/upgrade to avoid cookie loss.
+  * misc: Translation updates.
+
 1.2.0rc6:
   12 Jul 2008
   * bugfix: Fix bug causing Firefox history to get cleared in some situations

Modified: torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd	2008-07-29 22:11:30 UTC (rev 16239)
+++ torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd	2008-07-30 01:58:31 UTC (rev 16240)
@@ -85,5 +85,5 @@
 <!ENTITY torbutton.prefs.test_settings "Tester les paramètres">
 <!ENTITY torbutton.prefs.test_auto "Tester mes paramètres Tor lors de la première activation/désactivation suivant chaque démarrage de Firefox">
 <!ENTITY torbutton.prefs.disable_livemarks "Désactiver les marques-pages dynamiques durant l'utilisation de Tor">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
+<!ENTITY torbutton.prefs.tor_memory_jar "Ne pas écrire les cookies de Tor sur le disque">
+<!ENTITY torbutton.prefs.nontor_memory_jar "Ne pas écrire les cookies Non-Tor sur le disque">

Modified: torbutton/trunk/src/chrome/locale/fr-FR/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/fr-FR/torbutton.properties	2008-07-29 22:11:30 UTC (rev 16239)
+++ torbutton/trunk/src/chrome/locale/fr-FR/torbutton.properties	2008-07-30 01:58:31 UTC (rev 16240)
@@ -1,5 +1,5 @@
-torbutton.button.tooltip.disabled = Activer Tor
-torbutton.button.tooltip.enabled = Désactiver Tor
+torbutton.button.tooltip.disabled = Tor Actif
+torbutton.button.tooltip.enabled = Tor Inactif
 torbutton.panel.tooltip.disabled = Cliquer pour activer Tor
 torbutton.panel.tooltip.enabled = Cliquer pour désactiver Tor
 torbutton.panel.plugins.disabled = Cliquer pour activer les plugins

Modified: torbutton/trunk/src/install.rdf
===================================================================
--- torbutton/trunk/src/install.rdf	2008-07-29 22:11:30 UTC (rev 16239)
+++ torbutton/trunk/src/install.rdf	2008-07-30 01:58:31 UTC (rev 16240)
@@ -6,11 +6,13 @@
         <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.0rc6-dev</em:version>
+        <em:version>1.2.0</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>
+<!--        
         <em:updateURL>https://torbutton.torproject.org/dev/update.rdf</em:updateURL>
+-->
         <!-- firefox -->
         <em:targetApplication>
             <Description>