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

[tor/maint-0.2.5] Warn if Tor is a relay and a HS
by nickm＠torproject.org 11 Sep '14

11 Sep '14

commit a3fe8b11663a32f1f007bd7cb0b9656825093544 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Mon Jul 21 21:16:58 2014 -0700 Warn if Tor is a relay and a HS Closes 12908; see #8742 --- changes/bug12908 | 4 ++++ src/or/config.c | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/changes/bug12908 b/changes/bug12908 new file mode 100644 index 0000000..bd6784c --- /dev/null +++ b/changes/bug12908 @@ -0,0 +1,4 @@ + o Minor features: + - Warn about attempts to run hidden services and relays in the + same process: that's probably not a good idea. Closes ticket + 12908. diff --git a/src/or/config.c b/src/or/config.c index 6bb6209..c006bc2 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2563,6 +2563,13 @@ options_validate(or_options_t *old_options, or_options_t *options, REJECT("Can't use a relative path to torrc when RunAsDaemon is set."); #endif + if (server_mode(options) && options->RendConfigLines) + log_warn(LD_CONFIG, + "Tor is currently configured as a relay and a hidden service. " + "That's not very secure: you should probably run your hidden service " + "in a separate Tor process, at least -- see " + "https://trac.torproject.org/8742"); + /* XXXX require that the only port not be DirPort? */ /* XXXX require that at least one port be listened-upon. */ if (n_ports == 0 && !options->RendConfigLines)

1 0

[tor/maint-0.2.5] Merge remote-tracking branch 'public/bug12908_025' into maint-0.2.5
by nickm＠torproject.org 11 Sep '14

11 Sep '14

commit a9b2e5eac6168a1eb09da8d6d3ff43b08cc51411 Merge: 8eed82b a3fe8b1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 10 22:12:47 2014 -0400 Merge remote-tracking branch 'public/bug12908_025' into maint-0.2.5 changes/bug12908 | 4 ++++ src/or/config.c | 7 +++++++ 2 files changed, 11 insertions(+)

1 0

[translation/tails-iuk_completed] Update translations for tails-iuk_completed
by translation＠torproject.org 10 Sep '14

10 Sep '14

commit 8944e8d02cc11af8beb5a76978a0c50ef79abd97 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 10 16:45:56 2014 +0000 Update translations for tails-iuk_completed --- nb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nb.po b/nb.po index 927789e..9083ac0 100644 --- a/nb.po +++ b/nb.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-08-31 15:23+0200\n" -"PO-Revision-Date: 2014-09-10 16:15+0000\n" +"PO-Revision-Date: 2014-09-10 16:20+0000\n" "Last-Translator: Aleksandr Bakken <courfazor(a)gmail.com>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/torproject/language/nb/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 10 Sep '14

10 Sep '14

commit ed09f7d0214f0ea137809fbfab4ef30bed5fc531 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 10 16:45:54 2014 +0000 Update translations for tails-iuk --- nb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nb.po b/nb.po index 927789e..9083ac0 100644 --- a/nb.po +++ b/nb.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-08-31 15:23+0200\n" -"PO-Revision-Date: 2014-09-10 16:15+0000\n" +"PO-Revision-Date: 2014-09-10 16:20+0000\n" "Last-Translator: Aleksandr Bakken <courfazor(a)gmail.com>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/torproject/language/nb/)\n" "MIME-Version: 1.0\n"

1 0

[arm/master] Rewriting state file parsing
by atagar＠torproject.org 10 Sep '14

10 Sep '14

