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

[tor-launcher/master] Support packaging as a standalone XUL application.
by brade＠torproject.org 27 Feb '14

27 Feb '14

commit 4c1ef941aa146671f751ad7f696103da902c865b Author: Tails developers <amnesia(a)boum.org> Date: Tue Feb 11 00:02:22 2014 +0100 Support packaging as a standalone XUL application. --- Makefile | 29 +++++++++++++++++++++++++---- application.ini.in | 13 +++++++++++++ 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 9c3e853..3d3a857 100644 --- a/Makefile +++ b/Makefile @@ -2,14 +2,19 @@ ### See src/LICENSE for licensing information. EXT_NAME=tor-launcher -XPI_NAME:=$(shell echo "$(EXT_NAME)-`grep em:version src/install.rdf | sed -e 's/[<>]/ /g' | cut -f3`.xpi") +VERSION:=`grep em:version src/install.rdf | sed -e 's/[<>]/ /g' | cut -f3` +XPI_NAME:=$(shell echo "$(EXT_NAME)-$(VERSION).xpi") +STANDALONE_NAME=$(EXT_NAME)-standalone +STANDALONE_TARBALL=$(shell echo "$(STANDALONE_NAME)-$(VERSION).tar.gz") -AVAIL_TARGETS=help package clean +AVAIL_TARGETS=help package standalone clean ifeq ($(VERBOSE),1) ZIP=zip + TAR=tar -v else ZIP=zip -q + TAR=tar endif help: @@ -18,13 +23,29 @@ help: echo " make $$t"; \ done -package: clean +pkg-prepare: clean @mkdir -p pkg + +package: pkg-prepare @(cd src; $(ZIP) -X9r "../pkg/$(XPI_NAME)" ./ -x "*.diff") @echo "Created package pkg/$(XPI_NAME)" +standalone: pkg-prepare + $(eval TMP="$(shell mktemp -d "/tmp/$(STANDALONE_NAME).XXXXXX")") + @mkdir -p "$(TMP)/$(STANDALONE_NAME)" + @cp -a "src/"* "$(TMP)/$(STANDALONE_NAME)" + @cp application.ini.in "$(TMP)/$(STANDALONE_NAME)/application.ini" + @sed -i -e "s/__VERSION__/$(VERSION)/" \ + -e "s/__DATE__/`date '+%Y%m%d'`/" \ + "$(TMP)/$(STANDALONE_NAME)/application.ini" + @$(TAR) --exclude "*.diff" -czf "pkg/$(STANDALONE_TARBALL)" \ + -C "$(TMP)" "$(STANDALONE_NAME)" + @rm -rf "$(TMP)" + @echo "Created standalone package pkg/$(STANDALONE_TARBALL)" + clean: - @rm -f "pkg/$(XPI_NAME)" + @rm -f "pkg/$(XPI_NAME)" \ + "pkg/$(STANDALONE_TARBALL)" zip: @TMPFILE=/tmp/$(EXT_NAME)-`date '+%Y-%m-%d-%s'`.zip; \ diff --git a/application.ini.in b/application.ini.in new file mode 100644 index 0000000..00d66d1 --- /dev/null +++ b/application.ini.in @@ -0,0 +1,13 @@ +[App] +Vendor=TorProject +Name=TorLauncher +Version=__VERSION__ +BuildID=__DATE__ +ID=tor-launcher(a)torproject.org + +[Gecko] +MinVersion=24.0.0 +MaxVersion=*.*.* + +[Shell] +Icon=icon.png

1 0

[tor-launcher/master] Split Tor process starting code from control code.
by brade＠torproject.org 27 Feb '14

27 Feb '14

