May 2015 - tor-commits - lists.torproject.org

[nyx/master] Helper for getting curses attribute code
by atagar＠torproject.org 05 May '15

05 May '15

commit aa6d4e03b4a31bdfcd8f7dcc2ec1e28741bb530e Author: Damian Johnson <atagar(a)torproject.org> Date: Tue May 5 09:52:34 2015 -0700 Helper for getting curses attribute code Just moving some repeatedly duplicated code to a helper. --- nyx/util/panel.py | 32 ++++---------------------------- nyx/util/ui_tools.py | 28 +++++++++++++++++++++------- 2 files changed, 25 insertions(+), 35 deletions(-) diff --git a/nyx/util/panel.py b/nyx/util/panel.py index 6dc3d0e..3be145b 100644 --- a/nyx/util/panel.py +++ b/nyx/util/panel.py @@ -447,13 +447,7 @@ class Panel(object): attr - text attributes """ - format_attr = curses.A_NORMAL - - for attr in attributes: - if isinstance(attr, str): - format_attr |= ui_tools.get_color(attr) - else: - format_attr |= attr + format_attr = ui_tools.curses_format(*attributes) if self.win and self.max_x > x and self.max_y > y: try: @@ -475,13 +469,7 @@ class Panel(object): attr - text attributes """ - format_attr = curses.A_NORMAL - - for attr in attributes: - if isinstance(attr, str): - format_attr |= ui_tools.get_color(attr) - else: - format_attr |= attr + format_attr = ui_tools.curses_format(*attributes) if self.win and self.max_x > x and self.max_y > y: try: @@ -503,13 +491,7 @@ class Panel(object): attr - text attributes """ - format_attr = curses.A_NORMAL - - for attr in attributes: - if isinstance(attr, str): - format_attr |= ui_tools.get_color(attr) - else: - format_attr |= attr + format_attr = ui_tools.curses_format(*attributes) if self.win and self.max_x > x and self.max_y > y: try: @@ -531,13 +513,7 @@ class Panel(object): attr - text attributes """ - format_attr = curses.A_NORMAL - - for attr in attributes: - if isinstance(attr, str): - format_attr |= ui_tools.get_color(attr) - else: - format_attr |= attr + format_attr = ui_tools.curses_format(*attributes) # subwindows need a single character buffer (either in the x or y # direction) from actual content to prevent crash when shrank diff --git a/nyx/util/ui_tools.py b/nyx/util/ui_tools.py index 901676b..d546415 100644 --- a/nyx/util/ui_tools.py +++ b/nyx/util/ui_tools.py @@ -179,6 +179,26 @@ def get_printable(line, keep_newlines = True): return line +def curses_format(*attributes): + """ + Provides the curses integer code for a series of attributes. + + :param list attributes: curses attributes or color names + + :returns: **int** that can be used with curses + """ + + format_attr = curses.A_NORMAL + + for attr in attributes: + if isinstance(attr, str): + format_attr |= get_color(attr) + else: + format_attr |= attr + + return format_attr + + def draw_box(panel, top, left, width, height, *attributes): """ Draws a box in the panel with the given bounds. @@ -192,13 +212,7 @@ def draw_box(panel, top, left, width, height, *attributes): attr - text attributes """ - format_attr = curses.A_NORMAL - - for attr in attributes: - if isinstance(attr, str): - format_attr |= get_color(attr) - else: - format_attr |= attr + format_attr = curses_format(*attributes) # draws the top and bottom

1 0

[nyx/master] Change days_since() to day_count()
by atagar＠torproject.org 05 May '15

05 May '15

