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

[arm/master] Standardizing help and key input panel methods
by atagar＠torproject.org 07 Oct '14

07 Oct '14

commit 38a3189f240ed6151c1c7b414a02ee3898a2a3eb Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 5 16:37:25 2014 -0700 Standardizing help and key input panel methods Few minor bits of standarization... * use the 'with' keyword for locking * use 'in' for evaluating againt multiple key inputs * drop the 'key_consumed' variable * return a list in the help function rather than repeatedly calling append() --- arm/config_panel.py | 143 ++++++++++++++++++++--------------------- arm/connections/conn_panel.py | 132 ++++++++++++++++++------------------- arm/controller.py | 10 +-- arm/graphing/graph_panel.py | 31 ++++----- arm/header_panel.py | 6 +- arm/log_panel.py | 32 +++++---- arm/torrc_panel.py | 56 ++++++++-------- 7 files changed, 192 insertions(+), 218 deletions(-) diff --git a/arm/config_panel.py b/arm/config_panel.py index c2dac4b..637b354 100644 --- a/arm/config_panel.py +++ b/arm/config_panel.py @@ -360,81 +360,74 @@ class ConfigPanel(panel.Panel): self.set_sort_order(result_enums) def handle_key(self, key): - self.vals_lock.acquire() - is_keystroke_consumed = True + with self.vals_lock: + if ui_tools.is_scroll_key(key): + page_height = self.get_preferred_size()[0] - 1 + detail_panel_height = CONFIG["features.config.selectionDetails.height"] - if ui_tools.is_scroll_key(key): - page_height = self.get_preferred_size()[0] - 1 - detail_panel_height = CONFIG["features.config.selectionDetails.height"] + if detail_panel_height > 0 and detail_panel_height + 2 <= page_height: + page_height -= (detail_panel_height + 1) - if detail_panel_height > 0 and detail_panel_height + 2 <= page_height: - page_height -= (detail_panel_height + 1) + is_changed = self.scroller.handle_key(key, self._get_config_options(), page_height) - is_changed = self.scroller.handle_key(key, self._get_config_options(), page_height) + if is_changed: + self.redraw(True) + elif ui_tools.is_selection_key(key) and self._get_config_options(): + # Prompts the user to edit the selected configuration value. The + # interface is locked to prevent updates between setting the value + # and showing any errors. - if is_changed: - self.redraw(True) - elif ui_tools.is_selection_key(key) and self._get_config_options(): - # Prompts the user to edit the selected configuration value. The - # interface is locked to prevent updates between setting the value - # and showing any errors. + with panel.CURSES_LOCK: + selection = self.get_selection() + config_option = selection.get(Field.OPTION) - panel.CURSES_LOCK.acquire() + if selection.is_unset(): + initial_value = "" + else: + initial_value = selection.get(Field.VALUE) - try: - selection = self.get_selection() - config_option = selection.get(Field.OPTION) + prompt_msg = "%s Value (esc to cancel): " % config_option + is_prepopulated = CONFIG["features.config.prepopulateEditValues"] + new_value = popups.input_prompt(prompt_msg, initial_value if is_prepopulated else "") - if selection.is_unset(): - initial_value = "" - else: - initial_value = selection.get(Field.VALUE) + if new_value is not None and new_value != initial_value: + try: + if selection.get(Field.TYPE) == "Boolean": + # if the value's a boolean then allow for 'true' and 'false' inputs - prompt_msg = "%s Value (esc to cancel): " % config_option - is_prepopulated = CONFIG["features.config.prepopulateEditValues"] - new_value = popups.input_prompt(prompt_msg, initial_value if is_prepopulated else "") + if new_value.lower() == "true": + new_value = "1" + elif new_value.lower() == "false": + new_value = "0" + elif selection.get(Field.TYPE) == "LineList": + # set_option accepts list inputs when there's multiple values + new_value = new_value.split(",") - if new_value is not None and new_value != initial_value: - try: - if selection.get(Field.TYPE) == "Boolean": - # if the value's a boolean then allow for 'true' and 'false' inputs - - if new_value.lower() == "true": - new_value = "1" - elif new_value.lower() == "false": - new_value = "0" - elif selection.get(Field.TYPE) == "LineList": - # set_option accepts list inputs when there's multiple values - new_value = new_value.split(",") - - tor_controller().set_conf(config_option, new_value) - - # forces the label to be remade with the new value - - selection.label_cache = None - - # resets the is_default flag - - custom_options = tor_config.get_custom_options() - selection.fields[Field.IS_DEFAULT] = config_option not in custom_options - - self.redraw(True) - except Exception as exc: - popups.show_msg("%s (press any key)" % exc) - finally: - panel.CURSES_LOCK.release() - elif key == ord('a') or key == ord('A'): - self.show_all = not self.show_all - self.redraw(True) - elif key == ord('s') or key == ord('S'): - self.show_sort_dialog() - elif key == ord('v') or key == ord('V'): - self.show_write_dialog() - else: - is_keystroke_consumed = False + tor_controller().set_conf(config_option, new_value) - self.vals_lock.release() - return is_keystroke_consumed + # forces the label to be remade with the new value + + selection.label_cache = None + + # resets the is_default flag + + custom_options = tor_config.get_custom_options() + selection.fields[Field.IS_DEFAULT] = config_option not in custom_options + + self.redraw(True) + except Exception as exc: + popups.show_msg("%s (press any key)" % exc) + elif key in (ord('a'), ord('A')): + self.show_all = not self.show_all + self.redraw(True) + elif key in (ord('s'), ord('S')): + self.show_sort_dialog() + elif key in (ord('v'), ord('V')): + self.show_write_dialog() + else: + return False + + return True def show_write_dialog(self): """ @@ -566,16 +559,16 @@ class ConfigPanel(panel.Panel): popups.finalize() def get_help(self): - options = [] - options.append(("up arrow", "scroll up a line", None)) - options.append(("down arrow", "scroll down a line", None)) - options.append(("page up", "scroll up a page", None)) - options.append(("page down", "scroll down a page", None)) - options.append(("enter", "edit configuration option", None)) - options.append(("v", "save configuration", None)) - options.append(("a", "toggle option filtering", None)) - options.append(("s", "sort ordering", None)) - return options + return [ + ('up arrow', 'scroll up a line', None), + ('down arrow', 'scroll down a line', None), + ('page up', 'scroll up a page', None), + ('page down', 'scroll down a page', None), + ('enter', 'edit configuration option', None), + ('v', 'save configuration', None), + ('a', 'toggle option filtering', None), + ('s', 'sort ordering', None), + ] def draw(self, width, height): self.vals_lock.acquire() diff --git a/arm/connections/conn_panel.py b/arm/connections/conn_panel.py index 8168572..57c64f5 100644 --- a/arm/connections/conn_panel.py +++ b/arm/connections/conn_panel.py @@ -261,75 +261,71 @@ class ConnectionPanel(panel.Panel, threading.Thread): self.set_sort_order(results) def handle_key(self, key): - self.vals_lock.acquire() + with self.vals_lock: + if ui_tools.is_scroll_key(key): + page_height = self.get_preferred_size()[0] - 1 - is_keystroke_consumed = True + if self._show_details: + page_height -= (DETAILS_HEIGHT + 1) - if ui_tools.is_scroll_key(key): - page_height = self.get_preferred_size()[0] - 1 + is_changed = self._scroller.handle_key(key, self._entry_lines, page_height) - if self._show_details: - page_height -= (DETAILS_HEIGHT + 1) + if is_changed: + self.redraw(True) + elif ui_tools.is_selection_key(key): + self._show_details = not self._show_details + self.redraw(True) + elif key in (ord('s'), ord('S')): + self.show_sort_dialog() + elif key in (ord('u'), ord('U')): + # provides a menu to pick the connection resolver - is_changed = self._scroller.handle_key(key, self._entry_lines, page_height) + title = "Resolver Util:" + options = ["auto"] + list(connection.Resolver) + conn_resolver = arm.util.tracker.get_connection_tracker() - if is_changed: - self.redraw(True) - elif ui_tools.is_selection_key(key): - self._show_details = not self._show_details - self.redraw(True) - elif key == ord('s') or key == ord('S'): - self.show_sort_dialog() - elif key == ord('u') or key == ord('U'): - # provides a menu to pick the connection resolver - - title = "Resolver Util:" - options = ["auto"] + list(connection.Resolver) - conn_resolver = arm.util.tracker.get_connection_tracker() - - current_overwrite = conn_resolver.get_custom_resolver() - - if current_overwrite is None: - old_selection = 0 - else: - old_selection = options.index(current_overwrite) + current_overwrite = conn_resolver.get_custom_resolver() - selection = arm.popups.show_menu(title, options, old_selection) + if current_overwrite is None: + old_selection = 0 + else: + old_selection = options.index(current_overwrite) - # applies new setting + selection = arm.popups.show_menu(title, options, old_selection) - if selection != -1: - selected_option = options[selection] if selection != 0 else None - conn_resolver.set_custom_resolver(selected_option) - elif key == ord('l') or key == ord('L'): - # provides a menu to pick the primary information we list connections by + # applies new setting - title = "List By:" - options = list(entries.ListingType) + if selection != -1: + selected_option = options[selection] if selection != 0 else None + conn_resolver.set_custom_resolver(selected_option) + elif key in (ord('l'), ord('L')): + # provides a menu to pick the primary information we list connections by - # dropping the HOSTNAME listing type until we support displaying that content + title = "List By:" + options = list(entries.ListingType) - options.remove(arm.connections.entries.ListingType.HOSTNAME) + # dropping the HOSTNAME listing type until we support displaying that content - old_selection = options.index(self.get_listing_type()) - selection = arm.popups.show_menu(title, options, old_selection) + options.remove(arm.connections.entries.ListingType.HOSTNAME) - # applies new setting + old_selection = options.index(self.get_listing_type()) + selection = arm.popups.show_menu(title, options, old_selection) - if selection != -1: - self.set_listing_type(options[selection]) - elif key == ord('d') or key == ord('D'): - # presents popup for raw consensus data - descriptor_popup.show_descriptor_popup(self) - elif (key == ord('c') or key == ord('C')) and self.is_clients_allowed(): - count_popup.showCountDialog(count_popup.CountType.CLIENT_LOCALE, self._client_locale_usage) - elif (key == ord('e') or key == ord('E')) and self.is_exits_allowed(): - count_popup.showCountDialog(count_popup.CountType.EXIT_PORT, self._exit_port_usage) - else: - is_keystroke_consumed = False + # applies new setting - self.vals_lock.release() - return is_keystroke_consumed + if selection != -1: + self.set_listing_type(options[selection]) + elif key in (ord('d'), ord('D')): + # presents popup for raw consensus data + descriptor_popup.show_descriptor_popup(self) + elif key in (ord('c'), ord('C')) and self.is_clients_allowed(): + count_popup.showCountDialog(count_popup.CountType.CLIENT_LOCALE, self._client_locale_usage) + elif key in (ord('e'), ord('E')) and self.is_exits_allowed(): + count_popup.showCountDialog(count_popup.CountType.EXIT_PORT, self._exit_port_usage) + else: + return False + + return True def run(self): """ @@ -373,26 +369,24 @@ class ConnectionPanel(panel.Panel, threading.Thread): def get_help(self): resolver_util = arm.util.tracker.get_connection_tracker().get_custom_resolver() - if resolver_util is None: - resolver_util = "auto" - - options = [] - options.append(("up arrow", "scroll up a line", None)) - options.append(("down arrow", "scroll down a line", None)) - options.append(("page up", "scroll up a page", None)) - options.append(("page down", "scroll down a page", None)) - options.append(("enter", "show connection details", None)) - options.append(("d", "raw consensus descriptor", None)) + options = [ + ('up arrow', 'scroll up a line', None), + ('down arrow', 'scroll down a line', None), + ('page up', 'scroll up a page', None), + ('page down', 'scroll down a page', None), + ('enter', 'show connection details', None), + ('d', 'raw consensus descriptor', None), + ] if self.is_clients_allowed(): - options.append(("c", "client locale usage summary", None)) + options.append(('c', 'client locale usage summary', None)) if self.is_exits_allowed(): - options.append(("e", "exit port usage summary", None)) + options.append(('e', 'exit port usage summary', None)) - options.append(("l", "listed identity", self.get_listing_type().lower())) - options.append(("s", "sort ordering", None)) - options.append(("u", "resolving utility", resolver_util)) + options.append(('l', 'listed identity', self.get_listing_type().lower())) + options.append(('s', 'sort ordering', None)) + options.append(('u', 'resolving utility', 'auto' if resolver_util is None else resolver_util)) return options def get_selection(self): diff --git a/arm/controller.py b/arm/controller.py index cb0cf3e..09f0f83 100644 --- a/arm/controller.py +++ b/arm/controller.py @@ -658,11 +658,11 @@ def start_arm(stdscr): control.next_page() elif key == curses.KEY_LEFT: control.prev_page() - elif key == ord('p') or key == ord('P'): + elif key in (ord('p'), ord('P')): control.set_paused(not control.is_paused()) - elif key == ord('m') or key == ord('M'): + elif key in (ord('m'), ord('M')): arm.menu.menu.show_menu() - elif key == ord('q') or key == ord('Q'): + elif key in (ord('q'), ord('Q')): # provides prompt to confirm that arm should exit if CONFIG["features.confirmQuit"]: @@ -674,7 +674,7 @@ def start_arm(stdscr): if quit_confirmed: control.quit() - elif key == ord('x') or key == ord('X'): + elif key in (ord('x'), ord('X')): # provides prompt to confirm that arm should issue a sighup msg = "This will reset Tor's internal state. Are you sure (x again to confirm)?" @@ -685,7 +685,7 @@ def start_arm(stdscr): tor_controller().signal(stem.Signal.RELOAD) except IOError as exc: log.error("Error detected when reloading tor: %s" % exc.strerror) - elif key == ord('h') or key == ord('H'): + elif key in (ord('h'), ord('H')): override_key = arm.popups.show_help_popup() elif key == ord('l') - 96: # force redraw when ctrl+l is pressed diff --git a/arm/graphing/graph_panel.py b/arm/graphing/graph_panel.py index fc7f7cf..68328b8 100644 --- a/arm/graphing/graph_panel.py +++ b/arm/graphing/graph_panel.py @@ -344,15 +344,13 @@ class GraphPanel(panel.Panel): panel.CURSES_LOCK.release() def handle_key(self, key): - is_keystroke_consumed = True - - if key == ord('r') or key == ord('R'): + if key in (ord('r'), ord('R')): self.resize_graph() - elif key == ord('b') or key == ord('B'): + elif key in (ord('b'), ord('B')): # uses the next boundary type self.bounds = Bounds.next(self.bounds) self.redraw(True) - elif key == ord('s') or key == ord('S'): + elif key in (ord('s'), ord('S')): # provides a menu to pick the graphed stats available_stats = self.stats.keys() @@ -379,7 +377,7 @@ class GraphPanel(panel.Panel): self.set_stats(None) elif selection != -1: self.set_stats(available_stats[selection - 1]) - elif key == ord('i') or key == ord('I'): + elif key in (ord('i'), ord('I')): # provides menu to pick graph panel update interval options = [label for (label, _) in UPDATE_INTERVALS] @@ -388,22 +386,17 @@ class GraphPanel(panel.Panel): if selection != -1: self.update_interval = selection else: - is_keystroke_consumed = False + return False - return is_keystroke_consumed + return True def get_help(self): - if self.current_display: - graphed_stats = self.current_display - else: - graphed_stats = 'none' - - options = [] - options.append(('r', 'resize graph', None)) - options.append(('s', 'graphed stats', graphed_stats)) - options.append(('b', 'graph bounds', self.bounds.lower())) - options.append(('i', 'graph update interval', UPDATE_INTERVALS[self.update_interval][0])) - return options + return [ + ('r', 'resize graph', None), + ('s', 'graphed stats', self.current_display if self.current_display else 'none'), + ('b', 'graph bounds', self.bounds.lower()), + ('i', 'graph update interval', UPDATE_INTERVALS[self.update_interval][0]), + ] def draw(self, width, height): """ Redraws graph panel """ diff --git a/arm/header_panel.py b/arm/header_panel.py index 9b8ecd2..5278ca1 100644 --- a/arm/header_panel.py +++ b/arm/header_panel.py @@ -87,8 +87,6 @@ class HeaderPanel(panel.Panel, threading.Thread): arm.popups.show_msg('Requesting a new identity', 1) def handle_key(self, key): - is_keystroke_consumed = True - if key in (ord('n'), ord('N')): self.send_newnym() elif key in (ord('r'), ord('R')) and not self._vals.is_connected: @@ -120,9 +118,9 @@ class HeaderPanel(panel.Panel, threading.Thread): arm.popups.show_msg('Unable to reconnect (%s)' % exc, 3) controller.close() else: - is_keystroke_consumed = False + return False - return is_keystroke_consumed + return True def draw(self, width, height): vals = self._vals # local reference to avoid concurrency concerns diff --git a/arm/log_panel.py b/arm/log_panel.py index 6f5087b..e78ecc7 100644 --- a/arm/log_panel.py +++ b/arm/log_panel.py @@ -863,8 +863,6 @@ class LogPanel(panel.Panel, threading.Thread, logging.Handler): raise exc def handle_key(self, key): - is_keystroke_consumed = True - if ui_tools.is_scroll_key(key): page_height = self.get_preferred_size()[0] - 1 new_scroll = ui_tools.get_scroll_position(key, self.scroll, page_height, self.last_content_height) @@ -879,13 +877,13 @@ class LogPanel(panel.Panel, threading.Thread, logging.Handler): self.set_duplicate_visability(not CONFIG["features.log.showDuplicateEntries"]) self.redraw(True) self.vals_lock.release() - elif key == ord('c') or key == ord('C'): + elif key in (ord('c'), ord('C')): msg = "This will clear the log. Are you sure (c again to confirm)?" key_press = arm.popups.show_msg(msg, attr = curses.A_BOLD) if key_press in (ord('c'), ord('C')): self.clear() - elif key == ord('f') or key == ord('F'): + elif key in (ord('f'), ord('F')): # Provides menu to pick regular expression filters or adding new ones: # for syntax see: http://docs.python.org/library/re.html#regular-expression-syntax @@ -914,25 +912,25 @@ class LogPanel(panel.Panel, threading.Thread, logging.Handler): if len(self.filter_options) > MAX_REGEX_FILTERS: del self.filter_options[MAX_REGEX_FILTERS:] - elif key == ord('e') or key == ord('E'): + elif key in (ord('e'), ord('E')): self.show_event_selection_prompt() - elif key == ord('a') or key == ord('A'): + elif key in (ord('a'), ord('A')): self.show_snapshot_prompt() else: - is_keystroke_consumed = False + return False - return is_keystroke_consumed + return True def get_help(self): - options = [] - options.append(("up arrow", "scroll log up a line", None)) - options.append(("down arrow", "scroll log down a line", None)) - options.append(("a", "save snapshot of the log", None)) - options.append(("e", "change logged events", None)) - options.append(("f", "log regex filter", "enabled" if self.regex_filter else "disabled")) - options.append(("u", "duplicate log entries", "visible" if CONFIG["features.log.showDuplicateEntries"] else "hidden")) - options.append(("c", "clear event log", None)) - return options + return [ + ('up arrow', 'scroll log up a line', None), + ('down arrow', 'scroll log down a line', None), + ('a', 'save snapshot of the log', None), + ('e', 'change logged events', None), + ('f', 'log regex filter', 'enabled' if self.regex_filter else 'disabled'), + ('u', 'duplicate log entries', 'visible' if CONFIG['features.log.showDuplicateEntries'] else 'hidden'), + ('c', 'clear event log', None), + ] def draw(self, width, height): """ diff --git a/arm/torrc_panel.py b/arm/torrc_panel.py index 6dfaf17..2a3fb23 100644 --- a/arm/torrc_panel.py +++ b/arm/torrc_panel.py @@ -122,26 +122,24 @@ class TorrcPanel(panel.Panel): arm.popups.show_msg(result_msg, 1) def handle_key(self, key): - self.vals_lock.acquire() - is_keystroke_consumed = True - if ui_tools.is_scroll_key(key): - page_height = self.get_preferred_size()[0] - 1 - new_scroll = ui_tools.get_scroll_position(key, self.scroll, page_height, self._last_content_height) - - if self.scroll != new_scroll: - self.scroll = new_scroll - self.redraw(True) - elif key == ord('n') or key == ord('N'): - self.set_line_number_visible(not self.show_line_num) - elif key == ord('s') or key == ord('S'): - self.set_comments_visible(self.strip_comments) - elif key == ord('r') or key == ord('R'): - self.reload_torrc() - else: - is_keystroke_consumed = False + with self.vals_lock: + if ui_tools.is_scroll_key(key): + page_height = self.get_preferred_size()[0] - 1 + new_scroll = ui_tools.get_scroll_position(key, self.scroll, page_height, self._last_content_height) + + if self.scroll != new_scroll: + self.scroll = new_scroll + self.redraw(True) + elif key in (ord('n'), ord('N')): + self.set_line_number_visible(not self.show_line_num) + elif key in (ord('s'), ord('S')): + self.set_comments_visible(self.strip_comments) + elif key in (ord('r'), ord('R')): + self.reload_torrc() + else: + return False - self.vals_lock.release() - return is_keystroke_consumed + return True def set_visible(self, is_visible): if not is_visible: @@ -150,16 +148,16 @@ class TorrcPanel(panel.Panel): panel.Panel.set_visible(self, is_visible) def get_help(self): - options = [] - options.append(("up arrow", "scroll up a line", None)) - options.append(("down arrow", "scroll down a line", None)) - options.append(("page up", "scroll up a page", None)) - options.append(("page down", "scroll down a page", None)) - options.append(("s", "comment stripping", "on" if self.strip_comments else "off")) - options.append(("n", "line numbering", "on" if self.show_line_num else "off")) - options.append(("r", "reload torrc", None)) - options.append(("x", "reset tor (issue sighup)", None)) - return options + return [ + ('up arrow', 'scroll up a line', None), + ('down arrow', 'scroll down a line', None), + ('page up', 'scroll up a page', None), + ('page down', 'scroll down a page', None), + ('s', 'comment stripping', 'on' if self.strip_comments else 'off'), + ('n', 'line numbering', 'on' if self.show_line_num else 'off'), + ('r', 'reload torrc', None), + ('x', 'reset tor (issue sighup)', None), + ] def draw(self, width, height): self.vals_lock.acquire()