commit ce36cfd72d78422148bead146aecfa452a1b9c90 Author: Tails developers <amnesia(a)boum.org> Date: Mon Feb 17 20:20:28 2014 +0100 Split Tor process starting code from control code. This separation is useful for supporting configuration of already started, system-wide Tor instances. --- src/chrome/locale/en/torlauncher.properties | 1 + src/components/tl-process.js | 26 +++++++++++++++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index bd8646e..3d5ee3f 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -7,6 +7,7 @@ torlauncher.tor_exited=Tor unexpectedly exited. torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. +torlauncher.tor_control_failed=Failed to take control of Tor. torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). diff --git a/src/components/tl-process.js b/src/components/tl-process.js index f97fa59..b542fc4 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -90,7 +90,10 @@ TorProcessService.prototype = this.mObsSvc.addObserver(this, kBootstrapStatusTopic, false); if (TorLauncherUtil.shouldStartAndOwnTor) + { this._startTor(); + this._controlTor(); + } } else if ("quit-application-granted" == aTopic) { @@ -340,7 +343,24 @@ TorProcessService.prototype = p.runwAsync(args, args.length, this, false); this.mTorProcess = p; this.mTorProcessStartTime = Date.now(); + } + catch (e) + { + this.mTorProcessStatus = this.kStatusExited; + var s = TorLauncherUtil.getLocalizedString("tor_failed_to_start"); + TorLauncherUtil.showAlert(null, s); + TorLauncherLogger.safelog(4, "_startTor error: ", e); + } + }, // _startTor() + + + _controlTor: function() + { + var isInitialBootstrap = + TorLauncherUtil.getBoolPref(this.kPrefPromptAtStartup); + try + { this._monitorTorProcessStartup(); if (isInitialBootstrap) @@ -378,11 +398,11 @@ TorProcessService.prototype = catch (e) { this.mTorProcessStatus = this.kStatusExited; - var s = TorLauncherUtil.getLocalizedString("tor_failed_to_start"); + var s = TorLauncherUtil.getLocalizedString("tor_control_failed"); TorLauncherUtil.showAlert(null, s); - TorLauncherLogger.safelog(4, "_startTor error: ", e); + TorLauncherLogger.safelog(4, "_controlTor error: ", e); } - }, // _startTor() + }, // controlTor() _monitorTorProcessStartup: function() {

1 0

[tor-launcher/master] If TOR_CONFIGURE_ONLY=1, only configure Tor.
by brade＠torproject.org 27 Feb '14

27 Feb '14

commit 2545a772f23fe28127bbca17d1c6e89fd1aebfa1 Author: Tails developers <amnesia(a)boum.org> Date: Mon Feb 17 20:22:29 2014 +0100 If TOR_CONFIGURE_ONLY=1, only configure Tor. This option prevents Tor Launcher from starting a Tor process but it will try to configure any already started Tor process without taking ownership of it. This option is intended for situations where Tor Launcher is supposed to configure an already started, system-wide Tor instance. Note that it's not the same as TOR_SKIP_LAUNCH (and, equivalently, `extensions.torlauncher.start_tor`), which prevents *both* start and configuration of Tor. --- src/components/tl-process.js | 6 +++++- src/components/tl-protocol.js | 3 ++- src/modules/tl-util.jsm | 16 ++++++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index b542fc4..2517ae5 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -89,7 +89,11 @@ TorProcessService.prototype = this.mObsSvc.addObserver(this, kUserQuitTopic, false); this.mObsSvc.addObserver(this, kBootstrapStatusTopic, false); - if (TorLauncherUtil.shouldStartAndOwnTor) + if (TorLauncherUtil.shouldOnlyConfigureTor) + { + this._controlTor(); + } + else if (TorLauncherUtil.shouldStartAndOwnTor) { this._startTor(); this._controlTor(); diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index 72530ea..e73f2e9 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -568,7 +568,8 @@ TorProtocolService.prototype = return null; } - if (!aIsEventConnection && TorLauncherUtil.shouldStartAndOwnTor) + if (!aIsEventConnection && TorLauncherUtil.shouldStartAndOwnTor && + !TorLauncherUtil.shouldOnlyConfigureTor) { // Try to become the primary controller (TAKEOWNERSHIP). reply = this._sendCommand(conn, "TAKEOWNERSHIP", null); diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index ef13a72..5b1c6c0 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -196,6 +196,22 @@ let TorLauncherUtil = // Public return this.getBoolPref(kPrefStartTor, true); }, + + get shouldOnlyConfigureTor() + { + const kPrefOnlyConfigureTor = "extensions.torlauncher.only_configure_tor"; + try + { + const kEnvOnlyConfigureTor = "TOR_CONFIGURE_ONLY"; + + var env = Cc["@mozilla.org/process/environment;1"] + .getService(Ci.nsIEnvironment); + if (env.exists(kEnvOnlyConfigureTor)) + return ("1" == env.get(kEnvOnlyConfigureTor)); + } catch(e) {} + + return this.getBoolPref(kPrefOnlyConfigureTor, false); + }, };

1 0

[tor-launcher/master] Require Firefox 24.0 or newer. Use *.*.* for maxVersion of all applications.
by brade＠torproject.org 27 Feb '14

27 Feb '14

commit 317fb4eafa4248560baf09aafeb62355e9a680ae Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Feb 27 10:41:35 2014 -0500 Require Firefox 24.0 or newer. Use *.*.* for maxVersion of all applications. --- src/install.rdf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/install.rdf b/src/install.rdf index 9e45c8a..f718b6b 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -17,8 +17,8 @@ <em:targetApplication> <Description> <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> - <em:minVersion>17.0</em:minVersion> - <em:maxVersion>10000.0</em:maxVersion> + <em:minVersion>24.0</em:minVersion> + <em:maxVersion>*.*.*</em:maxVersion> </Description> </em:targetApplication>  @@ -26,7 +26,7 @@ <Description> <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id> <em:minVersion>10.0</em:minVersion> - <em:maxVersion>24.*</em:maxVersion> + <em:maxVersion>*.*.*</em:maxVersion> </Description> </em:targetApplication>  @@ -34,7 +34,7 @@ <Description> <em:id>{33cb9019-c295-46dd-be21-8c4936574bee}</em:id> <em:minVersion>1.4</em:minVersion> - <em:maxVersion>1000</em:maxVersion> + <em:maxVersion>*.*.*</em:maxVersion> </Description> </em:targetApplication>

