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

[torspec/master] Switching ConnType to be an enum
by nickm＠torproject.org 28 Feb '13

28 Feb '13

commit bdfd9f4818ce6ea754f1a5f7230ba91b7f7dcdaf Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Feb 11 08:18:03 2013 -0800 Switching ConnType to be an enum I'm still not really sure why Karsten wants to use a string field for this. This has all the hallmarks of being an enumeration and it's trivially easy to add new connection types as they arise. Using a string for this field is not just unusual, but makes things a bit harder for both controller users and anyone trying to build an alternative tor implementation. I'm also swapping the enums to be uppercase since that's the present convention in the control-spec. --- proposals/218-usage-controller-events.txt | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/proposals/218-usage-controller-events.txt b/proposals/218-usage-controller-events.txt index b835b69..6a456eb 100644 --- a/proposals/218-usage-controller-events.txt +++ b/proposals/218-usage-controller-events.txt @@ -70,12 +70,11 @@ Target: 0.2.5.x "650" SP "CONN_BW" [ SP "ID=" ConnID ] [ SP "TYPE=" ConnType ] [ SP "READ=" BytesRead ] [ SP "WRITTEN=" BytesWritten ] CRLF - ConnType = 1*( "a" - "z" / "0" - "9" / "_" ) + ConnType = "OR" / "DIR" / "EXIT" BytesRead = 1*DIGIT BytesWritten = 1*DIGIT - ConnType is the lower-case connection type name, which can be "or", - "dir", "exit", or something else. + Controllers MUST tolerate unrecognized connection types. BytesWritten and BytesRead are the number of bytes written and read by Tor since the last CONN_BW event on this connection. @@ -127,17 +126,18 @@ Target: 0.2.5.x [ SP "WRITTEN=" WriteBucketEmpty ] [ SP "LAST=" LastRefill ] CRLF - BucketName = "global" / "relay" / "orconn" + BucketName = "GLOBAL" / "RELAY" / "ORCONN" ReadBucketEmpty = 1*DIGIT WriteBucketEmpty = 1*DIGIT LastRefill = 1*DIGIT This event is generated when refilling a previously empty token - bucket. BucketNames "global" and "relay" keywords are used for the - global or relay token buckets, BucketName "orconn" is used for the - token buckets of an OR connection. + bucket. BucketNames "GLOBAL" and "RELAY" keywords are used for the + global or relay token buckets, BucketName "ORCONN" is used for the + token buckets of an OR connection. Controllers MUST tolerate unrecognized + bucket names. - ConnID is only included if the BucketName is "orconn". + ConnID is only included if the BucketName is "ORCONN". If both global and relay buckets and/or the buckets of one or more OR connections run out of tokens at the same time, multiple separate

1 0

[torspec/master] Replacing CircID with CircuitID
by nickm＠torproject.org 28 Feb '13

28 Feb '13

commit 74b96e9dc15346a82d871ec7792d09e9c11e074a Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Feb 11 08:13:36 2013 -0800 Replacing CircID with CircuitID CircuitID is defined in section 2.4, but 'CircID' isn't. Using that general definition in proposal 218 and also fixing a couple spots in the control-spec. --- control-spec.txt | 4 ++-- proposals/218-usage-controller-events.txt | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 5ea5038..02f4705 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -567,7 +567,7 @@ "stream-status" A series of lines as for a stream status event. Each is of the form: - StreamID SP StreamStatus SP CircID SP Target CRLF + StreamID SP StreamStatus SP CircuitID SP Target CRLF "orconn-status" A series of lines as for an OR connection status event. In Tor @@ -1394,7 +1394,7 @@ The syntax is: - "650" SP "STREAM" SP StreamID SP StreamStatus SP CircID SP Target + "650" SP "STREAM" SP StreamID SP StreamStatus SP CircuitID SP Target [SP "REASON=" Reason [ SP "REMOTE_REASON=" Reason ]] [SP "SOURCE=" Source] [ SP "SOURCE_ADDR=" Address ":" Port ] [SP "PURPOSE=" Purpose] diff --git a/proposals/218-usage-controller-events.txt b/proposals/218-usage-controller-events.txt index a912b52..b835b69 100644 --- a/proposals/218-usage-controller-events.txt +++ b/proposals/218-usage-controller-events.txt @@ -88,13 +88,12 @@ Target: 0.2.5.x The syntax is: "650" SP "CELL_STATS" - [ SP "PCircID=" PCircID ] [ SP "PConnID=" ConnID ] + [ SP "PCircID=" CircuitID ] [ SP "PConnID=" ConnID ] [ SP "PAdded=" PAdded ] [ SP "PRemoved=" PRemoved ] [ SP "PTime=" PTime ] - [ SP "NCircID=" NCircID ] [ SP "NConnID=" ConnID ] + [ SP "NCircID=" CircuitID ] [ SP "NConnID=" ConnID ] [ SP "NAdded=" NAdded ] [ SP "NRemoved=" NRemoved ] [ SP "NTime=" NTime ] CRLF - PCircID, NCircID = 1*16 IDChar PAdded, PRemoved, PTime, NAdded, NRemoved, NTime = CellType ":" 1*DIGIT 0*( "," CellType ":" 1*DIGIT ) CellType = 1*( "a" - "z" / "0" - "9" / "_" )