commit 8e75f349eee89a9565020e66af4d2f59bd1d7582 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Sep 10 09:35:58 2014 -0700 Rewriting state file parsing Revising the part of prepopulate_from_state() that parses our state file. Most interesting bit is that we were doing a dumb method of converting a 'UTC timestamp => unix time'. We used mktime() which converted to localtime, then converted back. The calendar.timegm() function, however, does exactly what we want, as described in the table at the top of... https://docs.python.org/3.3/library/time.html --- arm/graphing/bandwidth_stats.py | 64 +++++++++++++++------------------------ 1 file changed, 24 insertions(+), 40 deletions(-) diff --git a/arm/graphing/bandwidth_stats.py b/arm/graphing/bandwidth_stats.py index d2a0b33..a766435 100644 --- a/arm/graphing/bandwidth_stats.py +++ b/arm/graphing/bandwidth_stats.py @@ -3,6 +3,8 @@ Tracks bandwidth usage of the tor process, expanding to include accounting stats if they're set. """ +import calendar +import os import time import curses @@ -152,57 +154,44 @@ class BandwidthStats(graph_panel.GraphStats): elif uptime < (24 * 60 * 60): raise ValueError("insufficient uptime, tor must've been running for at least a day") - # get the user's data directory (usually '~/.tor') + # read the user's state file in their data directory (usually '~/.tor') data_dir = controller.get_conf('DataDirectory', None) if not data_dir: raise ValueError("unable to determine tor's data directory") - # attempt to open the state file - - state_file_path = '%s%s/state' % (CONFIG['tor.chroot'], data_dir) + state_path = os.path.join(CONFIG['tor.chroot'] + data_dir, 'state') try: - with open(state_file_path) as state_file: - state_file_content = state_file.readlines() + with open(state_path) as state_file: + state_content = state_file.readlines() except IOError as exc: - raise ValueError('unable to read the state file at %s, %s' % (state_file_path, exc)) + raise ValueError('unable to read the state file at %s, %s' % (state_path, exc)) - # get the BWHistory entries (ordered oldest to newest) and number of - # intervals since last recorded + # We're interested in two types of entries from our state file... + # + # * BWHistory*Values - Comma separated list of bytes we read or wrote + # during each fifteen minute period. The last value is an incremental + # counter for our current period, so ignoring that. + # + # * BWHistory*Ends - When our last sampling was recorded, in UTC. bw_read_entries, bw_write_entries = None, None missing_read_entries, missing_write_entries = None, None - # converts from gmt to local with respect to DST - - tz_offset = time.altzone if time.localtime()[8] else time.timezone - - for line in state_file_content: + for line in state_content: line = line.strip() - # According to the rep_hist_update_state() function the BWHistory*Ends - # correspond to the start of the following sampling period. Also, the - # most recent values of BWHistory*Values appear to be an incremental - # counter for the current sampling period. Hence, offsets are added to - # account for both. - - if line.startswith('BWHistoryReadValues'): - bw_read_entries = line[20:].split(',') - bw_read_entries = [int(entry) / 1024.0 / 900 for entry in bw_read_entries] - bw_read_entries.pop() - elif line.startswith('BWHistoryWriteValues'): - bw_write_entries = line[21:].split(',') - bw_write_entries = [int(entry) / 1024.0 / 900 for entry in bw_write_entries] - bw_write_entries.pop() - elif line.startswith('BWHistoryReadEnds'): - last_read_time = time.mktime(time.strptime(line[18:], '%Y-%m-%d %H:%M:%S')) - tz_offset - last_read_time -= 900 + if line.startswith('BWHistoryReadValues '): + bw_read_entries = [int(entry) / 1024.0 / 900 for entry in line[20:].split(',')[:-1]] + elif line.startswith('BWHistoryWriteValues '): + bw_write_entries = [int(entry) / 1024.0 / 900 for entry in line[21:].split(',')[:-1]] + elif line.startswith('BWHistoryReadEnds '): + last_read_time = calendar.timegm(time.strptime(line[18:], '%Y-%m-%d %H:%M:%S')) - 900 missing_read_entries = int((time.time() - last_read_time) / 900) - elif line.startswith('BWHistoryWriteEnds'): - last_write_time = time.mktime(time.strptime(line[19:], '%Y-%m-%d %H:%M:%S')) - tz_offset - last_write_time -= 900 + elif line.startswith('BWHistoryWriteEnds '): + last_write_time = calendar.timegm(time.strptime(line[19:], '%Y-%m-%d %H:%M:%S')) - 900 missing_write_entries = int((time.time() - last_write_time) / 900) if not bw_read_entries or not bw_write_entries or not last_read_time or not last_write_time: @@ -445,12 +434,7 @@ class BandwidthStats(graph_panel.GraphStats): if end_interval: # converts from gmt to local with respect to DST - if time.localtime()[8]: - tz_offset = time.altzone - else: - tz_offset = time.timezone - - sec = time.mktime(time.strptime(end_interval, '%Y-%m-%d %H:%M:%S')) - time.time() - tz_offset + sec = calendar.timegm(time.strptime(end_interval, '%Y-%m-%d %H:%M:%S')) - time.time() if CONFIG['features.graph.bw.accounting.isTimeLong']: queried['reset_time'] = ', '.join(str_tools.time_labels(sec, True))