1 0

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

27 Feb '14

commit d3e6750174f718c50bad07cd6128cdff7cdffc11 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 27 15:15:56 2014 +0000 Update translations for tails-iuk_completed --- de.po | 109 +++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 55 insertions(+), 54 deletions(-) diff --git a/de.po b/de.po index 32179ad..06998a8 100644 --- a/de.po +++ b/de.po @@ -6,15 +6,16 @@ # noble <noble(a)posteo.de>, 2013 # rike <u(a)451f.org>, 2014 # to_ba, 2013-2014 +# tom_fate <tomoffate(a)gmail.com>, 2014 # nufuk <tor(a)nufuk.com>, 2013 # rike <u(a)451f.org>, 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-02-20 15:49+0100\n" -"PO-Revision-Date: 2014-02-21 23:30+0000\n" -"Last-Translator: to_ba\n" +"POT-Creation-Date: 2014-02-21 17:38+0100\n" +"PO-Revision-Date: 2014-02-27 15:12+0000\n" +"Last-Translator: tom_fate <tomoffate(a)gmail.com>\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,16 +23,16 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../lib/Tails/IUK/Frontend.pm:145 ../lib/Tails/IUK/Frontend.pm:505 -#: ../lib/Tails/IUK/Frontend.pm:649 +#: ../lib/Tails/IUK/Frontend.pm:146 ../lib/Tails/IUK/Frontend.pm:523 +#: ../lib/Tails/IUK/Frontend.pm:667 msgid "For debugging information, see ~/.xsession-errors." msgstr "Für Fehlerdiagnoseinformationen ~/.xsession-errors öffnen." -#: ../lib/Tails/IUK/Frontend.pm:210 +#: ../lib/Tails/IUK/Frontend.pm:216 msgid "Error while checking for upgrades" msgstr "Fehler beim Suchen nach Aktualisierungen" -#: ../lib/Tails/IUK/Frontend.pm:213 +#: ../lib/Tails/IUK/Frontend.pm:219 msgid "" "Could not determine whether an upgrade is available from our website.\n" "\n" @@ -40,64 +41,64 @@ msgid "" "If the problem persists, go to file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" msgstr "Es konnte nicht festgestellt werden, ob eine Aktualisierung auf unserer Webseite verfügbar ist.\n\nBitte überprüfen Sie Ihre Netzwerkverbindung und starten Sie Tails erneut, für einen erneuten Versuch einer Aktualisierung.\n\nWenn das Problem weiterhin besteht, sehen Sie sich diese Datei an file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" -#: ../lib/Tails/IUK/Frontend.pm:227 -msgid "no incremental upgrade is available." -msgstr "keine schrittweise Aktualisierung verfügbar." +#: ../lib/Tails/IUK/Frontend.pm:234 +msgid "no automatic upgrade is available from our website for this version" +msgstr "Für diese Version steht kein automatisches Update von unserer Website zur Verfügung." -#: ../lib/Tails/IUK/Frontend.pm:230 -msgid "your device was not created using Tails Installer." -msgstr "Ihr Gerät wurde nicht mit dem Tails-Installationsprogramm erstellt." +#: ../lib/Tails/IUK/Frontend.pm:240 +msgid "your device was not created using Tails Installer" +msgstr "Ihr Gerät wurde nicht mit dem Tails Installer erstellt." -#: ../lib/Tails/IUK/Frontend.pm:233 -msgid "your device is not writable." -msgstr "Ihr Gerät ist nicht beschreibbar." +#: ../lib/Tails/IUK/Frontend.pm:245 +msgid "Tails was started from a DVD or a read-only device" +msgstr "Tails wurde von einer DVD, oder einem anderen Medium gestartet, auf das nur lesend zugegriffen werden kann." -#: ../lib/Tails/IUK/Frontend.pm:236 -msgid "there is not enough free space on your device." -msgstr "nicht genügend freier Speicherplatz auf Ihrem Gerät." +#: ../lib/Tails/IUK/Frontend.pm:250 +msgid "there is not enough free space on the Tails system partition" +msgstr "Die Systempartition auf der Tails installiert ist besitzt nicht genug freien Speicher." -#: ../lib/Tails/IUK/Frontend.pm:239 -msgid "there is not enough free memory." -msgstr "nicht genügend freier Arbeitsspeicher." +#: ../lib/Tails/IUK/Frontend.pm:255 +msgid "not enough memory is available on this system" +msgstr "Auf diesem Gerät steht nicht genug Speicher zur Verfügung." -#: ../lib/Tails/IUK/Frontend.pm:244 +#: ../lib/Tails/IUK/Frontend.pm:261 #, perl-brace-format msgid "No explanation available for reason '%{reason}s'." msgstr "Keine Erklärung verfügbar für Grund »%{reason}s«." -#: ../lib/Tails/IUK/Frontend.pm:264 +#: ../lib/Tails/IUK/Frontend.pm:281 msgid "The system is up-to-date" msgstr "Das System ist aktuell" -#: ../lib/Tails/IUK/Frontend.pm:269 +#: ../lib/Tails/IUK/Frontend.pm:286 msgid "This version of Tails is outdated, and may have security issues." msgstr "Diese Version von Tails ist veraltet und hat Sicherheitsprobleme." -#: ../lib/Tails/IUK/Frontend.pm:301 +#: ../lib/Tails/IUK/Frontend.pm:318 #, 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 "Die verfügbare inkrementelle Aktualisierung benötigt %{space_needed}s freien Speicherplatz auf der Tails-Systempartition, aber es sind nur %{free_space}s verfügbar. " -#: ../lib/Tails/IUK/Frontend.pm:317 +#: ../lib/Tails/IUK/Frontend.pm:334 #, perl-brace-format msgid "" "The available incremental upgrade requires %{memory_needed}s of free memory," " but only %{free_memory}s is available." msgstr "Die verfügbare inkrementelle Aktualisierung benötigt %{memory_needed}s freien Hauptspeicher, aber es sind nur %{free_memory}s verfügbar." -#: ../lib/Tails/IUK/Frontend.pm:339 +#: ../lib/Tails/IUK/Frontend.pm:356 msgid "" "An incremental upgrade is available, but no full upgrade is.\n" "This should not happen. Please report a bug." msgstr "Eine inkrementelle Aktualisierung ist verfügbar. Aber eine vollständige Aktualisierung wurde erwartet.\nDas sollte nicht passieren. Bitte melden Sie diesen Fehler." -#: ../lib/Tails/IUK/Frontend.pm:343 +#: ../lib/Tails/IUK/Frontend.pm:360 msgid "Error while detecting available upgrades" msgstr "Fehler beim Suchen nach Aktualisierungen" -#: ../lib/Tails/IUK/Frontend.pm:353 +#: ../lib/Tails/IUK/Frontend.pm:370 #, perl-brace-format msgid "" "You should upgrade to %{name}s %{version}s.\n" @@ -113,19 +114,19 @@ msgid "" "Do you want to upgrade now?" msgstr "Sie sollten auf %{name}s %{version}s aktualisieren.\n\nFür weitere Informationen zu dieser neuen Version, besuchen Sie %{details_url}s.\n\nEs ist empfohlen alle offenen Anwendungen vor der Aktualisierung zu schließen.\nDas Herunterladen der Aktualisierung könnte einige Zeit, von mehreren Minuten bis einigen Stunden, benötigen.\nDas Netzwerk wird nach dem Herunterladen der Aktualisierung abgeschalten.\n\nGröße zu Herunterladen: %{size}s\n\nWollen Sie jetzt aktualisieren?" -#: ../lib/Tails/IUK/Frontend.pm:368 +#: ../lib/Tails/IUK/Frontend.pm:385 msgid "Upgrade available" msgstr "Aktualisierung verfügbar" -#: ../lib/Tails/IUK/Frontend.pm:369 +#: ../lib/Tails/IUK/Frontend.pm:386 msgid "Upgrade now" msgstr "Jetzt aktualisieren" -#: ../lib/Tails/IUK/Frontend.pm:370 +#: ../lib/Tails/IUK/Frontend.pm:387 msgid "Upgrade later" msgstr "Später aktualisieren" -#: ../lib/Tails/IUK/Frontend.pm:378 +#: ../lib/Tails/IUK/Frontend.pm:395 #, perl-brace-format msgid "" "You should do a manual upgrade to %{name}s %{version}s.\n" @@ -137,20 +138,20 @@ msgid "" "To learn how to do a manual upgrade, go to https://tails.boum.org/doc/first_steps/upgrade/#manual" msgstr "Sie sollten eine manuelle Aktualisierung auf %{name}s %{version}s vornehmen.\n\nFür weitere Informationen über diese neue Version, besuchen Sie bitte %{details_url}s.\n\nEs ist nicht möglich, Ihr Gerät automatisch auf diese neue Version zu aktualisieren: %{explanation}s.\n\nUm zu lernen, wie man eine manuelle Aktualisierung vornimmt, besuchen Sie bitte https://tails.boum.org/doc/first_steps/upgrade/#manual" -#: ../lib/Tails/IUK/Frontend.pm:394 +#: ../lib/Tails/IUK/Frontend.pm:411 msgid "New version available" msgstr "Eine neue Version ist verfügbar" -#: ../lib/Tails/IUK/Frontend.pm:450 +#: ../lib/Tails/IUK/Frontend.pm:468 msgid "Downloading upgrade" msgstr "Aktualisierung herunterladen" -#: ../lib/Tails/IUK/Frontend.pm:453 +#: ../lib/Tails/IUK/Frontend.pm:471 #, perl-brace-format msgid "Downloading the upgrade to %{name}s %{version}s..." msgstr "Herunterladen der Aktualisierung auf %{name}s %{version}s …" -#: ../lib/Tails/IUK/Frontend.pm:494 +#: ../lib/Tails/IUK/Frontend.pm:512 msgid "" "The upgrade could not be downloaded.\\n\\nCheck your network " "connection, and restart Tails to try upgrading again.\\n\\nIf the problem " @@ -158,26 +159,26 @@ msgid "" "file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" msgstr "Die Aktualisierung konnte nicht heruntergeladen werden.\\n\\nBitte überprüfen Sie Ihre Netzwerkverbindung und starten Sie Tails für einen erneuten Versuch einer Aktualisierung.\\n\\nWenn das Problem weiterhin besteht, sehen Sie sich diese Datei an file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" -#: ../lib/Tails/IUK/Frontend.pm:510 ../lib/Tails/IUK/Frontend.pm:529 +#: ../lib/Tails/IUK/Frontend.pm:528 ../lib/Tails/IUK/Frontend.pm:547 msgid "Error while downloading the upgrade" msgstr "Fehler beim Herunterladen einer Aktualisierung" -#: ../lib/Tails/IUK/Frontend.pm:522 +#: ../lib/Tails/IUK/Frontend.pm:540 #, 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 "Die Ausgabedatei »%{output_file}s« existiert nicht, aber tails-iuk-get-target-file hat nichts beanstandet. Bitte melden Sie den Fehler." -#: ../lib/Tails/IUK/Frontend.pm:541 +#: ../lib/Tails/IUK/Frontend.pm:559 msgid "Error while creating temporary downloading directory" msgstr "Fehler während des Erstellens eines temporären Verzeichnisses zum Herunterladen" -#: ../lib/Tails/IUK/Frontend.pm:544 +#: ../lib/Tails/IUK/Frontend.pm:562 msgid "Failed to create temporary download directory" msgstr "Fehler beim Erstellen eines temporären Verzeichnisses zum Herunterladen" -#: ../lib/Tails/IUK/Frontend.pm:556 +#: ../lib/Tails/IUK/Frontend.pm:574 msgid "" "Your Tails device was successfully upgraded.\n" "\n" @@ -187,46 +188,46 @@ msgid "" "Do you want to restart now?" msgstr "Ihr Tails-Gerät wurde erfolgreich aktualisiert\n\nEinige Sicherheitsfunktionen wurden vorübergehend abgeschalten.\nSie sollten Tails mit der neuen Version so bald wie möglich neu starten.\n\nWollen Sie jetzt neu starten?" -#: ../lib/Tails/IUK/Frontend.pm:561 +#: ../lib/Tails/IUK/Frontend.pm:579 msgid "Restart Tails" msgstr "Neustart von Tails" -#: ../lib/Tails/IUK/Frontend.pm:562 +#: ../lib/Tails/IUK/Frontend.pm:580 msgid "Restart now" msgstr "Jetzt neu starten" -#: ../lib/Tails/IUK/Frontend.pm:563 +#: ../lib/Tails/IUK/Frontend.pm:581 msgid "Restart later" msgstr "später neu starten" -#: ../lib/Tails/IUK/Frontend.pm:574 +#: ../lib/Tails/IUK/Frontend.pm:592 msgid "Error while restarting the system" msgstr "Beim Neustart des Systems ist ein Fehler aufgetreten" -#: ../lib/Tails/IUK/Frontend.pm:577 +#: ../lib/Tails/IUK/Frontend.pm:595 msgid "Failed to restart the system" msgstr "Neustart des Systems ist fehlgeschlagen" -#: ../lib/Tails/IUK/Frontend.pm:592 +#: ../lib/Tails/IUK/Frontend.pm:610 msgid "Error while shutting down the network" msgstr "Fehler beim Herunterfahren des Netzwerks" -#: ../lib/Tails/IUK/Frontend.pm:595 +#: ../lib/Tails/IUK/Frontend.pm:613 msgid "Failed to shutdown network" msgstr "Herunterfahren des Netzwerks ist fehlgeschlagen" -#: ../lib/Tails/IUK/Frontend.pm:605 +#: ../lib/Tails/IUK/Frontend.pm:623 msgid "Upgrading the system" msgstr "Das System aktualisieren" -#: ../lib/Tails/IUK/Frontend.pm:607 +#: ../lib/Tails/IUK/Frontend.pm:625 msgid "" "Your Tails device is being upgraded...\n" "\n" "For security reasons, the networking is now disabled." msgstr "Ihr Tails-Gerät wird aktualisiert …\n\nAus Sicherheitsgründen wird das Netzwerk jetzt abgeschalten." -#: ../lib/Tails/IUK/Frontend.pm:644 +#: ../lib/Tails/IUK/Frontend.pm:662 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" @@ -234,6 +235,6 @@ msgid "" "file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" msgstr "Ein Fehler ist während der Aktualisierung ausgetreten.\\n\\nIhr Tails-Gerät muß repariert werden und ein Neustart könnte fehlschlagen.\\n\\nBitte folgen Sie den Anweisungen in der Datei file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" -#: ../lib/Tails/IUK/Frontend.pm:654 +#: ../lib/Tails/IUK/Frontend.pm:672 msgid "Error while installing the upgrade" msgstr "Fehler beim Installieren der Aktualisierungen"