1 0

[torspec/master] Deduplicating ConnID definition
by nickm＠torproject.org 28 Feb '13

28 Feb '13

commit fe5f30f9738587229ed80b6daf1251eeba7738a1 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Feb 11 08:10:16 2013 -0800 Deduplicating ConnID definition As mentioned on the tor-dev@ thread the ConnID definition should go in section 2.4 so we don't need to define it multiple times. --- proposals/218-usage-controller-events.txt | 36 +++++++++++++--------------- 1 files changed, 17 insertions(+), 19 deletions(-) diff --git a/proposals/218-usage-controller-events.txt b/proposals/218-usage-controller-events.txt index 390cd1f..a912b52 100644 --- a/proposals/218-usage-controller-events.txt +++ b/proposals/218-usage-controller-events.txt @@ -45,35 +45,35 @@ Target: 0.2.5.x 5. Specification -5.1. Adding an ID field to ORCONN events +5.1. ConnID Token + + Addition for section 2.4 of the control-spec (General-use tokens). + + ; Connection ID which is locally unique among all connection types and which + ; is only included in TestingTorNetwork mode. + + ConnID = 1*16 IDChar + +5.2. Adding an ID field to ORCONN events The new syntax for ORCONN events is: "650" SP "ORCONN" SP (LongName / Target) SP ORStatus [ SP "ID=" ConnID ] [ SP "REASON=" Reason ] [ SP "NCIRCS=" NumCircuits ] CRLF - ConnID = 1*16 IDChar - - ConnID is the connection ID which is locally unique among all - connection types and which is only included in TestingTorNetwork - mode. The remaining specification of that event type stays unchanged. -5.2. Bandwidth used on an OR or DIR or EXIT connection +5.3. Bandwidth used on an OR or DIR or EXIT connection The syntax is: "650" SP "CONN_BW" [ SP "ID=" ConnID ] [ SP "TYPE=" ConnType ] [ SP "READ=" BytesRead ] [ SP "WRITTEN=" BytesWritten ] CRLF - ConnID = 1*16 IDChar ConnType = 1*( "a" - "z" / "0" - "9" / "_" ) BytesRead = 1*DIGIT BytesWritten = 1*DIGIT - ConnID is the connection ID which is locally unique among all - connection types. - ConnType is the lower-case connection type name, which can be "or", "dir", "exit", or something else. @@ -84,17 +84,17 @@ Target: 0.2.5.x events are generated for connections that have not read or written. These events are only generated if TestingTorNetwork is set. -5.3. Per-circuit cell stats +5.4. Per-circuit cell stats The syntax is: "650" SP "CELL_STATS" - [ SP "PCircID=" PCircID ] [ SP "PConnID=" PConnID ] + [ SP "PCircID=" PCircID ] [ SP "PConnID=" ConnID ] [ SP "PAdded=" PAdded ] [ SP "PRemoved=" PRemoved ] [ SP "PTime=" PTime ] - [ SP "NCircID=" NCircID ] [ SP "NConnID=" NConnID ] + [ SP "NCircID=" NCircID ] [ SP "NConnID=" ConnID ] [ SP "NAdded=" NAdded ] [ SP "NRemoved=" NRemoved ] [ SP "NTime=" NTime ] CRLF - PCircID, PConnID, NCircID, NConnID = 1*16 IDChar + PCircID, NCircID = 1*16 IDChar PAdded, PRemoved, PTime, NAdded, NRemoved, NTime = CellType ":" 1*DIGIT 0*( "," CellType ":" 1*DIGIT ) CellType = 1*( "a" - "z" / "0" - "9" / "_" ) @@ -120,7 +120,7 @@ Target: 0.2.5.x events are generated for circuits that have not added or processed any cell. These events are only generated if TestingTorNetwork is set. -5.4. Token buckets refilled +5.5. Token buckets refilled The syntax is: "650" SP "TB_EMPTY" SP "BUCKET=" BucketName [ SP "ID=" ConnID ] @@ -129,7 +129,6 @@ Target: 0.2.5.x [ SP "LAST=" LastRefill ] CRLF BucketName = "global" / "relay" / "orconn" - ConnID = 1*16 IDChar ReadBucketEmpty = 1*DIGIT WriteBucketEmpty = 1*DIGIT LastRefill = 1*DIGIT @@ -139,8 +138,7 @@ Target: 0.2.5.x global or relay token buckets, BucketName "orconn" is used for the token buckets of an OR connection. - ConnID is the connection ID and is only given if BucketName is - "orconn". + ConnID is only included if the BucketName is "orconn". If both global and relay buckets and/or the buckets of one or more OR connections run out of tokens at the same time, multiple separate