1 0

[arm/master] Changing prepopulate_from_state() to raise exceptions
by atagar＠torproject.org 10 Sep '14

10 Sep '14

commit d1f4fbb15ce82b4075550d9acd495d9504d8c3da Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Sep 10 08:26:44 2014 -0700 Changing prepopulate_from_state() to raise exceptions Having prepopulate_from_state() raise upon issues, and return the seconds missing rather than a boolean indicating success. Both makes the function nicer, and lets us move the logging to the caller. --- arm/controller.py | 15 +++++++++++---- arm/graphing/bandwidth_stats.py | 27 +++++++-------------------- 2 files changed, 18 insertions(+), 24 deletions(-) diff --git a/arm/controller.py b/arm/controller.py index 4a864b9..457da4e 100644 --- a/arm/controller.py +++ b/arm/controller.py @@ -26,9 +26,9 @@ import stem from stem.control import State -from arm.util import panel, tor_config, tor_controller, ui_tools +from arm.util import msg, panel, tor_config, tor_controller, ui_tools -from stem.util import conf, enum, log, system +from stem.util import conf, enum, log, str_tools, system ARM_CONTROLLER = None @@ -198,10 +198,17 @@ def init_controller(stdscr, start_time): # prepopulates bandwidth values from state file if CONFIG["features.graph.bw.prepopulate"] and tor_controller().is_alive(): - is_successful = bw_stats.prepopulate_from_state() + try: + missing_seconds = bw_stats.prepopulate_from_state() + + if missing_sec: + log.notice(msg('panel.graphing.prepopulation_successful', duration = str_tools.time_label(missing_seconds, 0, True))) + else: + log.notice(msg('panel.graphing.prepopulation_all_successful')) - if is_successful: graph_panel.update_interval = 4 + except ValueError as exc: + log.info(msg('panel.graphing.prepopulation_failure', error = str(exc))) class LabelPanel(panel.Panel): diff --git a/arm/graphing/bandwidth_stats.py b/arm/graphing/bandwidth_stats.py index 384497e..d2a0b33 100644 --- a/arm/graphing/bandwidth_stats.py +++ b/arm/graphing/bandwidth_stats.py @@ -138,8 +138,7 @@ class BandwidthStats(graph_panel.GraphStats): controller = tor_controller() if not controller.is_localhost(): - log.info(msg('panel.graphing.prepopulation_failure', error = "we can only prepopulate bandwidth information for a local tor instance")) - return False + raise ValueError('we can only prepopulate bandwidth information for a local tor instance') start_time = system.start_time(controller.get_pid(None)) uptime = time.time() - start_time if start_time else None @@ -149,19 +148,16 @@ class BandwidthStats(graph_panel.GraphStats): # want to prepopulate with information from a prior tor instance. if not uptime: - log.info(msg('panel.graphing.prepopulation_failure', error = "unable to determine tor's uptime")) - return False + raise ValueError("unable to determine tor's uptime") elif uptime < (24 * 60 * 60): - log.info(msg('panel.graphing.prepopulation_failure', error = "insufficient uptime, tor must've been running for at least a day")) - return False + raise ValueError("insufficient uptime, tor must've been running for at least a day") # get the user's data directory (usually '~/.tor') data_dir = controller.get_conf('DataDirectory', None) if not data_dir: - log.info(msg('panel.graphing.prepopulation_failure', error = "unable to determine tor's data directory")) - return False + raise ValueError("unable to determine tor's data directory") # attempt to open the state file @@ -171,8 +167,7 @@ class BandwidthStats(graph_panel.GraphStats): with open(state_file_path) as state_file: state_file_content = state_file.readlines() except IOError as exc: - log.info(msg('panel.graphing.prepopulation_failure', error = 'unable to read the state file at %s, %s' % (state_file_path, exc))) - return False + raise ValueError('unable to read the state file at %s, %s' % (state_file_path, exc)) # get the BWHistory entries (ordered oldest to newest) and number of # intervals since last recorded @@ -211,8 +206,7 @@ class BandwidthStats(graph_panel.GraphStats): missing_write_entries = int((time.time() - last_write_time) / 900) if not bw_read_entries or not bw_write_entries or not last_read_time or not last_write_time: - log.info(msg('panel.graphing.prepopulation_failure', error = 'bandwidth stats missing from state file')) - return False + raise ValueError('bandwidth stats missing from state file') # fills missing entries with the last value @@ -255,14 +249,7 @@ class BandwidthStats(graph_panel.GraphStats): del self.primary_counts[interval_index][self.max_column + 1:] del self.secondary_counts[interval_index][self.max_column + 1:] - missing_sec = time.time() - min(last_read_time, last_write_time) - - if missing_sec: - log.notice(msg('panel.graphing.prepopulation_successful', duration = str_tools.time_label(missing_sec, 0, True))) - else: - log.notice(msg('panel.graphing.prepopulation_all_successful')) - - return True + return time.time() - min(last_read_time, last_write_time) def bandwidth_event(self, event): if self.is_accounting and self.is_next_tick_redraw():