1 0

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

27 Feb '14

commit 0568d6438eed440638d6fdd5a7f3d3512eea2b2c Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 27 15:15:53 2014 +0000 Update translations for tails-iuk --- de.po | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/de.po b/de.po index 0ddb5d4..06998a8 100644 --- a/de.po +++ b/de.po @@ -6,6 +6,7 @@ # noble <noble(a)posteo.de>, 2013 # rike <u(a)451f.org>, 2014 # to_ba, 2013-2014 +# tom_fate <tomoffate(a)gmail.com>, 2014 # nufuk <tor(a)nufuk.com>, 2013 # rike <u(a)451f.org>, 2014 msgid "" @@ -13,8 +14,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-02-21 17:38+0100\n" -"PO-Revision-Date: 2014-02-22 08:18+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-02-27 15:12+0000\n" +"Last-Translator: tom_fate <tomoffate(a)gmail.com>\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -42,23 +43,23 @@ msgstr "Es konnte nicht festgestellt werden, ob eine Aktualisierung auf unser #: ../lib/Tails/IUK/Frontend.pm:234 msgid "no automatic upgrade is available from our website for this version" -msgstr "" +msgstr "Für diese Version steht kein automatisches Update von unserer Website zur Verfügung." #: ../lib/Tails/IUK/Frontend.pm:240 msgid "your device was not created using Tails Installer" -msgstr "" +msgstr "Ihr Gerät wurde nicht mit dem Tails Installer erstellt." #: ../lib/Tails/IUK/Frontend.pm:245 msgid "Tails was started from a DVD or a read-only device" -msgstr "" +msgstr "Tails wurde von einer DVD, oder einem anderen Medium gestartet, auf das nur lesend zugegriffen werden kann." #: ../lib/Tails/IUK/Frontend.pm:250 msgid "there is not enough free space on the Tails system partition" -msgstr "" +msgstr "Die Systempartition auf der Tails installiert ist besitzt nicht genug freien Speicher." #: ../lib/Tails/IUK/Frontend.pm:255 msgid "not enough memory is available on this system" -msgstr "" +msgstr "Auf diesem Gerät steht nicht genug Speicher zur Verfügung." #: ../lib/Tails/IUK/Frontend.pm:261 #, perl-brace-format

