October 2017 - tor-commits - lists.torproject.org

[nyx/master] Update ConsensusTracker with unparsed consensus content
by atagar＠torproject.org 29 Oct '17

29 Oct '17

commit a8cf209dce02dc7722ff3601633b9ab847e5851e Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 29 12:21:58 2017 -0700 Update ConsensusTracker with unparsed consensus content Lighten the work needed by the ConsensusTracker by having it process unparsed consensus content. We already do this when starting up, so this actually simplifies our code quite a bit. --- nyx/__init__.py | 4 ++++ nyx/tracker.py | 43 ++++++++++++++++--------------------------- 2 files changed, 20 insertions(+), 27 deletions(-) diff --git a/nyx/__init__.py b/nyx/__init__.py index 7c61651..7394872 100644 --- a/nyx/__init__.py +++ b/nyx/__init__.py @@ -112,6 +112,10 @@ stem.control.CACHE_ADDRESS_FOR = 30 stem.control.LOG_CACHE_FETCHES = False +# don't parse NEWCONSENSUS events since we just care about the content + +stem.response.events.PARSE_NEWCONSENSUS_EVENTS = False + # Duration for threads to pause when there's no work left to do. This is a # compromise - lower means fater shutdown when quit but higher means lower cpu # usage when running. diff --git a/nyx/tracker.py b/nyx/tracker.py index fa2381e..c2c4714 100644 --- a/nyx/tracker.py +++ b/nyx/tracker.py @@ -818,43 +818,32 @@ class ConsensusTracker(object): stem.util.log.info('Cache is only %s old, no need to refresh it.' % str_tools.time_label(cache_age, is_long = True)) else: stem.util.log.info('Cache is %s old, refreshing relay information.' % str_tools.time_label(cache_age, is_long = True)) - start_time = time.time() ns_response = controller.get_info('ns/all', None) if ns_response: - with nyx.cache().write() as writer: - for line in ns_response.splitlines(): - if line.startswith('r '): - r_comp = line.split(' ') - - address = r_comp[6] - or_port = int(r_comp[7]) - fingerprint = stem.descriptor.router_status_entry._base64_to_hex(r_comp[2]) - nickname = r_comp[1] - - writer.record_relay(fingerprint, address, or_port, nickname) - - stem.util.log.info('Cached consensus data, took %0.2fs.' % (time.time() - start_time)) - - controller.add_event_listener(lambda event: self.update(event.desc), stem.control.EventType.NEWCONSENSUS) + self._update(ns_response) - def update(self, router_status_entries): - """ - Updates our cache with the given router status entries. - - :param list router_status_entries: router status entries to populate our cache with - """ + controller.add_event_listener(lambda event: self._update(event.consensus_content), stem.control.EventType.NEWCONSENSUS) + def _update(self, consensus_content): start_time = time.time() our_fingerprint = tor_controller().get_info('fingerprint', None) with nyx.cache().write() as writer: - for desc in router_status_entries: - writer.record_relay(desc.fingerprint, desc.address, desc.or_port, desc.nickname) + for line in consensus_content.splitlines(): + if line.startswith('r '): + r_comp = line.split(' ') + + address = r_comp[6] + or_port = int(r_comp[7]) + fingerprint = stem.descriptor.router_status_entry._base64_to_hex(r_comp[2]) + nickname = r_comp[1] + + if fingerprint == our_fingerprint: + self._my_router_status_entry = None + self._my_router_status_entry_time = 0 - if desc.fingerprint == our_fingerprint: - self._my_router_status_entry = desc - self._my_router_status_entry_time = time.time() + writer.record_relay(fingerprint, address, or_port, nickname) stem.util.log.info('Updated consensus cache, took %0.2fs.' % (time.time() - start_time))

1 0

[stem/master] Optionally having NEWCONSENSUS provide unparsed content
by atagar＠torproject.org 29 Oct '17

29 Oct '17

