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

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 08 Apr '13

08 Apr '13

commit bcfdc3fc55d8376438cf6b5d65decb9eb92dc2c8 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 8 01:45:40 2013 +0000 Update translations for vidalia_help --- sv/services.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sv/services.po b/sv/services.po index 7f79fcd..48f5e7e 100644 --- a/sv/services.po +++ b/sv/services.po @@ -6,7 +6,7 @@ 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: 2013-04-08 01:13+0000\n" +"PO-Revision-Date: 2013-04-08 01:18+0000\n" "Last-Translator: cryptohead <cryptohead(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -154,7 +154,7 @@ msgid "" "Vidalia and save the configuration. Then move the directory on your hard " "disk to the new place. Finally, change the directory in Vidalia to the new " "location, enable the service again, and save the new configuration." -msgstr "" +msgstr "Service Mapp (krävs): Tor behöver spara vissa hidden serive specifika filer i en separat mapp, tex den privata nyckeln och eb hostname-fil som innehåller onion-adressen. Denna mapp bör vara skild från den mapp som har tjänstens innehåll. En bra plats för denna service mapp kan vara en undermapp i Tors data-mapp. - - Notera att du inte kan ändra mappen för en körande tjänst (det finns inte någon anledning att stödja detta då Vidalia inte förväntas flytta mappar på din hårddisk!). Om du vill flytta en hidden service till en annan mapp så gör enligt följande: Starta med att stänga av tjänsten i Vidalia och spara konfigurationen. Flytta sedan mappen på din hårddisk till en ny plats. Slutligen, ändra mapp i Vidalia till den nya platsen, aktivera tjänsten igen och spara den nya konfigurationen." #. type: Content of: <html><body><p><ul><li> #: en/services.html:95

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 08 Apr '13

08 Apr '13

commit 6dc1ca274b331ebaa6b3a27aef295db0aa9ca1dc Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 8 01:15:42 2013 +0000 Update translations for vidalia_help --- sv/services.po | 56 ++++++++++++++++++++++++++++---------------------------- 1 files changed, 28 insertions(+), 28 deletions(-) diff --git a/sv/services.po b/sv/services.po index 526bf24..7f79fcd 100644 --- a/sv/services.po +++ b/sv/services.po @@ -6,7 +6,7 @@ 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: 2013-04-08 00:45+0000\n" +"PO-Revision-Date: 2013-04-08 01:13+0000\n" "Last-Translator: cryptohead <cryptohead(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -50,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 "För mer information om gömda tjänster läs sektion 5 av Tors designdokument (doc/design-paper/tor-design.pdf) eller Rendezvous specifikationen (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 "Hur tillhandahåller jag en hidden service?" #. type: Content of: <html><body><p> #: en/services.html:43 msgid "Providing a hidden service consists of at least two steps:" -msgstr "" +msgstr "Att tillhandahålla en hidden service består av åtminstone två steg:" #. 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 "Installera en webserver lokalt (eller en server för vilken specifik tjänst du nu tänker tillhandahålla, tex IRC) som lyssnar på lokala förfrågningar." #. 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 "Konfigurera din gömda tjänst så att Tor reläar förfrågningar som kommer från Tor-användare till din lokala 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 "Det finns en bra handledning på Tors webplats (https://www.torproject.org/docs/tor-hidden-service.html) som beskriver dessa steg i mer detalj." #. 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 "Vilken data behöver jag tillhandahålla?" #. 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 "Tjänstetabellen har fem kolumner som innehåller data om konfigurerade gömda tjänster:" #. type: Content of: <html><body><p><ul><li> #: en/services.html:61 @@ -115,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 Adress (genererad): Tjänsteadressen (eller onion-adressen) genereras av Tor för att skapa en unik identitet för din tjänst. Ge denna onion-adress till personer du vill skall kunna nå din tjänst. Du kan använda \"kopiera till urklipp\"-knappen för att undvika stavfel. Om just skapat din gömda tjänst kommer fältet säga \"[Skapad av Tor]\"; för att visa den riktiga onion-adressen behöver du spara din konfiguration och öppna inställningsfönstret igen." #. type: Content of: <html><body><p><ul><li> #: en/services.html:68 @@ -125,7 +125,7 @@ msgid "" "service-specific port here, e.g. port 80 for HTTP. Note that the virtual " "port usually has nothing to do with firewall settings, because it is only " "used Tor-internally." -msgstr "" +msgstr "Virtuell Port (nödvändig): Detta är TCP-porten som klienten behöver veta för att komma åt din tjänst. Du vill vanligtvis använda den service-specifika porten här, tex port 80 för HTTP. Notera att den virtuella porten vanligtvis inte har något att göra med brandväggsinställningar eftersom den bara används internt av Tor." #. type: Content of: <html><body><p><ul><li> #: en/services.html:73 @@ -137,7 +137,7 @@ msgid "" "localhost:5222 (or on whatever port your server is listening). If you don't " "specify any target, Tor will redirect requests to the port specified in " "\"Virtual Port\" on localhost." -msgstr "" +msgstr "Mål (frivillig): Vanligtvis vill du att Tor skall dirigera anslutningar till localhost på en annan port än den du angett under \"Virtuell Port\". Du kan därför specificera ett mål som består av fysisk adress och port dit du vill att din gömda service skall omdirigeras, tex localhost:5222 (eller vilken port din server nu lyssnar på). Om du inte anger något mål kommer Tor att dirigera anslutningar till den port som anges under \"Virtual Port\" på localhost." #. type: Content of: <html><body><p><ul><li> #: en/services.html:81 @@ -163,51 +163,51 @@ msgid "" "hidden service in Tor. This can be useful for keeping the configuration of a" " currently unused service for later use. All non-enabled services are stored" " in the Vidalia-specific configuration file vidalia.conf." -msgstr "" +msgstr "Aktiverad: Om denna checkbox är avmarkerad kommer Vidalia inte att konfigurera den gömda tjänsten i Tor. Detta kan vara användbart för att till senare spara konfigurationen för en tjänst som inte används just nu. Alla icke-aktiverade tjänster sparas i den Vidalia-specifika konfigurationsfilen vidalia.conf." #. 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 "Vad används de fem knapparna till?" #. type: Content of: <html><body><p><ul><li> #: en/services.html:107 msgid "Add service: Creates a new empty service configuration." -msgstr "" +msgstr "Lägg till service: Skapar en ny tom tjänstekonfiguration." #. type: Content of: <html><body><p><ul><li> #: en/services.html:108 msgid "" "Remove service: Permanently removes a hidden service configuration. (If you" " want to temporarily remove a service, uncheck its Enabled checkbox.)" -msgstr "" +msgstr "Ta bort service: Tar permanent bort en gömd tjänsts konfiguration. (Om du temporärt vill ta bort en tjänst så avmarkera checkboxen \"Aktiverad\".)" #. type: Content of: <html><body><p><ul><li> #: en/services.html:111 msgid "" "Copy to clipboard: Copies the onion address to the clipboard, so that you " "can tell it to whoever shall be able to use your service." -msgstr "" +msgstr "Kopiera till urklipp: Kopierar onion-adressen till urklipp så att du kan dela den till de du vill skall kunna nå din tjänst." #. type: Content of: <html><body><p><ul><li> #: en/services.html:114 msgid "Browse: Lets you browse to find a local hidden service directory." -msgstr "" +msgstr "Bläddra: Låter dig bläddra för att hitta en lokal hidden service mapp." #. type: Content of: <html><body> #: en/services.html:119 msgid "<a name=\"advanced\"/>" -msgstr "" +msgstr "<a name=\"advanced\"/>" #. type: Content of: <html><body><h3> #: en/services.html:120 msgid "How can I configure advanced hidden service settings?" -msgstr "" +msgstr "Hur kan jag konfigurera avancerade inställningar för en hidden service?" #. type: Content of: <html><body><p> #: en/services.html:122 @@ -215,7 +215,7 @@ msgid "" "Tor allows configuration of more specific settings for hidden services, e.g." " forcing to use (or avoiding) certain nodes as introduction points, or " "providing multiple virtual ports for the same service." -msgstr "" +msgstr "Tor tillåter konfiguration av mer specifika inställningar för gömda tjänster, tex tvinga användning (eller undvikande) av specifika noder som ingångspunkter, eller tillhandahållandet av multipla virtuella portar för samma tjänst." #. type: Content of: <html><body><p> #: en/services.html:128 @@ -225,17 +225,17 @@ msgid "" "so in Tor's torrc file. Vidalia will not remove those settings even when you" " are editing your hidden services. If you specify more than one virtual " "port, only the first will be displayed and be editable." -msgstr "" +msgstr "Emellertid, vi bestämde oss för att förenkla saker i Vidalia och bara tillhandahålla de vanligaste inställningarna. Om du vill konfigurera avancerade inställningar måste du göra det i Tors torrc-fil. Vidalia kommer inte ta ta bort de inställningarna även om du redigerar din gömda tjänst. Om du anger mer än en virtuell port kommer bara den första att visas och vara redigerbar." #. 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 "Hur hjälper Vidalia mig att nå andra hidden services?" #. type: Content of: <html><body><p> #: en/services.html:138 @@ -244,4 +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 "Inte alls. Det finns inget behov av det. Om du vill nå en annan hidden serivce så skriv in onion-adressen i din webläsare (eller annan klientapplikation om det inte är en web-tjänst) och Tor kommer att göra resten åt dig. Du behöver inte ställa in något speciellt i Tor för detta."

1 0

[translation/vidalia_help_completed] Update translations for vidalia_help_completed
by translation＠torproject.org 08 Apr '13

08 Apr '13

commit e33c0c464d7d09c4def31bf5558c8fd35a975ddb Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 8 00:45:52 2013 +0000 Update translations for vidalia_help_completed --- sv/troubleshooting.po | 244 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 244 insertions(+), 0 deletions(-) diff --git a/sv/troubleshooting.po b/sv/troubleshooting.po new file mode 100644 index 0000000..e97efe3 --- /dev/null +++ b/sv/troubleshooting.po @@ -0,0 +1,244 @@ +# +# Translators: +# <cryptohead(a)gmail.com>, 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-08-03 15:49-0300\n" +"PO-Revision-Date: 2013-04-08 00:36+0000\n" +"Last-Translator: cryptohead <cryptohead(a)gmail.com>\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: sv\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +# type: Content of: <html><body><h1> +#: en/troubleshooting.html:16 +msgid "Troubleshooting" +msgstr "Felsökning" + +# type: Content of: <html><body> +#: en/troubleshooting.html:19 +msgid "" +"Listed below are some of the common problems or questions people have while " +"running Tor. If you can't find anything about the particular problem you're " +"having, check out our website at <i>www.vidalia-project.net</i> for more " +"support and information. <a name=\"start\"/>" +msgstr "Nedan listas några av de mer vanliga problemen eller frågorna som användare har haft då de kört Tor. Om du inte kan hitta svaret på ett specifik problem som du har så ta en titt på våra websidor <i>www.vidalia-project.net</i> för mer hjälp och information." + +# type: Content of: <html><body><h3> +#: en/troubleshooting.html:25 +msgid "I Can't Start Tor" +msgstr "Jag kan inte starta Tor" + +# type: Content of: <html><body><p> +#: en/troubleshooting.html:27 +msgid "" +"The most likely reason that Vidalia could not start Tor is because Vidalia " +"is looking for your Tor installation in the wrong directory. You can tell " +"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in" +" the <a href=\"config.html#general\">general configuration settings</a>." +msgstr "Den mest sannolika anledningen till att Vidalia inte kunde starta Tor är för att Vidalia söker i fel mapp efter din Tor installation. Du kan tala om för Vidalia var Tor är installerat genom att uppdatera <i>Tor Executable</i> fältet under <a href=\"config.html#general\">allmänna inställningar</a>." + +# type: Content of: <html><body><p> +#: en/troubleshooting.html:33 +msgid "" +"Another possible reason that Tor cannot start is because there is already " +"another Tor process running. Check your list of running process and stop the" +" previous Tor process, if you find one. Then, try running Tor again." +msgstr "En annan möjlig orsak att Tor inte kan staras är för att det redan finns en Tor process igång. Kolla din lista över aktiva processer och stäng ned den tidigare Tor-processen om du hittar en. När du stängt Tor-processen så försök starta Tor igen." + +# type: Content of: <html><body><p> +#: en/troubleshooting.html:38 +msgid "" +"If that did not help, check your <a href=\"log.html\">message log</a> to see" +" if Tor printed any information about errors it encountered while trying to " +"start." +msgstr "Om det inte hjälpte så titta i din <a href=\"log.html\">meddelandejournal</a> för att se om Tor har givit någon mer information kring varför det inte kunde starta." + +# type: Content of: <html><body> +#: en/troubleshooting.html:43 +msgid "<a name=\"connect\"/>" +msgstr "<a name=\"connect\"/>" + +# type: Content of: <html><body><h3> +#: en/troubleshooting.html:44 +msgid "Vidalia Can't Connect to Tor" +msgstr "Vidalia kan inte ansluta till Tor" + +# type: Content of: <html><body><p> +#: en/troubleshooting.html:46 +msgid "" +"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>." +msgstr "Vidalia styr Tor genom att kommunicera med det via Tors <i>kontrollport</i>." + +# type: Content of: <html><body><p> +#: en/troubleshooting.html:49 +msgid "" +"The most common reason that Vidalia cannot connect to Tor is because Tor " +"started, but encountered an error and exited immediately. You should check " +"your <a href=\"log.html\">message log</a> to see if Tor reported any errors " +"while it started." +msgstr "Den mest vanliga orsaken till att Vidalia inte kan koppla upp till Tor är för att Tor startade men stötte på ett fel och avslutades direkt. Du bör titta i din <a href=\"log.html\">meddelandejournal</a> för att se om Tor har rapporterat några fel när det startade." + +# type: Content of: <html><body><p> +#: en/troubleshooting.html:55 +msgid "" +"If Tor is listening on a different port than Vidalia expects, Vidalia will " +"be unable to connect to Tor. You rarely need to change this setting, but if " +"there is another service running on your machine that conflicts with Tor's " +"control port, you will need to specify a different port. You can change this" +" setting in Vidalia's <a href=\"config.html#advanced\">advanced " +"configuration settings</a>." +msgstr "Om Tor lyssnar på en annan port än vad Vidalia förutsätter så kommer Vidalia inte att kunna koppla upp sig till Tor. Du behöver sällan ändra denna inställning, men om en annan tjänst som kör på din maskin har en konflikt med Tors kontrollport så måste du ange en annan port. Du kan ändra denna i Vidalias <a href=\"config.html#advanced\">avancerade inställningar</a>." + +# type: Content of: <html><body> +#: en/troubleshooting.html:63 +msgid "<a name=\"password\"/>" +msgstr "<a name=\"password\"/>" + +# type: Content of: <html><body><h3> +#: en/troubleshooting.html:64 +msgid "Why is Vidalia asking me for a \"control password\"?" +msgstr "Varför frågar Vidalia mig efter ett \"control password\"?" + +# type: Content of: <html><body><p> +#: en/troubleshooting.html:66 +msgid "" +"Vidalia interacts with the Tor software via Tor's \"control port\". The " +"control port lets Vidalia receive status updates from Tor, request a new " +"identity, configure Tor's settings, etc. Each time Vidalia starts Tor, " +"Vidalia sets a random password for Tor's control port to prevent other " +"applications from also connecting to the control port and potentially " +"compromising your anonymity." +msgstr "Vidalia interagerar med Tormjukvaran via Tors kontrollport (\"control port\"). Kontrollporten låter Vidalia ta emot statusuppdateringar från Tor, begära en ny identitet, konfigurera Tor, etc. Varje gång Vidalia startar Tor så sätter Vidalia ett slumpmässigt lösenord för Tors kontrollport för att förhindra att andra applikationer också kopplar upp sig till kontrollporten och potentiellt äventyrar din anonymitet." + +# type: Content of: <html><body><p> +#: en/troubleshooting.html:75 +msgid "" +"Usually this process of generating and setting a random control password " +"happens in the background. There are three common situations, though, where " +"Vidalia may prompt you for a password:" +msgstr "Vanligtvis så sker denna process med att generera och sätta ett slumpmässigt lösenord i bakgrunden. Det finns dock tre vanliga situationer när Vidalia kan komma att fråga dig efter ett lösenord:" + +# type: Content of: <html><body><ul><li> +#: en/troubleshooting.html:82 +msgid "" +"You're already running Vidalia and Tor. For example, this situation can " +"happen if you installed the Vidalia bundle and now you're trying to run the " +"Tor Browser Bundle. In that case, you'll need to close the old Vidalia and " +"Tor before you can run this one." +msgstr "Du kör redan Vidalia och Tor. Som exempel, denna sitation kan uppstå om du installerade Vidalia paketet och du nu försöker köra Tor Browser Bundle. Om så är fallet behöver du stänga den gamla Vidalia och Tor innan du kan köra TBB." + +# type: Content of: <html><body><ul><li><p> +#: en/troubleshooting.html:89 +msgid "" +"Vidalia crashed, but left Tor running with the last known random password. " +"After you restart Vidalia, it generates a new random password, but Vidalia " +"can't talk to Tor, because the random passwords are different." +msgstr "Vidalia kraschade men lämnade Tor igång med det senast kända slumpade lösenordet. När du startat om Vidalia kommer ett nytt lösenord att genereras, men då detta nya slumpmässiga lösenord skiljer sig från det förra så kommer Vidalia inte att kunna kommunicera med Tor." + +# type: Content of: <html><body><ul><li><p> +#: en/troubleshooting.html:94 +msgid "" +"If the dialog that prompts you for a control password has a <i>Reset</i> " +"button, you can click the button and Vidalia will restart Tor with a new " +"random control password." +msgstr "Om dialogen som frågar dig för ett \"control password\" har en <i>Återställ</i>-knapp kan du klicka på denna och Vidalia kommer då att starta om Tor med ett nytt slumpmässigt kontroll-lösenord." + +# type: Content of: <html><body><ul><li><p> +#: en/troubleshooting.html:99 +msgid "" +"If you do not see a <i>Reset</i> button, or if Vidalia is unable to restart " +"Tor for you, you can still fix the problem manually. Simply go into your " +"process or task manager, and terminate the Tor process. Then use Vidalia to " +"restart Tor and all will work again." +msgstr "Om du inte ser en <i>Återställ</i>-knapp, eller om Vidalia inte kan starta om Tor åt dig, kan du fortfarande lösa problemet manuellt. Bara gå till din process- eller program-hanterare och avsluta Tor processen. Låt sedan Vidalia starta om Tor och allt kommer att fungera igen." + +# type: Content of: <html><body><ul><li><p> +#: en/troubleshooting.html:106 +msgid "" +"You had previously set Tor to run as a service. When Tor is set to run as a " +"service, it starts up when the system boots. If you configured Tor to start " +"as a service through Vidalia, a random password was set and saved in Tor. " +"When you reboot, Tor starts up and uses the random password it saved. You " +"login and start up Vidalia. Vidalia attempts to talk to the already running " +"Tor. Vidalia generates a random password, but it is different than the saved" +" password in the Tor service." +msgstr "Du har tidigare satt upp Tor att köra som en service. När Tor är satt att köra som en service så startar det upp när systemet bootar. Om du konfigurerade Tor att starta som en service genom Vidalia har ett slumpmässigt lösenord satts och sparats i Tor. När du startar om startar Tor upp och använder det slumpmässiga lösenord det sparade. Du loggar in och startar Vidalia. Vidalia försöker kommunicera med den redan körande Tor-instansen. Vidalia genererar ett slumpmässigt lösenord men det är inte samma som det sparade lösenordet i Tor servicen." + +# type: Content of: <html><body><ul><li><p> +#: en/troubleshooting.html:114 +msgid "" +"You need to reconfigure Tor to not be a service. See the Tor wiki page on " +"running <a " +"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService\">" +" Tor as a service</a> for more information on how to remove the Tor service." +msgstr "Du behöver konfigurera om Tor till att inte starta som en service. Se Tors wiki-sidor för att köra <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService\">Tor som en service</a> för mer information om hur du tar bort Tor servicen." + +# type: Content of: <html><body> +#: en/troubleshooting.html:122 +msgid "<a name=\"torexited\"/>" +msgstr "<a name=\"torexited\"/>" + +# type: Content of: <html><body><h3> +#: en/troubleshooting.html:123 +msgid "Tor Exited Unexpectedly" +msgstr "Tor avslutades oväntat" + +# type: Content of: <html><body><p> +#: en/troubleshooting.html:125 +msgid "" +"If Tor exits immediately after trying to start, you most likely have another" +" Tor process already running. Check the <a href=\"log.html\">message log</a>" +" to see if any of the last few messages in the list are highlighted in " +"yellow and contain a message similar to the following:" +msgstr "Om Tor avslutas direkt efter försök att starta det så är det mest troligt att du har en annan Tor process redan körande. Kontrollera din <a href=\"log.html\">meddelandejournal</a> för att se om några av de senaste meddelandena är markerade i gult och innehåller ett meddelande i stil med följande:" + +# type: Content of: <html><body><pre> +#: en/troubleshooting.html:131 +#, no-wrap +msgid "" +"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n" +"Is Tor already running?\n" +msgstr "connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \nIs Tor already running?\n" + +# type: Content of: <html><body><p> +#: en/troubleshooting.html:135 +msgid "" +"If you find an error message like the one above, you will need to stop the " +"other Tor process before starting a new one with Vidalia. On Windows, you " +"would need to look for <i>tor.exe</i> in your Task Manager. On most other " +"operating systems, the <i>ps</i> command can help you find the other Tor " +"process." +msgstr "Om du ser ett felmeddelande som det ovan behöver du stoppa den andra Tor-processen innan du startar en ny med hjälp av Vidalia. På Windows behöver du titta efter <i>tor.exe<Ii> i din aktivitetshanterare. På de flesta andra operativsystem kan <i>ps</i>-kommandot hjälpa dig att hitta den andra Tor-processen." + +# type: Content of: <html><body><p> +#: en/troubleshooting.html:141 +msgid "" +"If Tor had been running successfully for awhile (that is, longer than a few " +"seconds), then you should check the <a href=\"log.html\">message log</a> for" +" information about any errors Tor experienced before it exited. Such errors " +"will be highlighted in either red or yellow." +msgstr "Om Tor varit igång en stund (dvs längre än ett par sekunder) bör du titta i din <a href=\"log.html\">meddelandejournal</a> efter information om eventuella fel som Tor stötte på innan det avslutades. Sådana fel kommer att vara markerade med antingen rött eller gult." + +# type: Content of: <html><body> +#: en/troubleshooting.html:147 +msgid "<a name=\"stop\"/>" +msgstr "<a name=\"stop\"/>" + +# type: Content of: <html><body><h3> +#: en/troubleshooting.html:148 +msgid "Vidalia Can't Stop Tor" +msgstr "Vidalia kan inte stoppa Tor" + +# type: Content of: <html><body><p> +#: en/troubleshooting.html:150 +msgid "" +"If Vidalia cannot stop Tor, you should check your <a " +"href=\"log.html\">message log</a> to see if Tor reported any errors while " +"trying to exit." +msgstr "Om Vidalia inte kan stoppa Tor bör du titta i din <a href=\"log.html\">meddelandejournal</a> för att se om Tor rapporterat några fel när det försökt att stänga ned."

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 08 Apr '13

08 Apr '13

commit 7dce215d0fcf85a41296020a3604a560df68ff7b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 8 00:45:39 2013 +0000 Update translations for vidalia_help --- sv/services.po | 17 ++++++++--------- sv/troubleshooting.po | 36 ++++++++++++++++++------------------ 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/sv/services.po b/sv/services.po index 3391f0b..526bf24 100644 --- a/sv/services.po +++ b/sv/services.po @@ -1,23 +1,24 @@ # # Translators: +# <cryptohead(a)gmail.com>, 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-04-08 00:45+0000\n" +"Last-Translator: cryptohead <cryptohead(a)gmail.com>\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: sv\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 "Hidden Services" #. 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 "Anmärkning: Stöd för gömda tjänster (\"hidden services\") är nytt i Vidalia. Du bör förutsätta att det finns buggar, vissa som kanske fördärvar din hidden service-konfiguration. Med andra ord, förlita dig inte på det, eller snarare - skyll inte på oss om något går snett. Om du hittar buggar eller har kommentarer om den här nya funktionen så låt oss veta! Vi behöver din återkoppling. <a name=about\"/>" #. type: Content of: <html><body><h3> #: en/services.html:26 msgid "What is a hidden service?" -msgstr "" +msgstr "Vad är en hidden service?" #. 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 "En hidden service låter dig tillhandahålla vilken typ av TCP-baserad tjänst som helst, tex en HTTP-tjänst, till andra utan att avslöja din IP-adress. Protokollet som tillhandahåller gömda tjänster bygger på samma kretsar som Tor använder för anonym websurf och har i stort samma anonymitetsegenskaper." #. type: Content of: <html><body><p> #: en/services.html:35 @@ -244,5 +245,3 @@ msgid "" "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 "" - - diff --git a/sv/troubleshooting.po b/sv/troubleshooting.po index 8f4a95e..e97efe3 100644 --- a/sv/troubleshooting.po +++ b/sv/troubleshooting.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-08-03 15:49-0300\n" -"PO-Revision-Date: 2013-04-08 00:13+0000\n" +"PO-Revision-Date: 2013-04-08 00:36+0000\n" "Last-Translator: cryptohead <cryptohead(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -114,7 +114,7 @@ msgid "" "Vidalia sets a random password for Tor's control port to prevent other " "applications from also connecting to the control port and potentially " "compromising your anonymity." -msgstr "" +msgstr "Vidalia interagerar med Tormjukvaran via Tors kontrollport (\"control port\"). Kontrollporten låter Vidalia ta emot statusuppdateringar från Tor, begära en ny identitet, konfigurera Tor, etc. Varje gång Vidalia startar Tor så sätter Vidalia ett slumpmässigt lösenord för Tors kontrollport för att förhindra att andra applikationer också kopplar upp sig till kontrollporten och potentiellt äventyrar din anonymitet." # type: Content of: <html><body><p> #: en/troubleshooting.html:75 @@ -122,7 +122,7 @@ msgid "" "Usually this process of generating and setting a random control password " "happens in the background. There are three common situations, though, where " "Vidalia may prompt you for a password:" -msgstr "" +msgstr "Vanligtvis så sker denna process med att generera och sätta ett slumpmässigt lösenord i bakgrunden. Det finns dock tre vanliga situationer när Vidalia kan komma att fråga dig efter ett lösenord:" # type: Content of: <html><body><ul><li> #: en/troubleshooting.html:82 @@ -131,7 +131,7 @@ msgid "" "happen if you installed the Vidalia bundle and now you're trying to run the " "Tor Browser Bundle. In that case, you'll need to close the old Vidalia and " "Tor before you can run this one." -msgstr "" +msgstr "Du kör redan Vidalia och Tor. Som exempel, denna sitation kan uppstå om du installerade Vidalia paketet och du nu försöker köra Tor Browser Bundle. Om så är fallet behöver du stänga den gamla Vidalia och Tor innan du kan köra TBB." # type: Content of: <html><body><ul><li><p> #: en/troubleshooting.html:89 @@ -139,7 +139,7 @@ msgid "" "Vidalia crashed, but left Tor running with the last known random password. " "After you restart Vidalia, it generates a new random password, but Vidalia " "can't talk to Tor, because the random passwords are different." -msgstr "" +msgstr "Vidalia kraschade men lämnade Tor igång med det senast kända slumpade lösenordet. När du startat om Vidalia kommer ett nytt lösenord att genereras, men då detta nya slumpmässiga lösenord skiljer sig från det förra så kommer Vidalia inte att kunna kommunicera med Tor." # type: Content of: <html><body><ul><li><p> #: en/troubleshooting.html:94 @@ -147,7 +147,7 @@ msgid "" "If the dialog that prompts you for a control password has a <i>Reset</i> " "button, you can click the button and Vidalia will restart Tor with a new " "random control password." -msgstr "" +msgstr "Om dialogen som frågar dig för ett \"control password\" har en <i>Återställ</i>-knapp kan du klicka på denna och Vidalia kommer då att starta om Tor med ett nytt slumpmässigt kontroll-lösenord." # type: Content of: <html><body><ul><li><p> #: en/troubleshooting.html:99 @@ -156,7 +156,7 @@ msgid "" "Tor for you, you can still fix the problem manually. Simply go into your " "process or task manager, and terminate the Tor process. Then use Vidalia to " "restart Tor and all will work again." -msgstr "" +msgstr "Om du inte ser en <i>Återställ</i>-knapp, eller om Vidalia inte kan starta om Tor åt dig, kan du fortfarande lösa problemet manuellt. Bara gå till din process- eller program-hanterare och avsluta Tor processen. Låt sedan Vidalia starta om Tor och allt kommer att fungera igen." # type: Content of: <html><body><ul><li><p> #: en/troubleshooting.html:106 @@ -168,7 +168,7 @@ msgid "" "login and start up Vidalia. Vidalia attempts to talk to the already running " "Tor. Vidalia generates a random password, but it is different than the saved" " password in the Tor service." -msgstr "" +msgstr "Du har tidigare satt upp Tor att köra som en service. När Tor är satt att köra som en service så startar det upp när systemet bootar. Om du konfigurerade Tor att starta som en service genom Vidalia har ett slumpmässigt lösenord satts och sparats i Tor. När du startar om startar Tor upp och använder det slumpmässiga lösenord det sparade. Du loggar in och startar Vidalia. Vidalia försöker kommunicera med den redan körande Tor-instansen. Vidalia genererar ett slumpmässigt lösenord men det är inte samma som det sparade lösenordet i Tor servicen." # type: Content of: <html><body><ul><li><p> #: en/troubleshooting.html:114 @@ -177,17 +177,17 @@ msgid "" "running <a " "href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService\">" " Tor as a service</a> for more information on how to remove the Tor service." -msgstr "" +msgstr "Du behöver konfigurera om Tor till att inte starta som en service. Se Tors wiki-sidor för att köra <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService\">Tor som en service</a> för mer information om hur du tar bort Tor servicen." # type: Content of: <html><body> #: en/troubleshooting.html:122 msgid "<a name=\"torexited\"/>" -msgstr "" +msgstr "<a name=\"torexited\"/>" # type: Content of: <html><body><h3> #: en/troubleshooting.html:123 msgid "Tor Exited Unexpectedly" -msgstr "" +msgstr "Tor avslutades oväntat" # type: Content of: <html><body><p> #: en/troubleshooting.html:125 @@ -196,7 +196,7 @@ msgid "" " Tor process already running. Check the <a href=\"log.html\">message log</a>" " to see if any of the last few messages in the list are highlighted in " "yellow and contain a message similar to the following:" -msgstr "" +msgstr "Om Tor avslutas direkt efter försök att starta det så är det mest troligt att du har en annan Tor process redan körande. Kontrollera din <a href=\"log.html\">meddelandejournal</a> för att se om några av de senaste meddelandena är markerade i gult och innehåller ett meddelande i stil med följande:" # type: Content of: <html><body><pre> #: en/troubleshooting.html:131 @@ -204,7 +204,7 @@ msgstr "" msgid "" "connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n" "Is Tor already running?\n" -msgstr "" +msgstr "connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \nIs Tor already running?\n" # type: Content of: <html><body><p> #: en/troubleshooting.html:135 @@ -214,7 +214,7 @@ msgid "" "would need to look for <i>tor.exe</i> in your Task Manager. On most other " "operating systems, the <i>ps</i> command can help you find the other Tor " "process." -msgstr "" +msgstr "Om du ser ett felmeddelande som det ovan behöver du stoppa den andra Tor-processen innan du startar en ny med hjälp av Vidalia. På Windows behöver du titta efter <i>tor.exe<Ii> i din aktivitetshanterare. På de flesta andra operativsystem kan <i>ps</i>-kommandot hjälpa dig att hitta den andra Tor-processen." # type: Content of: <html><body><p> #: en/troubleshooting.html:141 @@ -223,17 +223,17 @@ msgid "" "seconds), then you should check the <a href=\"log.html\">message log</a> for" " information about any errors Tor experienced before it exited. Such errors " "will be highlighted in either red or yellow." -msgstr "" +msgstr "Om Tor varit igång en stund (dvs längre än ett par sekunder) bör du titta i din <a href=\"log.html\">meddelandejournal</a> efter information om eventuella fel som Tor stötte på innan det avslutades. Sådana fel kommer att vara markerade med antingen rött eller gult." # type: Content of: <html><body> #: en/troubleshooting.html:147 msgid "<a name=\"stop\"/>" -msgstr "" +msgstr "<a name=\"stop\"/>" # type: Content of: <html><body><h3> #: en/troubleshooting.html:148 msgid "Vidalia Can't Stop Tor" -msgstr "" +msgstr "Vidalia kan inte stoppa Tor" # type: Content of: <html><body><p> #: en/troubleshooting.html:150 @@ -241,4 +241,4 @@ msgid "" "If Vidalia cannot stop Tor, you should check your <a " "href=\"log.html\">message log</a> to see if Tor reported any errors while " "trying to exit." -msgstr "" +msgstr "Om Vidalia inte kan stoppa Tor bör du titta i din <a href=\"log.html\">meddelandejournal</a> för att se om Tor rapporterat några fel när det försökt att stänga ned."

1 0

[stem/master] Replacing paging nav bar with categories
by atagar＠torproject.org 08 Apr '13

08 Apr '13

commit 174d39e9e5b6825da3ebb0490b3ebffb7d858fff Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Apr 7 11:33:49 2013 -0700 Replacing paging nav bar with categories Sphinx wants the layout of sites to be like a book, with a 'previous' and 'next' page. I'm at a loss for how that could possibly be a good idea. Sites like stem's have categories (tutorial, api, download, etc) which our navbar should provide a quick method to access. --- docs/_static/haiku.css_t | 2 -- docs/_templates/layout.html | 20 +++++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/_static/haiku.css_t b/docs/_static/haiku.css_t index 93007df..28be8f4 100644 --- a/docs/_static/haiku.css_t +++ b/docs/_static/haiku.css_t @@ -160,7 +160,6 @@ div.topnav p { margin-left: 40px; margin-right: 40px; margin-bottom: 0px; - text-align: right; font-size: 0.8em; } div.bottomnav { @@ -168,7 +167,6 @@ div.bottomnav { } div.bottomnav p { margin-right: 40px; - text-align: right; font-size: 0.8em; } diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html index c625808..1b87971 100644 --- a/docs/_templates/layout.html +++ b/docs/_templates/layout.html @@ -19,15 +19,17 @@ <p> {%- block haikurel1 %} {%- endblock %} - {%- if prev %} - «  <a href="{{ prev.link|e }}">{{ prev.title }}</a> -   ::   - {%- endif %} - <a class="uplink" href="{{ pathto(master_doc) }}">{{ _('Contents') }}</a> - {%- if next %} -   ::   - <a href="{{ next.link|e }}">{{ next.title }}</a>  » - {%- endif %} + <a class="uplink" href="{{ pathto(master_doc) }}">Home</a> +   |   + <a class="uplink" href="{{ pathto('tutorials') }}">Tutorials</a> +   |   + <a class="uplink" href="{{ pathto('api') }}">API</a> +   |   + <a class="uplink" href="https://trac.torproject.org/projects/tor/wiki/doc/stem/bugs">Bug Tracker</a> +   |   + <a class="uplink" href="{{ pathto('change_log') }}">Change Log</a> +   |   + <a class="uplink" href="{{ pathto('download') }}">Download</a> {%- block haikurel2 %} {%- endblock %} </p>

1 0

[stem/master] Site navbar menu
by atagar＠torproject.org 08 Apr '13

08 Apr '13

commit 29e7169d9a9947b86fe7af557a7230932fcc49f8 Merge: b7d8cad c719b1e Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Apr 7 17:25:34 2013 -0700 Site navbar menu Replacing the normal sphinx 'previous/next' navigation with a navbar menu. Hopefully this will make site navigation far, far easier... https://trac.torproject.org/8431 docs/_static/haiku.css_t | 456 +++++++++++++++++++++++++++++++++++++++++++ docs/_templates/layout.html | 92 +++++++++ docs/change_log.rst | 1 + 3 files changed, 549 insertions(+), 0 deletions(-)

1 0

[stem/master] Forking the haiku theme
by atagar＠torproject.org 08 Apr '13

08 Apr '13

commit bc8ec1da82bd45e2ec7b694ea824fedc49ae6395 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Apr 7 11:32:17 2013 -0700 Forking the haiku theme The haiku theme has limited customizability. In particular we can't... * Overwrite the normal nav elements (previous, contents, next) with something else since they aren't within a block. The only way to overwrite them it to clobber the contents block, which kinda defeats the point of using their layout. * The css uses text layout right but we want text layout left. Hence I'm copying in the haiku layout and css so I can customize them. This is the first step toward a proper navbar for our site... --- docs/_static/haiku.css_t | 371 +++++++++++++++++++++++++++++++++++++++++++ docs/_templates/layout.html | 68 ++++++++ 2 files changed, 439 insertions(+), 0 deletions(-) diff --git a/docs/_static/haiku.css_t b/docs/_static/haiku.css_t new file mode 100644 index 0000000..93007df --- /dev/null +++ b/docs/_static/haiku.css_t @@ -0,0 +1,371 @@ +/* + * haiku.css_t + * ~~~~~~~~~~~ + * + * Sphinx stylesheet -- haiku theme. + * + * Adapted from http://haiku-os.org/docs/Haiku-doc.css. + * Original copyright message: + * + * Copyright 2008-2009, Haiku. All rights reserved. + * Distributed under the terms of the MIT License. + * + * Authors: + * Francois Revol <revol(a)free.fr> + * Stephan Assmus <superstippi(a)gmx.de> + * Braden Ewing <brewin(a)gmail.com> + * Humdinger <humdingerb(a)gmail.com> + * + * :copyright: Copyright 2007-2010 by the Sphinx team, see AUTHORS. + * :license: BSD, see LICENSE for details. + * + */ + +@import url("basic.css"); + +html { + margin: 0px; + padding: 0px; + background: #FFF url(bg-page.png) top left repeat-x; +} + +body { + line-height: 1.5; + margin: auto; + padding: 0px; + font-family: "DejaVu Sans", Arial, Helvetica, sans-serif; + min-width: 59em; + max-width: 70em; + color: {{ theme_textcolor }}; +} + +div.footer { + padding: 8px; + font-size: 11px; + text-align: center; + letter-spacing: 0.5px; +} + +/* link colors and text decoration */ + +a:link { + font-weight: bold; + text-decoration: none; + color: {{ theme_linkcolor }}; +} + +a:visited { + font-weight: bold; + text-decoration: none; + color: {{ theme_visitedlinkcolor }}; +} + +a:hover, a:active { + text-decoration: underline; + color: {{ theme_hoverlinkcolor }}; +} + +/* Some headers act as anchors, don't give them a hover effect */ + +h1 a:hover, a:active { + text-decoration: none; + color: {{ theme_headingcolor }}; +} + +h2 a:hover, a:active { + text-decoration: none; + color: {{ theme_headingcolor }}; +} + +h3 a:hover, a:active { + text-decoration: none; + color: {{ theme_headingcolor }}; +} + +h4 a:hover, a:active { + text-decoration: none; + color: {{ theme_headingcolor }}; +} + +a.headerlink { + color: #a7ce38; + padding-left: 5px; +} + +a.headerlink:hover { + color: #a7ce38; +} + +/* basic text elements */ + +div.content { + margin-top: 20px; + margin-left: 40px; + margin-right: 40px; + margin-bottom: 50px; + font-size: 0.9em; +} + +/* heading and navigation */ + +div.header { + position: relative; + left: 0px; + top: 0px; + height: 85px; + /* background: #eeeeee; */ + padding: 0 40px; +} +div.header h1 { + font-size: 1.6em; + font-weight: normal; + letter-spacing: 1px; + color: {{ theme_headingcolor }}; + border: 0; + margin: 0; + padding-top: 15px; +} +div.header h1 a { + font-weight: normal; + color: {{ theme_headingcolor }}; +} +div.header h2 { + font-size: 1.3em; + font-weight: normal; + letter-spacing: 1px; + text-transform: uppercase; + color: #aaa; + border: 0; + margin-top: -3px; + padding: 0; +} + +div.header img.rightlogo { + float: right; +} + + +div.title { + font-size: 1.3em; + font-weight: bold; + color: {{ theme_headingcolor }}; + border-bottom: dotted thin #e0e0e0; + margin-bottom: 25px; +} +div.topnav { + /* background: #e0e0e0; */ +} +div.topnav p { + margin-top: 0; + margin-left: 40px; + margin-right: 40px; + margin-bottom: 0px; + text-align: right; + font-size: 0.8em; +} +div.bottomnav { + background: #eeeeee; +} +div.bottomnav p { + margin-right: 40px; + text-align: right; + font-size: 0.8em; +} + +a.uplink { + font-weight: normal; +} + + +/* contents box */ + +table.index { + margin: 0px 0px 30px 30px; + padding: 1px; + border-width: 1px; + border-style: dotted; + border-color: #e0e0e0; +} +table.index tr.heading { + background-color: #e0e0e0; + text-align: center; + font-weight: bold; + font-size: 1.1em; +} +table.index tr.index { + background-color: #eeeeee; +} +table.index td { + padding: 5px 20px; +} + +table.index a:link, table.index a:visited { + font-weight: normal; + text-decoration: none; + color: {{ theme_linkcolor }}; +} +table.index a:hover, table.index a:active { + text-decoration: underline; + color: {{ theme_hoverlinkcolor }}; +} + + +/* Haiku User Guide styles and layout */ + +/* Rounded corner boxes */ +/* Common declarations */ +div.admonition { + -webkit-border-radius: 10px; + -khtml-border-radius: 10px; + -moz-border-radius: 10px; + border-radius: 10px; + border-style: dotted; + border-width: thin; + border-color: #dcdcdc; + padding: 10px 15px 10px 15px; + margin-bottom: 15px; + margin-top: 15px; +} +div.note { + padding: 10px 15px 10px 80px; + background: #e4ffde url(alert_info_32.png) 15px 15px no-repeat; + min-height: 42px; +} +div.warning { + padding: 10px 15px 10px 80px; + background: #fffbc6 url(alert_warning_32.png) 15px 15px no-repeat; + min-height: 42px; +} +div.seealso { + background: #e4ffde; +} + +/* More layout and styles */ +h1 { + font-size: 1.3em; + font-weight: bold; + color: {{ theme_headingcolor }}; + border-bottom: dotted thin #e0e0e0; + margin-top: 30px; +} + +h2 { + font-size: 1.2em; + font-weight: normal; + color: {{ theme_headingcolor }}; + border-bottom: dotted thin #e0e0e0; + margin-top: 30px; +} + +h3 { + font-size: 1.1em; + font-weight: normal; + color: {{ theme_headingcolor }}; + margin-top: 30px; +} + +h4 { + font-size: 1.0em; + font-weight: normal; + color: {{ theme_headingcolor }}; + margin-top: 30px; +} + +p { + text-align: justify; +} + +p.last { + margin-bottom: 0; +} + +ol { + padding-left: 20px; +} + +ul { + padding-left: 5px; + margin-top: 3px; +} + +li { + line-height: 1.3; +} + +div.content li { + -moz-background-clip:border; + -moz-background-inline-policy:continuous; + -moz-background-origin:padding; + background: transparent url(bullet_orange.png) no-repeat scroll left 0.45em; + list-style-image: none; + list-style-type: none; + padding: 0 0 0 1.666em; + margin-bottom: 3px; +} + +td { + vertical-align: top; +} + +tt { + background-color: #e2e2e2; + font-size: 1.0em; + font-family: monospace; +} + +pre { + border-color: #0c3762; + border-style: dotted; + border-width: thin; + margin: 0 0 12px 0; + padding: 0.8em; + background-color: #f0f0f0; +} + +hr { + border-top: 1px solid #ccc; + border-bottom: 0; + border-right: 0; + border-left: 0; + margin-bottom: 10px; + margin-top: 20px; +} + +/* printer only pretty stuff */ +@media print { + .noprint { + display: none; + } + /* for acronyms we want their definitions inlined at print time */ + acronym[title]:after { + font-size: small; + content: " (" attr(title) ")"; + font-style: italic; + } + /* and not have mozilla dotted underline */ + acronym { + border: none; + } + div.topnav, div.bottomnav, div.header, table.index { + display: none; + } + div.content { + margin: 0px; + padding: 0px; + } + html { + background: #FFF; + } +} + +.viewcode-back { + font-family: "DejaVu Sans", Arial, Helvetica, sans-serif; +} + +div.viewcode-block:target { + background-color: #f4debf; + border-top: 1px solid #ac9; + border-bottom: 1px solid #ac9; + margin: -1px -12px; + padding: 0 12px; +} diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html new file mode 100644 index 0000000..c625808 --- /dev/null +++ b/docs/_templates/layout.html @@ -0,0 +1,68 @@ +{# + haiku/layout.html + ~~~~~~~~~~~~~~~~~ + + Sphinx layout template for the haiku theme. + + :copyright: Copyright 2007-2010 by the Sphinx team, see AUTHORS. + :license: BSD, see LICENSE for details. +#} +{% extends "basic/layout.html" %} +{% set script_files = script_files + ['_static/theme_extras.js'] %} +{% set css_files = css_files + ['_static/print.css'] %} + +{# do not display relbars #} +{% block relbar1 %}{% endblock %} +{% block relbar2 %}{% endblock %} + +{% macro nav() %} + <p> + {%- block haikurel1 %} + {%- endblock %} + {%- if prev %} + «  <a href="{{ prev.link|e }}">{{ prev.title }}</a> +   ::   + {%- endif %} + <a class="uplink" href="{{ pathto(master_doc) }}">{{ _('Contents') }}</a> + {%- if next %} +   ::   + <a href="{{ next.link|e }}">{{ next.title }}</a>  » + {%- endif %} + {%- block haikurel2 %} + {%- endblock %} + </p> +{% endmacro %} + +{% block content %} + <div class="header"> + {%- block haikuheader %} + {%- if theme_full_logo != "false" %} + <a href="{{ pathto('index') }}"> + <img class="logo" src="{{ pathto('_static/' + logo, 1) }}" alt="Logo"/> + </a> + {%- else %} + {%- if logo -%} + <img class="rightlogo" src="{{ pathto('_static/' + logo, 1) }}" alt="Logo"/> + {%- endif -%} + <h1 class="heading"><a href="{{ pathto('index') }}"> + <span>{{ shorttitle|e }}</span></a></h1> + <h2 class="heading"><span>{{ title|striptags|e }}</span></h2> + {%- endif %} + {%- endblock %} + </div> + <div class="topnav"> + {{ nav() }} + </div> + <div class="content"> + {#{%- if display_toc %} + <div id="toc"> + <h3>Table Of Contents</h3> + {{ toc }} + </div> + {%- endif %}#} + {% block body %}{% endblock %} + </div> + <div class="bottomnav"> + {{ nav() }} + </div> +{% endblock %}

1 0

[stem/master] Simplifying site navigation via a navbar menu
by atagar＠torproject.org 08 Apr '13

08 Apr '13

commit c719b1e5680898e9d1f6ede953b3169d12580f64 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Apr 7 17:22:17 2013 -0700 Simplifying site navigation via a navbar menu Using a CSS style navbar to make site navigation easier. This is based on the one from... http://aext.net/2009/09/elegant-drop-menu-with-css-only/ --- docs/_static/haiku.css_t | 87 +++++++++++++++++++++++++++++++++++++++++++ docs/_templates/layout.html | 46 +++++++++++++++++------ docs/change_log.rst | 1 + 3 files changed, 122 insertions(+), 12 deletions(-) diff --git a/docs/_static/haiku.css_t b/docs/_static/haiku.css_t index 28be8f4..cd3b28d 100644 --- a/docs/_static/haiku.css_t +++ b/docs/_static/haiku.css_t @@ -367,3 +367,90 @@ div.viewcode-block:target { margin: -1px -12px; padding: 0 12px; } + +/* Navbar */ + +#navbar { + list-style: none; + margin: 0; + padding: 0; + float: left; + position: relative; +} + +#navbar li { + float: left; + position: relative; +} + +/* top navbar items */ + +#navbar li a { + float: left; + display: block; + text-decoration: none; + color: #666; + font-weight: normal; + text-indent: 10px; + width: 130px; + font-size: 0.9em; +} + +#navbar li:hover a, +#navbar li a:hover { + font-weight: normal; + background: #999; + color: #fff; +} + +/* start child items as invisible, but make them visible on hover */ + +#navbar ul { + display: none; +} + +#navbar li:hover ul { + display: block; +} + +/* attributes for child navbar items */ + +#navbar ul { + float: none; + position: absolute; + list-style: none; + margin: 0; + padding: 0; + top: 1.1em; + left: 0; +} + +#navbar ul li { + float: none; + clear: none; + margin: 0; + padding: 0; + width: auto; + color: #666; +} + +#navbar li:hover ul li a, +#navbar ul li { + font-weight: normal; + text-indent: 5px; + line-height: 200%; + display: block; + padding: 0 0 0 0; + float: none; + color: #666; + background-color: #e0e0e0; +} + +#navbar li:hover ul li a:hover, +#navbar ul li a:hover { + font-weight: normal; + text-indent: 5px; + background-color: #c1c1c1; + color: #000; +} + diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html index 1b87971..e0cc749 100644 --- a/docs/_templates/layout.html +++ b/docs/_templates/layout.html @@ -19,17 +19,40 @@ <p> {%- block haikurel1 %} {%- endblock %} - <a class="uplink" href="{{ pathto(master_doc) }}">Home</a> -   |   - <a class="uplink" href="{{ pathto('tutorials') }}">Tutorials</a> -   |   - <a class="uplink" href="{{ pathto('api') }}">API</a> -   |   - <a class="uplink" href="https://trac.torproject.org/projects/tor/wiki/doc/stem/bugs">Bug Tracker</a> -   |   - <a class="uplink" href="{{ pathto('change_log') }}">Change Log</a> -   |   - <a class="uplink" href="{{ pathto('download') }}">Download</a> + + <ul id="navbar"> + <li><a href="{{ pathto(master_doc) }}">Home</a></li> + <li><a href="{{ pathto('tutorials') }}">Tutorials</a> + <ul> + <li><a href="{{ pathto('tutorials/the_little_relay_that_could') }}">Hello World</a></li> + <li><a href="{{ pathto('tutorials/to_russia_with_love') }}">Client Usage</a></li> + <li><a href="{{ pathto('tutorials/tortoise_and_the_hare') }}">Event Listening</a></li> + <li><a href="{{ pathto('tutorials/mirror_mirror_on_the_wall') }}">Tor Descriptors</a></li> + <li><a href="{{ pathto('tutorials/double_double_toil_and_trouble') }}">Examples</a></li> + </ul> + </li> + <li><a href="{{ pathto('api') }}">API</a> + <ul> + <li><a href="{{ pathto('api/control') }}">stem.control</a></li> + <li><a href="{{ pathto('api/connection') }}">stem.connection</a></li> + <li><a href="{{ pathto('api/socket') }}">stem.socket</a></li> + <li><a href="{{ pathto('api/process') }}">stem.process</a></li> + <li><a href="{{ pathto('api/response') }}">stem.response</a></li> + <li><a href="{{ pathto('api/exit_policy') }}">stem.exit_policy</a></li> + <li><a href="{{ pathto('api/version') }}">stem.version</a></li> + <li><a href="{{ pathto('api') }}#descriptors">Descriptors</a></li> + <li><a href="{{ pathto('api') }}#utilities">Utilities</a></li> + </ul> + </li> + <li><a href="https://trac.torproject.org/projects/tor/wiki/doc/stem">Development</a> + <ul> + <li><a href="{{ pathto('change_log') }}">Change Log</a></li> + <li><a href="https://trac.torproject.org/projects/tor/wiki/doc/stem/bugs">Bug Tracker</a></li> + <li><a href="{{ pathto('download') }}">Download</a></li> + </ul> + </li> + </ul> + {%- block haikurel2 %} {%- endblock %} </p> @@ -65,6 +88,5 @@ {% block body %}{% endblock %} </div> <div class="bottomnav"> - {{ nav() }} </div> {% endblock %} diff --git a/docs/change_log.rst b/docs/change_log.rst index 696bfda..479cb73 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -46,6 +46,7 @@ The following are only available within stem's `git repository * Overhaul of stem's `download page <download.html>`_. This included several improvements, most notably the addition of PyPI, FreeBSD, and RedHat. + * Replaced default sphinx header with a navbar menu. * Added this change log. * Settled on a `logo <http://www.wpclipart.com/plants/assorted/P/plant_stem.png.html>`_ for

1 0

[stem/master] Dynamically importing test modules
by atagar＠torproject.org 08 Apr '13

08 Apr '13

commit 76a7a12ae041cf9bab120264acd52a08a318d8d7 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 6 12:57:01 2013 -0700 Dynamically importing test modules Whenever we add a new test we need to add it to both the imports and UNIT_TESTS or INTEG_TESTS tuple. This is both a little clunky and, now that we have a crap ton of tests, it makes run_tests.py really long. Using __import__() to dynamically import the tests as we run them. This might have a slight runtime advantage too since we're just importing what we need, though it's not noticeable. This trick comes from... http://effbot.org/zone/import-string.htm --- run_tests.py | 175 ++++++++++++++++++++++++---------------------------------- 1 files changed, 73 insertions(+), 102 deletions(-) diff --git a/run_tests.py b/run_tests.py index ead0fb8..748fd65 100755 --- a/run_tests.py +++ b/run_tests.py @@ -24,56 +24,6 @@ from stem.util import log, system, term import test.output import test.runner import test.static_checks -import test.unit.connection.authentication -import test.unit.control.controller -import test.unit.descriptor.export -import test.unit.descriptor.extrainfo_descriptor -import test.unit.descriptor.microdescriptor -import test.unit.descriptor.networkstatus.bridge_document -import test.unit.descriptor.networkstatus.directory_authority -import test.unit.descriptor.networkstatus.document_v2 -import test.unit.descriptor.networkstatus.document_v3 -import test.unit.descriptor.networkstatus.key_certificate -import test.unit.descriptor.reader -import test.unit.descriptor.router_status_entry -import test.unit.descriptor.server_descriptor -import test.unit.exit_policy.policy -import test.unit.exit_policy.rule -import test.unit.response.authchallenge -import test.unit.response.control_line -import test.unit.response.control_message -import test.unit.response.events -import test.unit.response.getconf -import test.unit.response.getinfo -import test.unit.response.mapaddress -import test.unit.response.protocolinfo -import test.unit.response.singleline -import test.unit.tutorial -import test.unit.util.conf -import test.unit.util.connection -import test.unit.util.enum -import test.unit.util.proc -import test.unit.util.str_tools -import test.unit.util.system -import test.unit.util.tor_tools -import test.unit.version -import test.integ.connection.authentication -import test.integ.connection.connect -import test.integ.control.base_controller -import test.integ.control.controller -import test.integ.descriptor.extrainfo_descriptor -import test.integ.descriptor.microdescriptor -import test.integ.descriptor.networkstatus -import test.integ.descriptor.reader -import test.integ.descriptor.server_descriptor -import test.integ.process -import test.integ.response.protocolinfo -import test.integ.socket.control_message -import test.integ.socket.control_socket -import test.integ.util.conf -import test.integ.util.proc -import test.integ.util.system -import test.integ.version OPT = "auist:l:c:h" OPT_EXPANDED = ["all", "unit", "integ", "style", "python3", "clean", "targets=", "test=", "log=", "tor=", "config=", "help"] @@ -122,59 +72,59 @@ ERROR_ATTR = (term.Color.RED, term.Attr.BOLD) # exhibits problems to come first. UNIT_TESTS = ( - test.unit.util.enum.TestEnum, - test.unit.util.connection.TestConnection, - test.unit.util.conf.TestConf, - test.unit.util.proc.TestProc, - test.unit.util.str_tools.TestStrTools, - test.unit.util.system.TestSystem, - test.unit.util.tor_tools.TestTorTools, - test.unit.descriptor.export.TestExport, - test.unit.descriptor.reader.TestDescriptorReader, - test.unit.descriptor.server_descriptor.TestServerDescriptor, - test.unit.descriptor.extrainfo_descriptor.TestExtraInfoDescriptor, - test.unit.descriptor.microdescriptor.TestMicrodescriptor, - test.unit.descriptor.router_status_entry.TestRouterStatusEntry, - test.unit.descriptor.networkstatus.directory_authority.TestDirectoryAuthority, - test.unit.descriptor.networkstatus.key_certificate.TestKeyCertificate, - test.unit.descriptor.networkstatus.document_v2.TestNetworkStatusDocument, - test.unit.descriptor.networkstatus.document_v3.TestNetworkStatusDocument, - test.unit.descriptor.networkstatus.bridge_document.TestBridgeNetworkStatusDocument, - test.unit.exit_policy.rule.TestExitPolicyRule, - test.unit.exit_policy.policy.TestExitPolicy, - test.unit.version.TestVersion, - test.unit.tutorial.TestTutorial, - test.unit.response.control_message.TestControlMessage, - test.unit.response.control_line.TestControlLine, - test.unit.response.events.TestEvents, - test.unit.response.getinfo.TestGetInfoResponse, - test.unit.response.getconf.TestGetConfResponse, - test.unit.response.singleline.TestSingleLineResponse, - test.unit.response.mapaddress.TestMapAddressResponse, - test.unit.response.protocolinfo.TestProtocolInfoResponse, - test.unit.response.authchallenge.TestAuthChallengeResponse, - test.unit.connection.authentication.TestAuthenticate, - test.unit.control.controller.TestControl, + 'test.unit.util.enum.TestEnum', + 'test.unit.util.connection.TestConnection', + 'test.unit.util.conf.TestConf', + 'test.unit.util.proc.TestProc', + 'test.unit.util.str_tools.TestStrTools', + 'test.unit.util.system.TestSystem', + 'test.unit.util.tor_tools.TestTorTools', + 'test.unit.descriptor.export.TestExport', + 'test.unit.descriptor.reader.TestDescriptorReader', + 'test.unit.descriptor.server_descriptor.TestServerDescriptor', + 'test.unit.descriptor.extrainfo_descriptor.TestExtraInfoDescriptor', + 'test.unit.descriptor.microdescriptor.TestMicrodescriptor', + 'test.unit.descriptor.router_status_entry.TestRouterStatusEntry', + 'test.unit.descriptor.networkstatus.directory_authority.TestDirectoryAuthority', + 'test.unit.descriptor.networkstatus.key_certificate.TestKeyCertificate', + 'test.unit.descriptor.networkstatus.document_v2.TestNetworkStatusDocument', + 'test.unit.descriptor.networkstatus.document_v3.TestNetworkStatusDocument', + 'test.unit.descriptor.networkstatus.bridge_document.TestBridgeNetworkStatusDocument', + 'test.unit.exit_policy.rule.TestExitPolicyRule', + 'test.unit.exit_policy.policy.TestExitPolicy', + 'test.unit.version.TestVersion', + 'test.unit.tutorial.TestTutorial', + 'test.unit.response.control_message.TestControlMessage', + 'test.unit.response.control_line.TestControlLine', + 'test.unit.response.events.TestEvents', + 'test.unit.response.getinfo.TestGetInfoResponse', + 'test.unit.response.getconf.TestGetConfResponse', + 'test.unit.response.singleline.TestSingleLineResponse', + 'test.unit.response.mapaddress.TestMapAddressResponse', + 'test.unit.response.protocolinfo.TestProtocolInfoResponse', + 'test.unit.response.authchallenge.TestAuthChallengeResponse', + 'test.unit.connection.authentication.TestAuthenticate', + 'test.unit.control.controller.TestControl', ) INTEG_TESTS = ( - test.integ.util.conf.TestConf, - test.integ.util.proc.TestProc, - test.integ.util.system.TestSystem, - test.integ.descriptor.reader.TestDescriptorReader, - test.integ.descriptor.server_descriptor.TestServerDescriptor, - test.integ.descriptor.extrainfo_descriptor.TestExtraInfoDescriptor, - test.integ.descriptor.microdescriptor.TestMicrodescriptor, - test.integ.descriptor.networkstatus.TestNetworkStatus, - test.integ.version.TestVersion, - test.integ.response.protocolinfo.TestProtocolInfo, - test.integ.process.TestProcess, - test.integ.socket.control_socket.TestControlSocket, - test.integ.socket.control_message.TestControlMessage, - test.integ.connection.authentication.TestAuthenticate, - test.integ.connection.connect.TestConnect, - test.integ.control.base_controller.TestBaseController, - test.integ.control.controller.TestController, + 'test.integ.util.conf.TestConf', + 'test.integ.util.proc.TestProc', + 'test.integ.util.system.TestSystem', + 'test.integ.descriptor.reader.TestDescriptorReader', + 'test.integ.descriptor.server_descriptor.TestServerDescriptor', + 'test.integ.descriptor.extrainfo_descriptor.TestExtraInfoDescriptor', + 'test.integ.descriptor.microdescriptor.TestMicrodescriptor', + 'test.integ.descriptor.networkstatus.TestNetworkStatus', + 'test.integ.version.TestVersion', + 'test.integ.response.protocolinfo.TestProtocolInfo', + 'test.integ.process.TestProcess', + 'test.integ.socket.control_socket.TestControlSocket', + 'test.integ.socket.control_message.TestControlMessage', + 'test.integ.connection.authentication.TestAuthenticate', + 'test.integ.connection.connect.TestConnect', + 'test.integ.control.base_controller.TestBaseController', + 'test.integ.control.controller.TestController', ) @@ -393,6 +343,23 @@ def _print_style_issues(): print +def _import_test(import_name): + # Dynamically imports test modules. The __import__() call has a couple quirks + # that make this a little clunky... + # + # * it only accepts modules, not the actual class we want to import + # + # * it returns the top level module, so we need to transverse into it for + # the test class + + module_name = '.'.join(import_name.split('.')[:-1]) + module = __import__(module_name) + + for subcomponent in import_name.split(".")[1:]: + module = getattr(module, subcomponent) + + return module + if __name__ == '__main__': try: stem.prereq.check_requirements() @@ -469,7 +436,9 @@ if __name__ == '__main__': test.output.print_divider("UNIT TESTS", True) error_tracker.set_category("UNIT TEST") - for test_class in UNIT_TESTS: + for test_module in UNIT_TESTS: + test_class = _import_test(test_module) + if CONFIG["argument.test"] and \ not test_class.__module__.startswith(CONFIG["argument.test"]): continue @@ -553,7 +522,9 @@ if __name__ == '__main__': test.output.print_line("Running tests...", term.Color.BLUE, term.Attr.BOLD) print - for test_class in INTEG_TESTS: + for test_module in INTEG_TESTS: + test_class = _import_test(test_module) + if CONFIG["argument.test"] and \ not test_class.__module__.startswith(CONFIG["argument.test"]): continue

1 0

[stem/master] Moving list of test modules to settings.cfg
by atagar＠torproject.org 08 Apr '13

08 Apr '13

commit 744941e781c0597b05166001bae00b81ec8aaab1 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 6 13:25:38 2013 -0700 Moving list of test modules to settings.cfg Further cleaning up our overly-verbose run_tests.py by moving the list of test modules to our settings. --- run_tests.py | 73 +++++++--------------------------------------------- test/settings.cfg | 54 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 63 deletions(-) diff --git a/run_tests.py b/run_tests.py index 748fd65..17de0ee 100755 --- a/run_tests.py +++ b/run_tests.py @@ -45,6 +45,8 @@ CONFIG = stem.util.conf.config_dict("test", { "target.prereq": {}, "target.torrc": {}, "integ.test_directory": "./test/data", + "test.unit_tests": "", + "test.integ_tests": "", }) Target = stem.util.enum.UppercaseEnum( @@ -66,67 +68,6 @@ DEFAULT_RUN_TARGET = Target.RUN_OPEN ERROR_ATTR = (term.Color.RED, term.Attr.BOLD) -# Tests are ordered by the dependencies so the lowest level tests come first. -# This is because a problem in say, controller message parsing, will cause all -# higher level tests to fail too. Hence we want the test that most narrowly -# exhibits problems to come first. - -UNIT_TESTS = ( - 'test.unit.util.enum.TestEnum', - 'test.unit.util.connection.TestConnection', - 'test.unit.util.conf.TestConf', - 'test.unit.util.proc.TestProc', - 'test.unit.util.str_tools.TestStrTools', - 'test.unit.util.system.TestSystem', - 'test.unit.util.tor_tools.TestTorTools', - 'test.unit.descriptor.export.TestExport', - 'test.unit.descriptor.reader.TestDescriptorReader', - 'test.unit.descriptor.server_descriptor.TestServerDescriptor', - 'test.unit.descriptor.extrainfo_descriptor.TestExtraInfoDescriptor', - 'test.unit.descriptor.microdescriptor.TestMicrodescriptor', - 'test.unit.descriptor.router_status_entry.TestRouterStatusEntry', - 'test.unit.descriptor.networkstatus.directory_authority.TestDirectoryAuthority', - 'test.unit.descriptor.networkstatus.key_certificate.TestKeyCertificate', - 'test.unit.descriptor.networkstatus.document_v2.TestNetworkStatusDocument', - 'test.unit.descriptor.networkstatus.document_v3.TestNetworkStatusDocument', - 'test.unit.descriptor.networkstatus.bridge_document.TestBridgeNetworkStatusDocument', - 'test.unit.exit_policy.rule.TestExitPolicyRule', - 'test.unit.exit_policy.policy.TestExitPolicy', - 'test.unit.version.TestVersion', - 'test.unit.tutorial.TestTutorial', - 'test.unit.response.control_message.TestControlMessage', - 'test.unit.response.control_line.TestControlLine', - 'test.unit.response.events.TestEvents', - 'test.unit.response.getinfo.TestGetInfoResponse', - 'test.unit.response.getconf.TestGetConfResponse', - 'test.unit.response.singleline.TestSingleLineResponse', - 'test.unit.response.mapaddress.TestMapAddressResponse', - 'test.unit.response.protocolinfo.TestProtocolInfoResponse', - 'test.unit.response.authchallenge.TestAuthChallengeResponse', - 'test.unit.connection.authentication.TestAuthenticate', - 'test.unit.control.controller.TestControl', -) - -INTEG_TESTS = ( - 'test.integ.util.conf.TestConf', - 'test.integ.util.proc.TestProc', - 'test.integ.util.system.TestSystem', - 'test.integ.descriptor.reader.TestDescriptorReader', - 'test.integ.descriptor.server_descriptor.TestServerDescriptor', - 'test.integ.descriptor.extrainfo_descriptor.TestExtraInfoDescriptor', - 'test.integ.descriptor.microdescriptor.TestMicrodescriptor', - 'test.integ.descriptor.networkstatus.TestNetworkStatus', - 'test.integ.version.TestVersion', - 'test.integ.response.protocolinfo.TestProtocolInfo', - 'test.integ.process.TestProcess', - 'test.integ.socket.control_socket.TestControlSocket', - 'test.integ.socket.control_message.TestControlMessage', - 'test.integ.connection.authentication.TestAuthenticate', - 'test.integ.connection.connect.TestConnect', - 'test.integ.control.base_controller.TestBaseController', - 'test.integ.control.controller.TestController', -) - def load_user_configuration(test_config): """ @@ -436,7 +377,10 @@ if __name__ == '__main__': test.output.print_divider("UNIT TESTS", True) error_tracker.set_category("UNIT TEST") - for test_module in UNIT_TESTS: + for test_module in CONFIG["test.unit_tests"].splitlines(): + if not test_module: + continue + test_class = _import_test(test_module) if CONFIG["argument.test"] and \ @@ -522,7 +466,10 @@ if __name__ == '__main__': test.output.print_line("Running tests...", term.Color.BLUE, term.Attr.BOLD) print - for test_module in INTEG_TESTS: + for test_module in CONFIG["test.integ_tests"].splitlines(): + if not test_module: + continue + test_class = _import_test(test_module) if CONFIG["argument.test"] and \ diff --git a/test/settings.cfg b/test/settings.cfg index 78820ed..d75b7d7 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -163,3 +163,57 @@ pyflakes.ignore stem/util/str_tools.py => redefinition of function '_to_unicode_ pyflakes.ignore test/mocking.py => undefined name 'builtins' pyflakes.ignore test/unit/response/events.py => 'from stem import *' used; unable to detect undefined names +# Test modules we want to run. Modules are roughly ordered by the dependencies +# so the lowest level tests come first. This is because a problem in say, +# controller message parsing, will cause all higher level tests to fail too. +# Hence we want the test that most narrowly exhibits problems to come first. + +test.unit_tests +|test.unit.util.enum.TestEnum +|test.unit.util.connection.TestConnection +|test.unit.util.conf.TestConf +|test.unit.util.proc.TestProc +|test.unit.util.str_tools.TestStrTools +|test.unit.util.system.TestSystem +|test.unit.util.tor_tools.TestTorTools +|test.unit.descriptor.export.TestExport +|test.unit.descriptor.reader.TestDescriptorReader +|test.unit.descriptor.server_descriptor.TestServerDescriptor +|test.unit.descriptor.extrainfo_descriptor.TestExtraInfoDescriptor +|test.unit.descriptor.microdescriptor.TestMicrodescriptor +|test.unit.descriptor.router_status_entry.TestRouterStatusEntry +|test.unit.descriptor.networkstatus.directory_authority.TestDirectoryAuthority +|test.unit.descriptor.networkstatus.key_certificate.TestKeyCertificate +|test.unit.descriptor.networkstatus.document_v2.TestNetworkStatusDocument +|test.unit.descriptor.networkstatus.document_v3.TestNetworkStatusDocument +|test.unit.descriptor.networkstatus.bridge_document.TestBridgeNetworkStatusDocument +|test.unit.exit_policy.rule.TestExitPolicyRule +|test.unit.exit_policy.policy.TestExitPolicy +|test.unit.version.TestVersion +|test.unit.tutorial.TestTutorial +|test.unit.response.control_message.TestControlMessage +|test.unit.response.control_line.TestControlLine +|test.unit.response.events.TestEvents +|test.unit.response.getinfo.TestGetInfoResponse +|test.unit.response.getconf.TestGetConfResponse +|test.unit.response.singleline.TestSingleLineResponse + +test.integ_tests +|test.integ.util.conf.TestConf +|test.integ.util.proc.TestProc +|test.integ.util.system.TestSystem +|test.integ.descriptor.reader.TestDescriptorReader +|test.integ.descriptor.server_descriptor.TestServerDescriptor +|test.integ.descriptor.extrainfo_descriptor.TestExtraInfoDescriptor +|test.integ.descriptor.microdescriptor.TestMicrodescriptor +|test.integ.descriptor.networkstatus.TestNetworkStatus +|test.integ.version.TestVersion +|test.integ.response.protocolinfo.TestProtocolInfo +|test.integ.process.TestProcess +|test.integ.socket.control_socket.TestControlSocket +|test.integ.socket.control_message.TestControlMessage +|test.integ.connection.authentication.TestAuthenticate +|test.integ.connection.connect.TestConnect +|test.integ.control.base_controller.TestBaseController +|test.integ.control.controller.TestController +

1 0