1 0

[arm/master] Replacing key integer codes with KeyInput class
by atagar＠torproject.org 07 Oct '14

07 Oct '14

commit 7847a7521ba3423db2ac070bf8c52f145e7ac9b3 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Oct 7 09:51:51 2014 -0700 Replacing key integer codes with KeyInput class Curses' getch() method returns an integer code for the pressed key. This is well and good, but needed both ui_tools helper functions and a lotta checks like... if key in (ord('s'), ord('S')): Wrapping user input with a KeyInput class that both makes this nicer... if key.match('s'): ... and includes the ui_tools helpers. --- arm/config_panel.py | 22 +++++++------ arm/connections/conn_panel.py | 16 +++++----- arm/connections/count_popup.py | 2 +- arm/connections/descriptor_popup.py | 10 +++--- arm/controller.py | 25 +++++++++------ arm/graphing/graph_panel.py | 54 +++++++++++++++---------------- arm/header_panel.py | 4 +-- arm/log_panel.py | 14 ++++---- arm/menu/menu.py | 17 ++++------ arm/popups.py | 60 +++++++++++++++++------------------ arm/torrc_panel.py | 8 ++--- arm/util/panel.py | 56 ++++++++++++++++++++++++++++++++ arm/util/ui_tools.py | 39 ++++------------------- 13 files changed, 181 insertions(+), 146 deletions(-) diff --git a/arm/config_panel.py b/arm/config_panel.py index 637b354..dbae8de 100644 --- a/arm/config_panel.py +++ b/arm/config_panel.py @@ -361,7 +361,7 @@ class ConfigPanel(panel.Panel): def handle_key(self, key): with self.vals_lock: - if ui_tools.is_scroll_key(key): + if key.is_scroll(): page_height = self.get_preferred_size()[0] - 1 detail_panel_height = CONFIG["features.config.selectionDetails.height"] @@ -372,7 +372,7 @@ class ConfigPanel(panel.Panel): if is_changed: self.redraw(True) - elif ui_tools.is_selection_key(key) and self._get_config_options(): + elif key.is_selection() and self._get_config_options(): # Prompts the user to edit the selected configuration value. The # interface is locked to prevent updates between setting the value # and showing any errors. @@ -417,12 +417,12 @@ class ConfigPanel(panel.Panel): self.redraw(True) except Exception as exc: popups.show_msg("%s (press any key)" % exc) - elif key in (ord('a'), ord('A')): + elif key.match('a'): self.show_all = not self.show_all self.redraw(True) - elif key in (ord('s'), ord('S')): + elif key.match('s'): self.show_sort_dialog() - elif key in (ord('v'), ord('V')): + elif key.match('v'): self.show_write_dialog() else: return False @@ -468,9 +468,9 @@ class ConfigPanel(panel.Panel): height = new_height is_option_line_separate = True - key, selection = 0, 2 + selection = 2 - while not ui_tools.is_selection_key(key): + while True: # if the popup has been resized then recreate it (needed for the # proper border height) @@ -525,12 +525,14 @@ class ConfigPanel(panel.Panel): popup.win.refresh() - key = arm.controller.get_controller().get_screen().getch() + key = arm.controller.get_controller().key_input() - if key == curses.KEY_LEFT: + if key.match('left'): selection = max(0, selection - 1) - elif key == curses.KEY_RIGHT: + elif key.match('right'): selection = min(len(selection_options) - 1, selection + 1) + elif key.is_selection(): + break if selection in (0, 1): loaded_torrc, prompt_canceled = tor_config.get_torrc(), False diff --git a/arm/connections/conn_panel.py b/arm/connections/conn_panel.py index 57c64f5..76b2807 100644 --- a/arm/connections/conn_panel.py +++ b/arm/connections/conn_panel.py @@ -262,7 +262,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): def handle_key(self, key): with self.vals_lock: - if ui_tools.is_scroll_key(key): + if key.is_scroll(): page_height = self.get_preferred_size()[0] - 1 if self._show_details: @@ -272,12 +272,12 @@ class ConnectionPanel(panel.Panel, threading.Thread): if is_changed: self.redraw(True) - elif ui_tools.is_selection_key(key): + elif key.is_selection(): self._show_details = not self._show_details self.redraw(True) - elif key in (ord('s'), ord('S')): + elif key.match('s'): self.show_sort_dialog() - elif key in (ord('u'), ord('U')): + elif key.match('u'): # provides a menu to pick the connection resolver title = "Resolver Util:" @@ -298,7 +298,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): if selection != -1: selected_option = options[selection] if selection != 0 else None conn_resolver.set_custom_resolver(selected_option) - elif key in (ord('l'), ord('L')): + elif key.match('l'): # provides a menu to pick the primary information we list connections by title = "List By:" @@ -315,12 +315,12 @@ class ConnectionPanel(panel.Panel, threading.Thread): if selection != -1: self.set_listing_type(options[selection]) - elif key in (ord('d'), ord('D')): + elif key.match('d'): # presents popup for raw consensus data descriptor_popup.show_descriptor_popup(self) - elif key in (ord('c'), ord('C')) and self.is_clients_allowed(): + elif key.match('c') and self.is_clients_allowed(): count_popup.showCountDialog(count_popup.CountType.CLIENT_LOCALE, self._client_locale_usage) - elif key in (ord('e'), ord('E')) and self.is_exits_allowed(): + elif key.match('e') and self.is_exits_allowed(): count_popup.showCountDialog(count_popup.CountType.EXIT_PORT, self._exit_port_usage) else: return False diff --git a/arm/connections/count_popup.py b/arm/connections/count_popup.py index 4decf46..1e22870 100644 --- a/arm/connections/count_popup.py +++ b/arm/connections/count_popup.py @@ -106,6 +106,6 @@ def showCountDialog(count_type, counts): popup.win.refresh() curses.cbreak() - control.get_screen().getch() + control.key_input() finally: arm.popups.finalize() diff --git a/arm/connections/descriptor_popup.py b/arm/connections/descriptor_popup.py index af6ee69..d169309 100644 --- a/arm/connections/descriptor_popup.py +++ b/arm/connections/descriptor_popup.py @@ -79,9 +79,9 @@ def show_descriptor_popup(conn_panel): draw(popup, fingerprint, display_text, display_color, scroll, show_line_number) is_changed = False - key = control.get_screen().getch() + key = control.key_input() - if ui_tools.is_scroll_key(key): + if key.is_scroll(): # TODO: This is a bit buggy in that scrolling is by display_text # lines rather than the displayed lines, causing issues when # content wraps. The result is that we can't have a scrollbar and @@ -94,12 +94,12 @@ def show_descriptor_popup(conn_panel): if scroll != new_scroll: scroll, is_changed = new_scroll, True - elif ui_tools.is_selection_key(key) or key in (ord('d'), ord('D')): + elif key.is_selection() or key.match('d'): is_done = True # closes popup - elif key in (curses.KEY_LEFT, curses.KEY_RIGHT): + elif key.match('left', 'right'): # navigation - pass on to conn_panel and recreate popup - conn_panel.handle_key(curses.KEY_UP if key == curses.KEY_LEFT else curses.KEY_DOWN) + conn_panel.handle_key(panel.KeyInput(curses.KEY_UP) if key.match('left') else panel.KeyInput(curses.KEY_DOWN)) break finally: arm.popups.finalize() diff --git a/arm/controller.py b/arm/controller.py index 09f0f83..48034e9 100644 --- a/arm/controller.py +++ b/arm/controller.py @@ -273,6 +273,13 @@ class Controller: return self._screen + def key_input(self): + """ + Gets keystroke from the user. + """ + + return panel.KeyInput(self.get_screen().getch()) + def get_page_count(self): """ Provides the number of pages the interface has. This may be zero if all @@ -652,29 +659,29 @@ def start_arm(stdscr): key, override_key = override_key, None else: curses.halfdelay(CONFIG["features.redrawRate"] * 10) - key = stdscr.getch() + key = panel.KeyInput(stdscr.getch()) - if key == curses.KEY_RIGHT: + if key.match('right'): control.next_page() - elif key == curses.KEY_LEFT: + elif key.match('left'): control.prev_page() - elif key in (ord('p'), ord('P')): + elif key.match('p'): control.set_paused(not control.is_paused()) - elif key in (ord('m'), ord('M')): + elif key.match('m'): arm.menu.menu.show_menu() - elif key in (ord('q'), ord('Q')): + elif key.match('q'): # provides prompt to confirm that arm should exit if CONFIG["features.confirmQuit"]: msg = "Are you sure (q again to confirm)?" confirmation_key = arm.popups.show_msg(msg, attr = curses.A_BOLD) - quit_confirmed = confirmation_key in (ord('q'), ord('Q')) + quit_confirmed = confirmation_key.match('q') else: quit_confirmed = True if quit_confirmed: control.quit() - elif key in (ord('x'), ord('X')): + elif key.match('x'): # provides prompt to confirm that arm should issue a sighup msg = "This will reset Tor's internal state. Are you sure (x again to confirm)?" @@ -685,7 +692,7 @@ def start_arm(stdscr): tor_controller().signal(stem.Signal.RELOAD) except IOError as exc: log.error("Error detected when reloading tor: %s" % exc.strerror) - elif key in (ord('h'), ord('H')): + elif key.match('h'): override_key = arm.popups.show_help_popup() elif key == ord('l') - 96: # force redraw when ctrl+l is pressed diff --git a/arm/graphing/graph_panel.py b/arm/graphing/graph_panel.py index 68328b8..a034e56 100644 --- a/arm/graphing/graph_panel.py +++ b/arm/graphing/graph_panel.py @@ -24,7 +24,7 @@ import arm.controller import stem.control -from arm.util import panel, tor_controller, ui_tools +from arm.util import panel, tor_controller from stem.util import conf, enum, str_tools @@ -315,42 +315,40 @@ class GraphPanel(panel.Panel): control = arm.controller.get_controller() - panel.CURSES_LOCK.acquire() + with panel.CURSES_LOCK: + try: + while True: + msg = 'press the down/up to resize the graph, and enter when done' + control.set_msg(msg, curses.A_BOLD, True) + curses.cbreak() + key = control.key_input() - try: - while True: - msg = 'press the down/up to resize the graph, and enter when done' - control.set_msg(msg, curses.A_BOLD, True) - curses.cbreak() - key = control.get_screen().getch() + if key.match('down'): + # don't grow the graph if it's already consuming the whole display + # (plus an extra line for the graph/log gap) - if key == curses.KEY_DOWN: - # don't grow the graph if it's already consuming the whole display - # (plus an extra line for the graph/log gap) + max_height = self.parent.getmaxyx()[0] - self.top + current_height = self.get_height() - max_height = self.parent.getmaxyx()[0] - self.top - current_height = self.get_height() + if current_height < max_height + 1: + self.set_graph_height(self.graph_height + 1) + elif key.match('up'): + self.set_graph_height(self.graph_height - 1) + elif key.is_selection(): + break - if current_height < max_height + 1: - self.set_graph_height(self.graph_height + 1) - elif key == curses.KEY_UP: - self.set_graph_height(self.graph_height - 1) - elif ui_tools.is_selection_key(key): - break - - control.redraw() - finally: - control.set_msg() - panel.CURSES_LOCK.release() + control.redraw() + finally: + control.set_msg() def handle_key(self, key): - if key in (ord('r'), ord('R')): + if key.match('r'): self.resize_graph() - elif key in (ord('b'), ord('B')): + elif key.match('b'): # uses the next boundary type self.bounds = Bounds.next(self.bounds) self.redraw(True) - elif key in (ord('s'), ord('S')): + elif key.match('s'): # provides a menu to pick the graphed stats available_stats = self.stats.keys() @@ -377,7 +375,7 @@ class GraphPanel(panel.Panel): self.set_stats(None) elif selection != -1: self.set_stats(available_stats[selection - 1]) - elif key in (ord('i'), ord('I')): + elif key.match('i'): # provides menu to pick graph panel update interval options = [label for (label, _) in UPDATE_INTERVALS] diff --git a/arm/header_panel.py b/arm/header_panel.py index 5278ca1..7206870 100644 --- a/arm/header_panel.py +++ b/arm/header_panel.py @@ -87,9 +87,9 @@ class HeaderPanel(panel.Panel, threading.Thread): arm.popups.show_msg('Requesting a new identity', 1) def handle_key(self, key): - if key in (ord('n'), ord('N')): + if key.match('n'): self.send_newnym() - elif key in (ord('r'), ord('R')) and not self._vals.is_connected: + elif key.match('r') and not self._vals.is_connected: # TODO: This is borked. Not quite sure why but our attempt to call # PROTOCOLINFO fails with a socket error, followed by completely freezing # arm. This is exposing two bugs... diff --git a/arm/log_panel.py b/arm/log_panel.py index e78ecc7..f0e2a23 100644 --- a/arm/log_panel.py +++ b/arm/log_panel.py @@ -863,7 +863,7 @@ class LogPanel(panel.Panel, threading.Thread, logging.Handler): raise exc def handle_key(self, key): - if ui_tools.is_scroll_key(key): + if key.is_scroll(): page_height = self.get_preferred_size()[0] - 1 new_scroll = ui_tools.get_scroll_position(key, self.scroll, page_height, self.last_content_height) @@ -872,18 +872,18 @@ class LogPanel(panel.Panel, threading.Thread, logging.Handler): self.scroll = new_scroll self.redraw(True) self.vals_lock.release() - elif key in (ord('u'), ord('U')): + elif key.match('u'): self.vals_lock.acquire() self.set_duplicate_visability(not CONFIG["features.log.showDuplicateEntries"]) self.redraw(True) self.vals_lock.release() - elif key in (ord('c'), ord('C')): + elif key.match('c'): msg = "This will clear the log. Are you sure (c again to confirm)?" key_press = arm.popups.show_msg(msg, attr = curses.A_BOLD) - if key_press in (ord('c'), ord('C')): + if key_press.match('c'): self.clear() - elif key in (ord('f'), ord('F')): + elif key.match('f'): # Provides menu to pick regular expression filters or adding new ones: # for syntax see: http://docs.python.org/library/re.html#regular-expression-syntax @@ -912,9 +912,9 @@ class LogPanel(panel.Panel, threading.Thread, logging.Handler): if len(self.filter_options) > MAX_REGEX_FILTERS: del self.filter_options[MAX_REGEX_FILTERS:] - elif key in (ord('e'), ord('E')): + elif key.match('e'): self.show_event_selection_prompt() - elif key in (ord('a'), ord('A')): + elif key.match('a'): self.show_snapshot_prompt() else: return False diff --git a/arm/menu/menu.py b/arm/menu/menu.py index 435725b..e8fe297 100644 --- a/arm/menu/menu.py +++ b/arm/menu/menu.py @@ -40,17 +40,17 @@ class MenuCursor: is_selection_submenu = isinstance(self._selection, arm.menu.item.Submenu) selection_hierarchy = self._selection.get_hierarchy() - if ui_tools.is_selection_key(key): + if key.is_selection(): if is_selection_submenu: if not self._selection.is_empty(): self._selection = self._selection.get_children()[0] else: self._is_done = self._selection.select() - elif key == curses.KEY_UP: + elif key.match('up'): self._selection = self._selection.prev() - elif key == curses.KEY_DOWN: + elif key.match('down'): self._selection = self._selection.next() - elif key == curses.KEY_LEFT: + elif key.match('left'): if len(selection_hierarchy) <= 3: # shift to the previous main submenu @@ -60,7 +60,7 @@ class MenuCursor: # go up a submenu level self._selection = self._selection.get_parent() - elif key == curses.KEY_RIGHT: + elif key.match('right'): if is_selection_submenu: # open submenu (same as making a selection) @@ -71,9 +71,7 @@ class MenuCursor: next_submenu = selection_hierarchy[1].next() self._selection = next_submenu.get_children()[0] - elif key in (27, ord('m'), ord('M')): - # close menu - + elif key.match('esc', 'm'): self._is_done = True @@ -127,8 +125,7 @@ def show_menu(): popup.win.refresh() curses.cbreak() - key = control.get_screen().getch() - cursor.handle_key(key) + cursor.handle_key(control.key_input()) # redraws the rest of the interface if we're rendering on it again diff --git a/arm/popups.py b/arm/popups.py index 59cf40a..e852b95 100644 --- a/arm/popups.py +++ b/arm/popups.py @@ -91,20 +91,18 @@ def show_msg(msg, max_wait = -1, attr = curses.A_STANDOUT): attr - attributes with which to draw the message """ - panel.CURSES_LOCK.acquire() - control = arm.controller.get_controller() - control.set_msg(msg, attr, True) + with panel.CURSES_LOCK: + control = arm.controller.get_controller() + control.set_msg(msg, attr, True) - if max_wait == -1: - curses.cbreak() - else: - curses.halfdelay(max_wait * 10) + if max_wait == -1: + curses.cbreak() + else: + curses.halfdelay(max_wait * 10) - key_press = control.get_screen().getch() - control.set_msg() - panel.CURSES_LOCK.release() - - return key_press + key_press = control.key_input() + control.set_msg() + return key_press def show_help_popup(): @@ -173,13 +171,12 @@ def show_help_popup(): popup.win.refresh() curses.cbreak() - exit_key = control.get_screen().getch() + exit_key = control.key_input() finally: finalize() - if not ui_tools.is_selection_key(exit_key) and \ - not ui_tools.is_scroll_key(exit_key) and \ - exit_key not in (curses.KEY_LEFT, curses.KEY_RIGHT): + if not exit_key.is_selection() and not exit_key.is_scroll() and \ + not exit_key.match('left', 'right'): return exit_key else: return None @@ -208,7 +205,7 @@ def show_about_popup(): popup.win.refresh() curses.cbreak() - control.get_screen().getch() + control.key_input() finally: finalize() @@ -270,17 +267,17 @@ def show_sort_dialog(title, options, old_selection, option_colors): popup.win.refresh() - key = arm.controller.get_controller().get_screen().getch() + key = arm.controller.get_controller().key_input() - if key == curses.KEY_LEFT: + if key.match('left'): cursor_location = max(0, cursor_location - 1) - elif key == curses.KEY_RIGHT: + elif key.match('right'): cursor_location = min(len(selection_options) - 1, cursor_location + 1) - elif key == curses.KEY_UP: + elif key.match('up'): cursor_location = max(0, cursor_location - 4) - elif key == curses.KEY_DOWN: + elif key.match('down'): cursor_location = min(len(selection_options) - 1, cursor_location + 4) - elif ui_tools.is_selection_key(key): + elif key.is_selection(): selection = selection_options[cursor_location] if selection == "Cancel": @@ -351,7 +348,7 @@ def show_menu(title, options, old_selection): if not popup: return - key, selection = 0, old_selection if old_selection != -1 else 0 + selection = old_selection if old_selection != -1 else 0 try: # hides the title of the first panel on the page @@ -363,7 +360,7 @@ def show_menu(title, options, old_selection): curses.cbreak() # wait indefinitely for key presses (no timeout) - while not ui_tools.is_selection_key(key): + while True: popup.win.erase() popup.win.box() popup.addstr(0, 0, title, curses.A_STANDOUT) @@ -377,14 +374,17 @@ def show_menu(title, options, old_selection): popup.win.refresh() - key = control.get_screen().getch() + key = control.key_input() - if key == curses.KEY_UP: + if key.match('up'): selection = max(0, selection - 1) - elif key == curses.KEY_DOWN: + elif key.match('down'): selection = min(len(options) - 1, selection + 1) - elif key == 27: - selection, key = -1, curses.KEY_ENTER # esc - cancel + elif key.is_selection(): + break + elif key.match('esc'): + selection = -1 + break finally: top_panel.set_title_visible(True) finalize() diff --git a/arm/torrc_panel.py b/arm/torrc_panel.py index 2a3fb23..b7fa71a 100644 --- a/arm/torrc_panel.py +++ b/arm/torrc_panel.py @@ -123,18 +123,18 @@ class TorrcPanel(panel.Panel): def handle_key(self, key): with self.vals_lock: - if ui_tools.is_scroll_key(key): + if key.is_scroll(): page_height = self.get_preferred_size()[0] - 1 new_scroll = ui_tools.get_scroll_position(key, self.scroll, page_height, self._last_content_height) if self.scroll != new_scroll: self.scroll = new_scroll self.redraw(True) - elif key in (ord('n'), ord('N')): + elif key.match('n'): self.set_line_number_visible(not self.show_line_num) - elif key in (ord('s'), ord('S')): + elif key.match('s'): self.set_comments_visible(self.strip_comments) - elif key in (ord('r'), ord('R')): + elif key.match('r'): self.reload_torrc() else: return False diff --git a/arm/util/panel.py b/arm/util/panel.py index d68268a..fb6ae0e 100644 --- a/arm/util/panel.py +++ b/arm/util/panel.py @@ -18,6 +18,20 @@ from stem.util import log CURSES_LOCK = RLock() +SCROLL_KEYS = (curses.KEY_UP, curses.KEY_DOWN, curses.KEY_PPAGE, curses.KEY_NPAGE, curses.KEY_HOME, curses.KEY_END) + +SPECIAL_KEYS = { + 'up': curses.KEY_UP, + 'down': curses.KEY_DOWN, + 'left': curses.KEY_LEFT, + 'right': curses.KEY_RIGHT, + 'home': curses.KEY_HOME, + 'end': curses.KEY_END, + 'page_up': curses.KEY_PPAGE, + 'page_down': curses.KEY_NPAGE, + 'esc': 27, +} + # tags used by addfstr - this maps to functor/argument combinations since the # actual values (in the case of color attributes) might not yet be initialized @@ -806,3 +820,45 @@ class Panel(): log.debug("recreating panel '%s' with the dimensions of %i/%i" % (self.get_name(), new_height, new_width)) return recreate + + +class KeyInput(object): + """ + Keyboard input by the user. + """ + + def __init__(self, key): + self._key = key # pressed key as an integer + + def match(self, *keys): + """ + Checks if we have a case insensitive match with the given key. Beside + characters, this also recognizes: up, down, left, right, home, end, + page_up, page_down, and esc. + """ + + for key in keys: + if key in SPECIAL_KEYS: + if self._key == SPECIAL_KEYS[key]: + return True + elif len(key) == 1: + if self._key in (ord(key.lower()), ord(key.upper())): + return True + else: + raise ValueError("%s wasn't among our recognized key codes" % key) + + return False + + def is_scroll(self): + """ + True if the key is used for scrolling, false otherwise. + """ + + return self._key in SCROLL_KEYS + + def is_selection(self): + """ + True if the key matches the enter or space keys. + """ + + return self._key in (curses.KEY_ENTER, 10, ord(' ')) diff --git a/arm/util/ui_tools.py b/arm/util/ui_tools.py index d2a6f43..a1064ee 100644 --- a/arm/util/ui_tools.py +++ b/arm/util/ui_tools.py @@ -24,8 +24,6 @@ COLOR_LIST = { DEFAULT_COLOR_ATTR = dict([(color, 0) for color in COLOR_LIST]) COLOR_ATTR = None -SCROLL_KEYS = (curses.KEY_UP, curses.KEY_DOWN, curses.KEY_PPAGE, curses.KEY_NPAGE, curses.KEY_HOME, curses.KEY_END) - def conf_handler(key, value): if key == 'features.color_override': @@ -211,29 +209,6 @@ def draw_box(panel, top, left, width, height, attr=curses.A_NORMAL): panel.addch(top + height - 1, left, curses.ACS_LLCORNER, attr) -def is_selection_key(key): - """ - Returns true if the keycode matches the enter or space keys. - - Argument: - key - keycode to be checked - """ - - return key in (curses.KEY_ENTER, 10, ord(' ')) - - -def is_scroll_key(key): - """ - Returns true if the keycode is recognized by the get_scroll_position function - for scrolling. - - Argument: - key - keycode to be checked - """ - - return key in SCROLL_KEYS - - def get_scroll_position(key, position, page_height, content_height, is_cursor = False): """ Parses navigation keys, providing the new scroll possition the panel should @@ -254,20 +229,20 @@ def get_scroll_position(key, position, page_height, content_height, is_cursor = is_cursor - tracks a cursor position rather than scroll if true """ - if is_scroll_key(key): + if key.is_scroll(): shift = 0 - if key == curses.KEY_UP: + if key.match('up'): shift = -1 - elif key == curses.KEY_DOWN: + elif key.match('down'): shift = 1 - elif key == curses.KEY_PPAGE: + elif key.match('page_up'): shift = -page_height + 1 if is_cursor else -page_height - elif key == curses.KEY_NPAGE: + elif key.match('page_down'): shift = page_height - 1 if is_cursor else page_height - elif key == curses.KEY_HOME: + elif key.match('home'): shift = -content_height - elif key == curses.KEY_END: + elif key.match('end'): shift = content_height # returns the shift, restricted to valid bounds

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 07 Oct '14