commit c2c2b9b4926960f5215b21a3e2a13a40ae6b009a Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 29 12:13:30 2017 -0700 Optionally having NEWCONSENSUS provide unparsed content Parsing the whole consensus can be burdensome. Skip doing this upfront so the caller can decide if they want a parsed version or not. --- docs/change_log.rst | 1 + stem/response/events.py | 28 ++++++++++++++++++++++------ 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index a1fe57f6..4699c2b9 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -56,6 +56,7 @@ The following are only available within Stem's `git repository * Better error message when :func:`~stem.control.Controller.set_conf` fails due to an option being immutable * :func:`~stem.control.Controller.is_geoip_unavailable` now determines if database is available right away * Added the time attribute to :class:`~stem.response.events.StreamBwEvent` and :class:`~stem.response.events.CircuitBandwidthEvent` (:spec:`00b9daf`) + * Added the consensus_content attribute to :class:`~stem.response.events.NewConsensusEvent` and deprecated its 'desc' * Deprecated :func:`~stem.control.Controller.is_geoip_unavailable`, this is now available via getinfo instead (:trac:`23237`, :spec:`dc973f8`) * Deprecated :class:`~stem.respose.events.AuthDirNewDescEvent` (:trac:`22377`, :spec:`6e887ba`) * Caching manual information as sqlite rather than stem.util.conf, making :func:`stem.manual.Manual.from_cache` about ~8x faster diff --git a/stem/response/events.py b/stem/response/events.py index fcc92855..256ec30e 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -20,6 +20,7 @@ from stem.util import str_type, int_type, connection, log, str_tools, tor_tools KW_ARG = re.compile('^(.*) ([A-Za-z0-9_]+)=(\S*)$') QUOTED_KW_ARG = re.compile('^(.*) ([A-Za-z0-9_]+)="(.*)"$') CELL_TYPE = re.compile('^[a-z0-9_]+$') +PARSE_NEWCONSENSUS_EVENTS = True class Event(stem.response.ControlMessage): @@ -234,7 +235,6 @@ class AuthDirNewDescEvent(Event): removed in 0.3.2.1-alpha. (:spec:`6e887ba`) .. deprecated:: 1.6.0 - Tor dropped this event as of version 0.3.2.1. (:spec:`6e887ba`) :var stem.AuthDescriptorAction action: what is being done with the descriptor @@ -804,6 +804,19 @@ class NewConsensusEvent(Event): The NEWCONSENSUS event was introduced in tor version 0.2.1.13-alpha. + .. versionchanged:: 1.6.0 + Added the consensus_content attribute. + + .. deprecated:: 1.6.0 + In Stem 2.0 we'll remove the desc attribute, so this event only provides + the unparsed consensus. Callers can then parse it if they'd like. To drop + parsing before then you can set... + + :: + + stem.response.events.PARSE_NEWCONSENSUS_EVENTS = False + + :var str consensus_content: consensus content :var list desc: :class:`~stem.descriptor.router_status_entry.RouterStatusEntryV3` for the changed descriptors """ @@ -816,11 +829,14 @@ class NewConsensusEvent(Event): # TODO: For stem 2.0.0 consider changing 'desc' to 'descriptors' to match # our other events. - self.desc = list(stem.descriptor.router_status_entry._parse_file( - io.BytesIO(str_tools._to_bytes(content)), - False, - entry_class = stem.descriptor.router_status_entry.RouterStatusEntryV3, - )) + if PARSE_NEWCONSENSUS_EVENTS: + self.desc = list(stem.descriptor.router_status_entry._parse_file( + io.BytesIO(str_tools._to_bytes(content)), + False, + entry_class = stem.descriptor.router_status_entry.RouterStatusEntryV3, + )) + else: + self.desc = None class NewDescEvent(Event):

1 0

[stem/master] Fix missing validation argument from parse_file()
by atagar＠torproject.org 29 Oct '17

29 Oct '17

commit 53af90a546976285586303134a6f4faf8fee6078 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Oct 28 18:26:46 2017 -0700 Fix missing validation argument from parse_file() Oops, it's optional with other descriptor types but not router status entries. --- stem/control.py | 1 + stem/response/events.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/stem/control.py b/stem/control.py index 416deb0a..a02c2387 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1987,6 +1987,7 @@ class Controller(BaseController): desc_iterator = stem.descriptor.router_status_entry._parse_file( io.BytesIO(desc_content), + False, entry_class = desc_class, ) diff --git a/stem/response/events.py b/stem/response/events.py index a0a20f5b..fcc92855 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -774,6 +774,7 @@ class NetworkStatusEvent(Event): self.desc = list(stem.descriptor.router_status_entry._parse_file( io.BytesIO(str_tools._to_bytes(content)), + False, entry_class = stem.descriptor.router_status_entry.RouterStatusEntryV3, )) @@ -817,6 +818,7 @@ class NewConsensusEvent(Event): self.desc = list(stem.descriptor.router_status_entry._parse_file( io.BytesIO(str_tools._to_bytes(content)), + False, entry_class = stem.descriptor.router_status_entry.RouterStatusEntryV3, ))

1 0

[stem/master] Drop validation from controller descriptors
by atagar＠torproject.org 29 Oct '17

29 Oct '17

commit 460ee5df90a0b3dbb560b608ba3141fa82a0575a Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Oct 28 18:18:22 2017 -0700 Drop validation from controller descriptors Dropping validation when we receive it from the control port. This makes a particularly big impact in performance for NEWCONSENSUS events. --- stem/control.py | 1 - stem/response/events.py | 2 -- 2 files changed, 3 deletions(-) diff --git a/stem/control.py b/stem/control.py index 763c6dab..416deb0a 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1987,7 +1987,6 @@ class Controller(BaseController): desc_iterator = stem.descriptor.router_status_entry._parse_file( io.BytesIO(desc_content), - True, entry_class = desc_class, ) diff --git a/stem/response/events.py b/stem/response/events.py index 8392250b..a0a20f5b 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -774,7 +774,6 @@ class NetworkStatusEvent(Event): self.desc = list(stem.descriptor.router_status_entry._parse_file( io.BytesIO(str_tools._to_bytes(content)), - True, entry_class = stem.descriptor.router_status_entry.RouterStatusEntryV3, )) @@ -818,7 +817,6 @@ class NewConsensusEvent(Event): self.desc = list(stem.descriptor.router_status_entry._parse_file( io.BytesIO(str_tools._to_bytes(content)), - True, entry_class = stem.descriptor.router_status_entry.RouterStatusEntryV3, ))

1 0