1 0

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

27 Feb '14

commit 56c07dcd2e27d87d672bd830510b7fb2e98e35fd Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 27 15:15:28 2014 +0000 Update translations for tails-greeter_completed --- de/de.po | 69 +++++++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 55 insertions(+), 14 deletions(-) diff --git a/de/de.po b/de/de.po index dc787b3..13adab3 100644 --- a/de/de.po +++ b/de/de.po @@ -10,6 +10,7 @@ # Sacro <Scion(a)T-Online.de>, 2012 # to_ba, 2013 # to_ba, 2014 +# tom_fate <tomoffate(a)gmail.com>, 2014 # Victor1975 <VKerley75(a)gmail.com>, 2013 # djcrackhome <wallcityserver(a)gmail.com>, 2012 # Wasilis <inactive+Wasilis(a)transifex.com>, 2013 @@ -17,9 +18,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-10 12:01+0100\n" -"PO-Revision-Date: 2014-01-21 15:10+0000\n" -"Last-Translator: to_ba\n" +"POT-Creation-Date: 2014-02-21 19:40+0100\n" +"PO-Revision-Date: 2014-02-27 15:01+0000\n" +"Last-Translator: tom_fate <tomoffate(a)gmail.com>\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -44,26 +45,30 @@ msgid "Use persistence?" msgstr "Persistenz benutzen?" #: ../glade/persistencewindow.glade.h:5 +msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Help</a>" +msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Hilfe</a>" + +#: ../glade/persistencewindow.glade.h:6 msgid "Yes" msgstr "Ja" -#: ../glade/persistencewindow.glade.h:6 +#: ../glade/persistencewindow.glade.h:7 msgid "No" msgstr "Nein" -#: ../glade/persistencewindow.glade.h:7 +#: ../glade/persistencewindow.glade.h:8 msgid "Passphrase:" msgstr "Passphrase:" -#: ../glade/persistencewindow.glade.h:8 +#: ../glade/persistencewindow.glade.h:9 msgid "Read-Only?" msgstr "Schreibgeschützt?" -#: ../glade/persistencewindow.glade.h:9 +#: ../glade/persistencewindow.glade.h:10 msgid "Wrong passphrase. Please try again." msgstr "Falsche Passphrase. Bitte erneut versuchen." -#: ../glade/persistencewindow.glade.h:10 +#: ../glade/persistencewindow.glade.h:11 msgid "More options?" msgstr "Weitere Optionen?" @@ -73,36 +78,72 @@ msgstr "Administrationspasswort" #: ../glade/optionswindow.glade.h:4 msgid "" +"<a " +"href=\"doc/first_steps/startup_options/administration_password.en.html\">Help</a>" +msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Hilfe</a>" + +#: ../glade/optionswindow.glade.h:5 +msgid "" "Enter an administration password in case you need to perform administration tasks.\n" "Otherwise it will be disabled for better security." msgstr "Ein Administrationspasswort eingeben, falls Sie administrative Aufgaben durchführen wollen.\nAndernfalls wird diese Funktion zur Erhöhung der Sicherheit deaktiviert." -#: ../glade/optionswindow.glade.h:6 +#: ../glade/optionswindow.glade.h:7 msgid "Password:" msgstr "Passwort:" -#: ../glade/optionswindow.glade.h:7 +#: ../glade/optionswindow.glade.h:8 msgid "Verify Password:" msgstr "Passwort erneut eingeben:" -#: ../glade/optionswindow.glade.h:8 +#: ../glade/optionswindow.glade.h:9 msgid "Passwords do not match" msgstr "Passwörter stimmen nicht überein" -#: ../glade/optionswindow.glade.h:9 +#: ../glade/optionswindow.glade.h:10 msgid "Windows Camouflage" msgstr "Windows-Tarnung" -#: ../glade/optionswindow.glade.h:10 +#: ../glade/optionswindow.glade.h:11 +msgid "" +"<a " +"href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Help</a>" +msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Hilfe</a>" + +#: ../glade/optionswindow.glade.h:12 msgid "" "This option makes Tails look more like Microsoft Windows XP. This may be " "useful in public places in order to avoid attracting suspicion." msgstr "Diese Option lässt Tails wie Microsoft Windows XP aussehen. Dies kann in der Öffentlichkeit hilfreich sein, um keine Aufmerksamkeit zu erregen." -#: ../glade/optionswindow.glade.h:11 +#: ../glade/optionswindow.glade.h:13 msgid "Activate Microsoft Windows XP Camouflage" msgstr "Microsoft Windows XP Tarnung aktivieren" +#: ../glade/optionswindow.glade.h:14 +msgid "MAC address spoofing" +msgstr "Manipulation der MAC-Adresse" + +#: ../glade/optionswindow.glade.h:15 +msgid "<a href=\"doc/advanced_topics/mac_changer.en.html\">Help</a>" +msgstr "<a href=\"doc/advanced_topics/mac_changer.en.html\">Hilfe</a>" + +#: ../glade/optionswindow.glade.h:16 +msgid "" +"Spoofing MAC addresses hides the serial number of your network cards to the " +"local networks. This can help you hide your geographical location." +msgstr "Durch die Manipulation der MAC-Adresse kann die Seriennummer der eigenen Netzwerkkarte im lokalen Netzwerk verborgen werden, dies kann wiederum helfen Ihren geografischen Standort geheim zu halten." + +#: ../glade/optionswindow.glade.h:17 +msgid "" +"It is generally safer to spoof MAC addresses, but it might also raise " +"suspicion or cause network connection problems. See the documentation." +msgstr "Generell ist die Manipulation der MAC-Adresse sicher, jedoch kann sie zu Netzwerkproblemen führen oder Misstrauen gegenüber Ihnen und ihrem Gerät entstehen lassen. Genaueres dazu entnehmen Sie der Dokumentation." + +#: ../glade/optionswindow.glade.h:18 +msgid "Spoof all MAC addresses" +msgstr "Alle MAC-Adressen manipulieren" + #: ../glade/langpanel.glade.h:1 msgid " " msgstr " "