commit f58e1c2788bfc42890bd8eb5dbe8cbde0b452dda Author: Damian Johnson <atagar(a)torproject.org> Date: Tue May 5 09:06:59 2015 -0700 Change days_since() to day_count() Earlier I changed the behavior of days_since() to work as advertised, but actually having an absolute count as it previously did is a lot less error prone. For instance, the change introduced a narrow timing bug with deduplication. Reverting to our previous behavior, but with a more accruate name. --- nyx/log_panel.py | 20 +++++++++----------- nyx/util/log.py | 30 +++++++++++++----------------- 2 files changed, 22 insertions(+), 28 deletions(-) diff --git a/nyx/log_panel.py b/nyx/log_panel.py index 626a42f..a76340d 100644 --- a/nyx/log_panel.py +++ b/nyx/log_panel.py @@ -43,8 +43,6 @@ CONFIG = conf.config_dict('nyx', { 'attr.log_color': {}, }, conf_handler) -TIMEZONE_OFFSET = time.altzone if time.localtime()[8] else time.timezone - # The height of the drawn content is estimated based on the last time we redrew # the panel. It's chiefly used for scrolling and the bar indicating its # position. Letting the estimate be too inaccurate results in a display bug, so @@ -294,7 +292,7 @@ class LogPanel(panel.Panel, threading.Thread): # group entries by date, filtering out those that aren't visible - days_ago_to_entries = {} + day_to_entries, today = {}, nyx.util.log.day_count(time.time()) for entry in event_log: if entry.is_duplicate and not CONFIG['features.log.showDuplicateEntries']: @@ -302,20 +300,20 @@ class LogPanel(panel.Panel, threading.Thread): elif not self._filter.match(entry.display_message): continue # filter doesn't match log message - days_ago_to_entries.setdefault(entry.days_since(), []).append(entry) + day_to_entries.setdefault(entry.day_count(), []).append(entry) - for days_ago in sorted(days_ago_to_entries.keys()): - if days_ago == 0: - for entry in days_ago_to_entries[days_ago]: + for day in sorted(day_to_entries.keys(), reverse = True): + if day == today: + for entry in day_to_entries[day]: y = self._draw_entry(x, y, width, entry) else: original_y, y = y, y + 1 - for entry in days_ago_to_entries[days_ago]: + for entry in day_to_entries[day]: y = self._draw_entry(x, y, width, entry) ui_tools.draw_box(self, original_y, x - 1, width - x + 1, y - original_y + 1, curses.A_BOLD, 'yellow') - time_label = time.strftime(' %B %d, %Y ', time.localtime(days_ago_to_entries[days_ago][0].timestamp)) + time_label = time.strftime(' %B %d, %Y ', time.localtime(day_to_entries[day][0].timestamp)) self.addstr(original_y, x + 1, time_label, curses.A_BOLD, curses.A_BOLD, 'yellow') y += 1 @@ -414,10 +412,10 @@ class LogPanel(panel.Panel, threading.Thread): responsive if additions are less frequent. """ - last_ran, last_day = -1, int((time.time() - TIMEZONE_OFFSET) / 86400) + last_ran, last_day = -1, nyx.util.log.day_count(time.time()) while not self._halt: - current_day = int((time.time() - TIMEZONE_OFFSET) / 86400) + current_day = nyx.util.log.day_count(time.time()) time_since_reset = time.time() - last_ran max_log_update_rate = CONFIG['features.log.maxRefreshRate'] / 1000.0 diff --git a/nyx/util/log.py b/nyx/util/log.py index f224789..ca2b520 100644 --- a/nyx/util/log.py +++ b/nyx/util/log.py @@ -24,25 +24,21 @@ except ImportError: from stem.util.lru_cache import lru_cache TOR_RUNLEVELS = ['DEBUG', 'INFO', 'NOTICE', 'WARN', 'ERR'] +TIMEZONE_OFFSET = time.altzone if time.localtime()[8] else time.timezone CONFIG = stem.util.conf.config_dict('nyx', {'tor.chroot': ''}) -def days_since(timestamp): +def day_count(timestamp): """ - Provides the number of days since a given unix timestamp, by local time. - Daybreaks are rolled over at midnight. For instance, 5pm today would report - zero, and 5pm yesterday would report one. + Provoides a unique number for the day a given timestamp falls on, by local + time. Daybreaks are rolled over at midnight. - :param int timestamp: unix timestamp to provide time since + :param int timestamp: unix timestamp to provide a count for - :reutrns: **int** with the number of days since this event + :reutrns: **int** for the day it falls on """ - # unix timestamp for today at midnight - - midnight = time.mktime(datetime.datetime.today().date().timetuple()) - - return int((midnight - timestamp) / 86400) + return int((timestamp - TIMEZONE_OFFSET) / 86400) def log_file_path(controller): @@ -202,10 +198,10 @@ class LogGroup(object): def add(self, entry): with self._lock: duplicate = None - our_day = entry.days_since() + our_day = entry.day_count() for existing_entry in self._entries: - if self._group_by_day and our_day != existing_entry.days_since(): + if self._group_by_day and our_day != existing_entry.day_count(): break elif entry.is_duplicate_of(existing_entry): duplicate = existing_entry @@ -298,14 +294,14 @@ class LogEntry(object): return False - def days_since(self): + def day_count(self): """ - Provides the number of days since this event, by local time. + Provides the day this event occured on by local time. - :reutrns: **int** with the number of days since this event + :reutrns: **int** with the day this occured on """ - return days_since(self.timestamp) + return day_count(self.timestamp) def __eq__(self, other): if isinstance(other, LogEntry):