[stem/master] Check that tor_tools helpers work with both bytes and unicode
by atagar＠torproject.org 29 Oct '17

29 Oct '17

commit cbf9e45c7893ffade847c0a78e00ae484ccd3128 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Oct 28 18:06:16 2017 -0700 Check that tor_tools helpers work with both bytes and unicode Thought these might be having an issue but turns out that's not the case. Good tests none the less. --- test/unit/util/tor_tools.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/test/unit/util/tor_tools.py b/test/unit/util/tor_tools.py index c0881db0..5035d7b4 100644 --- a/test/unit/util/tor_tools.py +++ b/test/unit/util/tor_tools.py @@ -4,6 +4,7 @@ Unit tests for the stem.util.tor_tools functions. import unittest +import stem.util.str_tools import stem.util.tor_tools @@ -16,6 +17,8 @@ class TestTorTools(unittest.TestCase): valid_fingerprints = ( '$A7569A83B5706AB1B1A9CB52EFF7D2D32E4553EB', '$a7569a83b5706ab1b1a9cb52eff7d2d32e4553eb', + stem.util.str_tools._to_bytes('$A7569A83B5706AB1B1A9CB52EFF7D2D32E4553EB'), + stem.util.str_tools._to_unicode('$A7569A83B5706AB1B1A9CB52EFF7D2D32E4553EB'), ) invalid_fingerprints = ( @@ -44,6 +47,8 @@ class TestTorTools(unittest.TestCase): 'caerSidi', 'a', 'abcABC123', + stem.util.str_tools._to_bytes('caerSidi'), + stem.util.str_tools._to_unicode('caerSidi'), ) invalid_nicknames = ( @@ -69,6 +74,8 @@ class TestTorTools(unittest.TestCase): '0', '2', 'abcABC123', + stem.util.str_tools._to_bytes('2'), + stem.util.str_tools._to_unicode('2'), ) invalid_circuit_ids = ( @@ -94,6 +101,8 @@ class TestTorTools(unittest.TestCase): valid_hex_digits = ( '12345', 'AbCdE', + stem.util.str_tools._to_bytes('AbCdE'), + stem.util.str_tools._to_unicode('AbCdE'), ) invalid_hex_digits = (

1 0

[stem/master] Revert "Minor simplification for cache fetches"
by atagar＠torproject.org 29 Oct '17

29 Oct '17

commit 678c3b4d3235d063ee129c8cba067c15c9808762 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Oct 28 18:07:56 2017 -0700 Revert "Minor simplification for cache fetches" This change broke the ability for get_info() to accept unicode inputs (or bytes under python3)... >>> controller.get_network_status(u'0881E47137764C907E729C9303C094BD270CC27F') Traceback (most recent call last): File "<console>", line 1, in <module> File "/home/ubuntu/stem/stem/control.py", line 482, in wrapped return func(self, *args, **kwargs) File "/home/ubuntu/stem/stem/control.py", line 1928, in get_network_status desc_content = self.get_info(query, get_bytes = True) File "/home/ubuntu/stem/stem/control.py", line 482, in wrapped return func(self, *args, **kwargs) File "/home/ubuntu/stem/stem/control.py", line 1165, in get_info cached_results = self._get_cache_map(map(str.lower, params), 'getinfo') TypeError: descriptor 'lower' requires a 'str' object but received a 'unicode' This reverts commit e134dc59de93de3aef2ae1ec6e9b7a2f194c8eff. --- stem/control.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/stem/control.py b/stem/control.py index eebc24b6..763c6dab 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1162,7 +1162,8 @@ class Controller(BaseController): # check for cached results - cached_results = self._get_cache_map(map(str.lower, params), 'getinfo') + from_cache = [param.lower() for param in params] + cached_results = self._get_cache_map(from_cache, 'getinfo') for key in cached_results: if key == 'address' and (time.time() - self._address_cached_at) > CACHE_ADDRESS_FOR: @@ -2194,10 +2195,13 @@ class Controller(BaseController): if params == []: return {} - # check for cached results, translating context sensitive options - + # translate context sensitive options lookup_params = set([MAPPED_CONFIG_KEYS.get(entry, entry) for entry in params]) - cached_results = self._get_cache_map(map(str.lower, lookup_params), 'getconf') + + # check for cached results + + from_cache = [param.lower() for param in lookup_params] + cached_results = self._get_cache_map(from_cache, 'getconf') for key in cached_results: user_expected_key = _case_insensitive_lookup(lookup_params, key)

1 0

[nyx/master] Stretch descriptor dialog to include title
by atagar＠torproject.org 29 Oct '17

29 Oct '17

commit cb89c5e987fdcabdaa75b1487f1459d0ca93415d Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Oct 28 17:37:23 2017 -0700 Stretch descriptor dialog to include title If the dialog's title is shorter than the content (which happens when we lack descriptors) the dialog crops the title. --- nyx/popups.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nyx/popups.py b/nyx/popups.py index 96e9126..eaa2148 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -228,7 +228,7 @@ def show_descriptor(fingerprint, color, is_close_key): subwindow.box() subwindow.addstr(0, 0, title, HIGHLIGHT) - width, height = 0, len(lines) + 2 + width, height = len(title), len(lines) + 2 screen_size = nyx.curses.screen_size() for line in lines:

