tor-commits June 2016

tor-commits@lists.torproject.org

20 participants
1204 discussions

[nyx/master] Replace _get_graph_bounds() with a GraphData method
by atagar＠torproject.org 26 Jun '16

26 Jun '16

commit f0fe40933d9ffe5d05474f694eec2d7221eff190 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 25 16:39:40 2016 -0700 Replace _get_graph_bounds() with a GraphData method Good candidate for the GraphData. It has all the information we need and is fitting there. --- nyx/panel/graph.py | 62 +++++++++++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py index 70b7426..49f79ff 100644 --- a/nyx/panel/graph.py +++ b/nyx/panel/graph.py @@ -97,7 +97,6 @@ class GraphData(object): :var int total: sum of all values we've recorded :var int tick: number of events we've processed :var dict values: mapping of intervals to an array of samplings from newest to oldest - :var dict max_value: mapping of intervals to the maximum value it has had """ def __init__(self, clone = None, category = None, is_primary = True): @@ -106,21 +105,21 @@ class GraphData(object): self.total = clone.total self.tick = clone.tick self.values = copy.deepcopy(clone.values) - self.max_value = dict(clone.max_value) self._category = clone._category self._is_primary = clone._is_primary self._in_process_value = dict(clone._in_process_value) + self._max_value = dict(clone._max_value) else: self.latest_value = 0 self.total = 0 self.tick = 0 self.values = dict([(i, CONFIG['features.graph.max_width'] * [0]) for i in Interval]) - self.max_value = dict([(i, 0) for i in Interval]) self._category = category self._is_primary = is_primary self._in_process_value = dict([(i, 0) for i in Interval]) + self._max_value = dict([(i, 0) for i in Interval]) # interval => maximum value it's had def average(self): return self.total / max(1, self.tick) @@ -137,7 +136,7 @@ class GraphData(object): if self.tick % interval_seconds == 0: new_entry = self._in_process_value[interval] / interval_seconds self.values[interval] = [new_entry] + self.values[interval][:-1] - self.max_value[interval] = max(self.max_value[interval], new_entry) + self._max_value[interval] = max(self._max_value[interval], new_entry) self._in_process_value[interval] = 0 def header(self, width): @@ -151,6 +150,35 @@ class GraphData(object): return self._category._header(width, self._is_primary) + def bounds(self, bounds, interval, columns): + """ + Range of values for the graph. + + :param Bounds bounds: boundary type for the range we want + :param Interval interval: timing interval of the values + :param int columns: number of values to take into account + + :returns: **tuple** of the form (min, max) + """ + + min_bound, max_bound = 0, 0 + values = self.values[interval][:columns] + + if bounds == Bounds.GLOBAL_MAX: + max_bound = self._max_value[interval] + elif columns > 0: + max_bound = max(values) # local maxima + + if bounds == Bounds.TIGHT and columns > 0: + min_bound = min(values) + + # if the max = min pick zero so we still display something + + if min_bound == max_bound: + min_bound = 0 + + return min_bound, max_bound + def y_axis_label(self, value): """ Provides the label we should display on our y-axis. @@ -595,7 +623,7 @@ def _draw_subgraph(subwindow, attr, data, x, color): # the y_axis_labels. subgraph_columns = attr.subgraph_width - 8 - min_bound, max_bound = _get_graph_bounds(attr, data, subgraph_columns) + min_bound, max_bound = data.bounds(attr.bounds_type, attr.interval, subgraph_columns) x_axis_labels = _x_axis_labels(attr.interval, subgraph_columns) y_axis_labels = _y_axis_labels(attr.subgraph_height, data, min_bound, max_bound) @@ -624,30 +652,6 @@ def _draw_subgraph(subwindow, attr, data, x, color): subwindow.addstr(x + col + axis_offset + 1, attr.subgraph_height - 1 - row, ' ', color, HIGHLIGHT) -def _get_graph_bounds(attr, data, subgraph_columns): - """ - Provides the range the graph shows (ie, its minimum and maximum value). - """ - - min_bound, max_bound = 0, 0 - values = data.values[attr.interval][:subgraph_columns] - - if attr.bounds_type == Bounds.GLOBAL_MAX: - max_bound = data.max_value[attr.interval] - elif subgraph_columns > 0: - max_bound = max(values) # local maxima - - if attr.bounds_type == Bounds.TIGHT and subgraph_columns > 0: - min_bound = min(values) - - # if the max = min pick zero so we still display something - - if min_bound == max_bound: - min_bound = 0 - - return min_bound, max_bound - - def _x_axis_labels(interval, subgraph_columns): """ Provides the labels for the x-axis. We include the units for only its first

1 0

[nyx/master] Use draw() for graph panel
by atagar＠torproject.org 26 Jun '16

26 Jun '16