1 0

[webwml/master] Update git ignore
by atagar＠torproject.org 05 May '15

05 May '15

commit b8e02d6f05263540781402bc9987f9ae0c2af3cc Author: Damian Johnson <atagar(a)torproject.org> Date: Tue May 5 08:39:03 2015 -0700 Update git ignore Just a couple build artifacts that weren't currently covered. --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 8b45d74..1965530 100644 --- a/.gitignore +++ b/.gitignore @@ -10,10 +10,12 @@ about/gsoc.html.en about/jobs-browserhacker.html.en about/jobs-controller.html.en about/jobs-coredev.html.en +about/jobs-dircomms.html.en about/jobs-extdev.html.en about/jobs-lead-automation.html.en about/jobs-pluggabletransport.html.en about/jobs-projectcoordinator.html.en +about/jobs-projectmanager.html.en about/jobs-translatorsupport.html.en about/jobs.html.en about/overview.html.en

1 0

[webwml/master] Add link to Tor brochures to the Volunteer page.
by atagar＠torproject.org 05 May '15

05 May '15

commit f209865cc7e51653c396028253202297d8efafac Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue May 5 10:50:01 2015 +0200 Add link to Tor brochures to the Volunteer page. --- getinvolved/en/volunteer.wml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index 644d78e..e8ae31a 100644 --- a/getinvolved/en/volunteer.wml +++ b/getinvolved/en/volunteer.wml @@ -74,6 +74,10 @@ meetings around the world.</li> <li>Create a t-shirt design that incorporates "<a href="https://check.torproject.org/">Congratulations! You are using Tor!</a>" in any language.</li> + <li>Spread the word about Tor at a symposium or conference and use these + <a href="https://media.torproject.org/misc/2015-03-tor-brochure/">Tor + brochures</a> in PDF and ODG format and translated to at least ten + different languages as conversation starter.</li> </ol> <!--

1 0

[tor/master] Add collation/splitting support to sortChanges script
by nickm＠torproject.org 05 May '15

05 May '15

commit e81951c48949c83d6d3b618c95f128a8f41aff43 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 5 11:24:01 2015 -0400 Add collation/splitting support to sortChanges script --- scripts/maint/sortChanges.py | 47 +++++++++++++++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 7 deletions(-) diff --git a/scripts/maint/sortChanges.py b/scripts/maint/sortChanges.py index ad28c79..7e25cef 100755 --- a/scripts/maint/sortChanges.py +++ b/scripts/maint/sortChanges.py @@ -5,8 +5,6 @@ """This script sorts a bunch of changes files listed on its command line into roughly the order in which they should appear in the changelog. - - TODO: collation support. """ import re @@ -19,7 +17,7 @@ def fetch(fn): return s def score(s,fname=None): - m = re.match(r'^ +o (.*)', s) + m = re.match(r'^ +o ([^\n]*)\n(.*)', s, re.M|re.S) if not m: print >>sys.stderr, "Can't score %r from %s"%(s,fname) lw = m.group(1).lower() @@ -38,12 +36,47 @@ def score(s,fname=None): else: score = 100 - return (score, lw, s) + return (score, lw, m.group(1), m.group(2)) + +def splitChanges(s): + this_entry = [] + for line in s.split("\n"): + if line.strip() == "": + continue + if re.match(r" +o ", line): + if len(this_entry) > 2: + yield "".join(this_entry) + curHeader = line + this_entry = [ curHeader, "\n" ] + continue + elif re.match(r" +- ", line): + if len(this_entry) > 2: + yield "".join(this_entry) + this_entry = [ curHeader, "\n" ] + + this_entry.append(line) + this_entry.append("\n") + if len(this_entry) > 2: + yield "".join(this_entry) -changes = [ score(fetch(fn),fn) for fn in sys.argv[1:] if not fn.endswith('~') ] + +changes = [] + +for fn in sys.argv[1:]: + if fn.endswith('~'): + continue + for change in splitChanges(fetch(fn)): + changes.append(score(change,fn)) changes.sort() -for _, _, s in changes: - print s +last_lw = "this is not a header" +for _, lw, header, rest in changes: + if lw == last_lw: + print rest, + else: + print + print " o",header + print rest, + last_lw = lw