1 0

[nyx/master] Drop deduplication message if there aren't any duplicates
by atagar＠torproject.org 29 Oct '17

29 Oct '17

commit 4d2136b1fa14d6f0ecf359a55a572964792d1b82 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Oct 28 17:33:06 2017 -0700 Drop deduplication message if there aren't any duplicates It's rare, but once I spotted a "[0 duplicates hidden]" in my logs. Reason is that the message deduplicated, but then the log got long enough that the duplicate was dropped. --- nyx/panel/log.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nyx/panel/log.py b/nyx/panel/log.py index 32cbfef..c29f21e 100644 --- a/nyx/panel/log.py +++ b/nyx/panel/log.py @@ -406,7 +406,7 @@ def _draw_entry(subwindow, x, y, width, entry, show_duplicates): for line in entry.display_message.splitlines(): x, y = subwindow.addstr_wrap(x, y, line, width, min_x, boldness, color) - if entry.duplicates and not show_duplicates: + if entry.duplicates and len(entry.duplicates) != 1 and not show_duplicates: duplicate_count = len(entry.duplicates) - 1 plural = 's' if duplicate_count > 1 else '' duplicate_msg = ' [%i duplicate%s hidden]' % (duplicate_count, plural)

1 0

[translation/tails-iuk_completed] Update translations for tails-iuk_completed
by translation＠torproject.org 29 Oct '17

29 Oct '17