1 0

[torspec/master] Tweak proposal 218 based on Rob's comments.
by nickm＠torproject.org 28 Feb '13

28 Feb '13

commit faa53bdc1d5a1f3626ee3f52773d09b633d7773f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Feb 28 12:33:05 2013 +0100 Tweak proposal 218 based on Rob's comments. --- proposals/218-usage-controller-events.txt | 37 ++++++++++++++++++++++++---- 1 files changed, 31 insertions(+), 6 deletions(-) diff --git a/proposals/218-usage-controller-events.txt b/proposals/218-usage-controller-events.txt index 6a3e303..34d14b3 100644 --- a/proposals/218-usage-controller-events.txt +++ b/proposals/218-usage-controller-events.txt @@ -96,7 +96,8 @@ Target: 0.2.5.x CIRC_BW event. These events are generated about once per second per circuit; no events - are generated for circuits that had no attached stream writing or read. + are generated for circuits that had no attached stream writing or + reading. 5.5. Per-circuit cell stats @@ -115,6 +116,20 @@ Target: 0.2.5.x 0*( "," CellType ":" 1*DIGIT ) CellType = 1*( "a" - "z" / "0" - "9" / "_" ) + Examples are: + 650 CELL_STATS ID=14 OutboundQueue=19403 OutboundConn=15 + OutboundAdded=create_fast:1,relay_early:2 + OutboundRemoved=create_fast:1,relay_early:2 + OutboundTime=create_fast:0,relay_early:0 + 650 CELL_STATS InboundQueue=19403 InboundConn=32 + InboundAdded=relay:1,created_fast:1 + InboundRemoved=relay:1,created_fast:1 + InboundTime=relay:0,created_fast:0 + OutboundQueue=6710 OutboundConn=18 + OutboundAdded=create:1,relay_early:1 + OutboundRemoved=create:1,relay_early:1 + OutboundTime=create:0,relay_early:0 + ID is the locally unique circuit identifier that is only included if the circuit originates at this node. @@ -160,11 +175,16 @@ Target: 0.2.5.x WriteBucketEmpty = 1*DIGIT LastRefill = 1*DIGIT + Examples are: + 650 TB_EMPTY ORCONN ID=16 READ=0 WRITTEN=0 LAST=100 + 650 TB_EMPTY GLOBAL READ=93 WRITTEN=93 LAST=100 + 650 TB_EMPTY RELAY READ=93 WRITTEN=93 LAST=100 + This event is generated when refilling a previously empty token bucket. BucketNames "GLOBAL" and "RELAY" keywords are used for the global or relay token buckets, BucketName "ORCONN" is used for the - token buckets of an OR connection. Controllers MUST tolerate unrecognized - bucket names. + token buckets of an OR connection. Controllers MUST tolerate + unrecognized bucket names. ConnID is only included if the BucketName is "ORCONN". @@ -173,9 +193,14 @@ Target: 0.2.5.x events are generated. ReadBucketEmpty (WriteBucketEmpty) is the time in millis that the read - (write) bucket was empty. LastRefill is the time in millis since the - last refill. ReadBucketEmpty or WriteBucketEmpty are capped at - LastRefill in order not to report empty times more than once. + (write) bucket was empty since the last refill. LastRefill is the + time in millis since the last refill. + + If a bucket went negative and if refilling tokens didn't make it go + positive again, there will be multiple consecutive TB_EMPTY events for + each refill interval during which the bucket contained zero tokens or + less. In such a case, ReadBucketEmpty or WriteBucketEmpty are capped + at LastRefill in order not to report empty times more than once. These events are only generated if TestingTorNetwork is set.

1 0

[torspec/master] Merge remote-tracking branch 'karsten/proposal218'
by nickm＠torproject.org 28 Feb '13

28 Feb '13