1 0

[tor/master] Re-sort and flow the changelog. Add new entry
by nickm＠torproject.org 05 May '15

05 May '15

commit caaaea2ac936a1a8bfa0d54498447488b4525768 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 5 11:26:11 2015 -0400 Re-sort and flow the changelog. Add new entry --- ChangeLog | 38 +++++++++++++++++++------------------- changes/feature3523 | 3 --- 2 files changed, 19 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index 250fb2e..f5ef3d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,8 @@ Changes in version 0.2.7.1-alpha - 2015-05-?? of ticket 6411. - New HSFETCH command to launch a request for a hidden service descriptor. Closes ticket 14847. + - New HSPOST command to upload a hidden service descriptor. Closes + ticket 3523. Patch by "DonnchaC". o Major bugfixes (hidden services): - Revert commit that made directory authority assign the HSDir flag @@ -36,14 +38,12 @@ Changes in version 0.2.7.1-alpha - 2015-05-?? needless noise. Closes ticket 15542. Patch from "cypherpunks". o Minor features (controller): - - Controllers can now use GETINFO hs/client/desc/id/... to retrieve - items from the client's hidden service descriptor cache. Closes - ticket 14845. - - o Minor features (controller): - Add DirAuthority lines for default directory authorities to output of the GETINFO config/defaults controller command if not already present. Implements ticket 14840. + - Controllers can now use GETINFO hs/client/desc/id/... to retrieve + items from the client's hidden service descriptor cache. Closes + ticket 14845. - Implement a new controller command "status/fresh-relay-descs" to fetch a descriptor/extrainfo pair that was generated on demand just for the controller's use. Implements ticket 14784. @@ -72,17 +72,19 @@ Changes in version 0.2.7.1-alpha - 2015-05-?? ticket 15026. o Minor features (pluggable transports): + - When launching managed pluggable transports on linux systems, + attempt to have the kernel deliver a SIGTERM on tor exit if the + pluggable transport process is still running. Resolves + ticket 15471. - When launching managed pluggable transports, setup a valid open stdin in the child process that can be used to detect if tor has terminated. The "TOR_PT_EXIT_ON_STDIN_CLOSE" enviornment variable can be used by implementations to detect this new behavior. Resolves ticket 15435. - - When launching managed pluggable transports on linux systems, - attempt to have the kernel deliver a SIGTERM on tor exit if the - pluggable transport process is still running. Resolves - ticket 15471. o Minor features (testing): + - Add a test to verify that the compiler does not eliminate our + memwipe() implementation. Closes ticket 15377. - Add make rule `check-changes` to verify the format of changes files. Closes ticket 15180. - Add unit tests for control_event_is_interesting(). Add a compile- @@ -97,8 +99,6 @@ Changes in version 0.2.7.1-alpha - 2015-05-?? them artificially makes our branch coverage look worse than it is. This patch provides the new test-stem-full and coverage-html-full configure options. Implements ticket 15400. - - Add a test to verify that the compiler does not eliminate our - memwipe() implementation. Closes ticket 15377. o Minor bugfixes (build): - Improve out-of-tree builds by making non-standard rules work and @@ -122,13 +122,13 @@ Changes in version 0.2.7.1-alpha - 2015-05-?? 90f6071d8dc0 in 0.2.4.7-alpha. Patch by "teor". o Minor bugfixes (correctness): + - For correctness, avoid modifying a constant string in + handle_control_postdescriptor. Fixes bug 15546; bugfix + on 0.1.1.16-rc. - Remove side-effects from tor_assert() calls. This was harmless, because we never disable assertions, but it is bad style and unnecessary. Fixes bug 15211; bugfix on 0.2.5.5, 0.2.2.36, and 0.2.0.10. - - For correctness, avoid modifying a constant string in - handle_control_postdescriptor. Fixes bug 15546; bugfix - on 0.1.1.16-rc. o Minor bugfixes (hidden service): - Remove an extraneous newline character from the end of hidden @@ -168,14 +168,14 @@ Changes in version 0.2.7.1-alpha - 2015-05-?? discovered by CJ Ess. o Minor bugfixes (testing): + - Check for matching value in server response in ntor_ref.py. Fixes + bug 15591; bugfix on 0.2.4.8-alpha. Reported and fixed + by "joelanders". - Set the severity correctly when testing get_interface_addresses_ifaddrs() and get_interface_addresses_win32(), so that the tests fail gracefully instead of triggering an assertion. Fixes bug 15759; bugfix on 0.2.6.3-alpha. Reported by Nicolas Derive. - - Check for matching value in server response in ntor_ref.py. Fixes - bug 15591; bugfix on 0.2.4.8-alpha. Reported and fixed - by "joelanders". o Code simplification and refactoring: - Move the hacky fallback code out of get_interface_address6() into @@ -213,10 +213,10 @@ Changes in version 0.2.7.1-alpha - 2015-05-?? complicated our build process, caused subtle build issues on multiple platforms, and is now redundant since we started including git version identifiers. Closes ticket 14742. - - Tor no longer contains workarounds for stat files generated by - super-old versions of Tor that didn't choose guards sensibly. - Tor no longer contains checks for ancient directory cache versions that didn't know about microdescriptors. + - Tor no longer contains workarounds for stat files generated by + super-old versions of Tor that didn't choose guards sensibly. Changes in version 0.2.4.27 - 2015-04-06 diff --git a/changes/feature3523 b/changes/feature3523 deleted file mode 100644 index f11d1d3..0000000 --- a/changes/feature3523 +++ /dev/null @@ -1,3 +0,0 @@ - o Major features (controller): - - New HSPOST command to upload a hidden service descriptor. - Closes ticket 3523. Patch by "DonnchaC".