commit 327b4c6a3870c8b15b5e5a858491abe05e46dd97 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 29 00:17:50 2017 +0000 Update translations for tails-iuk_completed --- nl.po | 7 +- nl_BE.po | 249 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 253 insertions(+), 3 deletions(-) diff --git a/nl.po b/nl.po index 70057c52b..dc59c287e 100644 --- a/nl.po +++ b/nl.po @@ -7,6 +7,7 @@ # cialenhh <c1914502(a)drdrb.com>, 2013 # Cleveridge <erwin.de.laat(a)cleveridge.org>, 2014 # Joost Rijneveld <joost(a)joostrijneveld.nl>, 2014 +# Joren Vandeweyer <jorenvandeweyer(a)gmail.com>, 2017 # Roy Jacobs, 2016 # Tjeerd <transifex(a)syrion.net>, 2014 # jessesteinen <inactive+jessesteinen(a)transifex.com>, 2013 @@ -16,8 +17,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2017-04-18 12:13+0200\n" -"PO-Revision-Date: 2017-09-19 22:50+0000\n" -"Last-Translator: Roy Jacobs\n" +"PO-Revision-Date: 2017-10-28 23:59+0000\n" +"Last-Translator: Joren Vandeweyer <jorenvandeweyer(a)gmail.com>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -201,7 +202,7 @@ msgid "" "You should restart Tails on the new version as soon as possible.\n" "\n" "Do you want to restart now?" -msgstr "Je Tails apparaat is met succes geüpgradet.\n\nSommige beveiligingsopties werden tijdelijk uitgeschakeld.\nJe kunt het beste z.s.m. Tails in de nieuwe versie herstarten.\n\nWil je nu herstarten?" +msgstr "Je Tails apparaat is met succes geüpgraded.\n\nSommige beveiligingsopties werden tijdelijk uitgeschakeld.\nJe kunt het beste z.s.m. Tails in de nieuwe versie herstarten.\n\nWil je nu herstarten?" #: ../lib/Tails/IUK/Frontend.pm:613 msgid "Restart Tails" diff --git a/nl_BE.po b/nl_BE.po new file mode 100644 index 000000000..41dd79ae3 --- /dev/null +++ b/nl_BE.po @@ -0,0 +1,249 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Tails developers +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Joren Vandeweyer <jorenvandeweyer(a)gmail.com>, 2017 +# Katrien Igodt <kigodt(a)gmail.com>, 2015 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" +"POT-Creation-Date: 2017-04-18 12:13+0200\n" +"PO-Revision-Date: 2017-10-29 00:00+0000\n" +"Last-Translator: Joren Vandeweyer <jorenvandeweyer(a)gmail.com>\n" +"Language-Team: Dutch (Belgium) (http://www.transifex.com/otf/torproject/language/nl_BE/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: nl_BE\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../lib/Tails/IUK/Frontend.pm:148 ../lib/Tails/IUK/Frontend.pm:524 +#: ../lib/Tails/IUK/Frontend.pm:697 +msgid "" +"For debugging information, execute the following command: sudo tails-" +"debugging-info" +msgstr "Voor debug-informatie, voer het volgende command uit: sudo tails-debugging-info" + +#: ../lib/Tails/IUK/Frontend.pm:217 +msgid "Error while checking for upgrades" +msgstr "Fout bij het controleren naar updates" + +#: ../lib/Tails/IUK/Frontend.pm:220 +msgid "" +"Could not determine whether an upgrade is available from our website.\n" +"\n" +"Check your network connection, and restart Tails to try upgrading again.\n" +"\n" +"If the problem persists, go to file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" +msgstr "Het was niet mogelijk om te bepalen of een bijgewerkte versie beschikbaar is op onze website.\n\nControleer uw netwerkverbinding en start Tails opnieuw op om de upgrade nogmaals te proberen.\n\nAls het probleem aanhoudt, ga dan naar file:///usr/share/doc/tails/website/doc/upgrade/error/check.nl.html" + +#: ../lib/Tails/IUK/Frontend.pm:235 +msgid "no automatic upgrade is available from our website for this version" +msgstr "Voor deze versie is er geen automatische upgrade beschikbaar op onze website" + +#: ../lib/Tails/IUK/Frontend.pm:241 +msgid "your device was not created using Tails Installer" +msgstr "uw apparaat werd niet gecreeërd gebruik makende van de Tails Installer" + +#: ../lib/Tails/IUK/Frontend.pm:246 +msgid "Tails was started from a DVD or a read-only device" +msgstr "Tails werd gestart vanop een DVD of een read-only apparaat" + +#: ../lib/Tails/IUK/Frontend.pm:251 +msgid "there is not enough free space on the Tails system partition" +msgstr "er is onvoldoende vrije ruimte op de Tails systeempartitie" + +#: ../lib/Tails/IUK/Frontend.pm:256 +msgid "not enough memory is available on this system" +msgstr "onvoldoende geheugen beschikbaar op dit systeem" + +#: ../lib/Tails/IUK/Frontend.pm:262 +#, perl-brace-format +msgid "No explanation available for reason '%{reason}s'." +msgstr "Geen uitleg beschikbaar door '%{reason}s'." + +#: ../lib/Tails/IUK/Frontend.pm:282 +msgid "The system is up-to-date" +msgstr "Het systeem is up-to-date" + +#: ../lib/Tails/IUK/Frontend.pm:287 +msgid "This version of Tails is outdated, and may have security issues." +msgstr "Deze versie van Tails is verouderd en kan beveiligingsproblemen bevatten." + +#: ../lib/Tails/IUK/Frontend.pm:319 +#, perl-brace-format +msgid "" +"The available incremental upgrade requires %{space_needed}s of free space on" +" Tails system partition, but only %{free_space}s is available." +msgstr "De beschikbare incrementele upgrade vereist %{space_needed}s vrije ruimte op de Tails systeem partitie, maar slechts %{free_space}s is beschikbaar." + +#: ../lib/Tails/IUK/Frontend.pm:335 +#, perl-brace-format +msgid "" +"The available incremental upgrade requires %{memory_needed}s of free memory," +" but only %{free_memory}s is available." +msgstr "De beschikbare incrementele upgrade vereist %{memory_needed}s vrije ruimte, maar slechts %{free_memory}s is beschikbaar." + +#: ../lib/Tails/IUK/Frontend.pm:357 +msgid "" +"An incremental upgrade is available, but no full upgrade is.\n" +"This should not happen. Please report a bug." +msgstr "Een incrementele upgrade is beschikbaar, maar geen volledige upgrade.\nDit zou niet moeten gebeuren. Rapporteer alstublieft een bug." + +#: ../lib/Tails/IUK/Frontend.pm:361 +msgid "Error while detecting available upgrades" +msgstr "Fout bij het detecteren van beschikbare upgrades" + +#: ../lib/Tails/IUK/Frontend.pm:371 +#, perl-brace-format +msgid "" +"You should upgrade to %{name}s %{version}s.\n" +"\n" +"For more information about this new version, go to %{details_url}s\n" +"\n" +"It is recommended to close all the open applications during the upgrade.\n" +"Downloading the upgrade might take a long time, from several minutes to a few hours.\n" +"The networking will be disabled after downloading the upgrade.\n" +"\n" +"Download size: %{size}s\n" +"\n" +"Do you want to upgrade now?" +msgstr "U moet naar %{name}s %{version}s bijwerken.\n\nVoor meer informatie over deze nieuwe versie kunt u naar %{details_url}s gaan.\n\nHet wordt aanbevolen om alle programma's af te sluiten tijdens het bijwerken.\nHet downloaden van de upgrade kan enige tijd duren, verschillend van een paar minuten tot enkele uren.\nAlle netwerken worden uitgeschakeld als de upgrade is gedownload.\n\nBestandsgrootte download: %{size}s\n\nWil je nu bijwerken?" + +#: ../lib/Tails/IUK/Frontend.pm:386 +msgid "Upgrade available" +msgstr "Upgrade beschikbaar" + +#: ../lib/Tails/IUK/Frontend.pm:387 +msgid "Upgrade now" +msgstr "Nu upgraden" + +#: ../lib/Tails/IUK/Frontend.pm:388 +msgid "Upgrade later" +msgstr "Later upgraden" + +#: ../lib/Tails/IUK/Frontend.pm:396 +#, perl-brace-format +msgid "" +"You should do a manual upgrade to %{name}s %{version}s.\n" +"\n" +"For more information about this new version, go to %{details_url}s\n" +"\n" +"It is not possible to automatically upgrade your device to this new version: %{explanation}s.\n" +"\n" +"To learn how to do a manual upgrade, go to https://tails.boum.org/doc/first_steps/upgrade/#manual" +msgstr "U zult handmatig moeten bijwerken naar %{name}s %{version}s.\n\nMeer informatie over deze nieuwe versie kunt u vinden op %{details_url}s.\n\nHet is onmogelijk uw toestel automatisch te upgraden naar deze nieuwe versie: %{explanation}s.\n\nVoor uitleg hoe u handmatig bijwerkt, gaat u naar https://tails.boum.org/doc/first_steps/upgrade/#manual" + +#: ../lib/Tails/IUK/Frontend.pm:412 +msgid "New version available" +msgstr "Nieuwe versie beschikbaar" + +#: ../lib/Tails/IUK/Frontend.pm:469 +msgid "Downloading upgrade" +msgstr "Upgrade aan het downloaden" + +#: ../lib/Tails/IUK/Frontend.pm:472 +#, perl-brace-format +msgid "Downloading the upgrade to %{name}s %{version}s..." +msgstr "De upgrade aan het downloaden naar %{name}s %{version}s..." + +#: ../lib/Tails/IUK/Frontend.pm:513 +msgid "" +"The upgrade could not be downloaded.\\n\\nCheck your network " +"connection, and restart Tails to try upgrading again.\\n\\nIf the problem " +"persists, go to " +"file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" +msgstr "De upgrade kon niet gedownload worden.\\n\\nControleer de netwerkverbinding en start Tails opnieuw op om de upgrade nogmaals te proberen.\\n\\nAls het probleem aanhoudt, ga dan naar file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" + +#: ../lib/Tails/IUK/Frontend.pm:529 ../lib/Tails/IUK/Frontend.pm:548 +msgid "Error while downloading the upgrade" +msgstr "Fout bij het downloaden van de upgrade" + +#: ../lib/Tails/IUK/Frontend.pm:541 +#, perl-brace-format +msgid "" +"Output file '%{output_file}s' does not exist, but tails-iuk-get-target-file " +"did not complain. Please report a bug." +msgstr "Outputbestand '%{output_file}s' bestaat niet, maar tails-iuk-get-target-file klaagde niet. Rapporteer alstublieft een bug." + +#: ../lib/Tails/IUK/Frontend.pm:560 +msgid "Error while creating temporary downloading directory" +msgstr "Fout bij het aanmaken van een tijdelijke folder voor de download" + +#: ../lib/Tails/IUK/Frontend.pm:563 +msgid "Failed to create temporary download directory" +msgstr "Maken van tijdelijke download directory mislukt" + +#: ../lib/Tails/IUK/Frontend.pm:587 +msgid "" +"Could not choose a download server.\n" +"\n" +"This should not happen. Please report a bug." +msgstr "Kon geen download server kiezen.\n\nDit hoort niet te gebeuren. Vul a.u.b. een bug report in." + +#: ../lib/Tails/IUK/Frontend.pm:591 +msgid "Error while choosing a download server" +msgstr "Fout tijdens het kiezen van download server" + +#: ../lib/Tails/IUK/Frontend.pm:608 +msgid "" +"Your Tails device was successfully upgraded.\n" +"\n" +"Some security features were temporarily disabled.\n" +"You should restart Tails on the new version as soon as possible.\n" +"\n" +"Do you want to restart now?" +msgstr "Uw Tails apparaat is met succes geüpgraded.1\n\nSommige beveiligingsopties werden tijdelijk uitgeschakeld.\nU kunt het beste z.s.m. Tails in de nieuwe versie herstarten.\n\nWilt u nu herstarten?" + +#: ../lib/Tails/IUK/Frontend.pm:613 +msgid "Restart Tails" +msgstr "Tails herstarten" + +#: ../lib/Tails/IUK/Frontend.pm:614 +msgid "Restart now" +msgstr "Herstart nu" + +#: ../lib/Tails/IUK/Frontend.pm:615 +msgid "Restart later" +msgstr "Herstart later" + +#: ../lib/Tails/IUK/Frontend.pm:626 +msgid "Error while restarting the system" +msgstr "Fout bij het herstarten van het systeem" + +#: ../lib/Tails/IUK/Frontend.pm:629 +msgid "Failed to restart the system" +msgstr "Niet in staat het systeem te herstarten" + +#: ../lib/Tails/IUK/Frontend.pm:644 +msgid "Error while shutting down the network" +msgstr "Fout bij het uitschakelen van het netwerk" + +#: ../lib/Tails/IUK/Frontend.pm:647 +msgid "Failed to shutdown network" +msgstr "Niet in staat het netwerk uit te schakelen" + +#: ../lib/Tails/IUK/Frontend.pm:657 +msgid "Upgrading the system" +msgstr "Het systeem aan het upgraden" + +#: ../lib/Tails/IUK/Frontend.pm:659 +msgid "" +"Your Tails device is being upgraded...\n" +"\n" +"For security reasons, the networking is now disabled." +msgstr "Uw Tails apparaat wordt geüpgraded...\n\nOm veiligheidsredenen wordt het netwerk nu uitgeschakeld." + +#: ../lib/Tails/IUK/Frontend.pm:692 +msgid "" +"An error occured while installing the upgrade.\\n\\nYour Tails device" +" needs to be repaired and might be unable to restart.\\n\\nPlease follow the" +" instructions at " +"file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" +msgstr "Er is een fout opgetreden bij het installeren van de upgrade.\\n\\nUw Tails apparaat moet gerepareerd worden en kan mogelijk niet opnieuw opstarten..\\n\\nVolg a.u.b. de instructies op file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" + +#: ../lib/Tails/IUK/Frontend.pm:702 +msgid "Error while installing the upgrade" +msgstr "Fout bij het installeren van de upgrade"

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 29 Oct '17