1 0

[translation/tails-iuk_completed] Update translations for tails-iuk_completed
by translation＠torproject.org 10 Sep '14

10 Sep '14

commit 0d51315d866df454e1a83d11aa2f6929e30c1e2f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 10 16:16:45 2014 +0000 Update translations for tails-iuk_completed --- nb.po | 77 +++++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 41 insertions(+), 36 deletions(-) diff --git a/nb.po b/nb.po index 8f94669..927789e 100644 --- a/nb.po +++ b/nb.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Aleksandr Bakken <courfazor(a)gmail.com>, 2014 # lateralus, 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-04-16 17:54+0200\n" -"PO-Revision-Date: 2014-04-17 14:44+0000\n" -"Last-Translator: lateralus\n" +"POT-Creation-Date: 2014-08-31 15:23+0200\n" +"PO-Revision-Date: 2014-09-10 16:15+0000\n" +"Last-Translator: Aleksandr Bakken <courfazor(a)gmail.com>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/torproject/language/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,8 +19,8 @@ msgstr "" "Language: nb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../lib/Tails/IUK/Frontend.pm:146 ../lib/Tails/IUK/Frontend.pm:523 -#: ../lib/Tails/IUK/Frontend.pm:667 +#: ../lib/Tails/IUK/Frontend.pm:146 ../lib/Tails/IUK/Frontend.pm:527 +#: ../lib/Tails/IUK/Frontend.pm:671 msgid "For debugging information, see /home/amnesia/.xsession-errors" msgstr "For informasjon om feilsøking, se /home/amnesia/.xsession-errors" @@ -61,39 +62,43 @@ msgstr "ikke nok minne tilgjengelig på systemet" msgid "No explanation available for reason '%{reason}s'." msgstr "Ingen forklaring er tilgjengelig fordi '%{reason}s'." -#: ../lib/Tails/IUK/Frontend.pm:281 +#: ../lib/Tails/IUK/Frontend.pm:279 +msgid "XXX HEJ XXX" +msgstr "xxx hallo xxx" + +#: ../lib/Tails/IUK/Frontend.pm:285 msgid "The system is up-to-date" msgstr "Systemet er allerede oppdatert" -#: ../lib/Tails/IUK/Frontend.pm:286 +#: ../lib/Tails/IUK/Frontend.pm:290 msgid "This version of Tails is outdated, and may have security issues." msgstr "Denne versjonen av Tails er utdatert, og kan ha kjente sikkerhetsproblem." -#: ../lib/Tails/IUK/Frontend.pm:318 +#: ../lib/Tails/IUK/Frontend.pm:322 #, perl-brace-format msgid "" "The available incremental upgrade requires %{space_needed}s of free space on" " Tails system partition, but only %{free_space}s is available." msgstr "Den tilgjengelige trinnvise oppgraderingen krever %{space_needed}s ledig plass på Tails systempartisjon, men det er bare %{free_space}s tilgjengelig." -#: ../lib/Tails/IUK/Frontend.pm:334 +#: ../lib/Tails/IUK/Frontend.pm:338 #, perl-brace-format msgid "" "The available incremental upgrade requires %{memory_needed}s of free memory," " but only %{free_memory}s is available." msgstr "Den tilgjengelige trinnvise oppgraderingen krever %{memory_needed}s ledig minne, men det er bare %{free_memory}s tilgjengelig." -#: ../lib/Tails/IUK/Frontend.pm:356 +#: ../lib/Tails/IUK/Frontend.pm:360 msgid "" "An incremental upgrade is available, but no full upgrade is.\n" "This should not happen. Please report a bug." msgstr "En trinnvis oppgradering er tilgjengelig, men ingen full oppgradering. \nDette skal ikke skje. Vennligst rapporter feilen. " -#: ../lib/Tails/IUK/Frontend.pm:360 +#: ../lib/Tails/IUK/Frontend.pm:364 msgid "Error while detecting available upgrades" msgstr "Feil under søk av tilgjengelige oppgraderinger" -#: ../lib/Tails/IUK/Frontend.pm:370 +#: ../lib/Tails/IUK/Frontend.pm:374 #, perl-brace-format msgid "" "You should upgrade to %{name}s %{version}s.\n" @@ -109,19 +114,19 @@ msgid "" "Do you want to upgrade now?" msgstr "Du bør oppgradere til %{name}s %{version}s.\n\nFor mer informasjon om denne nye versjonen, gå til %{details_url}s\n\nDet er anbefalt å avslutte alle åpne programmer under oppgraderingen.\nNedlasting av oppgraderingen kan ta lang tid, alt fra noen minutter til flere timer. \nNettverk vil bli deaktivert etter at nedlastingen er fullført. \n\nFilstørrelse: %{size}s\n\nVil du oppgradere nå?" -#: ../lib/Tails/IUK/Frontend.pm:385 +#: ../lib/Tails/IUK/Frontend.pm:389 msgid "Upgrade available" msgstr "Oppgradering tilgjengelig" -#: ../lib/Tails/IUK/Frontend.pm:386 +#: ../lib/Tails/IUK/Frontend.pm:390 msgid "Upgrade now" msgstr "Oppgrader nå" -#: ../lib/Tails/IUK/Frontend.pm:387 +#: ../lib/Tails/IUK/Frontend.pm:391 msgid "Upgrade later" msgstr "Oppgrader senere" -#: ../lib/Tails/IUK/Frontend.pm:395 +#: ../lib/Tails/IUK/Frontend.pm:399 #, perl-brace-format msgid "" "You should do a manual upgrade to %{name}s %{version}s.\n" @@ -133,20 +138,20 @@ msgid "" "To learn how to do a manual upgrade, go to https://tails.boum.org/doc/first_steps/upgrade/#manual" msgstr "Du bør oppgradere manuelt til %{name}s %{version}s.\n\nFor mer informasjon om denne nye versjonen, besøk %{details_url}s.\n\nDet er ikke mulig å automatisk oppgradere enheten din til denne nye versjonen: %{explanation}s.\n\nFor å lære hvordan du oppgraderer manuelt, besøk https://tails.boum.org/doc/first_steps/upgrade/#manual" -#: ../lib/Tails/IUK/Frontend.pm:411 +#: ../lib/Tails/IUK/Frontend.pm:415 msgid "New version available" msgstr "Ny versjon tilgjengelig" -#: ../lib/Tails/IUK/Frontend.pm:468 +#: ../lib/Tails/IUK/Frontend.pm:472 msgid "Downloading upgrade" msgstr "Laster ned oppgradering" -#: ../lib/Tails/IUK/Frontend.pm:471 +#: ../lib/Tails/IUK/Frontend.pm:475 #, perl-brace-format msgid "Downloading the upgrade to %{name}s %{version}s..." msgstr "Laster ned oppgraderingen til %{name}s %{version}s..." -#: ../lib/Tails/IUK/Frontend.pm:512 +#: ../lib/Tails/IUK/Frontend.pm:516 msgid "" "The upgrade could not be downloaded.\\n\\nCheck your network " "connection, and restart Tails to try upgrading again.\\n\\nIf the problem " @@ -154,26 +159,26 @@ msgid "" "file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" msgstr "Oppgraderingen kunne ikke lastes ned.\\n\\nSjekk nettverksforbindelsen din, start Tails på nytt og prøv å oppgradere igjen.\\n\\nHvis problemet vedvarer, se file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" -#: ../lib/Tails/IUK/Frontend.pm:528 ../lib/Tails/IUK/Frontend.pm:547 +#: ../lib/Tails/IUK/Frontend.pm:532 ../lib/Tails/IUK/Frontend.pm:551 msgid "Error while downloading the upgrade" msgstr "Feil under nedlasting av oppgraderingen" -#: ../lib/Tails/IUK/Frontend.pm:540 +#: ../lib/Tails/IUK/Frontend.pm:544 #, perl-brace-format msgid "" "Output file '%{output_file}s' does not exist, but tails-iuk-get-target-file " "did not complain. Please report a bug." msgstr "Utdata filen '%{output_file}s' eksisterer ikke, men tails-iuk-get-target-file klaget ikke. Vennligst rapporter feilen." -#: ../lib/Tails/IUK/Frontend.pm:559 +#: ../lib/Tails/IUK/Frontend.pm:563 msgid "Error while creating temporary downloading directory" msgstr "Feil under oppretting av midlertidig nedlastingsmappe. " -#: ../lib/Tails/IUK/Frontend.pm:562 +#: ../lib/Tails/IUK/Frontend.pm:566 msgid "Failed to create temporary download directory" msgstr "Oppretting av midlertidig nedlastingsmappe feilet" -#: ../lib/Tails/IUK/Frontend.pm:574 +#: ../lib/Tails/IUK/Frontend.pm:578 msgid "" "Your Tails device was successfully upgraded.\n" "\n" @@ -183,46 +188,46 @@ msgid "" "Do you want to restart now?" msgstr "Din Tails enhet ble oppgradert uten problemer.\n\nNoen sikkerhetsfunksjoner ble midlertidig deaktivert. \nDu bør starte Tails på nytt med den nye versjonen snarest mulig. \n\nVil du starte på nytt nå?" -#: ../lib/Tails/IUK/Frontend.pm:579 +#: ../lib/Tails/IUK/Frontend.pm:583 msgid "Restart Tails" msgstr "Omstart av Tails" -#: ../lib/Tails/IUK/Frontend.pm:580 +#: ../lib/Tails/IUK/Frontend.pm:584 msgid "Restart now" msgstr "Omstart nå" -#: ../lib/Tails/IUK/Frontend.pm:581 +#: ../lib/Tails/IUK/Frontend.pm:585 msgid "Restart later" msgstr "Omstart senere" -#: ../lib/Tails/IUK/Frontend.pm:592 +#: ../lib/Tails/IUK/Frontend.pm:596 msgid "Error while restarting the system" msgstr "Feil under omstart av systemet" -#: ../lib/Tails/IUK/Frontend.pm:595 +#: ../lib/Tails/IUK/Frontend.pm:599 msgid "Failed to restart the system" msgstr "Omstart av systemet feilet" -#: ../lib/Tails/IUK/Frontend.pm:610 +#: ../lib/Tails/IUK/Frontend.pm:614 msgid "Error while shutting down the network" msgstr "Feil under avstengning av nettverket" -#: ../lib/Tails/IUK/Frontend.pm:613 +#: ../lib/Tails/IUK/Frontend.pm:617 msgid "Failed to shutdown network" msgstr "Avstengning av nettverket feilet" -#: ../lib/Tails/IUK/Frontend.pm:623 +#: ../lib/Tails/IUK/Frontend.pm:627 msgid "Upgrading the system" msgstr "Oppgraderer systemet" -#: ../lib/Tails/IUK/Frontend.pm:625 +#: ../lib/Tails/IUK/Frontend.pm:629 msgid "" "Your Tails device is being upgraded...\n" "\n" "For security reasons, the networking is now disabled." msgstr "Din Tails enhet oppgraderes...\n\nAv sikkerhetsmessige årsaker, er nettverk nå deaktivert." -#: ../lib/Tails/IUK/Frontend.pm:662 +#: ../lib/Tails/IUK/Frontend.pm:666 msgid "" "An error occured while installing the upgrade.\\n\\nYour Tails device" " needs to be repaired and might be unable to restart.\\n\\nPlease follow the" @@ -230,6 +235,6 @@ msgid "" "file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" msgstr "En feil oppstod under installering av oppgraderingen\\n\\nDin Tails enhet må repareres og kan kanskje ikke startes igjen.\\n\\nFølg instruksjonene på file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" -#: ../lib/Tails/IUK/Frontend.pm:672 +#: ../lib/Tails/IUK/Frontend.pm:676 msgid "Error while installing the upgrade" msgstr "Feil under installering av oppgraderingen "

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 10 Sep '14