commit 8ca9f9d4b5d222c761357b5348f06327288b7203 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Apr 19 10:06:33 2016 -0700 Use draw() for graph panel --- nyx/panel/__init__.py | 2 +- nyx/panel/graph.py | 56 +++++++++++++++++++++++++-------------------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py index 1f5143d..6c77ea9 100644 --- a/nyx/panel/__init__.py +++ b/nyx/panel/__init__.py @@ -266,7 +266,7 @@ class Panel(object): if not self.visible or HALT_ACTIVITY: return - if self.panel_name in ('header'): + if self.panel_name in ('header', 'graph'): height = self.get_height() if self.get_height() != -1 else None width = self.get_width() if self.get_width() != -1 else None diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py index 48cf3b9..132a7d6 100644 --- a/nyx/panel/graph.py +++ b/nyx/panel/graph.py @@ -535,7 +535,7 @@ class GraphPanel(nyx.panel.Panel): nyx.panel.Panel.set_paused(self, is_pause) - def draw(self, width, height): + def draw(self, subwindow): if not self.displayed_stat: return @@ -549,26 +549,26 @@ class GraphPanel(nyx.panel.Panel): attr = DrawAttributes( stat = type(stat)(stat), # clone the GraphCategory subgraph_height = self._graph_height + 2, # graph rows + header + x-axis label - subgraph_width = min(width / 2, CONFIG['features.graph.max_width']), + subgraph_width = min(subwindow.width / 2, CONFIG['features.graph.max_width']), interval = self.update_interval, bounds_type = self.bounds_type, accounting = accounting_stats, right_to_left = CONFIG['features.graph.right_to_left'], ) - self.addstr(0, 0, attr.stat.title(width), HIGHLIGHT) + subwindow.addstr(0, 0, attr.stat.title(subwindow.width), HIGHLIGHT) - self._draw_subgraph(attr, attr.stat.primary, 0, PRIMARY_COLOR) - self._draw_subgraph(attr, attr.stat.secondary, attr.subgraph_width, SECONDARY_COLOR) + self._draw_subgraph(subwindow, attr, attr.stat.primary, 0, PRIMARY_COLOR) + self._draw_subgraph(subwindow, attr, attr.stat.secondary, attr.subgraph_width, SECONDARY_COLOR) if attr.stat.stat_type() == GraphStat.BANDWIDTH: - if width <= COLLAPSE_WIDTH: - self._draw_bandwidth_stats(attr, width) + if subwindow.width <= COLLAPSE_WIDTH: + self._draw_bandwidth_stats(subwindow, attr, subwindow.width) if attr.accounting: - self._draw_accounting_stats(attr) + self._draw_accounting_stats(subwindow, attr) - def _draw_subgraph(self, attr, data, x, color): + def _draw_subgraph(self, subwindow, attr, data, x, color): # Concering our subgraph colums, the y-axis label can be at most six # characters, with two spaces of padding on either side of the graph. # Starting with the smallest size, then possibly raise it after determing @@ -582,16 +582,16 @@ class GraphPanel(nyx.panel.Panel): subgraph_columns = max(subgraph_columns, attr.subgraph_width - max([len(label) for label in y_axis_labels.values()]) - 2) axis_offset = max([len(label) for label in y_axis_labels.values()]) - self.addstr(1, x, data.header(attr.subgraph_width), color, BOLD) + subwindow.addstr(x, 1, data.header(attr.subgraph_width), color, BOLD) for x_offset, label in x_axis_labels.items(): if attr.right_to_left: - self.addstr(attr.subgraph_height, x + attr.subgraph_width - x_offset, label, color) + subwindow.addstr(x + attr.subgraph_width - x_offset, attr.subgraph_height, label, color) else: - self.addstr(attr.subgraph_height, x + x_offset + axis_offset, label, color) + subwindow.addstr(x + x_offset + axis_offset, attr.subgraph_height, label, color) for y, label in y_axis_labels.items(): - self.addstr(y, x, label, color) + subwindow.addstr(x, y, label, color) for col in range(subgraph_columns): column_count = int(data.values[attr.interval][col]) - min_bound @@ -599,9 +599,9 @@ class GraphPanel(nyx.panel.Panel): for row in range(column_height): if attr.right_to_left: - self.addstr(attr.subgraph_height - 1 - row, x + attr.subgraph_width - col - 1, ' ', color, HIGHLIGHT) + subwindow.addstr(x + attr.subgraph_width - col - 1, attr.subgraph_height - 1 - row, ' ', color, HIGHLIGHT) else: - self.addstr(attr.subgraph_height - 1 - row, x + col + axis_offset + 1, ' ', color, HIGHLIGHT) + subwindow.addstr(x + col + axis_offset + 1, attr.subgraph_height - 1 - row, ' ', color, HIGHLIGHT) def _get_graph_bounds(self, attr, data, subgraph_columns): """ @@ -684,39 +684,39 @@ class GraphPanel(nyx.panel.Panel): return x_axis_labels - def _draw_bandwidth_stats(self, attr, width): + def _draw_bandwidth_stats(self, subwindow, attr, width): """ Replaces the x-axis labeling with bandwidth stats. This is done on small screens since this information otherwise wouldn't fit. """ labeling_line = DEFAULT_CONTENT_HEIGHT + attr.subgraph_height - 4 - self.addstr(labeling_line, 0, ' ' * width) # clear line + subwindow.addstr(0, labeling_line, ' ' * width) # clear line runtime = time.time() - attr.stat.start_time primary_footer = 'total: %s, avg: %s/sec' % (_size_label(attr.stat.primary.total), _size_label(attr.stat.primary.total / runtime)) secondary_footer = 'total: %s, avg: %s/sec' % (_size_label(attr.stat.secondary.total), _size_label(attr.stat.secondary.total / runtime)) - self.addstr(labeling_line, 1, primary_footer, PRIMARY_COLOR) - self.addstr(labeling_line, attr.subgraph_width + 1, secondary_footer, SECONDARY_COLOR) + subwindow.addstr(1, labeling_line, primary_footer, PRIMARY_COLOR) + subwindow.addstr(attr.subgraph_width + 1, labeling_line, secondary_footer, SECONDARY_COLOR) - def _draw_accounting_stats(self, attr): + def _draw_accounting_stats(self, subwindow, attr): y = DEFAULT_CONTENT_HEIGHT + attr.subgraph_height - 2 if tor_controller().is_alive(): hibernate_color = CONFIG['attr.hibernate_color'].get(attr.accounting.status, RED) - x = self.addstr(y, 0, 'Accounting (', BOLD) - x = self.addstr(y, x, attr.accounting.status, BOLD, hibernate_color) - x = self.addstr(y, x, ')', BOLD) + x = subwindow.addstr(0, y, 'Accounting (', BOLD) + x = subwindow.addstr(x, y, attr.accounting.status, BOLD, hibernate_color) + x = subwindow.addstr(x, y, ')', BOLD) - self.addstr(y, 35, 'Time to reset: %s' % str_tools.short_time_label(attr.accounting.time_until_reset)) + subwindow.addstr(35, y, 'Time to reset: %s' % str_tools.short_time_label(attr.accounting.time_until_reset)) - self.addstr(y + 1, 2, '%s / %s' % (attr.accounting.read_bytes, attr.accounting.read_limit), PRIMARY_COLOR) - self.addstr(y + 1, 37, '%s / %s' % (attr.accounting.written_bytes, attr.accounting.write_limit), SECONDARY_COLOR) + subwindow.addstr(2, y + 1, '%s / %s' % (attr.accounting.read_bytes, attr.accounting.read_limit), PRIMARY_COLOR) + subwindow.addstr(37, y + 1, '%s / %s' % (attr.accounting.written_bytes, attr.accounting.write_limit), SECONDARY_COLOR) else: - self.addstr(y, 0, 'Accounting:', BOLD) - self.addstr(y, 12, 'Connection Closed...') + subwindow.addstr(0, y, 'Accounting:', BOLD) + subwindow.addstr(12, y, 'Connection Closed...') def _update_accounting(self, event): if not CONFIG['features.graph.bw.accounting.show']:

1 0

[nyx/master] Test for rendering subgraphs
by atagar＠torproject.org 26 Jun '16

26 Jun '16

commit 084d328c4782695707ba15f2dc483c069339fcb6 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 25 17:01:00 2016 -0700 Test for rendering subgraphs --- nyx/panel/graph.py | 6 +++--- test/panel/graph.py | 31 ++++++++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py index 49f79ff..a2a00bc 100644 --- a/nyx/panel/graph.py +++ b/nyx/panel/graph.py @@ -616,7 +616,7 @@ class GraphPanel(nyx.panel.Panel): self.redraw(True) -def _draw_subgraph(subwindow, attr, data, x, color): +def _draw_subgraph(subwindow, attr, data, x, color, fill_char = ' '): # Concering our subgraph colums, the y-axis label can be at most six # characters, with two spaces of padding on either side of the graph. # Starting with the smallest size, then possibly raise it after determing @@ -647,9 +647,9 @@ def _draw_subgraph(subwindow, attr, data, x, color): for row in range(column_height): if attr.right_to_left: - subwindow.addstr(x + attr.subgraph_width - col - 1, attr.subgraph_height - 1 - row, ' ', color, HIGHLIGHT) + subwindow.addstr(x + attr.subgraph_width - col - 1, attr.subgraph_height - 1 - row, fill_char, color, HIGHLIGHT) else: - subwindow.addstr(x + col + axis_offset + 1, attr.subgraph_height - 1 - row, ' ', color, HIGHLIGHT) + subwindow.addstr(x + col + axis_offset + 1, attr.subgraph_height - 1 - row, fill_char, color, HIGHLIGHT) def _x_axis_labels(interval, subgraph_columns): diff --git a/test/panel/graph.py b/test/panel/graph.py index c8635e1..a013d59 100644 --- a/test/panel/graph.py +++ b/test/panel/graph.py @@ -29,6 +29,16 @@ Accounting (awake) Time to reset: 01:02 37.7 Kb / 842.0 Kb 16.0 Kb / 74.1 Kb """.strip() +EXPECTED_GRAPH = """ +Download: +5 Kb * + * +2 Kb ** * + * **** +0 b ********* + 5s 10 15 +""".rstrip() + class TestGraph(unittest.TestCase): def test_x_axis_labels(self): @@ -97,11 +107,30 @@ class TestGraph(unittest.TestCase): data = nyx.panel.graph.BandwidthStats() - rendered = test.render(nyx.panel.graph._draw_subgraph, attr, data.primary, 0, nyx.curses.Color.CYAN) + rendered = test.render(nyx.panel.graph._draw_subgraph, attr, data.primary, 0, nyx.curses.Color.CYAN, '*') self.assertEqual(EXPECTED_BLANK_GRAPH, rendered.content) @require_curses @patch('nyx.panel.graph.tor_controller') + def test_draw_subgraph(self, tor_controller_mock): + tor_controller_mock().get_info.return_value = '543,543 421,421 551,551 710,710 200,200 175,175 188,188 250,250 377,377' + + attr = nyx.panel.graph.DrawAttributes( + stat = None, + subgraph_height = 7, + subgraph_width = 30, + interval = nyx.panel.graph.Interval.EACH_SECOND, + bounds_type = nyx.panel.graph.Bounds.LOCAL_MAX, + right_to_left = False, + ) + + data = nyx.panel.graph.BandwidthStats() + + rendered = test.render(nyx.panel.graph._draw_subgraph, attr, data.primary, 0, nyx.curses.Color.CYAN, '*') + self.assertEqual(EXPECTED_GRAPH, rendered.content) + + @require_curses + @patch('nyx.panel.graph.tor_controller') def test_draw_accounting_stats(self, tor_controller_mock): tor_controller_mock().is_alive.return_value = True

1 0

[nyx/master] Drop DrawAttributes attribute container
by atagar＠torproject.org 26 Jun '16

26 Jun '16

commit 9fec021715ebd054086cffb707c70968f47e039a Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 25 17:30:58 2016 -0700 Drop DrawAttributes attribute container This made some sense when we needed to pass a bundle of attributes among helpers, but it's now just clutter. Testability is simple without it. --- nyx/panel/graph.py | 61 ++++++++++++++++++++++++----------------------------- test/panel/graph.py | 22 ++----------------- 2 files changed, 29 insertions(+), 54 deletions(-) diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py index e35e972..1043339 100644 --- a/nyx/panel/graph.py +++ b/nyx/panel/graph.py @@ -14,7 +14,6 @@ Downloaded (0.0 B/sec): Uploaded (0.0 B/sec): 25s 50 1m 1.6 2.0 25s 50 1m 1.6 2.0 """ -import collections import copy import time @@ -33,8 +32,6 @@ GraphStat = enum.Enum(('BANDWIDTH', 'bandwidth'), ('CONNECTIONS', 'connections') Interval = enum.Enum(('EACH_SECOND', 'each second'), ('FIVE_SECONDS', '5 seconds'), ('THIRTY_SECONDS', '30 seconds'), ('MINUTELY', 'minutely'), ('FIFTEEN_MINUTE', '15 minute'), ('THIRTY_MINUTE', '30 minute'), ('HOURLY', 'hourly'), ('DAILY', 'daily')) Bounds = enum.Enum(('GLOBAL_MAX', 'global_max'), ('LOCAL_MAX', 'local_max'), ('TIGHT', 'tight')) -DrawAttributes = collections.namedtuple('DrawAttributes', ('stat', 'subgraph_height', 'subgraph_width', 'interval', 'bounds_type')) - INTERVAL_SECONDS = { Interval.EACH_SECOND: 1, Interval.FIVE_SECONDS: 5, @@ -572,21 +569,18 @@ class GraphPanel(nyx.panel.Panel): stat = self._stats_paused[self.displayed_stat] accounting_stats = self._accounting_stats_paused - attr = DrawAttributes( - stat = type(stat)(stat), # clone the GraphCategory - subgraph_height = self._graph_height + 2, # graph rows + header + x-axis label - subgraph_width = min(subwindow.width / 2, CONFIG['features.graph.max_width']), - interval = self.update_interval, - bounds_type = self.bounds_type, - ) + stat = type(stat)(stat) # clone the GraphCategory + subgraph_height = self._graph_height + 2 # graph rows + header + x-axis label + subgraph_width = min(subwindow.width / 2, CONFIG['features.graph.max_width']) + interval, bounds_type = self.update_interval, self.bounds_type - subwindow.addstr(0, 0, attr.stat.title(subwindow.width), HIGHLIGHT) + subwindow.addstr(0, 0, stat.title(subwindow.width), HIGHLIGHT) - _draw_subgraph(subwindow, attr, attr.stat.primary, 0, PRIMARY_COLOR) - _draw_subgraph(subwindow, attr, attr.stat.secondary, attr.subgraph_width, SECONDARY_COLOR) + _draw_subgraph(subwindow, stat.primary, 0, subgraph_width, subgraph_height, bounds_type, interval, PRIMARY_COLOR) + _draw_subgraph(subwindow, stat.secondary, subgraph_width, subgraph_width, subgraph_height, bounds_type, interval, SECONDARY_COLOR) - if attr.stat.stat_type() == GraphStat.BANDWIDTH and accounting_stats: - _draw_accounting_stats(subwindow, DEFAULT_CONTENT_HEIGHT + attr.subgraph_height - 2, accounting_stats) + if stat.stat_type() == GraphStat.BANDWIDTH and accounting_stats: + _draw_accounting_stats(subwindow, DEFAULT_CONTENT_HEIGHT + subgraph_height - 2, accounting_stats) def _update_accounting(self, event): if not CONFIG['features.graph.bw.accounting.show']: @@ -614,37 +608,36 @@ class GraphPanel(nyx.panel.Panel): self.redraw(True) -def _draw_subgraph(subwindow, attr, data, x, color, fill_char = ' '): - # Concering our subgraph colums, the y-axis label can be at most six - # characters, with two spaces of padding on either side of the graph. - # Starting with the smallest size, then possibly raise it after determing - # the y_axis_labels. +def _draw_subgraph(subwindow, data, x, width, height, bounds_type, interval, color, fill_char = ' '): + """ + Renders subgraph including its title, labeled axis, and content. + """ - subgraph_columns = attr.subgraph_width - 8 - min_bound, max_bound = data.bounds(attr.bounds_type, attr.interval, subgraph_columns) + columns = width - 8 # y-axis labels can be at most six characters wide with a space on either side + min_bound, max_bound = data.bounds(bounds_type, interval, columns) - x_axis_labels = _x_axis_labels(attr.interval, subgraph_columns) - y_axis_labels = _y_axis_labels(attr.subgraph_height, data, min_bound, max_bound) - subgraph_columns = max(subgraph_columns, attr.subgraph_width - max([len(label) for label in y_axis_labels.values()]) - 2) + x_axis_labels = _x_axis_labels(interval, columns) + y_axis_labels = _y_axis_labels(height, data, min_bound, max_bound) + columns = max(columns, width - max([len(label) for label in y_axis_labels.values()]) - 2) axis_offset = max([len(label) for label in y_axis_labels.values()]) - subwindow.addstr(x, 1, data.header(attr.subgraph_width), color, BOLD) + subwindow.addstr(x, 1, data.header(width), color, BOLD) for x_offset, label in x_axis_labels.items(): - subwindow.addstr(x + x_offset + axis_offset, attr.subgraph_height, label, color) + subwindow.addstr(x + x_offset + axis_offset, height, label, color) for y, label in y_axis_labels.items(): subwindow.addstr(x, y, label, color) - for col in range(subgraph_columns): - column_count = int(data.values[attr.interval][col]) - min_bound - column_height = int(min(attr.subgraph_height - 2, (attr.subgraph_height - 2) * column_count / (max(1, max_bound) - min_bound))) + for col in range(columns): + column_count = int(data.values[interval][col]) - min_bound + column_height = int(min(height - 2, (height - 2) * column_count / (max(1, max_bound) - min_bound))) for row in range(column_height): - subwindow.addstr(x + col + axis_offset + 1, attr.subgraph_height - 1 - row, fill_char, color, HIGHLIGHT) + subwindow.addstr(x + col + axis_offset + 1, height - 1 - row, fill_char, color, HIGHLIGHT) -def _x_axis_labels(interval, subgraph_columns): +def _x_axis_labels(interval, columns): """ Provides the labels for the x-axis. We include the units for only its first value, then bump the precision for subsequent units. For example... @@ -655,10 +648,10 @@ def _x_axis_labels(interval, subgraph_columns): x_axis_labels = {} interval_sec = INTERVAL_SECONDS[interval] - interval_spacing = 10 if subgraph_columns >= WIDE_LABELING_GRAPH_COL else 5 + interval_spacing = 10 if columns >= WIDE_LABELING_GRAPH_COL else 5 previous_units, decimal_precision = None, 0 - for i in range((subgraph_columns - 4) / interval_spacing): + for i in range((columns - 4) / interval_spacing): x = (i + 1) * interval_spacing time_label = str_tools.time_label(x * interval_sec, decimal_precision) diff --git a/test/panel/graph.py b/test/panel/graph.py index 5327cba..6df72c5 100644 --- a/test/panel/graph.py +++ b/test/panel/graph.py @@ -95,36 +95,18 @@ class TestGraph(unittest.TestCase): @patch('nyx.panel.graph.tor_controller') def test_draw_subgraph_blank(self, tor_controller_mock): tor_controller_mock().get_info.return_value = None - - attr = nyx.panel.graph.DrawAttributes( - stat = None, - subgraph_height = 7, - subgraph_width = 30, - interval = nyx.panel.graph.Interval.EACH_SECOND, - bounds_type = nyx.panel.graph.Bounds.LOCAL_MAX, - ) - data = nyx.panel.graph.BandwidthStats() - rendered = test.render(nyx.panel.graph._draw_subgraph, attr, data.primary, 0, nyx.curses.Color.CYAN, '*') + rendered = test.render(nyx.panel.graph._draw_subgraph, data.primary, 0, 30, 7, nyx.panel.graph.Bounds.LOCAL_MAX, nyx.panel.graph.Interval.EACH_SECOND, nyx.curses.Color.CYAN, '*') self.assertEqual(EXPECTED_BLANK_GRAPH, rendered.content) @require_curses @patch('nyx.panel.graph.tor_controller') def test_draw_subgraph(self, tor_controller_mock): tor_controller_mock().get_info.return_value = '543,543 421,421 551,551 710,710 200,200 175,175 188,188 250,250 377,377' - - attr = nyx.panel.graph.DrawAttributes( - stat = None, - subgraph_height = 7, - subgraph_width = 30, - interval = nyx.panel.graph.Interval.EACH_SECOND, - bounds_type = nyx.panel.graph.Bounds.LOCAL_MAX, - ) - data = nyx.panel.graph.BandwidthStats() - rendered = test.render(nyx.panel.graph._draw_subgraph, attr, data.primary, 0, nyx.curses.Color.CYAN, '*') + rendered = test.render(nyx.panel.graph._draw_subgraph, data.primary, 0, 30, 7, nyx.panel.graph.Bounds.LOCAL_MAX, nyx.panel.graph.Interval.EACH_SECOND, nyx.curses.Color.CYAN, '*') self.assertEqual(EXPECTED_GRAPH, rendered.content) @require_curses

1 0

[nyx/master] Header panel testing failure due to system calls
by atagar＠torproject.org 26 Jun '16

26 Jun '16

commit ede4af404c14e7297e43845714e1baf1f5d900e8 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun May 29 08:36:44 2016 -0700 Header panel testing failure due to system calls System calls by our tests caused our nyx cpu time assertion to fail... ====================================================================== FAIL: test_sample (panel.header.TestHeader) ---------------------------------------------------------------------- Traceback (most recent call last): File "/usr/local/lib/python2.7/dist-packages/mock.py", line 1201, in patched return func(*args, **keywargs) File "/home/atagar/Desktop/nyx/test/panel/header.py", line 151, in test_sample self.assertEqual(0.11, vals.nyx_total_cpu_time) AssertionError: 0.11 != 1.6735180473327638 ---------------------------------------------------------------------- --- test/panel/header.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/panel/header.py b/test/panel/header.py index 62d54af..e8502d9 100644 --- a/test/panel/header.py +++ b/test/panel/header.py @@ -123,6 +123,7 @@ class TestHeader(unittest.TestCase): resources.memory_percent = .125 resource_tracker_mock().get_value.return_value = resources + stem.util.system.SYSTEM_CALL_TIME = 0.0 vals = nyx.panel.header.Sampling.create()

1 0

[nyx/master] Drop _draw_bandwidth_stats()
by atagar＠torproject.org 26 Jun '16

26 Jun '16

commit 973da9b991803cac0640982c2b9a31f14d11a103 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun May 29 10:24:29 2016 -0700 Drop _draw_bandwidth_stats() I can see why we had this but... it's confusing. On small screen resolutions we replaced our y-axis with the average and total bandwidth usage. This only applied when rendering bandwidths and it's debatable if this is more valuable than the y-axis. On my netbook (which is just 100 colums wide) we still show the averages (just dropping the total) which imho works just fine. We might try something else if this makes anyone sad. --- nyx/panel/graph.py | 27 +++------------------------ test/panel/graph.py | 13 +------------ 2 files changed, 4 insertions(+), 36 deletions(-) diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py index c35df13..d3ed768 100644 --- a/nyx/panel/graph.py +++ b/nyx/panel/graph.py @@ -51,7 +51,6 @@ PRIMARY_COLOR, SECONDARY_COLOR = GREEN, CYAN ACCOUNTING_RATE = 5 DEFAULT_CONTENT_HEIGHT = 4 # space needed for labeling above and below the graph WIDE_LABELING_GRAPH_COL = 50 # minimum graph columns to use wide spacing for x-axis labels -COLLAPSE_WIDTH = 135 # width at which to move optional stats from the title to x-axis label def conf_handler(key, value): @@ -228,7 +227,7 @@ class GraphCategory(object): header = CONFIG['attr.graph.header.secondary'].get(self.stat_type(), '') header_stats = self._secondary_header_stats - header_stats = join(header_stats, '', width - len(header) - 4) + header_stats = join(header_stats, '', width - len(header) - 4).rstrip() return '%s (%s):' % (header, header_stats) if header_stats else '%s:' % header def _y_axis_label(self, value, is_primary): @@ -560,12 +559,8 @@ class GraphPanel(nyx.panel.Panel): self._draw_subgraph(subwindow, attr, attr.stat.primary, 0, PRIMARY_COLOR) self._draw_subgraph(subwindow, attr, attr.stat.secondary, attr.subgraph_width, SECONDARY_COLOR) - if attr.stat.stat_type() == GraphStat.BANDWIDTH: - if subwindow.width <= COLLAPSE_WIDTH: - _draw_bandwidth_stats(subwindow, DEFAULT_CONTENT_HEIGHT + attr.subgraph_height - 4, attr.stat, attr.subgraph_width) - - if accounting_stats: - _draw_accounting_stats(subwindow, DEFAULT_CONTENT_HEIGHT + attr.subgraph_height - 2, accounting_stats) + if attr.stat.stat_type() == GraphStat.BANDWIDTH and accounting_stats: + _draw_accounting_stats(subwindow, DEFAULT_CONTENT_HEIGHT + attr.subgraph_height - 2, accounting_stats) def _draw_subgraph(self, subwindow, attr, data, x, color): # Concering our subgraph colums, the y-axis label can be at most six @@ -709,22 +704,6 @@ class GraphPanel(nyx.panel.Panel): self.redraw(True) -def _draw_bandwidth_stats(subwindow, y, stat, subgraph_width): - """ - Replaces the x-axis labeling with bandwidth stats. This is done on small - screens since this information otherwise wouldn't fit. - """ - - subwindow.addstr(0, y, ' ' * 500) # clear line - - runtime = time.time() - stat.start_time - primary_footer = 'total: %s, avg: %s/sec' % (_size_label(stat.primary.total), _size_label(stat.primary.total / runtime)) - secondary_footer = 'total: %s, avg: %s/sec' % (_size_label(stat.secondary.total), _size_label(stat.secondary.total / runtime)) - - subwindow.addstr(1, y, primary_footer, PRIMARY_COLOR) - subwindow.addstr(subgraph_width + 1, y, secondary_footer, SECONDARY_COLOR) - - def _draw_accounting_stats(subwindow, y, accounting): if tor_controller().is_alive(): hibernate_color = CONFIG['attr.hibernate_color'].get(accounting.status, RED) diff --git a/test/panel/graph.py b/test/panel/graph.py index 40c07fb..f2eca4b 100644 --- a/test/panel/graph.py +++ b/test/panel/graph.py @@ -11,7 +11,7 @@ import nyx.panel.graph import test from test import require_curses -from mock import patch, Mock +from mock import patch EXPECTED_ACCOUNTING = """ Accounting (awake) Time to reset: 01:02 @@ -21,17 +21,6 @@ Accounting (awake) Time to reset: 01:02 class TestGraph(unittest.TestCase): @require_curses - @patch('time.time', Mock(return_value = 460.0)) - def test_draw_bandwidth_stats(self): - stat = Mock() - stat.start_time = 215.0 - stat.primary.total = 2306867.2 - stat.secondary.total = 1782579.2 - - rendered = test.render(nyx.panel.graph._draw_bandwidth_stats, 0, stat, 40) - self.assertEqual(' total: 17.6 Mb, avg: 73.5 Kb/sec total: 13.5 Mb, avg: 56.8 Kb/sec', rendered.content) - - @require_curses @patch('nyx.panel.graph.tor_controller') def test_draw_accounting_stats(self, tor_controller_mock): tor_controller_mock().is_alive.return_value = True

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 25 Jun '16

25 Jun '16

commit cf802040966807e021e9c26dd5d31f5db899f1c9 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 25 22:45:39 2016 +0000 Update translations for liveusb-creator_completed --- nn/nn.po | 609 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 609 insertions(+) diff --git a/nn/nn.po b/nn/nn.po new file mode 100644 index 0000000..951669d --- /dev/null +++ b/nn/nn.po @@ -0,0 +1,609 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Bjørn I. <bjorn.svindseth(a)online.no>, 2014,2016 +# Finn Brudal <finnbrudal(a)yahoo.com>, 2016 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-11-02 21:23+0100\n" +"PO-Revision-Date: 2016-06-25 22:39+0000\n" +"Last-Translator: Finn Brudal <finnbrudal(a)yahoo.com>\n" +"Language-Team: Norwegian Nynorsk (http://www.transifex.com/otf/torproject/language/nn/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: nn\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../liveusb/gui.py:451 +msgid "\"Clone & Install\"" +msgstr "«Klon og installer" + +#: ../liveusb/gui.py:453 +msgid "\"Install from ISO\"" +msgstr "«Installerer frå ISO" + +#: ../liveusb/dialog.py:157 ../liveusb/launcher_ui.py:153 +#, python-format +msgid "%(distribution)s Installer" +msgstr "%(distribution)s Installerar" + +#: ../liveusb/gui.py:804 +#, python-format +msgid "%(filename)s selected" +msgstr "%(filename)s vald(e)" + +#: ../liveusb/gui.py:424 +#, python-format +msgid "%(size)s %(label)s" +msgstr "%(size)s %(label)s" + +#: ../liveusb/gui.py:430 +#, python-format +msgid "%(vendor)s %(model)s (%(details)s) - %(device)s" +msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s" + +#: ../liveusb/creator.py:1097 +#, python-format +msgid "%s already bootable" +msgstr "%s allereie startbar" + +#: ../liveusb/launcher_ui.py:160 +msgid "" +"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" +"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" +"p, li { white-space: pre-wrap; }\n" +"</style></head><body style=\" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;\">\n" +"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Need help? Read the <a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a>.</p></body></html>" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Treng du hjelp? Les <a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">dokumentasjonen</span></a>.</p></body></html>" + +#: ../liveusb/launcher_ui.py:155 +msgid "" +"<ul>\n" +"<li>Install Tails on another USB stick by copying the Tails system that you are currently using..</li>\n" +"\n" +"<li>The USB stick that you install on is formatted and all data is lost.</li>\n" +"\n" +"<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n" +"\n" +"</ul>" +msgstr "<ul>\n<li>Installer Tails på ei onnor USB-pinna ved å kopiera Tails-systemet som du nyttar no.</li>\n\n<li>USB-pinni som du installerer på formaterest og alle upplysingar gjeng tapt.</li>\n\n<li>Det krypterte vedvarande lagaret åt Tails-USB-pinni som du nyttar no vert ikkje kopiert.</li>\n\n</ul>" + +#: ../liveusb/launcher_ui.py:157 +msgid "" +"<ul>\n" +"<li>Upgrade another Tails USB stick to the same version of Tails that you are currently using.</li>\n" +"\n" +"<li>The encrypted persistent storage of the Tails USB stick that you upgrade is preserved.</li>\n" +"\n" +"<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n" +"\n" +"\n" +"</ul>" +msgstr "<ul>\n<li>Uppgrader ei onnor Tails-USB-pinna åt same versjon av Tails som du nyttar no.</li>\n\n<li>Det krypterte vedvarande lageret på Tails-USB-pinni du uppgraderer vert forvart.</li>\n\n<li>Det krypterte vedvarande lageret på Tails-USB-pinni du nyttar no vert ikkje kopiert.</li>\n\n\n</ul>" + +#: ../liveusb/launcher_ui.py:159 +msgid "" +"<ul>\n" +"<li>Upgrade another Tails USB stick to the version of an ISO image.</li>\n" +"\n" +"<li>The encrypted persistent storage of the Tails USB stick that you upgrade is preserved.</li>\n" +"\n" +"<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n" +"\n" +"</ul>" +msgstr "<ul>\n<li>Uppgrader ei onnor Tails-USB-pinna åt versjonen av eit ISO-bilete.</li>\n\n<li>Det krypterte vedvarande lageret på Tails-USB-pinni du uppgraderer vert forvart.</li>\n\n<li>Det krypterte vedvarande lageret på Tails-USB-pinni du nyttar no vert ikkje kopiert.</li>\n\n</ul>" + +#: ../liveusb/dialog.py:161 +msgid "Alt+B" +msgstr "Alt+B" + +#: ../liveusb/dialog.py:160 +msgid "Browse" +msgstr "Surf" + +#: ../liveusb/dialog.py:167 +msgid "" +"By allocating extra space on your USB stick for a persistent overlay, you " +"will be able to store data and make permanent modifications to your live " +"operating system. Without it, you will not be able to save data that will " +"persist after a reboot." +msgstr "Ved å åtdela yttarlegare plass på USB-pinni di for eit vedvarande yverlegg, vil du kunna lagra upplysingar og gjere vedvarande endringar på ditt køyrande operativsystem. Utan dette vil du ikkje kunna lagra upplysingar som vil vedvara etter umstart." + +#: ../liveusb/creator.py:1196 ../liveusb/creator.py:1459 +#, python-format +msgid "Calculating the SHA1 of %s" +msgstr "Reknar ut SHA1'en av %s" + +#: ../liveusb/creator.py:1407 +msgid "Cannot find" +msgstr "Finn ikkje" + +#: ../liveusb/creator.py:560 +#, python-format +msgid "Cannot find device %s" +msgstr "Finn ikkje eininga %s" + +#: ../liveusb/creator.py:417 +#, python-format +msgid "Creating %sMB persistent overlay" +msgstr "Skapar %sMB vedvarande yverlegg" + +#: ../liveusb/gui.py:582 +msgid "" +"Device is not yet mounted, so we cannot determine the amount of free space." +msgstr "Einheiten er ikkje enno montert, so me kan ikkje avgjere mengden fri lagringsplass." + +#: ../liveusb/dialog.py:164 +#, python-format +msgid "Download %(distribution)s" +msgstr "Last ned %(distribution)s" + +#: ../liveusb/gui.py:778 +msgid "Download complete!" +msgstr "Nedlastinga er ferdig!" + +#: ../liveusb/gui.py:782 +msgid "Download failed: " +msgstr "Mislukka nedlasting:" + +#: ../liveusb/gui.py:89 +#, python-format +msgid "Downloading %s..." +msgstr "Lastar ned %s " + +#: ../liveusb/creator.py:1192 +msgid "Drive is a loopback, skipping MBR reset" +msgstr "Drevet er ei attendekopling, hoppar yver MBR-nullstilling" + +#: ../liveusb/creator.py:837 +#, python-format +msgid "Entering unmount_device for '%(device)s'" +msgstr "Gjeng inn i unmount_device for '%(device)s'" + +#: ../liveusb/creator.py:1272 +msgid "Error probing device" +msgstr "Feil ved sondering av einheit" + +#: ../liveusb/gui.py:213 +msgid "" +"Error: Cannot set the label or obtain the UUID of your device. Unable to " +"continue." +msgstr "Feil: Kan ikkje setja etiketten eller fenge UUID'en åt einheita di. Kan ikkje halda fram." + +#: ../liveusb/creator.py:393 +msgid "" +"Error: The SHA1 of your Live CD is invalid. You can run this program with " +"the --noverify argument to bypass this verification check." +msgstr "Feil: SHA1'en åt Live-CD'en din er ugyldig. Du kan køyra dette programmet med --noverify-parameteren for å hoppa yver denne stadfestingskontrollen." + +#: ../liveusb/creator.py:155 +msgid "Extracting live image to the target device..." +msgstr "Dreg ut live-bilete åt måleinheita..." + +#: ../liveusb/creator.py:1140 +#, python-format +msgid "Formatting %(device)s as FAT32" +msgstr "Formaterer %(device)s som FAT32" + +#: ../liveusb/creator.py:150 +msgid "ISO MD5 checksum passed" +msgstr "ISO-MD5-kontrollsum passerte" + +#: ../liveusb/creator.py:148 +msgid "ISO MD5 checksum verification failed" +msgstr "Mislukka ISO MD5 kontrollsumstadfesting" + +#: ../liveusb/dialog.py:163 +msgid "" +"If you do not select an existing Live ISO, the selected release will be " +"downloaded for you." +msgstr "Um du ikkje vel ein Live-ISO som finst, vil den valde utgåva verte lasta ned for deg." + +#: ../liveusb/launcher_ui.py:154 +msgid "" +"Install\n" +"by cloning" +msgstr "Installer\nved å klona" + +#: ../liveusb/dialog.py:172 +msgid "Install Tails" +msgstr "Installer Tails" + +#: ../liveusb/gui.py:645 +msgid "Installation complete!" +msgstr "Installering fullførd" + +#: ../liveusb/gui.py:265 +#, python-format +msgid "Installation complete! (%s)" +msgstr "Installasjonen er fullført! (%s)" + +#: ../liveusb/gui.py:646 +msgid "Installation was completed. Press OK to close this program." +msgstr "Installering vart fullendt. Trykk OK for å lukka dette programmet." + +#: ../liveusb/creator.py:990 ../liveusb/creator.py:1313 +msgid "Installing bootloader..." +msgstr "Installerer støvellastar..." + +#: ../liveusb/gui.py:454 +#, python-format +msgid "" +"It is impossible to upgrade the device %(pretty_name)s because it was not " +"created using Tails Installer. You should instead use %(action)s to upgrade " +"Tails on this device." +msgstr "Det er umogleg å uppgradere einheita %(pretty_name)s av di ho ikkje vart skapa ved hjelp av Tails-installatøren. Du burde i staden nytta %(action)s for å uppgradere Tails på denne einheita." + +#: ../liveusb/gui.py:270 +msgid "LiveUSB creation failed!" +msgstr "Laging av LiveUSB mislukkast!" + +#: ../liveusb/creator.py:1408 +msgid "" +"Make sure to extract the entire liveusb-creator zip file before running this" +" program." +msgstr "Sjå til å draga ut heile liveusb-creator-zipfili fyre du køyrar dette programmet." + +#: ../liveusb/creator.py:1284 +msgid "" +"Make sure your USB key is plugged in and formatted with the FAT filesystem" +msgstr "Sjå til at USB-lykelen din er plugga inn og formatert med FAT-filsystemet" + +#: ../liveusb/creator.py:859 +#, python-format +msgid "Mount %s exists after unmounting" +msgstr "Montering %s finst etter avmontering" + +#: ../liveusb/gui.py:588 +#, python-format +msgid "No free space on device %(device)s" +msgstr "Ingen ledig plass på eininga %(device)s" + +#: ../liveusb/creator.py:826 +msgid "No mount points found" +msgstr "Fann ingen monteringspunkt" + +#: ../liveusb/creator.py:410 +#, python-format +msgid "" +"Not enough free space on device.\n" +"%dMB ISO + %dMB overlay > %dMB free space" +msgstr "Ikkje nok ledug plass på einheiti.\n%dMB ISO + %dMB yverlegg > %dMB ledug plass" + +#: ../liveusb/gui.py:569 +msgid "Partition is FAT16; Restricting overlay size to 2G" +msgstr "Inndeling er FAT16; avgrensar yverleggstorleik åt 2G" + +#: ../liveusb/gui.py:565 +msgid "Partition is FAT32; Restricting overlay size to 4G" +msgstr "Inndeling er FAT32; avgrenar yverleggstorleik åt 4G" + +#: ../liveusb/creator.py:236 ../liveusb/creator.py:866 +#, python-format +msgid "Partitioning device %(device)s" +msgstr "Delar inn einheit %(device)s" + +#: ../liveusb/gui.py:636 +msgid "Persistent Storage" +msgstr "Vedvarande lager" + +#: ../liveusb/dialog.py:168 +msgid "Persistent Storage (0 MB)" +msgstr "Vedvarande lager (0 MB)" + +#: ../liveusb/gui.py:698 ../liveusb/gui.py:727 +msgid "Please confirm your device selection" +msgstr "Ver venleg og godtak einheitsvalet ditt" + +#: ../liveusb/gui.py:481 +msgid "Refreshing releases..." +msgstr "Oppdaterer versjonane " + +#: ../liveusb/gui.py:486 +msgid "Releases updated!" +msgstr "Versjonane oppdaterte!" + +#: ../liveusb/creator.py:997 ../liveusb/creator.py:1331 +#, python-format +msgid "Removing %(file)s" +msgstr "Fjernar %(file)s" + +#: ../liveusb/creator.py:492 +msgid "Removing existing Live OS" +msgstr "Fjernar verande Live-OS" + +#: ../liveusb/creator.py:1186 +#, python-format +msgid "Resetting Master Boot Record of %s" +msgstr "Nullstiller hovudinndelingssektor åt %s" + +#: ../liveusb/gui.py:789 +msgid "Select Live ISO" +msgstr "Vel Live-ISO" + +#: ../liveusb/creator.py:192 +msgid "Setting up OLPC boot file..." +msgstr "Set upp OLPC-støvelfili..." + +#: ../liveusb/creator.py:742 +#, python-format +msgid "" +"Some partitions of the target device %(device)s are mounted. They will be " +"unmounted before starting the installation process." +msgstr "Nokre inndelingar på måleinheiti %(device)s er monterte. Dei vil verte avmontera fyre innstalleringsgangen tek til." + +#: ../liveusb/creator.py:141 +msgid "" +"Source type does not support verification of ISO MD5 checksum, skipping" +msgstr "Kjeldetype støttar ikkje stadfesting av ISO-MD5-kontrollsum, hoppar yver" + +#: ../liveusb/creator.py:1220 +msgid "Synchronizing data on disk..." +msgstr "Skapar samsvar med upplysingar på skivi..." + +#: ../liveusb/dialog.py:166 +msgid "Target Device" +msgstr "Måleining" + +#: ../liveusb/gui.py:438 +#, python-format +msgid "" +"The device \"%(pretty_name)s\" is too small to install Tails (at least " +"%(size)s GB is required)." +msgstr "Einheiti \"%(pretty_name)s\" er for lita til å installere Tails på (minst %(size)s GB er påkravt)." + +#: ../liveusb/gui.py:792 +msgid "" +"The selected file is unreadable. Please fix its permissions or select " +"another file." +msgstr "Den valde fili er ulesbar. Ver venleg og fiks løyvi hennar eller vel ei onnor fil." + +#: ../liveusb/creator.py:354 +#, python-format +msgid "" +"There was a problem executing the following command: `%(command)s`.\n" +"A more detailed error log has been written to '%(filename)s'." +msgstr "Det var vanskeleg å køyra fylgjande ordre: `%(command)s`\nEin meir utførleg feillogg hev vorte skriven åt '%(filename)s'." + +#: ../liveusb/dialog.py:158 +msgid "" +"This button allows you to browse for an existing Live system ISO that you " +"have previously downloaded. If you do not select one, a release will be " +"downloaded for you automatically." +msgstr "Denne knappen lèt deg sjå etter ein eksisterande Live system-ISO som du hev lasta ned fyrr. Um du ikkje vel ein, vil ei utgåva verte lasta ned for deg av seg sjølv." + +#: ../liveusb/dialog.py:171 +msgid "" +"This button will begin the LiveUSB creation process. This entails " +"optionally downloading a release (if an existing one wasn't selected), " +"extracting the ISO to the USB device, creating the persistent overlay, and " +"installing the bootloader." +msgstr "Denne knappen vil byrja LiveUSB-skapnadsgangen. Dette medførar å kanskje lasta ned ei utgåva (um ei som finst ikkje var vald), draga ut ISO'en åt USB-einheiti, skapa det vedvarande yverlegget, og installera støvellastaren." + +#: ../liveusb/dialog.py:165 +msgid "" +"This is the USB stick that you want to install your Live system on. This " +"device must be formatted with the FAT filesystem." +msgstr "Dette er USB-pinni du vil installera Live-systemet ditt på. Denne einheiti lyt vera formatert med FAT-filsystemet." + +#: ../liveusb/dialog.py:170 +msgid "" +"This is the progress bar that will indicate how far along in the LiveUSB " +"creation process you are" +msgstr "Dette er framgangslina som vil visa kor langt i LiveUSB-skapnadsgangen du er" + +#: ../liveusb/dialog.py:169 +msgid "This is the status console, where all messages get written to." +msgstr "Dette er stodkonsollen, kor alle meldingar vert skrivne." + +#: ../liveusb/creator.py:952 +msgid "Trying to continue anyway." +msgstr "Freistar å halda fram likevel." + +#: ../liveusb/gui.py:464 +msgid "USB drive found" +msgstr "USB-drev funne" + +#: ../liveusb/creator.py:985 +#, python-format +msgid "Unable to change volume label: %(message)s" +msgstr "Kan ikkje gjera um volumetikett: %(message)s" + +#: ../liveusb/creator.py:501 ../liveusb/creator.py:512 +#, python-format +msgid "Unable to chmod %(file)s: %(message)s" +msgstr "Kan ikkje chmod'a %(file)s: %(message)s" + +#: ../liveusb/creator.py:478 +#, python-format +msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s" +msgstr "Kan ikkje kopiera %(infile)s åt %(outfile)s: %(message)s" + +#: ../liveusb/gui.py:403 +msgid "Unable to find any USB drive" +msgstr "Kan ikkje finna noko USB-drev" + +#: ../liveusb/creator.py:1274 +msgid "Unable to find any supported device" +msgstr "Kan ikkje finna nokor støtta einheit." + +#: ../liveusb/creator.py:1117 +msgid "Unable to find partition" +msgstr "Kan ikkje finna inndeling" + +#: ../liveusb/creator.py:1354 +msgid "" +"Unable to get Win32_LogicalDisk; win32com query did not return any results" +msgstr "Kan ikkje fenga Win32_LogicalDisk; win32com-fyrespurnad gav ingi resultat" + +#: ../liveusb/gui.py:691 +msgid "Unable to mount device" +msgstr "Kan ikkje montera einheiti" + +#: ../liveusb/creator.py:814 +#, python-format +msgid "Unable to mount device: %(message)s" +msgstr "Kan ikkje montera einheiti: %(message)s" + +#: ../liveusb/creator.py:517 +#, python-format +msgid "Unable to remove directory from previous LiveOS: %(message)s" +msgstr "Kan ikkje fjerna katalog frå fyrre LiveOS: %(message)s" + +#: ../liveusb/creator.py:505 +#, python-format +msgid "Unable to remove file from previous LiveOS: %(message)s" +msgstr "Kan ikkje fjerna fil frå fyrre LiveOS: %(message)s" + +#: ../liveusb/creator.py:1189 +msgid "" +"Unable to reset MBR. You may not have the `syslinux` package installed." +msgstr "Kan ikkje nullstille MBR. Du hev kanskje ikkje `syslinux`-pakki installert." + +#: ../liveusb/gui.py:798 +msgid "" +"Unable to use the selected file. You may have better luck if you move your " +"ISO to the root of your drive (ie: C:\\)" +msgstr "Kan ikkje nytta den valde fili. Du hev kanskje betre hell um du flyttar ISO'en din åt roti av drevet ditt (t.d. C:\\)" + +#: ../liveusb/creator.py:723 +#, python-format +msgid "Unable to write on %(device)s, skipping." +msgstr "Kan ikkje skriva på %(device)s, hoppar yver." + +#: ../liveusb/creator.py:399 +msgid "Unknown ISO, skipping checksum verification" +msgstr "Ukjend ISO, hoppar yver kontrollsumstadfestingi" + +#: ../liveusb/creator.py:810 +#, python-format +msgid "Unknown dbus exception while trying to mount device: %(message)s" +msgstr "Ukjend dbus-unnatak under montering av einheiti: %(message)s" + +#: ../liveusb/creator.py:791 ../liveusb/creator.py:964 +msgid "Unknown filesystem. Your device may need to be reformatted." +msgstr "Ukjend filsystem. Det kan vera at einheiti di treng å verta formatert um." + +#: ../liveusb/gui.py:85 +#, python-format +msgid "Unknown release: %s" +msgstr "Ukjend versjon: %s" + +#: ../liveusb/creator.py:851 +#, python-format +msgid "Unmounting '%(udi)s' on '%(device)s'" +msgstr "Avmonterer '%(udi)s' på '%(device)s'" + +#: ../liveusb/creator.py:847 +#, python-format +msgid "Unmounting mounted filesystems on '%(device)s'" +msgstr "Avmonterer monterte filsystem på '%(device)s'" + +#: ../liveusb/creator.py:949 +#, python-format +msgid "Unsupported device '%(device)s', please report a bug." +msgstr "Ustøtta einheit '%(device)s', ver venleg og meld inn eit insekt." + +#: ../liveusb/creator.py:794 ../liveusb/creator.py:967 +#, python-format +msgid "Unsupported filesystem: %s" +msgstr "Ustøtta filsystem: %s" + +#: ../liveusb/creator.py:1287 +#, python-format +msgid "" +"Unsupported filesystem: %s\n" +"Please backup and format your USB key with the FAT filesystem." +msgstr "Ustøtta filsystem: %s\nVer venleg og ta kopi av USB-lykelen din og formater han med FAT-filsystemet." + +#: ../liveusb/creator.py:892 +#, python-format +msgid "Updating properties of system partition %(system_partition)s" +msgstr "Uppdaterer eigenskapar åt systeminndelingi: %(system_partition)s" + +#: ../liveusb/launcher_ui.py:156 +msgid "" +"Upgrade\n" +"by cloning" +msgstr "Uppgrader\nved kloning" + +#: ../liveusb/launcher_ui.py:158 +msgid "" +"Upgrade\n" +"from ISO" +msgstr "Uppgrader\nfrå ISO" + +#: ../liveusb/dialog.py:159 +msgid "Use existing Live system ISO" +msgstr "Bruk gjeldande Live system ISO" + +#: ../liveusb/creator.py:143 +msgid "Verifying ISO MD5 checksum" +msgstr "Stadfestar ISO MD5 kontrollsum" + +#: ../liveusb/creator.py:373 +msgid "Verifying SHA1 checksum of LiveCD image..." +msgstr "Stadfestar SHA1-kontrollsummen åt LiveCD-biletet..." + +#: ../liveusb/creator.py:377 +msgid "Verifying SHA256 checksum of LiveCD image..." +msgstr "Stadfestar SHA256-kontrollsummen åt LiveCD-biletet..." + +#: ../liveusb/creator.py:961 ../liveusb/creator.py:1280 +msgid "Verifying filesystem..." +msgstr "Stadfestar filsystem..." + +#: ../liveusb/gui.py:725 +msgid "" +"Warning: Creating a new persistent overlay will delete your existing one." +msgstr "Åtvaring: Å skapa eit nytt vedvarande yverlegg vil slette det som finst." + +#: ../liveusb/gui.py:377 +msgid "" +"Warning: This tool needs to be run as an Administrator. To do this, right " +"click on the icon and open the Properties. Under the Compatibility tab, " +"check the \"Run this program as an administrator\" box." +msgstr "Åtvaring: Dette verktyet treng å køyra som Administrator. For å gjera dette, høgreklikk på ikonet og opn Eigenskapar. Under Kompatibilitet-fanen, kryss av \"Køyr dette programmet som administrator\"-boksen." + +#: ../liveusb/creator.py:162 +#, python-format +msgid "Wrote to device at %(speed)d MB/sec" +msgstr "Skreiv åt einheiti med %(speed)d MB/sec" + +#: ../liveusb/gui.py:699 +#, python-format +msgid "" +"You are going to install Tails on the %(size)s %(vendor)s %(model)s device " +"(%(device)s). All data on the selected device will be lost. Continue?" +msgstr "Du kjem til å installera Tails på %(size)s %(vendor)s %(model)s-einheiti (%(device)s). Alle upplysingar på den valde einheiti vil gjenga tapt. Halda fram?" + +#: ../liveusb/gui.py:715 +#, python-format +msgid "" +"You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s " +"device (%(device)s). Any persistent volume on this device will remain " +"unchanged. Continue?" +msgstr "Du kjem til å uppgradera Tails på %(parent_size)s %(vendor)s %(model)s-einheiti (%(device)s). Eitkvart vedvarande volum på denne einheiti vil bli uendra. Halda fram?" + +#: ../liveusb/creator.py:622 +msgid "" +"You are using an old version of syslinux-extlinux that does not support the " +"ext4 filesystem" +msgstr "Du nyttar ein gamal versjon av syslinux-extlinux som ikkje støttar ext4-filsystemet" + +#: ../liveusb/gui.py:783 +msgid "You can try again to resume your download" +msgstr "Du kan prøva å halda fram med nedlastinga" + +#: ../liveusb/creator.py:95 +msgid "You must run this application as root" +msgstr "Du lyt køyra denne applikasjonen som rot" + +#: ../liveusb/dialog.py:162 +msgid "or" +msgstr "eller"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 25 Jun '16

25 Jun '16

commit 26e3670fb4337284ecdda2035ba223386d874e51 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 25 22:45:35 2016 +0000 Update translations for liveusb-creator --- nn/nn.po | 106 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/nn/nn.po b/nn/nn.po index 07b7e4e..951669d 100644 --- a/nn/nn.po +++ b/nn/nn.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-02 21:23+0100\n" -"PO-Revision-Date: 2016-06-25 22:15+0000\n" +"PO-Revision-Date: 2016-06-25 22:39+0000\n" "Last-Translator: Finn Brudal <finnbrudal(a)yahoo.com>\n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/otf/torproject/language/nn/)\n" "MIME-Version: 1.0\n" @@ -50,7 +50,7 @@ msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s" #: ../liveusb/creator.py:1097 #, python-format msgid "%s already bootable" -msgstr "" +msgstr "%s allereie startbar" #: ../liveusb/launcher_ui.py:160 msgid "" @@ -273,7 +273,7 @@ msgstr "Fann ingen monteringspunkt" msgid "" "Not enough free space on device.\n" "%dMB ISO + %dMB overlay > %dMB free space" -msgstr "Ikkje nok ledug plass på einheita.\n%dMB ISO + %dMB yverlegg > %dMB ledug plass" +msgstr "Ikkje nok ledug plass på einheiti.\n%dMB ISO + %dMB yverlegg > %dMB ledug plass" #: ../liveusb/gui.py:569 msgid "Partition is FAT16; Restricting overlay size to 2G" @@ -320,7 +320,7 @@ msgstr "Fjernar verande Live-OS" #: ../liveusb/creator.py:1186 #, python-format msgid "Resetting Master Boot Record of %s" -msgstr "" +msgstr "Nullstiller hovudinndelingssektor åt %s" #: ../liveusb/gui.py:789 msgid "Select Live ISO" @@ -328,23 +328,23 @@ msgstr "Vel Live-ISO" #: ../liveusb/creator.py:192 msgid "Setting up OLPC boot file..." -msgstr "" +msgstr "Set upp OLPC-støvelfili..." #: ../liveusb/creator.py:742 #, python-format msgid "" "Some partitions of the target device %(device)s are mounted. They will be " "unmounted before starting the installation process." -msgstr "" +msgstr "Nokre inndelingar på måleinheiti %(device)s er monterte. Dei vil verte avmontera fyre innstalleringsgangen tek til." #: ../liveusb/creator.py:141 msgid "" "Source type does not support verification of ISO MD5 checksum, skipping" -msgstr "" +msgstr "Kjeldetype støttar ikkje stadfesting av ISO-MD5-kontrollsum, hoppar yver" #: ../liveusb/creator.py:1220 msgid "Synchronizing data on disk..." -msgstr "" +msgstr "Skapar samsvar med upplysingar på skivi..." #: ../liveusb/dialog.py:166 msgid "Target Device" @@ -355,27 +355,27 @@ msgstr "Måleining" msgid "" "The device \"%(pretty_name)s\" is too small to install Tails (at least " "%(size)s GB is required)." -msgstr "" +msgstr "Einheiti \"%(pretty_name)s\" er for lita til å installere Tails på (minst %(size)s GB er påkravt)." #: ../liveusb/gui.py:792 msgid "" "The selected file is unreadable. Please fix its permissions or select " "another file." -msgstr "" +msgstr "Den valde fili er ulesbar. Ver venleg og fiks løyvi hennar eller vel ei onnor fil." #: ../liveusb/creator.py:354 #, python-format msgid "" "There was a problem executing the following command: `%(command)s`.\n" "A more detailed error log has been written to '%(filename)s'." -msgstr "" +msgstr "Det var vanskeleg å køyra fylgjande ordre: `%(command)s`\nEin meir utførleg feillogg hev vorte skriven åt '%(filename)s'." #: ../liveusb/dialog.py:158 msgid "" "This button allows you to browse for an existing Live system ISO that you " "have previously downloaded. If you do not select one, a release will be " "downloaded for you automatically." -msgstr "" +msgstr "Denne knappen lèt deg sjå etter ein eksisterande Live system-ISO som du hev lasta ned fyrr. Um du ikkje vel ein, vil ei utgåva verte lasta ned for deg av seg sjølv." #: ../liveusb/dialog.py:171 msgid "" @@ -383,111 +383,111 @@ msgid "" "optionally downloading a release (if an existing one wasn't selected), " "extracting the ISO to the USB device, creating the persistent overlay, and " "installing the bootloader." -msgstr "" +msgstr "Denne knappen vil byrja LiveUSB-skapnadsgangen. Dette medførar å kanskje lasta ned ei utgåva (um ei som finst ikkje var vald), draga ut ISO'en åt USB-einheiti, skapa det vedvarande yverlegget, og installera støvellastaren." #: ../liveusb/dialog.py:165 msgid "" "This is the USB stick that you want to install your Live system on. This " "device must be formatted with the FAT filesystem." -msgstr "" +msgstr "Dette er USB-pinni du vil installera Live-systemet ditt på. Denne einheiti lyt vera formatert med FAT-filsystemet." #: ../liveusb/dialog.py:170 msgid "" "This is the progress bar that will indicate how far along in the LiveUSB " "creation process you are" -msgstr "" +msgstr "Dette er framgangslina som vil visa kor langt i LiveUSB-skapnadsgangen du er" #: ../liveusb/dialog.py:169 msgid "This is the status console, where all messages get written to." -msgstr "" +msgstr "Dette er stodkonsollen, kor alle meldingar vert skrivne." #: ../liveusb/creator.py:952 msgid "Trying to continue anyway." -msgstr "" +msgstr "Freistar å halda fram likevel." #: ../liveusb/gui.py:464 msgid "USB drive found" -msgstr "" +msgstr "USB-drev funne" #: ../liveusb/creator.py:985 #, python-format msgid "Unable to change volume label: %(message)s" -msgstr "" +msgstr "Kan ikkje gjera um volumetikett: %(message)s" #: ../liveusb/creator.py:501 ../liveusb/creator.py:512 #, python-format msgid "Unable to chmod %(file)s: %(message)s" -msgstr "" +msgstr "Kan ikkje chmod'a %(file)s: %(message)s" #: ../liveusb/creator.py:478 #, python-format msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s" -msgstr "" +msgstr "Kan ikkje kopiera %(infile)s åt %(outfile)s: %(message)s" #: ../liveusb/gui.py:403 msgid "Unable to find any USB drive" -msgstr "" +msgstr "Kan ikkje finna noko USB-drev" #: ../liveusb/creator.py:1274 msgid "Unable to find any supported device" -msgstr "" +msgstr "Kan ikkje finna nokor støtta einheit." #: ../liveusb/creator.py:1117 msgid "Unable to find partition" -msgstr "" +msgstr "Kan ikkje finna inndeling" #: ../liveusb/creator.py:1354 msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" -msgstr "" +msgstr "Kan ikkje fenga Win32_LogicalDisk; win32com-fyrespurnad gav ingi resultat" #: ../liveusb/gui.py:691 msgid "Unable to mount device" -msgstr "" +msgstr "Kan ikkje montera einheiti" #: ../liveusb/creator.py:814 #, python-format msgid "Unable to mount device: %(message)s" -msgstr "" +msgstr "Kan ikkje montera einheiti: %(message)s" #: ../liveusb/creator.py:517 #, python-format msgid "Unable to remove directory from previous LiveOS: %(message)s" -msgstr "" +msgstr "Kan ikkje fjerna katalog frå fyrre LiveOS: %(message)s" #: ../liveusb/creator.py:505 #, python-format msgid "Unable to remove file from previous LiveOS: %(message)s" -msgstr "" +msgstr "Kan ikkje fjerna fil frå fyrre LiveOS: %(message)s" #: ../liveusb/creator.py:1189 msgid "" "Unable to reset MBR. You may not have the `syslinux` package installed." -msgstr "" +msgstr "Kan ikkje nullstille MBR. Du hev kanskje ikkje `syslinux`-pakki installert." #: ../liveusb/gui.py:798 msgid "" "Unable to use the selected file. You may have better luck if you move your " "ISO to the root of your drive (ie: C:\\)" -msgstr "" +msgstr "Kan ikkje nytta den valde fili. Du hev kanskje betre hell um du flyttar ISO'en din åt roti av drevet ditt (t.d. C:\\)" #: ../liveusb/creator.py:723 #, python-format msgid "Unable to write on %(device)s, skipping." -msgstr "" +msgstr "Kan ikkje skriva på %(device)s, hoppar yver." #: ../liveusb/creator.py:399 msgid "Unknown ISO, skipping checksum verification" -msgstr "" +msgstr "Ukjend ISO, hoppar yver kontrollsumstadfestingi" #: ../liveusb/creator.py:810 #, python-format msgid "Unknown dbus exception while trying to mount device: %(message)s" -msgstr "" +msgstr "Ukjend dbus-unnatak under montering av einheiti: %(message)s" #: ../liveusb/creator.py:791 ../liveusb/creator.py:964 msgid "Unknown filesystem. Your device may need to be reformatted." -msgstr "" +msgstr "Ukjend filsystem. Det kan vera at einheiti di treng å verta formatert um." #: ../liveusb/gui.py:85 #, python-format @@ -497,46 +497,46 @@ msgstr "Ukjend versjon: %s" #: ../liveusb/creator.py:851 #, python-format msgid "Unmounting '%(udi)s' on '%(device)s'" -msgstr "" +msgstr "Avmonterer '%(udi)s' på '%(device)s'" #: ../liveusb/creator.py:847 #, python-format msgid "Unmounting mounted filesystems on '%(device)s'" -msgstr "" +msgstr "Avmonterer monterte filsystem på '%(device)s'" #: ../liveusb/creator.py:949 #, python-format msgid "Unsupported device '%(device)s', please report a bug." -msgstr "" +msgstr "Ustøtta einheit '%(device)s', ver venleg og meld inn eit insekt." #: ../liveusb/creator.py:794 ../liveusb/creator.py:967 #, python-format msgid "Unsupported filesystem: %s" -msgstr "" +msgstr "Ustøtta filsystem: %s" #: ../liveusb/creator.py:1287 #, python-format msgid "" "Unsupported filesystem: %s\n" "Please backup and format your USB key with the FAT filesystem." -msgstr "" +msgstr "Ustøtta filsystem: %s\nVer venleg og ta kopi av USB-lykelen din og formater han med FAT-filsystemet." #: ../liveusb/creator.py:892 #, python-format msgid "Updating properties of system partition %(system_partition)s" -msgstr "" +msgstr "Uppdaterer eigenskapar åt systeminndelingi: %(system_partition)s" #: ../liveusb/launcher_ui.py:156 msgid "" "Upgrade\n" "by cloning" -msgstr "" +msgstr "Uppgrader\nved kloning" #: ../liveusb/launcher_ui.py:158 msgid "" "Upgrade\n" "from ISO" -msgstr "" +msgstr "Uppgrader\nfrå ISO" #: ../liveusb/dialog.py:159 msgid "Use existing Live system ISO" @@ -548,39 +548,39 @@ msgstr "Stadfestar ISO MD5 kontrollsum" #: ../liveusb/creator.py:373 msgid "Verifying SHA1 checksum of LiveCD image..." -msgstr "" +msgstr "Stadfestar SHA1-kontrollsummen åt LiveCD-biletet..." #: ../liveusb/creator.py:377 msgid "Verifying SHA256 checksum of LiveCD image..." -msgstr "" +msgstr "Stadfestar SHA256-kontrollsummen åt LiveCD-biletet..." #: ../liveusb/creator.py:961 ../liveusb/creator.py:1280 msgid "Verifying filesystem..." -msgstr "" +msgstr "Stadfestar filsystem..." #: ../liveusb/gui.py:725 msgid "" "Warning: Creating a new persistent overlay will delete your existing one." -msgstr "" +msgstr "Åtvaring: Å skapa eit nytt vedvarande yverlegg vil slette det som finst." #: ../liveusb/gui.py:377 msgid "" "Warning: This tool needs to be run as an Administrator. To do this, right " "click on the icon and open the Properties. Under the Compatibility tab, " "check the \"Run this program as an administrator\" box." -msgstr "" +msgstr "Åtvaring: Dette verktyet treng å køyra som Administrator. For å gjera dette, høgreklikk på ikonet og opn Eigenskapar. Under Kompatibilitet-fanen, kryss av \"Køyr dette programmet som administrator\"-boksen." #: ../liveusb/creator.py:162 #, python-format msgid "Wrote to device at %(speed)d MB/sec" -msgstr "" +msgstr "Skreiv åt einheiti med %(speed)d MB/sec" #: ../liveusb/gui.py:699 #, python-format msgid "" "You are going to install Tails on the %(size)s %(vendor)s %(model)s device " "(%(device)s). All data on the selected device will be lost. Continue?" -msgstr "" +msgstr "Du kjem til å installera Tails på %(size)s %(vendor)s %(model)s-einheiti (%(device)s). Alle upplysingar på den valde einheiti vil gjenga tapt. Halda fram?" #: ../liveusb/gui.py:715 #, python-format @@ -588,13 +588,13 @@ msgid "" "You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s " "device (%(device)s). Any persistent volume on this device will remain " "unchanged. Continue?" -msgstr "" +msgstr "Du kjem til å uppgradera Tails på %(parent_size)s %(vendor)s %(model)s-einheiti (%(device)s). Eitkvart vedvarande volum på denne einheiti vil bli uendra. Halda fram?" #: ../liveusb/creator.py:622 msgid "" "You are using an old version of syslinux-extlinux that does not support the " "ext4 filesystem" -msgstr "" +msgstr "Du nyttar ein gamal versjon av syslinux-extlinux som ikkje støttar ext4-filsystemet" #: ../liveusb/gui.py:783 msgid "You can try again to resume your download" @@ -602,7 +602,7 @@ msgstr "Du kan prøva å halda fram med nedlastinga" #: ../liveusb/creator.py:95 msgid "You must run this application as root" -msgstr "" +msgstr "Du lyt køyra denne applikasjonen som rot" #: ../liveusb/dialog.py:162 msgid "or"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 25 Jun '16