1 0

[tor/master] Fix a harmless memory leak in tor-gencert
by nickm＠torproject.org 05 May '15

05 May '15

commit 72c4a4eb03d6d1be1de2701b4c2c2703bfbca699 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 5 11:05:01 2015 -0400 Fix a harmless memory leak in tor-gencert --- src/tools/tor-gencert.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c index c0cab7e..28b1a58 100644 --- a/src/tools/tor-gencert.c +++ b/src/tools/tor-gencert.c @@ -186,8 +186,7 @@ parse_commandline(int argc, char **argv) return 1; in.s_addr = htonl(addr); tor_inet_ntoa(&in, b, sizeof(b)); - address = tor_malloc(INET_NTOA_BUF_LEN+32); - tor_snprintf(address, INET_NTOA_BUF_LEN+32, "%s:%d", b, (int)port); + tor_asprintf(&address, "%s:%d", b, (int)port); } else if (!strcmp(argv[i], "--create-identity-key")) { make_new_id = 1; } else if (!strcmp(argv[i], "--passphrase-fd")) { @@ -566,6 +565,7 @@ main(int argc, char **argv) tor_free(identity_key_file); tor_free(signing_key_file); tor_free(certificate_file); + tor_free(address); crypto_global_cleanup(); return r;

1 0

[tor/master] Fix a few more memory leaks; not in any released Tor
by nickm＠torproject.org 05 May '15

05 May '15

commit f61088ce2321be7c408b4298258a268a0a546e78 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 5 11:08:05 2015 -0400 Fix a few more memory leaks; not in any released Tor --- src/or/control.c | 7 ++++++- src/test/test_controller.c | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/or/control.c b/src/or/control.c index ebe3859..780dea5 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3779,12 +3779,17 @@ add_onion_helper_keyarg(const char *arg, int discard_pk, memwipe(cp, 0, strlen(cp)); tor_free(cp); }); + smartlist_free(key_args); if (!ok) { crypto_pk_free(pk); pk = NULL; } - if (err_msg_out) *err_msg_out = err_msg; + if (err_msg_out) { + *err_msg_out = err_msg; + } else { + tor_free(err_msg); + } *key_new_alg_out = key_new_alg; *key_new_blob_out = key_new_blob; diff --git a/src/test/test_controller.c b/src/test/test_controller.c index 9039dc7..b40825b 100644 --- a/src/test/test_controller.c +++ b/src/test/test_controller.c @@ -72,6 +72,7 @@ test_add_onion_helper_keyarg(void *arg) /* Test loading a invalid key type. */ tor_free(arg_str); + crypto_pk_free(pk); pk = NULL; tor_asprintf(&arg_str, "RSA512:%s", encoded); pk = add_onion_helper_keyarg(arg_str, 0, &key_new_alg, &key_new_blob, &err_msg); @@ -82,6 +83,7 @@ test_add_onion_helper_keyarg(void *arg) /* Test loading a invalid key. */ tor_free(arg_str); + crypto_pk_free(pk); pk = NULL; tor_free(err_msg); encoded[strlen(encoded)/2] = '\0'; tor_asprintf(&arg_str, "RSA1024:%s", encoded);