commit 566f31e68a11e66ec3bc1e98340926bbc7564e77 Merge: 800d5ea faa53bd Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 28 11:24:26 2013 -0500 Merge remote-tracking branch 'karsten/proposal218' control-spec.txt | 4 +- proposals/218-usage-controller-events.txt | 170 ++++++++++++++++++----------- 2 files changed, 109 insertions(+), 65 deletions(-)

1 0

[torspec/master] Making BucketName a positional argument
by nickm＠torproject.org 28 Feb '13

28 Feb '13

commit c34b62c97199634b9ec69f6f96aeece1a22df3b2 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Feb 11 08:29:43 2013 -0800 Making BucketName a positional argument Keyword arguments tend to always be optional, but Karsten made BucketName mandatory. Conventionally mandatory args are positional so swapping to that. --- proposals/218-usage-controller-events.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/proposals/218-usage-controller-events.txt b/proposals/218-usage-controller-events.txt index 6a456eb..bf0aa8c 100644 --- a/proposals/218-usage-controller-events.txt +++ b/proposals/218-usage-controller-events.txt @@ -121,7 +121,7 @@ Target: 0.2.5.x 5.5. Token buckets refilled The syntax is: - "650" SP "TB_EMPTY" SP "BUCKET=" BucketName [ SP "ID=" ConnID ] + "650" SP "TB_EMPTY" SP BucketName [ SP "ID=" ConnID ] [ SP "READ=" ReadBucketEmpty ] [ SP "WRITTEN=" WriteBucketEmpty ] [ SP "LAST=" LastRefill ] CRLF

1 0

[torspec/master] Add new CIRC_BW event and tweak CELL_STATS event.
by nickm＠torproject.org 28 Feb '13

28 Feb '13