25 Jun '16

commit d2292cd9c7e351b4d8ccbd134588c3b129228633 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 25 22:15:35 2016 +0000 Update translations for liveusb-creator --- nn/nn.po | 75 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 38 insertions(+), 37 deletions(-) diff --git a/nn/nn.po b/nn/nn.po index 7f0df4b..07b7e4e 100644 --- a/nn/nn.po +++ b/nn/nn.po @@ -4,13 +4,14 @@ # # Translators: # Bjørn I. <bjorn.svindseth(a)online.no>, 2014,2016 +# Finn Brudal <finnbrudal(a)yahoo.com>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-02 21:23+0100\n" -"PO-Revision-Date: 2016-03-21 16:31+0000\n" -"Last-Translator: Bjørn I. <bjorn.svindseth(a)online.no>\n" +"PO-Revision-Date: 2016-06-25 22:15+0000\n" +"Last-Translator: Finn Brudal <finnbrudal(a)yahoo.com>\n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/otf/torproject/language/nn/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -58,7 +59,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;\">\n" "<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Need help? Read the <a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a>.</p></body></html>" -msgstr "" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Treng du hjelp? Les <a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">dokumentasjonen</span></a>.</p></body></html>" #: ../liveusb/launcher_ui.py:155 msgid "" @@ -70,7 +71,7 @@ msgid "" "<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n" "\n" "</ul>" -msgstr "" +msgstr "<ul>\n<li>Installer Tails på ei onnor USB-pinna ved å kopiera Tails-systemet som du nyttar no.</li>\n\n<li>USB-pinni som du installerer på formaterest og alle upplysingar gjeng tapt.</li>\n\n<li>Det krypterte vedvarande lagaret åt Tails-USB-pinni som du nyttar no vert ikkje kopiert.</li>\n\n</ul>" #: ../liveusb/launcher_ui.py:157 msgid "" @@ -83,7 +84,7 @@ msgid "" "\n" "\n" "</ul>" -msgstr "" +msgstr "<ul>\n<li>Uppgrader ei onnor Tails-USB-pinna åt same versjon av Tails som du nyttar no.</li>\n\n<li>Det krypterte vedvarande lageret på Tails-USB-pinni du uppgraderer vert forvart.</li>\n\n<li>Det krypterte vedvarande lageret på Tails-USB-pinni du nyttar no vert ikkje kopiert.</li>\n\n\n</ul>" #: ../liveusb/launcher_ui.py:159 msgid "" @@ -95,7 +96,7 @@ msgid "" "<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n" "\n" "</ul>" -msgstr "" +msgstr "<ul>\n<li>Uppgrader ei onnor Tails-USB-pinna åt versjonen av eit ISO-bilete.</li>\n\n<li>Det krypterte vedvarande lageret på Tails-USB-pinni du uppgraderer vert forvart.</li>\n\n<li>Det krypterte vedvarande lageret på Tails-USB-pinni du nyttar no vert ikkje kopiert.</li>\n\n</ul>" #: ../liveusb/dialog.py:161 msgid "Alt+B" @@ -111,12 +112,12 @@ msgid "" "will be able to store data and make permanent modifications to your live " "operating system. Without it, you will not be able to save data that will " "persist after a reboot." -msgstr "" +msgstr "Ved å åtdela yttarlegare plass på USB-pinni di for eit vedvarande yverlegg, vil du kunna lagra upplysingar og gjere vedvarande endringar på ditt køyrande operativsystem. Utan dette vil du ikkje kunna lagra upplysingar som vil vedvara etter umstart." #: ../liveusb/creator.py:1196 ../liveusb/creator.py:1459 #, python-format msgid "Calculating the SHA1 of %s" -msgstr "" +msgstr "Reknar ut SHA1'en av %s" #: ../liveusb/creator.py:1407 msgid "Cannot find" @@ -130,12 +131,12 @@ msgstr "Finn ikkje eininga %s" #: ../liveusb/creator.py:417 #, python-format msgid "Creating %sMB persistent overlay" -msgstr "" +msgstr "Skapar %sMB vedvarande yverlegg" #: ../liveusb/gui.py:582 msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." -msgstr "" +msgstr "Einheiten er ikkje enno montert, so me kan ikkje avgjere mengden fri lagringsplass." #: ../liveusb/dialog.py:164 #, python-format @@ -157,41 +158,41 @@ msgstr "Lastar ned %s " #: ../liveusb/creator.py:1192 msgid "Drive is a loopback, skipping MBR reset" -msgstr "" +msgstr "Drevet er ei attendekopling, hoppar yver MBR-nullstilling" #: ../liveusb/creator.py:837 #, python-format msgid "Entering unmount_device for '%(device)s'" -msgstr "" +msgstr "Gjeng inn i unmount_device for '%(device)s'" #: ../liveusb/creator.py:1272 msgid "Error probing device" -msgstr "" +msgstr "Feil ved sondering av einheit" #: ../liveusb/gui.py:213 msgid "" "Error: Cannot set the label or obtain the UUID of your device. Unable to " "continue." -msgstr "" +msgstr "Feil: Kan ikkje setja etiketten eller fenge UUID'en åt einheita di. Kan ikkje halda fram." #: ../liveusb/creator.py:393 msgid "" "Error: The SHA1 of your Live CD is invalid. You can run this program with " "the --noverify argument to bypass this verification check." -msgstr "" +msgstr "Feil: SHA1'en åt Live-CD'en din er ugyldig. Du kan køyra dette programmet med --noverify-parameteren for å hoppa yver denne stadfestingskontrollen." #: ../liveusb/creator.py:155 msgid "Extracting live image to the target device..." -msgstr "" +msgstr "Dreg ut live-bilete åt måleinheita..." #: ../liveusb/creator.py:1140 #, python-format msgid "Formatting %(device)s as FAT32" -msgstr "" +msgstr "Formaterer %(device)s som FAT32" #: ../liveusb/creator.py:150 msgid "ISO MD5 checksum passed" -msgstr "" +msgstr "ISO-MD5-kontrollsum passerte" #: ../liveusb/creator.py:148 msgid "ISO MD5 checksum verification failed" @@ -201,21 +202,21 @@ msgstr "Mislukka ISO MD5 kontrollsumstadfesting" msgid "" "If you do not select an existing Live ISO, the selected release will be " "downloaded for you." -msgstr "" +msgstr "Um du ikkje vel ein Live-ISO som finst, vil den valde utgåva verte lasta ned for deg." #: ../liveusb/launcher_ui.py:154 msgid "" "Install\n" "by cloning" -msgstr "" +msgstr "Installer\nved å klona" #: ../liveusb/dialog.py:172 msgid "Install Tails" -msgstr "" +msgstr "Installer Tails" #: ../liveusb/gui.py:645 msgid "Installation complete!" -msgstr "" +msgstr "Installering fullførd" #: ../liveusb/gui.py:265 #, python-format @@ -224,11 +225,11 @@ msgstr "Installasjonen er fullført! (%s)" #: ../liveusb/gui.py:646 msgid "Installation was completed. Press OK to close this program." -msgstr "" +msgstr "Installering vart fullendt. Trykk OK for å lukka dette programmet." #: ../liveusb/creator.py:990 ../liveusb/creator.py:1313 msgid "Installing bootloader..." -msgstr "" +msgstr "Installerer støvellastar..." #: ../liveusb/gui.py:454 #, python-format @@ -236,7 +237,7 @@ msgid "" "It is impossible to upgrade the device %(pretty_name)s because it was not " "created using Tails Installer. You should instead use %(action)s to upgrade " "Tails on this device." -msgstr "" +msgstr "Det er umogleg å uppgradere einheita %(pretty_name)s av di ho ikkje vart skapa ved hjelp av Tails-installatøren. Du burde i staden nytta %(action)s for å uppgradere Tails på denne einheita." #: ../liveusb/gui.py:270 msgid "LiveUSB creation failed!" @@ -246,17 +247,17 @@ msgstr "Laging av LiveUSB mislukkast!" msgid "" "Make sure to extract the entire liveusb-creator zip file before running this" " program." -msgstr "" +msgstr "Sjå til å draga ut heile liveusb-creator-zipfili fyre du køyrar dette programmet." #: ../liveusb/creator.py:1284 msgid "" "Make sure your USB key is plugged in and formatted with the FAT filesystem" -msgstr "" +msgstr "Sjå til at USB-lykelen din er plugga inn og formatert med FAT-filsystemet" #: ../liveusb/creator.py:859 #, python-format msgid "Mount %s exists after unmounting" -msgstr "" +msgstr "Montering %s finst etter avmontering" #: ../liveusb/gui.py:588 #, python-format @@ -272,32 +273,32 @@ msgstr "Fann ingen monteringspunkt" msgid "" "Not enough free space on device.\n" "%dMB ISO + %dMB overlay > %dMB free space" -msgstr "" +msgstr "Ikkje nok ledug plass på einheita.\n%dMB ISO + %dMB yverlegg > %dMB ledug plass" #: ../liveusb/gui.py:569 msgid "Partition is FAT16; Restricting overlay size to 2G" -msgstr "" +msgstr "Inndeling er FAT16; avgrensar yverleggstorleik åt 2G" #: ../liveusb/gui.py:565 msgid "Partition is FAT32; Restricting overlay size to 4G" -msgstr "" +msgstr "Inndeling er FAT32; avgrenar yverleggstorleik åt 4G" #: ../liveusb/creator.py:236 ../liveusb/creator.py:866 #, python-format msgid "Partitioning device %(device)s" -msgstr "" +msgstr "Delar inn einheit %(device)s" #: ../liveusb/gui.py:636 msgid "Persistent Storage" -msgstr "" +msgstr "Vedvarande lager" #: ../liveusb/dialog.py:168 msgid "Persistent Storage (0 MB)" -msgstr "" +msgstr "Vedvarande lager (0 MB)" #: ../liveusb/gui.py:698 ../liveusb/gui.py:727 msgid "Please confirm your device selection" -msgstr "" +msgstr "Ver venleg og godtak einheitsvalet ditt" #: ../liveusb/gui.py:481 msgid "Refreshing releases..." @@ -310,11 +311,11 @@ msgstr "Versjonane oppdaterte!" #: ../liveusb/creator.py:997 ../liveusb/creator.py:1331 #, python-format msgid "Removing %(file)s" -msgstr "" +msgstr "Fjernar %(file)s" #: ../liveusb/creator.py:492 msgid "Removing existing Live OS" -msgstr "" +msgstr "Fjernar verande Live-OS" #: ../liveusb/creator.py:1186 #, python-format

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 25 Jun '16

25 Jun '16

commit 19160bf38e0aea364dc11d95ad010610a3b42f96 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 25 20:46:26 2016 +0000 Update translations for tails-misc_completed --- pl.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pl.po b/pl.po index 5a78d97..d412efc 100644 --- a/pl.po +++ b/pl.po @@ -17,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-25 20:25+0200\n" -"PO-Revision-Date: 2016-05-27 10:12+0000\n" +"POT-Creation-Date: 2016-06-06 14:26+0200\n" +"PO-Revision-Date: 2016-06-25 20:16+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Polish (http://www.transifex.com/otf/torproject/language/pl/)\n" "MIME-Version: 1.0\n"

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2016