1 0

[metrics-db/master] Avoid duplicates when storing bridge descriptors.
by karsten＠torproject.org 05 May '15

05 May '15

commit 91aeeb6f4e7bd893fa2ded40e13138ab7f9ee3cc Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue May 5 12:22:58 2015 +0200 Avoid duplicates when storing bridge descriptors. Implements #12676. --- .../ernie/db/bridgedescs/SanitizedBridgesWriter.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/org/torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java b/src/org/torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java index 1c64d79..37f37a1 100644 --- a/src/org/torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java +++ b/src/org/torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java @@ -852,6 +852,11 @@ public class SanitizedBridgesWriter extends Thread { for (int i = 0; i < outputFiles.length; i++) { File outputFile = outputFiles[i]; boolean appendToFile = append[i]; + if (outputFile.exists() && !appendToFile) { + /* We already stored this descriptor to disk before, so let's + * not store it yet another time. */ + break; + } outputFile.getParentFile().mkdirs(); BufferedWriter bw = new BufferedWriter(new FileWriter( outputFile, appendToFile)); @@ -999,6 +1004,11 @@ public class SanitizedBridgesWriter extends Thread { for (int i = 0; i < outputFiles.length; i++) { File outputFile = outputFiles[i]; boolean appendToFile = append[i]; + if (outputFile.exists() && !appendToFile) { + /* We already stored this descriptor to disk before, so let's + * not store it yet another time. */ + break; + } outputFile.getParentFile().mkdirs(); BufferedWriter bw = new BufferedWriter(new FileWriter( outputFile, appendToFile));

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 05 May '15

05 May '15