07 Oct '14

commit a07eaf63a5d97a9dc6946e0299f33a9e84c373cc Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 7 16:45:35 2014 +0000 Update translations for tails-greeter_completed --- de/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/de/de.po b/de/de.po index b1c7fd3..d92b005 100644 --- a/de/de.po +++ b/de/de.po @@ -23,7 +23,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-08-31 10:36+0200\n" -"PO-Revision-Date: 2014-10-03 22:30+0000\n" +"PO-Revision-Date: 2014-10-07 16:34+0000\n" "Last-Translator: rike\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" @@ -152,7 +152,7 @@ msgstr "Alle MAC-Adressen manipulieren" #: ../glade/optionswindow.glade.h:19 msgid "Network configuration" -msgstr "Netzwerkonfiguration" +msgstr "Netzwerkkonfiguration" #: ../glade/optionswindow.glade.h:20 msgid ""

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 07 Oct '14

07 Oct '14

commit f852b91535e2712f5260a702251f3cdebd661ecf Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 7 16:45:30 2014 +0000 Update translations for tails-greeter --- de/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/de/de.po b/de/de.po index b1c7fd3..d92b005 100644 --- a/de/de.po +++ b/de/de.po @@ -23,7 +23,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-08-31 10:36+0200\n" -"PO-Revision-Date: 2014-10-03 22:30+0000\n" +"PO-Revision-Date: 2014-10-07 16:34+0000\n" "Last-Translator: rike\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" @@ -152,7 +152,7 @@ msgstr "Alle MAC-Adressen manipulieren" #: ../glade/optionswindow.glade.h:19 msgid "Network configuration" -msgstr "Netzwerkonfiguration" +msgstr "Netzwerkkonfiguration" #: ../glade/optionswindow.glade.h:20 msgid ""

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 07 Oct '14