1 0

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

27 Feb '14

commit e725954a800613ea7825a3f9dc48c30b5812a112 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 27 15:15:22 2014 +0000 Update translations for tails-greeter --- de/de.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/de/de.po b/de/de.po index 4478d2a..13adab3 100644 --- a/de/de.po +++ b/de/de.po @@ -10,6 +10,7 @@ # Sacro <Scion(a)T-Online.de>, 2012 # to_ba, 2013 # to_ba, 2014 +# tom_fate <tomoffate(a)gmail.com>, 2014 # Victor1975 <VKerley75(a)gmail.com>, 2013 # djcrackhome <wallcityserver(a)gmail.com>, 2012 # Wasilis <inactive+Wasilis(a)transifex.com>, 2013 @@ -18,8 +19,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-21 19:40+0100\n" -"PO-Revision-Date: 2014-02-25 14:41+0000\n" -"Last-Translator: to_ba\n" +"PO-Revision-Date: 2014-02-27 15:01+0000\n" +"Last-Translator: tom_fate <tomoffate(a)gmail.com>\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -131,13 +132,13 @@ msgstr "<a href=\"doc/advanced_topics/mac_changer.en.html\">Hilfe</a>" msgid "" "Spoofing MAC addresses hides the serial number of your network cards to the " "local networks. This can help you hide your geographical location." -msgstr "" +msgstr "Durch die Manipulation der MAC-Adresse kann die Seriennummer der eigenen Netzwerkkarte im lokalen Netzwerk verborgen werden, dies kann wiederum helfen Ihren geografischen Standort geheim zu halten." #: ../glade/optionswindow.glade.h:17 msgid "" "It is generally safer to spoof MAC addresses, but it might also raise " "suspicion or cause network connection problems. See the documentation." -msgstr "" +msgstr "Generell ist die Manipulation der MAC-Adresse sicher, jedoch kann sie zu Netzwerkproblemen führen oder Misstrauen gegenüber Ihnen und ihrem Gerät entstehen lassen. Genaueres dazu entnehmen Sie der Dokumentation." #: ../glade/optionswindow.glade.h:18 msgid "Spoof all MAC addresses"

