June 2014 - tor-commits - lists.torproject.org

[orbot/master] renable large heap request
by n8fr8＠torproject.org 11 Jun '14

11 Jun '14

commit 2d6a7b35c0b29d8fbc0cd9d389ff2144fbc64138 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jun 11 07:50:33 2014 -0400 renable large heap request --- AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 7c97a84..2577b01 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -22,6 +22,7 @@ android:theme="@style/Theme.AppCompat" android:allowBackup="false" android:allowClearUserData="true" + android:largeHeap="true" > <activity android:name=".Orbot" android:configChanges="orientation|screenSize"

1 0

[orbot/master] more fixes for UI disconnect issue
by n8fr8＠torproject.org 11 Jun '14

11 Jun '14

commit d7f3f1989d5571dd473014973b4ca85f74fbeb30 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jun 11 07:07:48 2014 -0400 more fixes for UI disconnect issue ensure service and status updates occur on new layout updates --- src/org/torproject/android/Orbot.java | 43 ++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 48deae5..cd7a392 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -110,6 +110,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic { Intent torService = new Intent(this, TorService.class); + /* if (Build.VERSION.SDK_INT > 14) { @@ -118,10 +119,10 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic } else { - + */ bindService(torService, mConnection, Context.BIND_AUTO_CREATE); - } + //} startService(torService); @@ -183,6 +184,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic // Gesture detection mGestureDetector = new GestureDetector(this, new MyGestureDetector()); + } @@ -534,13 +536,6 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic setResult(RESULT_OK, nResult); } - - @Override - protected void onNewIntent(Intent intent) { - - setIntent(intent); - handleIntents(); - } private void handleIntents () { @@ -674,6 +669,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic super.onConfigurationChanged(newConfig); doLayout(); + updateStatus(""); } /* (non-Javadoc) @@ -799,19 +795,23 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic @Override protected void onResume() { super.onResume(); - - if (mService != null && torStatus != TorServiceConstants.STATUS_ON) + if (mService != null) { try { - mService.processSettings(); + + if (torStatus != TorServiceConstants.STATUS_ON) + mService.processSettings(); + setLocale(); - } catch (RemoteException e) { // TODO Auto-generated catch block e.printStackTrace(); } } + + + updateStatus(""); } AlertDialog aDialog = null; @@ -901,8 +901,8 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic if (newTorStatus == TorServiceConstants.STATUS_ON) { - if (torStatus != newTorStatus) - { + //if (torStatus != newTorStatus) + //{ imgStatus.setImageResource(R.drawable.toron); // mViewMain.setBackgroundResource(R.drawable.onionrootonly); @@ -912,7 +912,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic if (mItemOnOff != null) mItemOnOff.setTitle(R.string.menu_stop); - } + //} if (mTorServiceMsg != null && mTorServiceMsg.length() > 0) { @@ -1193,6 +1193,8 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic // representation of that from the raw service object. mService = ITorService.Stub.asInterface(service); + torStatus = -1; + // We want to monitor the service for as long as we are // connected to it. try { @@ -1206,9 +1208,9 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic } - updateStatus(""); handleIntents(); - + + updateStatus(""); } catch (RemoteException e) { // In this case the service has crashed before we could even @@ -1229,7 +1231,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic // This is called when the connection with the service has been // unexpectedly disconnected -- that is, its process crashed. mService = null; - + Log.d(TAG,"service was disconnected"); } }; @@ -1254,6 +1256,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic unbindService(mConnection); mIsBound = false; + Log.d(TAG,"service was ubnound"); //maybe needs this? mService = null; @@ -1310,7 +1313,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic protected void onDestroy() { super.onDestroy(); - unbindService(); + //unbindService(); } public class DataCount {

1 0

[tor/master] Merge remote-tracking branch 'public/bug11970'
by nickm＠torproject.org 11 Jun '14

11 Jun '14

commit 6f20dd7bfc256e650b0d04f70f06c9837b90158d Merge: e8dd34f b883b8d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 11 11:01:52 2014 -0400 Merge remote-tracking branch 'public/bug11970' changes/bug11970 | 7 +++ src/common/address.c | 2 +- src/common/sandbox.c | 160 +++++++++++++++++++++++++++++++++++++------------- src/common/sandbox.h | 20 ++----- src/or/main.c | 1 + 5 files changed, 134 insertions(+), 56 deletions(-)