commit 729468df9a610feaa31532725ddd648c8c2168c5 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Feb 25 10:24:57 2013 +0100 Add new CIRC_BW event and tweak CELL_STATS event. --- proposals/218-usage-controller-events.txt | 98 ++++++++++++++++++----------- 1 files changed, 60 insertions(+), 38 deletions(-) diff --git a/proposals/218-usage-controller-events.txt b/proposals/218-usage-controller-events.txt index bf0aa8c..6a3e303 100644 --- a/proposals/218-usage-controller-events.txt +++ b/proposals/218-usage-controller-events.txt @@ -49,10 +49,11 @@ Target: 0.2.5.x Addition for section 2.4 of the control-spec (General-use tokens). - ; Connection ID which is locally unique among all connection types and which - ; is only included in TestingTorNetwork mode. + ; Unique identifiers for connections or queues. Only included in + ; TestingTorNetwork mode. ConnID = 1*16 IDChar + QueueID = 1*16 IDChar 5.2. Adding an ID field to ORCONN events @@ -67,9 +68,8 @@ Target: 0.2.5.x 5.3. Bandwidth used on an OR or DIR or EXIT connection The syntax is: - "650" SP "CONN_BW" [ SP "ID=" ConnID ] [ SP "TYPE=" ConnType ] - [ SP "READ=" BytesRead ] [ SP "WRITTEN=" BytesWritten ] - CRLF + "650" SP "CONN_BW" SP "ID=" ConnID SP "TYPE=" ConnType + SP "READ=" BytesRead SP "WRITTEN=" BytesWritten CRLF ConnType = "OR" / "DIR" / "EXIT" BytesRead = 1*DIGIT BytesWritten = 1*DIGIT @@ -83,48 +83,77 @@ Target: 0.2.5.x events are generated for connections that have not read or written. These events are only generated if TestingTorNetwork is set. -5.4. Per-circuit cell stats +5.4. Bandwidth used by all streams attached to a circuit + + The syntax is: + "650" SP "CIRC_BW" SP "ID=" CircuitID SP "READ=" BytesRead SP + "WRITTEN=" BytesWritten CRLF + BytesRead = 1*DIGIT + BytesWritten = 1*DIGIT + + BytesRead and BytesWritten are the number of bytes read and written by + all applications with streams attached to this circuit since the last + CIRC_BW event. + + These events are generated about once per second per circuit; no events + are generated for circuits that had no attached stream writing or read. + +5.5. Per-circuit cell stats The syntax is: "650" SP "CELL_STATS" - [ SP "PCircID=" CircuitID ] [ SP "PConnID=" ConnID ] - [ SP "PAdded=" PAdded ] [ SP "PRemoved=" PRemoved ] - [ SP "PTime=" PTime ] - [ SP "NCircID=" CircuitID ] [ SP "NConnID=" ConnID ] - [ SP "NAdded=" NAdded ] [ SP "NRemoved=" NRemoved ] - [ SP "NTime=" NTime ] CRLF - PAdded, PRemoved, PTime, NAdded, NRemoved, NTime = - CellType ":" 1*DIGIT 0*( "," CellType ":" 1*DIGIT ) + [ SP "ID=" CircuitID ] + [ SP "InboundQueue=" QueueID SP "InboundConn=" ConnID ] + [ SP "InboundAdded=" CellsByType ] + [ SP "InboundRemoved=" CellsByType SP + "InboundTime=" MsecByType ] + [ SP "OutboundQueue=" QueueID SP "OutboundConn=" ConnID ] + [ SP "OutboundAdded=" CellsByType ] + [ SP "OutboundRemoved=" CellsByType SP + "OutboundTime=" MsecByType ] CRLF + CellsByType, MsecByType = CellType ":" 1*DIGIT + 0*( "," CellType ":" 1*DIGIT ) CellType = 1*( "a" - "z" / "0" - "9" / "_" ) - PCircID and NCircID are the locally unique IDs of the app-ward - (PCircID) and exit-ward (NCircID) circuit. + ID is the locally unique circuit identifier that is only included if the + circuit originates at this node. + + Inbound and outbound refer to the direction of cell flow through the + circuit which is either to origin (inbound) or from origin (outbound). - PConnID and NConnID are the locally unique IDs of the app-ward - (PConnID) and exit-ward (NConnID) OR connection. + InboundQueue and OutboundQueue are identifiers of the inbound and + outbound circuit queues of this circuit. These identifiers are only + unique per OR connection. OutboundQueue is chosen by this node and + matches InboundQueue of the next node in the circuit. - PAdded and NAdded are the total number of cells by cell type added to - the app-ward (PAdded) and exit-ward (NAdded) queues of this circuit. + InboundConn and OutboundConn are locally unique IDs of inbound and + outbound OR connection. OutboundConn does not necessarily match + InboundConn of the next node in the circuit. - PRemoved and NRemoved are the total number of cells by cell type - processed from the app-ward (PRemoved) and exit-ward (NRemoved) - queues of this circuit. + InboundQueue and InboundConn are not present if the circuit originates + at this node. OutboundQueue and OutboundConn are not present if the + circuit (currently) ends at this node. - PTime and NTime are the total waiting times in milliseconds of all - processed cells by cell type in the app-ward (PTime) and exit-ward - (NTime) queues of this circuit. + InboundAdded and OutboundAdded are total number of cells by cell type + added to inbound and outbound queues. Only present if at least one cell + was added to a queue. + + InboundRemoved and OutboundRemoved are total number of cells by + cell type processed from inbound and outbound queues. InboundTime and + OutboundTime are total waiting times in milliseconds of all processed + cells by cell type. Only present if at least one cell was removed from + a queue. These events are generated about once per second per circuit; no events are generated for circuits that have not added or processed any cell. These events are only generated if TestingTorNetwork is set. -5.5. Token buckets refilled +5.6. Token buckets refilled The syntax is: - "650" SP "TB_EMPTY" SP BucketName [ SP "ID=" ConnID ] - [ SP "READ=" ReadBucketEmpty ] - [ SP "WRITTEN=" WriteBucketEmpty ] - [ SP "LAST=" LastRefill ] CRLF + "650" SP "TB_EMPTY" SP BucketName [ SP "ID=" ConnID ] SP + "READ=" ReadBucketEmpty SP "WRITTEN=" WriteBucketEmpty SP + "LAST=" LastRefill CRLF BucketName = "GLOBAL" / "RELAY" / "ORCONN" ReadBucketEmpty = 1*DIGIT @@ -158,13 +187,6 @@ Target: 0.2.5.x Most of the implementation should be straight-forward. - There's one exception: we pondered adding a unique circuit ID to - CELL_STATS events, but so far, only origin circuits have a unique ID. - We could move that field from origin_circuit_t to circuit_t and - update all references in the code. But this may have undesired side - effects which we're not yet aware of. We don't have a good answer - yet if we need this ID or not. - 8. Performance and scalability notes Most of the new code won't be executed in normal Tor mode. Wherever

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 28 Feb '13

28 Feb '13