1 0

[torspec/master] Expand an unfinished sentence into a paragraph. Caught by grarpamp.
by nickm＠torproject.org 26 Feb '14

26 Feb '14

commit 084858c89e905fbf87fe216944bd2f31c337db40 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 26 11:27:36 2014 -0500 Expand an unfinished sentence into a paragraph. Caught by grarpamp. --- proposals/228-cross-certification-onionkeys.txt | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/proposals/228-cross-certification-onionkeys.txt b/proposals/228-cross-certification-onionkeys.txt index 7e94107..904265a 100644 --- a/proposals/228-cross-certification-onionkeys.txt +++ b/proposals/228-cross-certification-onionkeys.txt @@ -22,8 +22,18 @@ Status: Open (an attacker) from listing somebody else's public onion key in your descriptor. If you do, you can't actually recover any keys negotiated using that key, and you can't MITM circuits made with - that key (since you don't have the private key). You _could_ do - something weird in the TAP protocol where you . + that key (since you don't have the private key). + + (You _could_ do something weird in the TAP protocol where you + receive an onionskin that you can't process, relay it to the + party who can process it, and receive a valid reply that you + could send back to the user. But this makes you a less effective + man-in-the-middle than you would be if you had just generated + your own onion key. The ntor protocol shuts down this + possibility by including the router identity in the material to + be hashed, so that you can't complete an ntor handshake unless + the client agrees with you about what identity goes with your + ntor onion key.) Nonetheless, it's probably undesirable that this is possible at all. Just because it isn't obvious today how to exploit this

1 0

r26626: {website} Include note that we're taking part in GSoC 2014 Uncommmenti (website/trunk/about/en)
by Damian Johnson 26 Feb '14

26 Feb '14

Author: atagar Date: 2014-02-26 16:19:35 +0000 (Wed, 26 Feb 2014) New Revision: 26626 Modified: website/trunk/about/en/gsoc.wml Log: Include note that we're taking part in GSoC 2014 Uncommmenting the bit that says we've been accepted. Yay! \o/ Modified: website/trunk/about/en/gsoc.wml =================================================================== --- website/trunk/about/en/gsoc.wml 2014-02-26 01:06:03 UTC (rev 26625) +++ website/trunk/about/en/gsoc.wml 2014-02-26 16:19:35 UTC (rev 26626) @@ -15,13 +15,10 @@ The Tor Project, in collaboration with <a href="https://www.eff.org/">The Electronic Frontier Foundation</a>, have taken part in Google Summer of Code - for 2007 through 2013, mentoring the total of 40 students. -  + href="https://www.google-melange.com/gsoc/homepage/google/gsoc2014">Google + Summer of Code 2014</a>!

1 0