10 Sep '14

commit 839cec9c2f4e2849704313820b961ac3e65e27c5 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 10 16:16:37 2014 +0000 Update translations for tails-iuk --- nb.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nb.po b/nb.po index 38b500c..927789e 100644 --- a/nb.po +++ b/nb.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Aleksandr Bakken <courfazor(a)gmail.com>, 2014 # lateralus, 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-08-31 15:23+0200\n" -"PO-Revision-Date: 2014-09-01 09:20+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-09-10 16:15+0000\n" +"Last-Translator: Aleksandr Bakken <courfazor(a)gmail.com>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/torproject/language/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -63,7 +64,7 @@ msgstr "Ingen forklaring er tilgjengelig fordi '%{reason}s'." #: ../lib/Tails/IUK/Frontend.pm:279 msgid "XXX HEJ XXX" -msgstr "" +msgstr "xxx hallo xxx" #: ../lib/Tails/IUK/Frontend.pm:285 msgid "The system is up-to-date"

1 0

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

10 Sep '14

commit 6f5b08761dbb37955339f0e874d1cf3c97d31069 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 10 16:16:12 2014 +0000 Update translations for tor-launcher-network-settings_completed --- nb/network-settings.dtd | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/nb/network-settings.dtd b/nb/network-settings.dtd index 527f6b6..5e45a97 100644 --- a/nb/network-settings.dtd +++ b/nb/network-settings.dtd @@ -8,8 +8,8 @@ <!ENTITY torSettings.no "Nei"> <!ENTITY torSettings.firstQuestion "Hvilket av følgende beskriver best din situasjon?"> -<!ENTITY torSettings.configurePrompt1 "Denne datamaskinens Internett-tilkobling er sensurert, filtrert, eller går gjennom en proxy."> -<!ENTITY torSettings.configurePrompt2 "Jeg må konfigurere bro, brannmur eller proxy innstillinger."> +<!ENTITY torSettings.configurePrompt1 "Computeren's internett tilkobling er sensurert eller under proxy."> +<!ENTITY torSettings.configurePrompt2 "Jeg må konfigurere brdige eller proxy instillinger."> <!ENTITY torSettings.configure "Konfigurer"> <!ENTITY torSettings.connectPrompt2 "Jeg vil koble direkte til Tor-nettverket."> <!ENTITY torSettings.connectPrompt3 "Dette vil fungere i de fleste situasjoner."> @@ -19,9 +19,6 @@  <!ENTITY torSettings.proxyHelp "Hvis du ikke er sikker på hvordan du skal svare på dette spørsmålet, se på Internett-innstillingene i en annen nettleser for å se om den er konfigurert til å bruke en proxy."> <!ENTITY torSettings.enterProxy "Skriv inn proxy-innstillingene."> -<!ENTITY torSettings.firewallQuestion "Går denne datamaskinens Internett-tilkobling gjennom en brannmur som kun tillater forbindelser til visse porter?"> -<!ENTITY torSettings.firewallHelp "Hvis du ikke er sikker på hvordan du skal svare på dette spørsmålet, velg nei. Hvis du støter på problemer med å koble til Tor-nettverket, endrer du denne innstillingen."> -<!ENTITY torSettings.enterFirewall "Skriv inn en liste, adskilt med komma, over porter som er tillatt av brannmuren."> <!ENTITY torSettings.bridgeQuestion "Blokkerer eller sensurerer internettleverandøren (ISP) din tilkoblinger til Tor-nettverket?"> <!ENTITY torSettings.bridgeHelp "Hvis du er usikker på hva du skal svare på dette spørsmålet, velg Nei.  Hvis du velger Ja, vil du bli bedt om å konfigurere Tor-broer, som er ulistede reléer som gjør det vanskeligere å blokkere tilkoblinger til Tor-nettverket."> <!ENTITY torSettings.bridgeSettingsPrompt "Du kan bruke de angitte broene eller du kan skaffe og oppgi egendefinerte broer.">

1 0

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

10 Sep '14

commit ae09fb46cd9be04b58b97550297ef1648383792f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 10 16:16:06 2014 +0000 Update translations for tor-launcher-network-settings --- nb/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nb/network-settings.dtd b/nb/network-settings.dtd index 7c02244..5e45a97 100644 --- a/nb/network-settings.dtd +++ b/nb/network-settings.dtd @@ -8,8 +8,8 @@ <!ENTITY torSettings.no "Nei"> <!ENTITY torSettings.firstQuestion "Hvilket av følgende beskriver best din situasjon?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> +<!ENTITY torSettings.configurePrompt1 "Computeren's internett tilkobling er sensurert eller under proxy."> +<!ENTITY torSettings.configurePrompt2 "Jeg må konfigurere brdige eller proxy instillinger."> <!ENTITY torSettings.configure "Konfigurer"> <!ENTITY torSettings.connectPrompt2 "Jeg vil koble direkte til Tor-nettverket."> <!ENTITY torSettings.connectPrompt3 "Dette vil fungere i de fleste situasjoner.">

1 0