1 0

[tor/master] sandbox: revamp sandbox_getaddrinfo cacheing
by nickm＠torproject.org 11 Jun '14

11 Jun '14

commit e425fc78045f99725d256956acc7360ed71bfaa5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 22 17:39:36 2014 -0400 sandbox: revamp sandbox_getaddrinfo cacheing The old cache had problems: * It needed to be manually preloaded. (It didn't remember any address you didn't tell it to remember) * It was AF_INET only. * It looked at its cache even if the sandbox wasn't turned on. * It couldn't remember errors. * It had some memory management problems. (You can't use memcpy to copy an addrinfo safely; it has pointers in.) This patch fixes those issues, and moves to a hash table. Fixes bug 11970; bugfix on 0.2.5.1-alpha. --- changes/bug11970 | 7 +++ src/common/address.c | 2 +- src/common/sandbox.c | 158 +++++++++++++++++++++++++++++++++++++------------- src/common/sandbox.h | 20 ++----- src/or/main.c | 1 + 5 files changed, 133 insertions(+), 55 deletions(-) diff --git a/changes/bug11970 b/changes/bug11970 new file mode 100644 index 0000000..896f0cf --- /dev/null +++ b/changes/bug11970 @@ -0,0 +1,7 @@ + o Minor bugfixes (linux seccomp sandbox): + - Refactor the getaddrinfo workaround that the seccomp sandbox + uses to avoid calling getaddrinfo() after installing the sandbox + filters. Previously, it preloaded a cache with the IPv4 address + for our hostname, and nothing else. Now, it loads the cache with + every address that it used to initialize the Tor process. Fixes + bug 11970; bugfix on 0.2.5.1-alpha. diff --git a/src/common/address.c b/src/common/address.c index 2825b12..29d4c04 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -264,7 +264,7 @@ tor_addr_lookup(const char *name, uint16_t family, tor_addr_t *addr) &((struct sockaddr_in6*)best->ai_addr)->sin6_addr); result = 0; } - freeaddrinfo(res); + sandbox_freeaddrinfo(res); return result; } return (err == EAI_AGAIN) ? 1 : -1; diff --git a/src/common/sandbox.c b/src/common/sandbox.c index bb2b3ed..eba766b 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -33,6 +33,8 @@ #include "util.h" #include "tor_queue.h" +#include "ht.h" + #define DEBUGGING_CLOSE #if defined(USE_LIBSECCOMP) @@ -71,8 +73,6 @@ static int sandbox_active = 0; /** Holds the parameter list configuration for the sandbox.*/ static sandbox_cfg_t *filter_dynamic = NULL; -/** Holds a list of pre-recorded results from getaddrinfo().*/ -static sb_addr_info_t *sb_addr_info = NULL; #undef SCMP_CMP #define SCMP_CMP(a,b,c) ((struct scmp_arg_cmp){(a),(b),(c),0}) @@ -1288,73 +1288,153 @@ sandbox_cfg_allow_execve_array(sandbox_cfg_t **cfg, ...) } #endif +/** Cache entry for getaddrinfo results; used when sandboxing is implemented + * so that we can consult the cache when the sandbox prevents us from doing + * getaddrinfo. + * + * We support only a limited range of getaddrinfo calls, where servname is null + * and hints contains only socktype=SOCK_STREAM, family in INET,INET6,UNSPEC. + */ +typedef struct cached_getaddrinfo_item_t { + HT_ENTRY(cached_getaddrinfo_item_t) node; + char *name; + int family; + /** set if no error; otherwise NULL */ + struct addrinfo *res; + /** 0 for no error; otherwise an EAI_* value */ + int err; +} cached_getaddrinfo_item_t; + +static unsigned +cached_getaddrinfo_item_hash(const cached_getaddrinfo_item_t *item) +{ + return siphash24g(item->name, strlen(item->name)) + item->family; +} + +static unsigned +cached_getaddrinfo_items_eq(const cached_getaddrinfo_item_t *a, + const cached_getaddrinfo_item_t *b) +{ + return (a->family == b->family) && 0 == strcmp(a->name, b->name); +} + +static void +cached_getaddrinfo_item_free(cached_getaddrinfo_item_t *item) +{ + if (item == NULL) + return; + + tor_free(item->name); + if (item->res) + freeaddrinfo(item->res); + tor_free(item); +} + +static HT_HEAD(getaddrinfo_cache, cached_getaddrinfo_item_t) + getaddrinfo_cache = HT_INITIALIZER(); + +HT_PROTOTYPE(getaddrinfo_cache, cached_getaddrinfo_item_t, node, + cached_getaddrinfo_item_hash, + cached_getaddrinfo_items_eq); +HT_GENERATE(getaddrinfo_cache, cached_getaddrinfo_item_t, node, + cached_getaddrinfo_item_hash, + cached_getaddrinfo_items_eq, + 0.6, tor_malloc_, tor_realloc_, tor_free_); + int sandbox_getaddrinfo(const char *name, const char *servname, const struct addrinfo *hints, struct addrinfo **res) { - sb_addr_info_t *el; + int err; + struct cached_getaddrinfo_item_t search, *item; - if (servname != NULL) - return -1; + if (servname != NULL) { + log_warn(LD_BUG, "called with non-NULL servname"); + return EAI_NONAME; + } + if (name == NULL) { + log_warn(LD_BUG, "called with NULL name"); + return EAI_NONAME; + } *res = NULL; - for (el = sb_addr_info; el; el = el->next) { - if (!strcmp(el->name, name)) { - *res = tor_malloc(sizeof(struct addrinfo)); + memset(&search, 0, sizeof(search)); + search.name = (char *) name; + search.family = hints ? hints->ai_family : AF_UNSPEC; + item = HT_FIND(getaddrinfo_cache, &getaddrinfo_cache, &search); - memcpy(*res, el->info, sizeof(struct addrinfo)); - /* XXXX What if there are multiple items in the list? */ - return 0; + if (! sandbox_is_active()) { + /* If the sandbox is not turned on yet, then getaddrinfo and store the + result. */ + + err = getaddrinfo(name, NULL, hints, res); + log_info(LD_NET,"(Sandbox) getaddrinfo %s.", err ? "failed" : "succeeded"); + + if (! item) { + item = tor_malloc_zero(sizeof(*item)); + item->name = tor_strdup(name); + item->family = hints ? hints->ai_family : AF_UNSPEC; + HT_INSERT(getaddrinfo_cache, &getaddrinfo_cache, item); } - } - if (!sandbox_active) { - if (getaddrinfo(name, NULL, hints, res)) { - log_err(LD_BUG,"(Sandbox) getaddrinfo failed!"); - return -1; + if (item->res) { + freeaddrinfo(item->res); + item->res = NULL; } + item->res = *res; + item->err = err; + return err; + } - return 0; + /* Otherwise, the sanbox is on. If we have an item, yield its cached + result. */ + if (item) { + *res = item->res; + return item->err; } - // getting here means something went wrong + /* getting here means something went wrong */ log_err(LD_BUG,"(Sandbox) failed to get address %s!", name); - if (*res) { - tor_free(*res); - res = NULL; - } return -1; } int -sandbox_add_addrinfo(const char* name) +sandbox_add_addrinfo(const char *name) { - int ret; + struct addrinfo *res; struct addrinfo hints; - sb_addr_info_t *el = NULL; - - el = tor_malloc(sizeof(sb_addr_info_t)); + int i; + static const int families[] = { AF_INET, AF_INET6, AF_UNSPEC }; memset(&hints, 0, sizeof(hints)); - hints.ai_family = AF_INET; hints.ai_socktype = SOCK_STREAM; + for (i = 0; i < 3; ++i) { + hints.ai_family = families[i]; - ret = getaddrinfo(name, NULL, &hints, &(el->info)); - if (ret) { - log_err(LD_BUG,"(Sandbox) failed to getaddrinfo"); - ret = -2; - tor_free(el); - goto out; + res = NULL; + (void) sandbox_getaddrinfo(name, NULL, &hints, &res); + if (res) + sandbox_freeaddrinfo(res); } - el->name = tor_strdup(name); - el->next = sb_addr_info; - sb_addr_info = el; + return 0; +} - out: - return ret; +void +sandbox_free_getaddrinfo_cache(void) +{ + cached_getaddrinfo_item_t **next, **item; + + for (item = HT_START(getaddrinfo_cache, &getaddrinfo_cache); + item; + item = next) { + next = HT_NEXT_RMV(getaddrinfo_cache, &getaddrinfo_cache, item); + cached_getaddrinfo_item_free(*item); + } + + HT_CLEAR(getaddrinfo_cache, &getaddrinfo_cache); } /** diff --git a/src/common/sandbox.h b/src/common/sandbox.h index b572152..7763570 100644 --- a/src/common/sandbox.h +++ b/src/common/sandbox.h @@ -91,21 +91,6 @@ struct sandbox_cfg_elem { struct sandbox_cfg_elem *next; }; -/** - * Structure used for keeping a linked list of getaddrinfo pre-recorded - * results. - */ -struct sb_addr_info_el { - /** Name of the address info result. */ - char *name; - /** Pre-recorded getaddrinfo result. */ - struct addrinfo *info; - /** Next element in the list. */ - struct sb_addr_info_el *next; -}; -/** Typedef to structure used to manage an addrinfo list. */ -typedef struct sb_addr_info_el sb_addr_info_t; - /** Function pointer defining the prototype of a filter function.*/ typedef int (*sandbox_filter_func_t)(scmp_filter_ctx ctx, sandbox_cfg_t *filter); @@ -146,11 +131,16 @@ struct addrinfo; int sandbox_getaddrinfo(const char *name, const char *servname, const struct addrinfo *hints, struct addrinfo **res); +#define sandbox_freeaddrinfo(addrinfo) ((void)0) +void sandbox_free_getaddrinfo_cache(void); #else #define sandbox_getaddrinfo(name, servname, hints, res) \ getaddrinfo((name),(servname), (hints),(res)) #define sandbox_add_addrinfo(name) \ ((void)(name)) +#define sandbox_freeaddrinfo(addrinfo) \ + freeaddrinfo((addrinfo)) +#define sandbox_free_getaddrinfo_cache() #endif #ifdef USE_LIBSECCOMP diff --git a/src/or/main.c b/src/or/main.c index 1168f43..f665f87 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2543,6 +2543,7 @@ tor_free_all(int postfork) microdesc_free_all(); ext_orport_free_all(); control_free_all(); + sandbox_free_getaddrinfo_cache(); if (!postfork) { config_free_all(); or_state_free_all();

1 0

[tor/master] Yield a real error in the bug case of sandbox_getaddrinfo()
by nickm＠torproject.org 11 Jun '14

11 Jun '14

commit b883b8d1a5edbccbc38c77f8e8bdea549792bd22 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 11 11:00:56 2014 -0400 Yield a real error in the bug case of sandbox_getaddrinfo() --- src/common/sandbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index eba766b..a387f37 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -1397,7 +1397,7 @@ sandbox_getaddrinfo(const char *name, const char *servname, /* getting here means something went wrong */ log_err(LD_BUG,"(Sandbox) failed to get address %s!", name); - return -1; + return EAI_NONAME; } int

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 11 Jun '14

11 Jun '14

commit 76ea7dcdada97ea47bf297af36c7b57e987ad827 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 11 14:45:49 2014 +0000 Update translations for torbutton-torbuttonproperties --- ro/torbutton.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ro/torbutton.properties b/ro/torbutton.properties index 2c3fd00..11cc496 100644 --- a/ro/torbutton.properties +++ b/ro/torbutton.properties @@ -21,13 +21,13 @@ torbutton.popup.test.auto_failed = Testul automat pentru proxy Tor a eşuat la f torbutton.prefs.recommended = (recomandat) torbutton.prefs.optional = (opţional) torbutton.prefs.crucial = (critic) -torbutton.popup.external.title = Download an external file type? -torbutton.popup.external.app = Tor Browser cannot display this file. You will need to open it with another application.\n\n -torbutton.popup.external.note = Some types of files can cause applications to connect to the Internet without using Tor.\n\n -torbutton.popup.external.suggest = To be safe, you should only open downloaded files while offline, or use a Tor Live CD such as Tails.\n -torbutton.popup.launch = Download file +torbutton.popup.external.title = Descarca un tip de fisier extern? +torbutton.popup.external.app = Browser-ul Tor nu poate afisa acest fisier. Va trebui sa il deschizi cu o alta aplicatie.\n\n +torbutton.popup.external.note = Anumite tipuri de fisiere pot determina aplicatii sa se conecteze la Internet fara Tor.\n\n +torbutton.popup.external.suggest = Pentru siguranta, esti sfatuit sa deschizi fisiere descarcate numai cand esti offline, sau sa folosesti un sistem Tor Live precum Tails.\n +torbutton.popup.launch = Descarca fisier torbutton.popup.cancel = Anulare -torbutton.popup.dontask = Automatically download files from now on +torbutton.popup.dontask = Descarca fisiere automat de acum inainte torbutton.popup.test.no_http_proxy = Testul proxy Tor: Local proxy HTTP este inaccesibil. Este Polipo executat corect? torbutton.popup.captcha.title = Evitaţi captcha Google? torbutton.popup.captcha.ask = Torbutton a detectat un captcha Google.Doreşti sa fii redirecţionat către un alt motor de căutare pentru această interogare?

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 11 Jun '14

11 Jun '14

commit c0a0e4bef49834270ab4daea4f4e54eb10206403 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 11 14:45:21 2014 +0000 Update translations for https_everywhere_completed --- ro/ssl-observatory.dtd | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ro/ssl-observatory.dtd b/ro/ssl-observatory.dtd index c3a061d..eea1892 100644 --- a/ro/ssl-observatory.dtd +++ b/ro/ssl-observatory.dtd @@ -44,6 +44,12 @@ o rețea de companie intruzivă:"> <!ENTITY ssl-observatory.prefs.asn_tooltip "Asta va obține și va trimite "numărul de sistem autonom" al rețelei tale. Asta ne va ajuta să localizăm atacurile împotriva HTTPS și să determinăm dacă avem observații de la rețelele din locuri precum Iran și Siria unde atacurile sunt comparativ comune."> +<!ENTITY ssl-observatory.prefs.show_cert_warning +"Afiseaza o avertizare cand Observatory detecteaza un certificat revocat ce nu a fost detectat de browser-ul tau."> + +<!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip +"Acesta va verifica certificate prezentate impotriva Listelor de Certificate Revocate cunoscute. Din pacate, nu putem garanta ca vom semnala toate certificatele revocate, dar daca vezi o avertizare, exista o sansa buna ca ceva nu este bine."> + <!ENTITY ssl-observatory.prefs.done "Gata"> <!ENTITY ssl-observatory.prefs.explanation @@ -87,7 +93,7 @@ a vizionat. Menține mausul deasupra opțiunilor pentru mai multe detalii:"> <!ENTITY ssl-observatory.warning.showcert "Arată lanțul certificatului"> <!ENTITY ssl-observatory.warning.okay "Înțeleg"> <!ENTITY ssl-observatory.warning.text "Observatorul SSL al EFF a emis o atenționare despre certificatul HTTPS al acestui site:"> -<!ENTITY ssl-observatory.warning.defense "Dacă ești autentificat pe acest site este recomandat să îți schimbi parola în momentul în care ai o conexiune sigură."> +<!ENTITY ssl-observatory.warning.defense "Daca esti autentificat pe acest site, te sfatuim sa schimbi parola de indata ce ai o conexiune sigura. (Aceste avertizari pot fi dezactivate in tab-ul "SSL Observatory" in fereastra de preferinte HTTPS Everywhere.)"> <!ENTITY ssl-observatory.prefs.self_signed "Trimite și verifică certificatele auto-semnate">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 11 Jun '14

11 Jun '14

commit 0f2934af4a98ec456bb9a1f58062866e09e64726 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 11 14:45:18 2014 +0000 Update translations for https_everywhere --- ro/ssl-observatory.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ro/ssl-observatory.dtd b/ro/ssl-observatory.dtd index de006da..eea1892 100644 --- a/ro/ssl-observatory.dtd +++ b/ro/ssl-observatory.dtd @@ -48,7 +48,7 @@ o rețea de companie intruzivă:"> "Afiseaza o avertizare cand Observatory detecteaza un certificat revocat ce nu a fost detectat de browser-ul tau."> <!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip -"This will check submitted certificates against known Certificate Revocation Lists. Unfortunately we cannot guarantee that we will flag every revoked certificate, but if you do see a warning there's a good chance something is wrong."> +"Acesta va verifica certificate prezentate impotriva Listelor de Certificate Revocate cunoscute. Din pacate, nu putem garanta ca vom semnala toate certificatele revocate, dar daca vezi o avertizare, exista o sansa buna ca ceva nu este bine."> <!ENTITY ssl-observatory.prefs.done "Gata">

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 11 Jun '14

11 Jun '14

commit 757cca3e0110ac2b7edd1939e49de412e7216014 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 11 14:45:03 2014 +0000 Update translations for bridgedb --- fr/LC_MESSAGES/bridgedb.po | 131 ++++++++++++++++++++++++++------------------ 1 file changed, 78 insertions(+), 53 deletions(-) diff --git a/fr/LC_MESSAGES/bridgedb.po b/fr/LC_MESSAGES/bridgedb.po index 74fa872..be4b0f9 100644 --- a/fr/LC_MESSAGES/bridgedb.po +++ b/fr/LC_MESSAGES/bridgedb.po @@ -5,6 +5,7 @@ # Translators: # apaddlingduck, 2014 # Frisson Reynald <frissonreynald(a)yahoo.fr>, 2014 +# hpatte <hadrien.44(a)gmail.com>, 2014 # Lunar <lunar(a)torproject.org>, 2013 # Onizuka, 2013 # mehditaileb <mehditaileb(a)liberte-info.net>, 2011 @@ -14,9 +15,9 @@ 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-05-16 18:39+0000\n" -"PO-Revision-Date: 2014-06-05 09:52+0000\n" -"Last-Translator: themen <themen2004(a)gmail.com>\n" +"POT-Creation-Date: 2014-06-06 21:46+0000\n" +"PO-Revision-Date: 2014-06-11 14:15+0000\n" +"Last-Translator: hpatte <hadrien.44(a)gmail.com>\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" @@ -27,19 +28,16 @@ msgstr "" #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in #. any string (regardless of capitalization and/or punctuation): -#. "bridge" -#. "bridges" #. "BridgeDB" #. "pluggable transport" #. "pluggable transports" #. "obfs2" #. "obfs3" #. "scramblesuit" -#. "fte" +#. "fteproxy" #. "Tor" #. "Tor Browser" -#. "TBB" -#: lib/bridgedb/HTTPServer.py:124 +#: lib/bridgedb/HTTPServer.py:121 msgid "Sorry! Something went wrong with your request." msgstr "Désolé ! Quelque chose n'allait pas avec votre demande." @@ -63,39 +61,44 @@ msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" msgstr "COMMANDES: (combiner des commandes pour spécifier plusieurs options en même temps)" -#: lib/bridgedb/strings.py:27 +#. TRANSLATORS: Please DO NOT translate the word "BridgeDB". +#: lib/bridgedb/strings.py:28 msgid "Welcome to BridgeDB!" msgstr "Bienvenue à BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: lib/bridgedb/strings.py:29 +#: lib/bridgedb/strings.py:30 msgid "Currently supported transport TYPEs:" msgstr "TYPEs de transport pris en charge actuellement:" -#: lib/bridgedb/strings.py:30 +#: lib/bridgedb/strings.py:31 #, python-format msgid "Hey, %s!" msgstr "Salut, %s!" -#: lib/bridgedb/strings.py:31 +#: lib/bridgedb/strings.py:32 msgid "Hello, friend!" msgstr "Bonjour, ami !" -#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100 +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 msgid "Public Keys" msgstr "Les clés publiques" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles #. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." -#: lib/bridgedb/strings.py:36 +#: lib/bridgedb/strings.py:37 #, python-format msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." msgstr "Ce courriel a été généré avec des arcs en ciel, des licornes, et des étincelles pour %s sur %s à%s." -#: lib/bridgedb/strings.py:42 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor". +#. TRANSLATORS: Please DO NOT translate "Tor Network". +#: lib/bridgedb/strings.py:47 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -105,14 +108,20 @@ msgid "" "\n" msgstr "BridgeDB peut fournir des ponts avec plusieurs %stypes de transports enfichables%s, qui peuvent aider à brouiller vos connexions au réseau Tor, ce qui rend plus difficile pour tous ceux qui regardent votre trafic Internet de déterminer que vous utilisez Tor.\n" -#: lib/bridgedb/strings.py:48 +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#: lib/bridgedb/strings.py:54 msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" msgstr "Certains ponts avec les adresses IPv6 sont également disponibles, bien que certains Transports soient enfichables ; ils ne sont pas compatibles avec l'IPv6.\n" -#: lib/bridgedb/strings.py:52 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, +#. regular, or unexciting". Like vanilla ice cream. It refers to bridges +#. which do not have Pluggable Transports, and only speak the regular, +#. boring Tor protocol. Translate it as you see fit. Have fun with it. +#: lib/bridgedb/strings.py:63 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" @@ -121,20 +130,20 @@ msgid "" "\n" msgstr "" -#: lib/bridgedb/strings.py:65 +#: lib/bridgedb/strings.py:76 msgid "What are bridges?" msgstr "Que sont les bridges ?" -#: lib/bridgedb/strings.py:66 +#: lib/bridgedb/strings.py:77 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "%s Bridges %s sont des relais Tor qui vous aident à contourner la censure." -#: lib/bridgedb/strings.py:71 +#: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" msgstr "J'ai besoin d'une alternative pour obtenir des adresses de bridges !" -#: lib/bridgedb/strings.py:72 +#: lib/bridgedb/strings.py:83 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" @@ -142,75 +151,83 @@ msgid "" "%s or %s." msgstr "" -#: lib/bridgedb/strings.py:79 +#: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" msgstr "Mes bridges ne fonctionnent pas, j'ai besoin d'aide !" -#: lib/bridgedb/strings.py:80 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:92 #, python-format msgid "If your Tor doesn't work, you should email %s." msgstr "Si votre Tor ne marche pas, vous devriez envoyer un courriel %s." -#: lib/bridgedb/strings.py:81 +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:96 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 "" -#: lib/bridgedb/strings.py:88 +#: lib/bridgedb/strings.py:103 msgid "Here are your bridge lines:" msgstr "Voici vos lignes des bridges:" -#: lib/bridgedb/strings.py:89 +#: lib/bridgedb/strings.py:104 msgid "Get Bridges!" msgstr "Obtenez des bridges!" -#: lib/bridgedb/strings.py:93 +#: lib/bridgedb/strings.py:108 msgid "Please select options for bridge type:" msgstr "Sélectionnez vos choix pour le type de bridge, s'il vous plaît:" -#: lib/bridgedb/strings.py:94 +#: lib/bridgedb/strings.py:109 msgid "Do you need IPv6 addresses?" msgstr "Avez-vous besoin des adresses IPv6?" -#: lib/bridgedb/strings.py:95 +#: lib/bridgedb/strings.py:110 #, python-format msgid "Do you need a %s?" msgstr "Avez-vous besoin un %s?" -#: lib/bridgedb/strings.py:99 +#: lib/bridgedb/strings.py:114 msgid "Your browser is not displaying images properly." msgstr "Votre navigateur n'affiche pas correctement les images." -#: lib/bridgedb/strings.py:100 +#: lib/bridgedb/strings.py:115 msgid "Enter the characters from the image above..." msgstr "Inscrire les caractères de l'image ci-dessus…" -#: lib/bridgedb/strings.py:104 +#: lib/bridgedb/strings.py:119 msgid "How to start using your bridges" msgstr "Comment démarrer l'utilisation de vos Bridges." -#: lib/bridgedb/strings.py:105 +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#: lib/bridgedb/strings.py:121 #, python-format msgid "" "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" "Browser download page %s to start Tor Browser." msgstr "" -#: lib/bridgedb/strings.py:108 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:125 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "" -#: lib/bridgedb/strings.py:111 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:129 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "" -#: lib/bridgedb/strings.py:114 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:133 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" @@ -218,24 +235,29 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "" -#: lib/bridgedb/strings.py:122 +#: lib/bridgedb/strings.py:141 msgid "Displays this message." msgstr "Afficher ce message." -#: lib/bridgedb/strings.py:123 +#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the +#. same non-Pluggable Transport bridges described above as being +#. "plain-ol'-vanilla" bridges. +#: lib/bridgedb/strings.py:145 msgid "Request vanilla bridges." msgstr "Demander les bridges vanilles." -#: lib/bridgedb/strings.py:124 +#: lib/bridgedb/strings.py:146 msgid "Request IPv6 bridges." msgstr "Demander IPv6 bridges." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:126 +#: lib/bridgedb/strings.py:148 msgid "Request a Pluggable Transport by TYPE." msgstr "Demander un Pluggable Transport par TYPE." -#: lib/bridgedb/strings.py:127 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "GnuPG". +#: lib/bridgedb/strings.py:151 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "Obtenir une copie de la clef GnuPG publique BridgeDB." @@ -255,15 +277,19 @@ msgstr "Changelog" msgid "Contact" msgstr "Contact" -#: lib/bridgedb/templates/bridges.html:65 +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: lib/bridgedb/templates/bridges.html:66 msgid "Uh oh, spaghettios!" msgstr "Houlà!" -#: lib/bridgedb/templates/bridges.html:70 +#: lib/bridgedb/templates/bridges.html:72 msgid "There currently aren't any bridges available..." msgstr "Il n'y a pas de bridges disponibles en ce moment…" -#: lib/bridgedb/templates/bridges.html:71 +#: lib/bridgedb/templates/bridges.html:73 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " @@ -304,36 +330,35 @@ msgstr "" #. beginning of words are present in your final translation. Thanks! #. (These are used to insert HTML5 underlining tags, to mark accesskeys #. for disabled users.) -#. TRANSLATORS: Please do NOT translate the word "bridges"! -#: lib/bridgedb/templates/options.html:39 +#: lib/bridgedb/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" msgstr "" -#: lib/bridgedb/templates/options.html:53 +#: lib/bridgedb/templates/options.html:52 msgid "Advanced Options" msgstr "Options avancées" -#: lib/bridgedb/templates/options.html:89 +#: lib/bridgedb/templates/options.html:88 msgid "No" msgstr "Non" -#: lib/bridgedb/templates/options.html:90 +#: lib/bridgedb/templates/options.html:89 msgid "none" msgstr "aucun" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: lib/bridgedb/templates/options.html:131 +#: lib/bridgedb/templates/options.html:130 #, python-format msgid "%sY%ses!" -msgstr "" +msgstr "%sO%sui!" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Please do NOT translate the word "bridge"! -#: lib/bridgedb/templates/options.html:155 +#: lib/bridgedb/templates/options.html:154 #, python-format msgid "%sG%set Bridges" -msgstr "" +msgstr "%sO%sbtenir Bridges"

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 11 Jun '14

11 Jun '14

commit dde959838c5935a5423daf4a07efd59601f0ed91 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 11 14:15:19 2014 +0000 Update translations for https_everywhere --- ro/ssl-observatory.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ro/ssl-observatory.dtd b/ro/ssl-observatory.dtd index 4b0e8f6..de006da 100644 --- a/ro/ssl-observatory.dtd +++ b/ro/ssl-observatory.dtd @@ -45,7 +45,7 @@ o rețea de companie intruzivă:"> "Asta va obține și va trimite "numărul de sistem autonom" al rețelei tale. Asta ne va ajuta să localizăm atacurile împotriva HTTPS și să determinăm dacă avem observații de la rețelele din locuri precum Iran și Siria unde atacurile sunt comparativ comune."> <!ENTITY ssl-observatory.prefs.show_cert_warning -"Show a warning when the Observatory detects a revoked certificate not caught by your browser"> +"Afiseaza o avertizare cand Observatory detecteaza un certificat revocat ce nu a fost detectat de browser-ul tau."> <!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip "This will check submitted certificates against known Certificate Revocation Lists. Unfortunately we cannot guarantee that we will flag every revoked certificate, but if you do see a warning there's a good chance something is wrong."> @@ -93,7 +93,7 @@ a vizionat. Menține mausul deasupra opțiunilor pentru mai multe detalii:"> <!ENTITY ssl-observatory.warning.showcert "Arată lanțul certificatului"> <!ENTITY ssl-observatory.warning.okay "Înțeleg"> <!ENTITY ssl-observatory.warning.text "Observatorul SSL al EFF a emis o atenționare despre certificatul HTTPS al acestui site:"> -<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection. (These warnings can be disabled in the "SSL Observatory" tab of the HTTPS Everywhere preferences dialog.)"> +<!ENTITY ssl-observatory.warning.defense "Daca esti autentificat pe acest site, te sfatuim sa schimbi parola de indata ce ai o conexiune sigura. (Aceste avertizari pot fi dezactivate in tab-ul "SSL Observatory" in fereastra de preferinte HTTPS Everywhere.)"> <!ENTITY ssl-observatory.prefs.self_signed "Trimite și verifică certificatele auto-semnate">

1 0