07 Oct '14

commit a823a88d7b184414ce9d2d902a795c29b9224b3b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 7 16:15:08 2014 +0000 Update translations for bridgedb_completed --- hr_HR/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hr_HR/LC_MESSAGES/bridgedb.po b/hr_HR/LC_MESSAGES/bridgedb.po index 77c2407..c47f546 100644 --- a/hr_HR/LC_MESSAGES/bridgedb.po +++ b/hr_HR/LC_MESSAGES/bridgedb.po @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-07-26 02:11+0000\n" -"PO-Revision-Date: 2014-10-06 08:02+0000\n" -"Last-Translator: skiddiep <lyricaltumor(a)gmail.com>\n" +"PO-Revision-Date: 2014-10-07 16:07+0000\n" +"Last-Translator: Ana B\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 07 Oct '14

07 Oct '14

commit f15546726c721b626cd5fa8cbbac6ac5ee14c2d3 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 7 16:15:03 2014 +0000 Update translations for bridgedb --- hr_HR/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hr_HR/LC_MESSAGES/bridgedb.po b/hr_HR/LC_MESSAGES/bridgedb.po index 77c2407..c47f546 100644 --- a/hr_HR/LC_MESSAGES/bridgedb.po +++ b/hr_HR/LC_MESSAGES/bridgedb.po @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-07-26 02:11+0000\n" -"PO-Revision-Date: 2014-10-06 08:02+0000\n" -"Last-Translator: skiddiep <lyricaltumor(a)gmail.com>\n" +"PO-Revision-Date: 2014-10-07 16:07+0000\n" +"Last-Translator: Ana B\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 07 Oct '14