commit 36998b9270d7f5329732cbf5aefb4631d6d2fafe Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 28 05:15:56 2013 +0000 Update translations for liveusb-creator --- de/de.po | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/de/de.po b/de/de.po index b5891fb..818cf9b 100644 --- a/de/de.po +++ b/de/de.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-02-14 16:07+0100\n" -"PO-Revision-Date: 2013-02-18 23:07+0000\n" +"PO-Revision-Date: 2013-02-28 05:00+0000\n" "Last-Translator: Sacro <Scion(a)T-Online.de>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -110,18 +110,18 @@ msgid "" "Clone\n" "&&\n" "Install" -msgstr "" +msgstr "Clone\n&&\nInstall" #: ../liveusb/launcher_ui.py:152 msgid "" "Clone\n" "&&\n" "Upgrade" -msgstr "" +msgstr "Clone\n&&\nUpgrade" #: ../liveusb/dialog.py:165 msgid "Create Live USB" -msgstr "" +msgstr "Erstelle Live USB" #: ../liveusb/creator.py:429 #, python-format @@ -142,7 +142,7 @@ msgstr "Gerät ist zu klein: es muss mindestens %s MiB groß sein." #: ../liveusb/dialog.py:157 #, python-format msgid "Download %(distribution)s" -msgstr "" +msgstr "Download %(distribution)s" #: ../liveusb/gui.py:732 msgid "Download complete!" @@ -198,7 +198,7 @@ msgstr "ISO MD5 checksum Überprüfung schlug fehl" msgid "" "If you do not select an existing Live ISO, the selected release will be " "downloaded for you." -msgstr "" +msgstr "Wenn Sie kein existierendes Live ISO auswählen, wird das aktuellste für Sie heruntergeladen." #: ../liveusb/gui.py:601 msgid "Installation complete!" @@ -264,7 +264,7 @@ msgstr "Persistenter Speicher" #: ../liveusb/dialog.py:161 msgid "Persistent Storage (0 MB)" -msgstr "" +msgstr "Persistenter Speicher (0 MB)" #: ../liveusb/gui.py:661 ../liveusb/gui.py:678 msgid "Press 'Next' if you wish to continue." @@ -272,11 +272,11 @@ msgstr "Drücken Sie auf \"Weiter\" um fortzufahren." #: ../liveusb/gui.py:452 msgid "Refreshing releases..." -msgstr "" +msgstr "Aktualisiere Releases..." #: ../liveusb/gui.py:457 msgid "Releases updated!" -msgstr "" +msgstr "Releases wurden aktualisiert!" #: ../liveusb/creator.py:936 ../liveusb/creator.py:1255 #, python-format @@ -318,7 +318,7 @@ msgstr "Synchronisiere Daten auf dem Datenträger" #: ../liveusb/dialog.py:159 msgid "Target Device" -msgstr "" +msgstr "Zielgerät" #: ../liveusb/gui.py:625 msgid "" @@ -330,7 +330,7 @@ msgstr "Der Master Boot Record auf Ihrem Gerät ist leer. Drücken Sie auf \"Liv msgid "" "The selected file is unreadable. Please fix its permissions or select " "another file." -msgstr "" +msgstr "Die ausgewählte Datei konnte nicht gelesen werden. Bitte editiren Sie die Berechtigungen oder wählen Sie eine andere Datei aus." #: ../liveusb/creator.py:366 #, python-format @@ -358,17 +358,17 @@ msgstr "" msgid "" "This is the USB stick that you want to install your Live system on. This " "device must be formatted with the FAT filesystem." -msgstr "" +msgstr "Das ist der USB-Stick, auf dem Sie das Live System Installieren möchten. Das Gerät muss mit FAT formatiert sein." #: ../liveusb/dialog.py:163 msgid "" "This is the progress bar that will indicate how far along in the LiveUSB " "creation process you are" -msgstr "" +msgstr "Dies ist die Fortschrittsanzeige, die anzeigt, wie weit der LiveUSB Erstellungsprozess ist." #: ../liveusb/dialog.py:162 msgid "This is the status console, where all messages get written to." -msgstr "" +msgstr "Dies ist die Status-Konsole, wo alle nachrichten hingeschrieben werden." #: ../liveusb/creator.py:908 #, python-format @@ -481,11 +481,11 @@ msgstr "Nicht unterstütztes Dateisystem: %s\nBitte erstellen Sie eine Daten-Sic #: ../liveusb/launcher_ui.py:154 msgid "Upgrade from ISO" -msgstr "" +msgstr "Von ISO upgraden" #: ../liveusb/dialog.py:152 msgid "Use existing Live system ISO" -msgstr "" +msgstr "Benutze existierendes Live System ISO" #: ../liveusb/creator.py:132 msgid "Verifying ISO MD5 checksum" @@ -553,4 +553,4 @@ msgstr "Ihr Gerät enthält ein LiveOS.\nWenn Sie fortsetzen, wird es überschri #: ../liveusb/dialog.py:155 msgid "or" -msgstr "" +msgstr "oder"

