commit eda372628716a8d1cd4f304427647af67cbca05d
Author: Translation commit bot <translation(a)torproject.org>
Date: Sun Jun 29 06:45:03 2014 +0000
Update translations for bridgedb
---
fr/LC_MESSAGES/bridgedb.po | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/fr/LC_MESSAGES/bridgedb.po b/fr/LC_MESSAGES/bridgedb.po
index 815bdc5..374f845 100644
--- a/fr/LC_MESSAGES/bridgedb.po
+++ b/fr/LC_MESSAGES/bridgedb.po
@@ -11,14 +11,15 @@
# mehditaileb <mehditaileb(a)liberte-info.net>, 2011
# Onizuka, 2013
# themen <themen2004(a)gmail.com>, 2014
-# Yannick Heintz <yannickheintz(a)gmail.com>, 2014
+# Towinet, 2014
+# Yannick Heintz, 2014
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n"
"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-06-20 10:40+0000\n"
-"Last-Translator: Yannick Heintz <yannickheintz(a)gmail.com>\n"
+"PO-Revision-Date: 2014-06-29 06:40+0000\n"
+"Last-Translator: Towinet\n"
"Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -129,7 +130,7 @@ msgid ""
"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
"help to circumvent internet censorship in many cases.\n"
"\n"
-msgstr ""
+msgstr "De plus, BridgeDB a beaucoup de banals ponts %s sans aucun\nTransports Enfichables (Pluggable Transports) %s, ne semblant pas être autant cool, mais pouvant toutefois\naider à contourner la censure Internet dans des nombreux cas.\n"
#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
@@ -170,7 +171,7 @@ msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
-msgstr ""
+msgstr "Essayez d'inclure autant d'infos que possible concernant votre cas, y compris la liste des\nponts et des Transports Enfichables (Pluggable Transports) que vous avez essayé d'utiliser, votre version de Tor Browser,\net n'importes quel autres messages que Tor vous a sorti, etc."
#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
@@ -211,7 +212,7 @@ msgstr "Comment démarrer l'utilisation de vos Bridges."
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
-msgstr ""
+msgstr "Pour entrer des ponts dans Tor Browser, suivez les instructions sur la %s page de téléchargement de Tor Browser %s pour démarrer Tor Browser."
#. TRANSLATORS: Please DO NOT translate "Tor".
#: lib/bridgedb/strings.py:125
commit ffb534a1c2f2024ccafe4965f1a3bea5145c7524
Author: David Fifield <david(a)bamsoftware.com>
Date: Thu Jun 19 19:19:41 2014 -0700
Put the headless TorBrowser.app under PluggableTransports.
https://trac.torproject.org/projects/tor/ticket/10935#comment:28
---
meek-client-torbrowser/mac.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meek-client-torbrowser/mac.go b/meek-client-torbrowser/mac.go
index 4b015df..7eee72d 100644
--- a/meek-client-torbrowser/mac.go
+++ b/meek-client-torbrowser/mac.go
@@ -9,6 +9,6 @@ const (
// The TorBrowser.app.meek-http-helper directory is a special case for
// the mac bundle. It is a copy of TorBrowser.app that has a modified
// Info.plist file so that it doesn't show a dock icon.
- firefoxPath = "../Data/TorBrowser.app.meek-http-helper/Contents/MacOS/firefox"
+ firefoxPath = "PluggableTransports/TorBrowser.app.meek-http-helper/Contents/MacOS/firefox"
firefoxProfilePath = "../Data/Browser/profile.meek-http-helper"
)