07 Oct '14

commit b55a5c486a39d86f9322fe2c637f7a361049006b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 7 15:15:55 2014 +0000 Update translations for tor-launcher-network-settings_completed --- ca/network-settings.dtd | 63 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/ca/network-settings.dtd b/ca/network-settings.dtd new file mode 100644 index 0000000..0d8fea2 --- /dev/null +++ b/ca/network-settings.dtd @@ -0,0 +1,63 @@ +<!ENTITY torsettings.dialog.title "Configuració Xarxa Tor"> + + + +<!ENTITY torsettings.prompt "Abans de connectar-te a la xarxa Thor, necessites introduir informació sobre el ordinador que fas servir per la connexió a internet."> + +<!ENTITY torSettings.yes "Sí"> +<!ENTITY torSettings.no "No"> + +<!ENTITY torSettings.firstQuestion "Quina de les següuens descriula teva situació?"> +<!ENTITY torSettings.configurePrompt1 "La connexió a internet d'aquest ordinador està censurada o configurada amb un proxy. "> +<!ENTITY torSettings.configurePrompt2 "Necessito configurar ajustos de pont o de proxy"> +<!ENTITY torSettings.configure "Configura"> +<!ENTITY torSettings.connectPrompt2 "M'agradaria conectar-me directament a la xarxa Tor."> +<!ENTITY torSettings.connectPrompt3 "Això funciona en la majoria dels casos."> +<!ENTITY torSettings.connect "Conectar"> + +<!ENTITY torSettings.proxyQuestion "Necessita aquest ordinador usar un proxy per accedir a internet?"> + +<!ENTITY torSettings.proxyHelp "Si no estas segur de com respondre a aquesta pregunta, observa els paràmetres d'Internet en un altre navegador per veure si està configurat per utilitzar un proxy."> +<!ENTITY torSettings.enterProxy "Introdueix les opcions del proxy."> +<!ENTITY torSettings.bridgeQuestion "El vostre proveïdor d'Internet (ISP) bloqueja o censura les connexions a la Xarxa Tor?"> +<!ENTITY torSettings.bridgeHelp "Si no esteu segurs de com respondre a aquesta pregunta, escolliu No.  Si escolliu Sí, se us demanarà que configureu Ponts Tor, que són relés no llistats que fan més dificil de bloquejar les connexions a la Xarxa Tor"> +<!ENTITY torSettings.bridgeSettingsPrompt "Hauries d'utilitzar el set de repetidors provist o customitzar el teu propi."> + + + +<!ENTITY torsettings.startingTor "Esperant a Tor per començar..."> +<!ENTITY torsettings.restartTor "Reinicia Tor"> + +<!ENTITY torsettings.optional "Opcional +"> + +<!ENTITY torsettings.useProxy.checkbox "Aquest ordinador ha de fer servir un proxy per accedir a Internet"> +<!ENTITY torsettings.useProxy.type "Tipus de Proxy:"> +<!ENTITY torsettings.useProxy.address "Adreça:"> +<!ENTITY torsettings.useProxy.address.placeholder "Direcció IP o nom del host"> +<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.username "Nom d'usuari:"> +<!ENTITY torsettings.useProxy.password "Contrasenya:"> +<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> +<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> +<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> +<!ENTITY torsettings.firewall.checkbox "Aquest ordinador va a través d'un proxy que només permet connexions a certs ports"> +<!ENTITY torsettings.firewall.allowedPorts "Ports permesos:"> +<!ENTITY torsettings.useBridges.checkbox "El meu proveidor d'internet (ISP) bloqueja les conexions a la xarxa Tor"> +<!ENTITY torsettings.useBridges.default "Connectar amb els repetidors porvistos."> +<!ENTITY torsettings.useBridges.type "Tipus de transport:"> +<!ENTITY torsettings.useBridges.custom "Entra als repetidors customitzats."> +<!ENTITY torsettings.useBridges.label "Entra en un o més repetidors (un per linia)."> +<!ENTITY torsettings.useBridges.placeholder "introdueix adreça:port"> + +<!ENTITY torsettings.copyLog "Copiar el Log al portapapers"> +<!ENTITY torsettings.bridgeHelpTitle "Ajuda Repetidors"> +<!ENTITY torsettings.bridgeHelp1 "Si no sóu capaçps de connectar-vos a la xarxa Tor, pot ser que el vostre proveidor d'internet (ISP) o alguna altra agència estigui bloquejant Tor.  normalment, podeu evitar aquest problema usant Ponts Tor, que son relés no llistats més difícils de bloquejar. "> +<!ENTITY torsettings.bridgeHelp1B "Podeu usar el conjunt d'adreces pont preconfigurades o podeu obtenir un conjunt personalitzat d'adreces usant un d'aquests tres mètodes: "> +<!ENTITY torsettings.bridgeHelp2Heading "A través del web"> +<!ENTITY torsettings.bridgeHelp2 "Utilitza un navegador web o vés a: https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "A través del mail d'autorresposta."> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Envieu un e-mail a bridges(a)torproject.org només amb el text 'get bridges' al cos del missatge.  No obstant, per a fer més difícil per a l'atacant d'aprendre moltes adreces pont, heu d'enviar aquesta petició des d'un dels proveïdors de correu següents (llistats en ordre de preferència):"> +<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, o https://mail.yahoo.com"> +<!ENTITY torsettings.bridgeHelp4Heading "A través del Escriptori d'Ajuda"> +<!ENTITY torsettings.bridgeHelp4 "Com a última opció, pots demanar adreces de repetidors enviant un missatge a help(a)rt.torproject.org.  siusplau recorda que serà una persona qui et respondrà, siguis pacient i amable.">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 07 Oct '14