29 Oct '17

commit 9f093756382a2f826dbaae70795b7fe8b63ab6dd Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 29 00:17:44 2017 +0000 Update translations for tails-iuk --- nl.po | 7 ++++--- nl_BE.po | 37 +++++++++++++++++++------------------ 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/nl.po b/nl.po index 70057c52b..dc59c287e 100644 --- a/nl.po +++ b/nl.po @@ -7,6 +7,7 @@ # cialenhh <c1914502(a)drdrb.com>, 2013 # Cleveridge <erwin.de.laat(a)cleveridge.org>, 2014 # Joost Rijneveld <joost(a)joostrijneveld.nl>, 2014 +# Joren Vandeweyer <jorenvandeweyer(a)gmail.com>, 2017 # Roy Jacobs, 2016 # Tjeerd <transifex(a)syrion.net>, 2014 # jessesteinen <inactive+jessesteinen(a)transifex.com>, 2013 @@ -16,8 +17,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2017-04-18 12:13+0200\n" -"PO-Revision-Date: 2017-09-19 22:50+0000\n" -"Last-Translator: Roy Jacobs\n" +"PO-Revision-Date: 2017-10-28 23:59+0000\n" +"Last-Translator: Joren Vandeweyer <jorenvandeweyer(a)gmail.com>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -201,7 +202,7 @@ msgid "" "You should restart Tails on the new version as soon as possible.\n" "\n" "Do you want to restart now?" -msgstr "Je Tails apparaat is met succes geüpgradet.\n\nSommige beveiligingsopties werden tijdelijk uitgeschakeld.\nJe kunt het beste z.s.m. Tails in de nieuwe versie herstarten.\n\nWil je nu herstarten?" +msgstr "Je Tails apparaat is met succes geüpgraded.\n\nSommige beveiligingsopties werden tijdelijk uitgeschakeld.\nJe kunt het beste z.s.m. Tails in de nieuwe versie herstarten.\n\nWil je nu herstarten?" #: ../lib/Tails/IUK/Frontend.pm:613 msgid "Restart Tails" diff --git a/nl_BE.po b/nl_BE.po index 676085822..41dd79ae3 100644 --- a/nl_BE.po +++ b/nl_BE.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Joren Vandeweyer <jorenvandeweyer(a)gmail.com>, 2017 # Katrien Igodt <kigodt(a)gmail.com>, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2017-04-18 12:13+0200\n" -"PO-Revision-Date: 2017-09-19 23:00+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2017-10-29 00:00+0000\n" +"Last-Translator: Joren Vandeweyer <jorenvandeweyer(a)gmail.com>\n" "Language-Team: Dutch (Belgium) (http://www.transifex.com/otf/torproject/language/nl_BE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,7 +24,7 @@ msgstr "" msgid "" "For debugging information, execute the following command: sudo tails-" "debugging-info" -msgstr "" +msgstr "Voor debug-informatie, voer het volgende command uit: sudo tails-debugging-info" #: ../lib/Tails/IUK/Frontend.pm:217 msgid "Error while checking for upgrades" @@ -36,7 +37,7 @@ msgid "" "Check your network connection, and restart Tails to try upgrading again.\n" "\n" "If the problem persists, go to file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" -msgstr "" +msgstr "Het was niet mogelijk om te bepalen of een bijgewerkte versie beschikbaar is op onze website.\n\nControleer uw netwerkverbinding en start Tails opnieuw op om de upgrade nogmaals te proberen.\n\nAls het probleem aanhoudt, ga dan naar file:///usr/share/doc/tails/website/doc/upgrade/error/check.nl.html" #: ../lib/Tails/IUK/Frontend.pm:235 msgid "no automatic upgrade is available from our website for this version" @@ -61,7 +62,7 @@ msgstr "onvoldoende geheugen beschikbaar op dit systeem" #: ../lib/Tails/IUK/Frontend.pm:262 #, perl-brace-format msgid "No explanation available for reason '%{reason}s'." -msgstr "" +msgstr "Geen uitleg beschikbaar door '%{reason}s'." #: ../lib/Tails/IUK/Frontend.pm:282 msgid "The system is up-to-date" @@ -76,20 +77,20 @@ msgstr "Deze versie van Tails is verouderd en kan beveiligingsproblemen bevatten msgid "" "The available incremental upgrade requires %{space_needed}s of free space on" " Tails system partition, but only %{free_space}s is available." -msgstr "" +msgstr "De beschikbare incrementele upgrade vereist %{space_needed}s vrije ruimte op de Tails systeem partitie, maar slechts %{free_space}s is beschikbaar." #: ../lib/Tails/IUK/Frontend.pm:335 #, perl-brace-format msgid "" "The available incremental upgrade requires %{memory_needed}s of free memory," " but only %{free_memory}s is available." -msgstr "" +msgstr "De beschikbare incrementele upgrade vereist %{memory_needed}s vrije ruimte, maar slechts %{free_memory}s is beschikbaar." #: ../lib/Tails/IUK/Frontend.pm:357 msgid "" "An incremental upgrade is available, but no full upgrade is.\n" "This should not happen. Please report a bug." -msgstr "" +msgstr "Een incrementele upgrade is beschikbaar, maar geen volledige upgrade.\nDit zou niet moeten gebeuren. Rapporteer alstublieft een bug." #: ../lib/Tails/IUK/Frontend.pm:361 msgid "Error while detecting available upgrades" @@ -109,7 +110,7 @@ msgid "" "Download size: %{size}s\n" "\n" "Do you want to upgrade now?" -msgstr "" +msgstr "U moet naar %{name}s %{version}s bijwerken.\n\nVoor meer informatie over deze nieuwe versie kunt u naar %{details_url}s gaan.\n\nHet wordt aanbevolen om alle programma's af te sluiten tijdens het bijwerken.\nHet downloaden van de upgrade kan enige tijd duren, verschillend van een paar minuten tot enkele uren.\nAlle netwerken worden uitgeschakeld als de upgrade is gedownload.\n\nBestandsgrootte download: %{size}s\n\nWil je nu bijwerken?" #: ../lib/Tails/IUK/Frontend.pm:386 msgid "Upgrade available" @@ -133,7 +134,7 @@ msgid "" "It is not possible to automatically upgrade your device to this new version: %{explanation}s.\n" "\n" "To learn how to do a manual upgrade, go to https://tails.boum.org/doc/first_steps/upgrade/#manual" -msgstr "" +msgstr "U zult handmatig moeten bijwerken naar %{name}s %{version}s.\n\nMeer informatie over deze nieuwe versie kunt u vinden op %{details_url}s.\n\nHet is onmogelijk uw toestel automatisch te upgraden naar deze nieuwe versie: %{explanation}s.\n\nVoor uitleg hoe u handmatig bijwerkt, gaat u naar https://tails.boum.org/doc/first_steps/upgrade/#manual" #: ../lib/Tails/IUK/Frontend.pm:412 msgid "New version available" @@ -154,7 +155,7 @@ msgid "" "connection, and restart Tails to try upgrading again.\\n\\nIf the problem " "persists, go to " "file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" -msgstr "" +msgstr "De upgrade kon niet gedownload worden.\\n\\nControleer de netwerkverbinding en start Tails opnieuw op om de upgrade nogmaals te proberen.\\n\\nAls het probleem aanhoudt, ga dan naar file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" #: ../lib/Tails/IUK/Frontend.pm:529 ../lib/Tails/IUK/Frontend.pm:548 msgid "Error while downloading the upgrade" @@ -165,7 +166,7 @@ msgstr "Fout bij het downloaden van de upgrade" msgid "" "Output file '%{output_file}s' does not exist, but tails-iuk-get-target-file " "did not complain. Please report a bug." -msgstr "" +msgstr "Outputbestand '%{output_file}s' bestaat niet, maar tails-iuk-get-target-file klaagde niet. Rapporteer alstublieft een bug." #: ../lib/Tails/IUK/Frontend.pm:560 msgid "Error while creating temporary downloading directory" @@ -173,18 +174,18 @@ msgstr "Fout bij het aanmaken van een tijdelijke folder voor de download" #: ../lib/Tails/IUK/Frontend.pm:563 msgid "Failed to create temporary download directory" -msgstr "" +msgstr "Maken van tijdelijke download directory mislukt" #: ../lib/Tails/IUK/Frontend.pm:587 msgid "" "Could not choose a download server.\n" "\n" "This should not happen. Please report a bug." -msgstr "" +msgstr "Kon geen download server kiezen.\n\nDit hoort niet te gebeuren. Vul a.u.b. een bug report in." #: ../lib/Tails/IUK/Frontend.pm:591 msgid "Error while choosing a download server" -msgstr "" +msgstr "Fout tijdens het kiezen van download server" #: ../lib/Tails/IUK/Frontend.pm:608 msgid "" @@ -194,7 +195,7 @@ msgid "" "You should restart Tails on the new version as soon as possible.\n" "\n" "Do you want to restart now?" -msgstr "" +msgstr "Uw Tails apparaat is met succes geüpgraded.1\n\nSommige beveiligingsopties werden tijdelijk uitgeschakeld.\nU kunt het beste z.s.m. Tails in de nieuwe versie herstarten.\n\nWilt u nu herstarten?" #: ../lib/Tails/IUK/Frontend.pm:613 msgid "Restart Tails" @@ -233,7 +234,7 @@ msgid "" "Your Tails device is being upgraded...\n" "\n" "For security reasons, the networking is now disabled." -msgstr "" +msgstr "Uw Tails apparaat wordt geüpgraded...\n\nOm veiligheidsredenen wordt het netwerk nu uitgeschakeld." #: ../lib/Tails/IUK/Frontend.pm:692 msgid "" @@ -241,7 +242,7 @@ msgid "" " needs to be repaired and might be unable to restart.\\n\\nPlease follow the" " instructions at " "file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" -msgstr "" +msgstr "Er is een fout opgetreden bij het installeren van de upgrade.\\n\\nUw Tails apparaat moet gerepareerd worden en kan mogelijk niet opnieuw opstarten..\\n\\nVolg a.u.b. de instructies op file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" #: ../lib/Tails/IUK/Frontend.pm:702 msgid "Error while installing the upgrade"

1 0