1 0

r26068: {website} stats is a word, but it wasn't the right word. (website/trunk/docs/en)
by Roger Dingledine 28 Feb '13

28 Feb '13

Author: arma Date: 2013-02-28 02:21:26 +0000 (Thu, 28 Feb 2013) New Revision: 26068 Modified: website/trunk/docs/en/documentation.wml Log: stats is a word, but it wasn't the right word. Modified: website/trunk/docs/en/documentation.wml =================================================================== --- website/trunk/docs/en/documentation.wml 2013-02-27 16:30:04 UTC (rev 26067) +++ website/trunk/docs/en/documentation.wml 2013-02-28 02:21:26 UTC (rev 26068) @@ -171,7 +171,7 @@ commits</a> may be interesting for developers.</li> <li>An automated list for <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs/">bug reports from trac</a> may be interesting for users and developers.</li> - <li>A list for <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-reports/">Tor stats reports.</li> + <li>A list for <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-reports/">Tor status reports.</li> </ul> <a id="DesignDoc"></a>

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 27 Feb '13

27 Feb '13

commit 4cf0bf06c66abc3607b278b9006445f952b7347b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 27 16:45:47 2013 +0000 Update translations for vidalia_help --- da/services.po | 49 ++++++++++++++++++++++++------------------------- 1 files changed, 24 insertions(+), 25 deletions(-) diff --git a/da/services.po b/da/services.po index 03a0d17..9118501 100644 --- a/da/services.po +++ b/da/services.po @@ -1,23 +1,24 @@ # # Translators: +# Aputsiaĸ Niels Janussen <aj(a)isit.gl>, 2013. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2010-11-30 05:03+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2013-02-27 16:35+0000\n" +"Last-Translator: Aputsiaĸ Niels Janussen <aj(a)isit.gl>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: da\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #. type: Content of: <html><body><h1> #: en/services.html:16 msgid "Hidden Services" -msgstr "" +msgstr "Skjulte tjenester" #. type: Content of: <html><body> #: en/services.html:19 @@ -27,12 +28,12 @@ msgid "" "configuration. So, don't rely on it, or rather, don't blame us if something " "goes wrong. If you find bugs or have comments on this new feature, please " "let us know! We need your feedback. <a name=\"about\"/>" -msgstr "" +msgstr "Bemærk: Understøttelse af skjulte tjenester er nyt i Vidalia. Du bør forvente at der kan være fejl, hvoraf nogle eventuelt ødelægger opsætningen for dine skjulte tjenester. Derfor bør du ikke afhænge af dem, eller snarere; du bør ikke skyde skylden på os, hvis noget går galt. Finder du fejl eller har du kommentarer til denne nye egenskab, så kontakt os venligst! Vi har brug for din tilbagemelding. <a name=\"about\">" #. type: Content of: <html><body><h3> #: en/services.html:26 msgid "What is a hidden service?" -msgstr "" +msgstr "Hvad er en skjult tjeneste?" #. type: Content of: <html><body><p> #: en/services.html:28 @@ -41,7 +42,7 @@ msgid "" "HTTP service, to others without revealing your IP address. The protocol to " "provide a hidden service is built on top of the same circuits that Tor uses " "for anonymous browsing and roughly has similar anonymity properties." -msgstr "" +msgstr "Skjulte tjenester lader dig tilbyde enhver slags TCP-baseret tjeneste, f.eks. en HTTP-tjeneste overfor andre, uden at afsløre din IP-adresse. Protokolllen som tilbyder skjult tjeneste, er bygget ovenpå samme kredsløb som Tor anvender til anonym netbrug og har omtrent samme anonymitetsfunktioner." #. type: Content of: <html><body><p> #: en/services.html:35 @@ -49,60 +50,60 @@ msgid "" "For more information on hidden service you may want to read section 5 of " "Tor's design paper (doc/design-paper/tor-design.pdf) or the Rendezvous " "Specification (doc/spec/rend-spec.txt)." -msgstr "" +msgstr "For at få mere information om skjulte tjenester, så kan du eventuelt læse sektion 5 af Tor's designdokument (doc/design-paper/tor-design.pdf), eller dokumentet Rendezvous Specification (doc/spec/rend-spec.txt)." #. type: Content of: <html><body> #: en/services.html:40 msgid "<a name=\"provide\"/>" -msgstr "" +msgstr "<a name=\"provide\"/>" #. type: Content of: <html><body><h3> #: en/services.html:41 msgid "How do I provide a hidden service?" -msgstr "" +msgstr "Hvordan etablerer jeg en skjult tjeneste?" #. type: Content of: <html><body><p> #: en/services.html:43 msgid "Providing a hidden service consists of at least two steps:" -msgstr "" +msgstr "Etablering af en skjult tjeneste består af mindst to trin:" #. type: Content of: <html><body><p><ol><li> #: en/services.html:45 msgid "" "Install a web server locally (or a server for whatever service you want to " "provide, e.g. IRC) to listen for local requests." -msgstr "" +msgstr "Installér en webserver lokalt (eller en server til hvilken som helst tjeneste du ønsker at etablere, f.eks. IRC) for at lytte efter lokale forespørgsler." #. type: Content of: <html><body><p><ol><li> #: en/services.html:47 msgid "" "Configure your hidden service, so that Tor relays requests coming from Tor " "users to your local server." -msgstr "" +msgstr "Konfigurér din skjulte tjeneste, således at Tor danner relæer for forespørgsler, der kommer fra Tor-brugere til din lokale server." #. type: Content of: <html><body><p> #: en/services.html:50 msgid "" "There is a fine tutorial on the Tor website (https://www.torproject.org/docs" "/tor-hidden-service.html) that describes these steps in more detail." -msgstr "" +msgstr "Der er en fin vejledning på Tor-hjemmesiden (https://www.torproject.org/docs/tor-hidden-service.html) der beskriver disse trin i flere detaljer." #. type: Content of: <html><body> #: en/services.html:55 msgid "<a name=\"data\"/>" -msgstr "" +msgstr "<a name=\"data\"/>" #. type: Content of: <html><body><h3> #: en/services.html:56 msgid "What data do I need to provide?" -msgstr "" +msgstr "Hvilke informationer skal jeg give?" #. type: Content of: <html><body><p> #: en/services.html:58 msgid "" "The services table contains five columns containing data about configured " "hidden services:" -msgstr "" +msgstr "Tabellen over tjenester indeholder fem kolonner, der indeholder information om konfigurerede, skjulte tjenester:" #. type: Content of: <html><body><p><ul><li> #: en/services.html:61 @@ -114,7 +115,7 @@ msgid "" "hidden service, the field says \"[Created by Tor]\"; in order to make it " "display the real onion address, you need to save your configuration and re-" "open the settings window." -msgstr "" +msgstr "Onion-adresse (genereret): Adressen for tjenesten (eller onion) genereres af Tor, så din tjeneste får en unik identifikation. Give denne onion-adresse til personer, der skal kunne tilgå din tjeneste. Du kan anvende knappen \"Kopiér til udklipsholder\", for at undgå tastefejl. Hvis du netop har oprettet en skjult tjeneste, så vil feltet vise \"[Oprettet af Tor]\"; for at vise den rigtig onion-adresse, så skal du gemme din konfiguration og genåbne vinduet med indstillinger." #. type: Content of: <html><body><p><ul><li> #: en/services.html:68 @@ -167,12 +168,12 @@ msgstr "" #. type: Content of: <html><body> #: en/services.html:103 msgid "<a name=\"buttons\"/>" -msgstr "" +msgstr "<a name=\"buttons\"/>" #. type: Content of: <html><body><h3> #: en/services.html:104 msgid "What are the five buttons used for?" -msgstr "" +msgstr "Hvad bruges de fem knapper til?" #. type: Content of: <html><body><p><ul><li> #: en/services.html:107 @@ -229,12 +230,12 @@ msgstr "" #. type: Content of: <html><body> #: en/services.html:135 msgid "<a name=\"client\"/>" -msgstr "" +msgstr "<a name=\"client\"/>" #. type: Content of: <html><body><h3> #: en/services.html:136 msgid "How does Vidalia help me to access other hidden services?" -msgstr "" +msgstr "Hvordan hjælper Vidalia mig med at tligå andre skjulte tjenester?" #. type: Content of: <html><body><p> #: en/services.html:138 @@ -243,6 +244,4 @@ msgid "" "service, type the service's onion address in your browser (or appropriate " "client application if it's not a web service), and Tor does the rest for " "you. There is no need to specifically configure Tor for that." -msgstr "" - - +msgstr "Overhovedet ikke. Der er ikke behov for at gøre dette. Hvis du ønsker at tilgå en anden skjult tjeneste, så indtast tjenestens onion-adresse i din browser (eller respektive klientprogram, hvis det ikke er en webtjeneste), og Tor foretager resten for dig. Der er ikke behov for at Tor konfigureres specifikt til dette."

1 0