07 Oct '14

commit 96ab73a1ac67cc93aa55f613f5d0413239098053 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 7 15:15:51 2014 +0000 Update translations for tor-launcher-network-settings --- ca/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ca/network-settings.dtd b/ca/network-settings.dtd index 82fdc43..0d8fea2 100644 --- a/ca/network-settings.dtd +++ b/ca/network-settings.dtd @@ -57,7 +57,7 @@ <!ENTITY torsettings.bridgeHelp2Heading "A través del web"> <!ENTITY torsettings.bridgeHelp2 "Utilitza un navegador web o vés a: https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "A través del mail d'autorresposta."> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Envieu un e-mail a bridges(a)torproject.org només amb el text 'get bridges' al cos del missatge.  No obstant, per a fer més difícil per a l'atacant d'aprendre moltes adreces pont, heu d'enviar aquesta petició des d'un dels proveïdors de correu següents (llistats en ordre de preferència):"> +<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, o https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "A través del Escriptori d'Ajuda"> <!ENTITY torsettings.bridgeHelp4 "Com a última opció, pots demanar adreces de repetidors enviant un missatge a help(a)rt.torproject.org.  siusplau recorda que serà una persona qui et respondrà, siguis pacient i amable.">

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 07 Oct '14

07 Oct '14

commit 41bffd88c2ca20085b4ae28359d06754df23c8b5 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 7 15:15:32 2014 +0000 Update translations for tails-persistence-setup_completed --- ca/ca.po | 317 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 317 insertions(+) diff --git a/ca/ca.po b/ca/ca.po new file mode 100644 index 0000000..3631003 --- /dev/null +++ b/ca/ca.po @@ -0,0 +1,317 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Tails developers +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Eloi García i Fargas, 2014 +# Humbert <humbert.costas(a)gmail.com>, 2014 +# laia_ <laiaadorio(a)gmail.com>, 2014 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" +"POT-Creation-Date: 2014-07-01 22:15+0200\n" +"PO-Revision-Date: 2014-10-07 15:10+0000\n" +"Last-Translator: laia_ <laiaadorio(a)gmail.com>\n" +"Language-Team: Catalan (http://www.transifex.com/projects/p/torproject/language/ca/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ca\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:48 +msgid "Personal Data" +msgstr "Dades Personals" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:50 +msgid "Keep files stored in the `Persistent' directory" +msgstr "Conserva els arxius emmagatzemats en la carpeta \"Persistent\"" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:58 +msgid "GnuPG" +msgstr "GnuPG" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:60 +msgid "GnuPG keyrings and configuration" +msgstr "Claus i configuració de GnuPG" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:68 +msgid "SSH Client" +msgstr "Client SSH" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:70 +msgid "SSH keys, configuration and known hosts" +msgstr "Claus SSH, configuració i hostes coneguts" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:78 +msgid "Pidgin" +msgstr "Pidgin" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:80 +msgid "Pidgin profiles and OTR keyring" +msgstr "Perfils de Pidgin i clauer de OTR" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:88 +msgid "Claws Mail" +msgstr "Claws Mail" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:90 +msgid "Claws Mail profiles and locally stored email" +msgstr "Perfils de Claws Mail i correu emmagatzemat localment" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:98 +msgid "GNOME Keyring" +msgstr "Clauer de GNOME" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:100 +msgid "Secrets stored by GNOME Keyring" +msgstr "Secrets emmagatzemats pel clauer de GNOME" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:108 +msgid "Network Connections" +msgstr "Connexions en xarxa" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:110 +msgid "Configuration of network devices and connections" +msgstr "Configuració de dispositius en xarxa i connexions" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:118 +msgid "Browser bookmarks" +msgstr "Marques del navegador" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:120 +msgid "Bookmarks saved in Iceweasel browser" +msgstr "Marcadors desats al buscador Iceweasel" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:128 +msgid "Printers" +msgstr "Impresores" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:130 +msgid "Printers configuration" +msgstr "Configuració d'impresores" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:138 +msgid "APT Packages" +msgstr "Paquets APT" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 +msgid "Packages downloaded by APT" +msgstr "Paquets descarregats per APT" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:148 +msgid "APT Lists" +msgstr "Llistes APT" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:150 +msgid "Lists downloaded by APT" +msgstr "Llistes descarregades per APT" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:158 +msgid "Dotfiles" +msgstr "Dotfiles" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:160 +msgid "" +"Symlink into $HOME every file or directory found in the `dotfiles' directory" +msgstr "Symlink a $HOME tot arxiu o carpeta trobat al directori 'dotfiles'" + +#: ../lib/Tails/Persistence/Setup.pm:227 +msgid "Setup Tails persistent volume" +msgstr "Configura el volum persistent de Tails" + +#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:452 +msgid "Error" +msgstr "Error" + +#: ../lib/Tails/Persistence/Setup.pm:339 +#, perl-format +msgid "Device %s already has a persistent volume." +msgstr "El dispositiu %s ja té un volum persistent." + +#: ../lib/Tails/Persistence/Setup.pm:347 +#, perl-format +msgid "Device %s has not enough unallocated space." +msgstr "El dispositiu %s no té prou espai lliure." + +#: ../lib/Tails/Persistence/Setup.pm:355 ../lib/Tails/Persistence/Setup.pm:369 +#, perl-format +msgid "Device %s has no persistent volume." +msgstr "El dispositiu %s no té un volum persistent." + +#: ../lib/Tails/Persistence/Setup.pm:361 +msgid "" +"Cannot delete the persistent volume while in use. You should restart Tails " +"without persistence." +msgstr "No es pot eliminar un volum persistent mentre es troba en us. Hauries de reiniciar Tails sense persistència." + +#: ../lib/Tails/Persistence/Setup.pm:380 +msgid "Persistence volume is not unlocked." +msgstr "El volum persistent no està desbloquejat." + +#: ../lib/Tails/Persistence/Setup.pm:385 +msgid "Persistence volume is not mounted." +msgstr "El volum persistent no està muntat." + +#: ../lib/Tails/Persistence/Setup.pm:390 +msgid "Persistence volume is not readable. Permissions or ownership problems?" +msgstr "El volum persistent és il·legible. Problemes de permisos o propietat?" + +#: ../lib/Tails/Persistence/Setup.pm:395 +msgid "Persistence volume is not writable. Maybe it was mounted read-only?" +msgstr "El volum persistent no es pot escriure. Potser ha estat muntat en mode només lectura?" + +#: ../lib/Tails/Persistence/Setup.pm:404 +#, perl-format +msgid "Tails is running from non-USB / non-SDIO device %s." +msgstr "Tails s'està executant des d'un dispositiu %s no-USB / no-SDIO" + +#: ../lib/Tails/Persistence/Setup.pm:410 +#, perl-format +msgid "Device %s is optical." +msgstr "El dispositiu %s és òptic." + +#: ../lib/Tails/Persistence/Setup.pm:417 +#, perl-format +msgid "Device %s was not created using Tails Installer." +msgstr "El dispositiu %s no va ser creat usant Tails Installer" + +#: ../lib/Tails/Persistence/Setup.pm:677 +msgid "Persistence wizard - Finished" +msgstr "Assistent de persistència - Acabat" + +#: ../lib/Tails/Persistence/Setup.pm:680 +msgid "" +"Any changes you have made will only take effect after restarting Tails.\n" +"\n" +"You may now close this application." +msgstr "Qualsevol canvi que hagueu fet només tindrà efecte després de reiniciar Tails. \n\nHeu de tancar ara l'aplicació. " + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:54 +msgid "Persistence wizard - Persistent volume creation" +msgstr "Assistent de persistència - Creació de volum persistent" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:57 +msgid "Choose a passphrase to protect the persistent volume" +msgstr "Escolliu una contrassenya per a protegir el volum persistent" + +#. TRANSLATORS: size, device vendor, device model +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:61 +#, perl-format +msgid "" +"A %s persistent volume will be created on the %s %s device. Data on " +"this volume will be stored in an encrypted form protected by a passphrase." +msgstr "Un volum persistent de %s serà creat al dispositiu %s %s . Les dades d'aquest volum seràn emmagatzemades en una forma encriptada protegida per contrassenya. " + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:66 +msgid "Create" +msgstr "Crear" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:110 +msgid "" +"Beware! Using persistence has consequences that must be well " +"understood. Tails can't help you if you use it wrong! See <a " +"href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>Tails" +" documentation about persistence</a> to learn more." +msgstr "Atenció! Usar la persistència té conseqüències que han d'entendre's bé. Tails no pot ajudar-vos si ho feu servir malament! Vegeu <a href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>documentació de Tails sobre la persistència</a> per a saber-ne més. " + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:144 +msgid "Passphrase:" +msgstr "Frase de contrasenya:" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:154 +msgid "Verify Passphrase:" +msgstr "Verifica la Frase de contrasenya:" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:167 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:231 +msgid "Passphrase can't be empty" +msgstr "La contrasenya no pot ser buida" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:222 +msgid "Passphrases do not match" +msgstr "La contrasenya no coincideix" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:262 +#: ../lib/Tails/Persistence/Step/Configure.pm:129 +msgid "Failed" +msgstr "Fallit" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:271 +msgid "Mounting Tails persistence partition." +msgstr "Muntant la partició persistent de Tails." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:274 +msgid "The Tails persistence partition will be mounted." +msgstr "La partició de persistència de Tails serà muntada. " + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 +msgid "Correcting permissions of the persistent volume." +msgstr "Corregint els permisos del volum persistent." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:286 +msgid "The permissions of the persistent volume will be corrected." +msgstr "Els permisos del volum persistent seran corregits." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:308 +msgid "Creating..." +msgstr "Creant..." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:311 +msgid "Creating the persistent volume..." +msgstr "Creant el volum persistent..." + +#: ../lib/Tails/Persistence/Step/Configure.pm:61 +msgid "Persistence wizard - Persistent volume configuration" +msgstr "Assistent de persistència - Configuració del volum persistent" + +#: ../lib/Tails/Persistence/Step/Configure.pm:64 +msgid "Specify the files that will be saved in the persistent volume" +msgstr "Especifiqueu els arxius que seran desats en el volum persistent" + +#. TRANSLATORS: partition, size, device vendor, device model +#: ../lib/Tails/Persistence/Step/Configure.pm:68 +#, perl-format +msgid "" +"The selected files will be stored in the encrypted partition %s (%s), on the" +" %s %s device." +msgstr "Els arxius seleccionats seran guardats en la partició encriptada %s (%s) en el dispositiu %s %s ." + +#: ../lib/Tails/Persistence/Step/Configure.pm:74 +msgid "Save" +msgstr "Desa" + +#: ../lib/Tails/Persistence/Step/Configure.pm:143 +msgid "Saving..." +msgstr "Desant..." + +#: ../lib/Tails/Persistence/Step/Configure.pm:146 +msgid "Saving persistence configuration..." +msgstr "Desant la configuració persistent..." + +#: ../lib/Tails/Persistence/Step/Delete.pm:41 +msgid "Persistence wizard - Persistent volume deletion" +msgstr "Assistent de persistència - Eliminació del volum persistent" + +#: ../lib/Tails/Persistence/Step/Delete.pm:44 +msgid "Your persistent data will be deleted." +msgstr "Les vostres dades restants seran borrades." + +#: ../lib/Tails/Persistence/Step/Delete.pm:48 +#, perl-format +msgid "" +"The persistent volume %s (%s), on the %s %s device, will be deleted." +msgstr "El volum restant %s (%s), en el dispositiu %s %s sera borrada." + +#: ../lib/Tails/Persistence/Step/Delete.pm:54 +msgid "Delete" +msgstr "Esborrar" + +#: ../lib/Tails/Persistence/Step/Delete.pm:101 +msgid "Deleting..." +msgstr "Esborrant..." + +#: ../lib/Tails/Persistence/Step/Delete.pm:104 +msgid "Deleting the persistent volume..." +msgstr "Esborrant el volum persistent..."

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 07 Oct '14