commit b1b6918f8fb158d8724c6da0b64e452b05ae4605 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 5 09:15:40 2015 +0000 Update translations for tails-misc_completed --- fr.po | 75 +++++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 40 insertions(+), 35 deletions(-) diff --git a/fr.po b/fr.po index b167b34..0922e8f 100644 --- a/fr.po +++ b/fr.po @@ -7,6 +7,7 @@ # Alex <chioubaca(a)gmail.com>, 2014 # tneskovic <antoine_ecuador(a)yahoo.fr>, 2014 # apaddlingduck, 2014 +# Athorcis, 2015 # Emmanuel Simond, 2014 # Jean-Yves Toumit <saiolar-c(a)yahoo.fr>, 2013 # Onizuka, 2013 @@ -16,9 +17,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-23 16:25+0100\n" -"PO-Revision-Date: 2015-03-04 10:01+0000\n" -"Last-Translator: Towinet\n" +"POT-Creation-Date: 2015-05-02 23:47+0200\n" +"PO-Revision-Date: 2015-05-05 09:03+0000\n" +"Last-Translator: Athorcis\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" @@ -26,11 +27,11 @@ msgstr "" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:42 +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:43 msgid "Tor is ready" msgstr "Tor est opérationnel" -#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:43 +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:44 msgid "You can now access the Internet." msgstr "Vous pouvez maintenant accéder à Internet." @@ -104,128 +105,132 @@ msgstr "_Déchiffrer/Vérifier le presse-papier" msgid "_Manage Keys" msgstr "_Gérer les Clés" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:244 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:208 +msgid "_Open Text Editor" +msgstr "_Ouvrir l'éditeur de texte" + +#: config/chroot_local-includes/usr/local/bin/gpgApplet:252 msgid "The clipboard does not contain valid input data." msgstr "Le presse-papier ne contient pas de données valides." -#: config/chroot_local-includes/usr/local/bin/gpgApplet:295 -#: config/chroot_local-includes/usr/local/bin/gpgApplet:297 -#: config/chroot_local-includes/usr/local/bin/gpgApplet:299 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:303 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:305 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:307 msgid "Unknown Trust" msgstr "Confiance inconnue" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:301 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:309 msgid "Marginal Trust" msgstr "Confiance minime" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:303 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:311 msgid "Full Trust" msgstr "Confiance complète" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:305 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:313 msgid "Ultimate Trust" msgstr "Confiance absolue" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:358 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:366 msgid "Name" msgstr "Nom" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:359 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:367 msgid "Key ID" msgstr "Identifiant de la clé" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:360 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:368 msgid "Status" msgstr "Statut" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:392 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:400 msgid "Fingerprint:" msgstr "Empreinte :" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:395 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:403 msgid "User ID:" msgid_plural "User IDs:" msgstr[0] "Identifiant de l'utilisateur :" msgstr[1] "Identifiants de l'utilisateur :" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:425 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:433 msgid "None (Don't sign)" msgstr "Aucun (ne pas signer)" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:488 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:496 msgid "Select recipients:" msgstr "Choisir les destinataires :" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:496 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:504 msgid "Hide recipients" msgstr "Cacher les destinataires" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:499 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:507 msgid "" "Hide the user IDs of all recipients of an encrypted message. Otherwise " "anyone that sees the encrypted message can see who the recipients are." msgstr "Cacher les identifiants utilisateur de tous les destinataires d'un message chiffré. Sans quoi n'importe qui interceptant le message chiffré peut savoir à qui il est destiné." -#: config/chroot_local-includes/usr/local/bin/gpgApplet:505 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:513 msgid "Sign message as:" msgstr "Signer le message en tant que :" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:509 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:517 msgid "Choose keys" msgstr "Choisir les clés" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:549 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:557 msgid "Do you trust these keys?" msgstr "Faites-vous confiance à ces clés ?" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:552 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:560 msgid "The following selected key is not fully trusted:" msgid_plural "The following selected keys are not fully trusted:" msgstr[0] "La clé suivante n'est pas totalement de confiance :" msgstr[1] "Les clés suivantes ne sont pas totalement de confiance :" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:570 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:578 msgid "Do you trust this key enough to use it anyway?" msgid_plural "Do you trust these keys enough to use them anyway?" msgstr[0] "Faites-vous quand même assez confiance à cette clé pour l'utiliser ?" msgstr[1] "Faites-vous quand même assez confiance à ces clés pour les utiliser ?" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:583 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:591 msgid "No keys selected" msgstr "Aucune clé sélectionnée" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:585 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:593 msgid "" "You must select a private key to sign the message, or some public keys to " "encrypt the message, or both." msgstr "Vous devez sélectionner une clé privée pour signer le message, une clé publique pour le chiffrer, ou les deux." -#: config/chroot_local-includes/usr/local/bin/gpgApplet:613 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:621 msgid "No keys available" msgstr "Pas de clé disponible" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:615 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:623 msgid "" "You need a private key to sign messages or a public key to encrypt messages." msgstr "Vous avez besoin d'une clé privée pour signer les messages ou d'une clé publique pour les chiffrer." -#: config/chroot_local-includes/usr/local/bin/gpgApplet:743 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:751 msgid "GnuPG error" msgstr "Erreur de GnuPG" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:764 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:772 msgid "Therefore the operation cannot be performed." msgstr "L'opération ne peut donc pas être effectuée." -#: config/chroot_local-includes/usr/local/bin/gpgApplet:814 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:822 msgid "GnuPG results" msgstr "Résultats de GnuPG" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:820 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:828 msgid "Output of GnuPG:" msgstr "Voici la sortie de GnuPG :" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:845 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:853 msgid "Other messages provided by GnuPG:" msgstr "Autres messages fournis par GnuPG :"

1 0