07 Oct '14

commit e28d88580b8f852e1be2a3fd045436af86c97eac Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 7 15:15:27 2014 +0000 Update translations for tails-persistence-setup --- ca/ca.po | 78 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/ca/ca.po b/ca/ca.po index f3b15c1..3631003 100644 --- a/ca/ca.po +++ b/ca/ca.po @@ -3,16 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# ELOI95, 2014 +# Eloi García i Fargas, 2014 # Humbert <humbert.costas(a)gmail.com>, 2014 # laia_ <laiaadorio(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2014-05-28 22:46+0200\n" -"PO-Revision-Date: 2014-06-02 09:42+0000\n" -"Last-Translator: Humbert <humbert.costas(a)gmail.com>\n" +"POT-Creation-Date: 2014-07-01 22:15+0200\n" +"PO-Revision-Date: 2014-10-07 15:10+0000\n" +"Last-Translator: laia_ <laiaadorio(a)gmail.com>\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/torproject/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -82,7 +82,7 @@ msgstr "Marques del navegador" #: ../lib/Tails/Persistence/Configuration/Presets.pm:120 msgid "Bookmarks saved in Iceweasel browser" -msgstr "" +msgstr "Marcadors desats al buscador Iceweasel" #: ../lib/Tails/Persistence/Configuration/Presets.pm:128 msgid "Printers" @@ -110,91 +110,91 @@ msgstr "Llistes descarregades per APT" #: ../lib/Tails/Persistence/Configuration/Presets.pm:158 msgid "Dotfiles" -msgstr "" +msgstr "Dotfiles" #: ../lib/Tails/Persistence/Configuration/Presets.pm:160 msgid "" "Symlink into $HOME every file or directory found in the `dotfiles' directory" -msgstr "" +msgstr "Symlink a $HOME tot arxiu o carpeta trobat al directori 'dotfiles'" #: ../lib/Tails/Persistence/Setup.pm:227 msgid "Setup Tails persistent volume" -msgstr "" +msgstr "Configura el volum persistent de Tails" + +#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:452 +msgid "Error" +msgstr "Error" -#: ../lib/Tails/Persistence/Setup.pm:337 +#: ../lib/Tails/Persistence/Setup.pm:339 #, perl-format msgid "Device %s already has a persistent volume." msgstr "El dispositiu %s ja té un volum persistent." -#: ../lib/Tails/Persistence/Setup.pm:345 +#: ../lib/Tails/Persistence/Setup.pm:347 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "El dispositiu %s no té prou espai lliure." -#: ../lib/Tails/Persistence/Setup.pm:353 ../lib/Tails/Persistence/Setup.pm:367 +#: ../lib/Tails/Persistence/Setup.pm:355 ../lib/Tails/Persistence/Setup.pm:369 #, perl-format msgid "Device %s has no persistent volume." msgstr "El dispositiu %s no té un volum persistent." -#: ../lib/Tails/Persistence/Setup.pm:359 +#: ../lib/Tails/Persistence/Setup.pm:361 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "No es pot eliminar un volum persistent mentre es troba en us. Hauries de reiniciar Tails sense persistència." -#: ../lib/Tails/Persistence/Setup.pm:378 +#: ../lib/Tails/Persistence/Setup.pm:380 msgid "Persistence volume is not unlocked." msgstr "El volum persistent no està desbloquejat." -#: ../lib/Tails/Persistence/Setup.pm:383 +#: ../lib/Tails/Persistence/Setup.pm:385 msgid "Persistence volume is not mounted." msgstr "El volum persistent no està muntat." -#: ../lib/Tails/Persistence/Setup.pm:388 +#: ../lib/Tails/Persistence/Setup.pm:390 msgid "Persistence volume is not readable. Permissions or ownership problems?" -msgstr "" +msgstr "El volum persistent és il·legible. Problemes de permisos o propietat?" -#: ../lib/Tails/Persistence/Setup.pm:393 +#: ../lib/Tails/Persistence/Setup.pm:395 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" -msgstr "" +msgstr "El volum persistent no es pot escriure. Potser ha estat muntat en mode només lectura?" -#: ../lib/Tails/Persistence/Setup.pm:402 +#: ../lib/Tails/Persistence/Setup.pm:404 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." -msgstr "" +msgstr "Tails s'està executant des d'un dispositiu %s no-USB / no-SDIO" -#: ../lib/Tails/Persistence/Setup.pm:408 +#: ../lib/Tails/Persistence/Setup.pm:410 #, perl-format msgid "Device %s is optical." -msgstr "" +msgstr "El dispositiu %s és òptic." -#: ../lib/Tails/Persistence/Setup.pm:415 +#: ../lib/Tails/Persistence/Setup.pm:417 #, perl-format msgid "Device %s was not created using Tails Installer." msgstr "El dispositiu %s no va ser creat usant Tails Installer" -#: ../lib/Tails/Persistence/Setup.pm:450 -msgid "Error" -msgstr "Error" - -#: ../lib/Tails/Persistence/Setup.pm:670 +#: ../lib/Tails/Persistence/Setup.pm:677 msgid "Persistence wizard - Finished" -msgstr "" +msgstr "Assistent de persistència - Acabat" -#: ../lib/Tails/Persistence/Setup.pm:673 +#: ../lib/Tails/Persistence/Setup.pm:680 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" "You may now close this application." -msgstr "" +msgstr "Qualsevol canvi que hagueu fet només tindrà efecte després de reiniciar Tails. \n\nHeu de tancar ara l'aplicació. " #: ../lib/Tails/Persistence/Step/Bootstrap.pm:54 msgid "Persistence wizard - Persistent volume creation" -msgstr "" +msgstr "Assistent de persistència - Creació de volum persistent" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:57 msgid "Choose a passphrase to protect the persistent volume" -msgstr "" +msgstr "Escolliu una contrassenya per a protegir el volum persistent" #. TRANSLATORS: size, device vendor, device model #: ../lib/Tails/Persistence/Step/Bootstrap.pm:61 @@ -202,7 +202,7 @@ msgstr "" msgid "" "A %s persistent volume will be created on the %s %s device. Data on " "this volume will be stored in an encrypted form protected by a passphrase." -msgstr "" +msgstr "Un volum persistent de %s serà creat al dispositiu %s %s . Les dades d'aquest volum seràn emmagatzemades en una forma encriptada protegida per contrassenya. " #: ../lib/Tails/Persistence/Step/Bootstrap.pm:66 msgid "Create" @@ -214,7 +214,7 @@ msgid "" "understood. Tails can't help you if you use it wrong! See <a " "href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>Tails" " documentation about persistence</a> to learn more." -msgstr "" +msgstr "Atenció! Usar la persistència té conseqüències que han d'entendre's bé. Tails no pot ajudar-vos si ho feu servir malament! Vegeu <a href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>documentació de Tails sobre la persistència</a> per a saber-ne més. " #: ../lib/Tails/Persistence/Step/Bootstrap.pm:144 msgid "Passphrase:" @@ -244,7 +244,7 @@ msgstr "Muntant la partició persistent de Tails." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:274 msgid "The Tails persistence partition will be mounted." -msgstr "" +msgstr "La partició de persistència de Tails serà muntada. " #: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 msgid "Correcting permissions of the persistent volume." @@ -264,11 +264,11 @@ msgstr "Creant el volum persistent..." #: ../lib/Tails/Persistence/Step/Configure.pm:61 msgid "Persistence wizard - Persistent volume configuration" -msgstr "" +msgstr "Assistent de persistència - Configuració del volum persistent" #: ../lib/Tails/Persistence/Step/Configure.pm:64 msgid "Specify the files that will be saved in the persistent volume" -msgstr "" +msgstr "Especifiqueu els arxius que seran desats en el volum persistent" #. TRANSLATORS: partition, size, device vendor, device model #: ../lib/Tails/Persistence/Step/Configure.pm:68 @@ -292,7 +292,7 @@ msgstr "Desant la configuració persistent..." #: ../lib/Tails/Persistence/Step/Delete.pm:41 msgid "Persistence wizard - Persistent volume deletion" -msgstr "" +msgstr "Assistent de persistència - Eliminació del volum persistent" #: ../lib/Tails/Persistence/Step/Delete.pm:44 msgid "Your persistent data will be deleted."

1 0