tor-commits September 2016

tor-commits@lists.torproject.org

20 participants
1187 discussions

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 02 Sep '16

02 Sep '16

commit 7362171c9af2c3f7e9f0f536b2010b7e3d2d4e65 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 2 17:16:35 2016 +0000 Update translations for torbutton-torbuttonproperties --- da/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/da/torbutton.properties b/da/torbutton.properties index 489acfa..422ad61 100644 --- a/da/torbutton.properties +++ b/da/torbutton.properties @@ -48,4 +48,4 @@ profileProblemTitle=%S Profil Problem profileReadOnly=Du kan ikke køre %S fra et skrivebeskyttet filsystem. Kopier venligst %S til et andet sted før du prøver at bruge det. profileReadOnlyMac=Du kan ikke køre %S fra et skrivebeskyttet filsystem. Kopier venligst %S til skrivebordet eller en programmappe før du prøver at bruge det. profileAccessDenied= %S har ikke rettigheder til at bruge profilen. Skift venligst rettigheder og prøv igen. -profileMigrationFailed=Migration of your existing %S profile failed.\nNew settings will be used. +profileMigrationFailed=Overførsel af din eksisterende %S profil fejlede.\nNye indstillinger vil blive brugt.

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 02 Sep '16

02 Sep '16

commit 5a60292436f28e04f431a1f737c629e980f41b52 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 2 17:16:17 2016 +0000 Update translations for tails-misc_completed --- da.po | 210 ++++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 109 insertions(+), 101 deletions(-) diff --git a/da.po b/da.po index 069fc59..6dfede6 100644 --- a/da.po +++ b/da.po @@ -3,22 +3,25 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Aesthese, 2016 # Anders Damsgaard <andersd(a)riseup.net>, 2013 # bna1605 <bna1605(a)gmail.com>, 2014 # Caspar Christensen, 2015 # christianflintrup <chr(a)agge.net>, 2014 # Christian Villum <villum(a)autofunk.dk>, 2014-2015 # David Nielsen <gnomeuser(a)gmail.com>, 2014-2015 -# Niels, 2013 +# mort3n <nalholm(a)yahoo.dk>, 2016 +# Aesthese, 2013 +# Aesthese, 2016 # Tommy Gade, 2015 # Whiz Zurrd <Whizzurrd(a)hmamail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-03 01:06+0100\n" -"PO-Revision-Date: 2015-12-08 12:29+0000\n" -"Last-Translator: Tommy Gade\n" +"POT-Creation-Date: 2016-07-31 10:43+0200\n" +"PO-Revision-Date: 2016-09-02 17:09+0000\n" +"Last-Translator: mort3n <nalholm(a)yahoo.dk>\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,15 +29,15 @@ msgstr "" "Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:43 +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:39 msgid "Tor is ready" msgstr "Tor er klar" -#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:44 +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:40 msgid "You can now access the Internet." msgstr "Du kan nu forbinde til internettet" -#: config/chroot_local-includes/etc/whisperback/config.py:64 +#: config/chroot_local-includes/etc/whisperback/config.py:65 #, python-format msgid "" "<h1>Help us fix your bug!</h1>\n" @@ -51,28 +54,30 @@ msgid "" "\n" msgstr "<h1>Hjælp os med at fikse din bug!</h1>\nLæs <a href=\"%s\">vores bug rapporteringsinstrukser</a>.\nInkludér ikke mere personlig information end\nbehøvet!\n<h2>Vedrørende at give os en mailadresse</h2>\n\nVed at give os en mailadresse tillader du os at kontakte dig for at undersøge problemet. Dette\ner nødvendigt for størstedelen af indsendte rapporter vi modtager, idet de fleste rapporter\nuden nogen kontaktinformation er ubrugelige. På den anden side åbner det dog også\nen mulighed for mellemmænd, såsom din email- eller Internetudbyder, for at\nbekræfte at du bruger Tails.\n\n" -#: config/chroot_local-includes/usr/local/bin/electrum:14 +#: config/chroot_local-includes/usr/local/bin/electrum:17 msgid "Persistence is disabled for Electrum" msgstr "Persistence er frakoblet for Electrum" -#: config/chroot_local-includes/usr/local/bin/electrum:16 +#: config/chroot_local-includes/usr/local/bin/electrum:19 msgid "" "When you reboot Tails, all of Electrum's data will be lost, including your " "Bitcoin wallet. It is strongly recommended to only run Electrum when its " "persistence feature is activated." msgstr "Når du genstarter Tails vil alle Electrums data blive tabt, inklusiv din Bitcoin pung. Det anbefales stærkt at du kun kører Electrum når persistence funktionen er aktiveret." -#: config/chroot_local-includes/usr/local/bin/electrum:18 +#: config/chroot_local-includes/usr/local/bin/electrum:21 msgid "Do you want to start Electrum anyway?" msgstr "Vil du starte Electrum alligevel?" -#: config/chroot_local-includes/usr/local/bin/electrum:20 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:36 +#: config/chroot_local-includes/usr/local/bin/electrum:23 +#: config/chroot_local-includes/usr/local/bin/icedove:37 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41 msgid "_Launch" msgstr "_Start" -#: config/chroot_local-includes/usr/local/bin/electrum:21 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37 +#: config/chroot_local-includes/usr/local/bin/electrum:24 +#: config/chroot_local-includes/usr/local/bin/icedove:38 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42 msgid "_Exit" msgstr "_Afslut" @@ -233,13 +238,31 @@ msgstr "GnuPG's output:" msgid "Other messages provided by GnuPG:" msgstr "Andre beskeder udbudt af GnuPG:" -#: config/chroot_local-includes/usr/local/lib/shutdown-helper-applet:39 -msgid "Shutdown Immediately" -msgstr "Luk ned med det samme" +#: config/chroot_local-includes/usr/local/bin/icedove:27 +msgid "The Claws Mail persistence feature is activated." +msgstr "Persistence-funktionaliteten i Claws Mail er aktiveret." + +#: config/chroot_local-includes/usr/local/bin/icedove:29 +msgid "" +"If you have emails saved in Claws Mail, you should <a " +"href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate" +" your data</a> before starting Icedove." +msgstr "Hvis du har e-mails gemt i Claws Mail, så bør du <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'> overføre dine data</a> før du starter Icedove." + +#: config/chroot_local-includes/usr/local/bin/icedove:34 +msgid "" +"If you already migrated your emails to Icedove, you should <a " +"href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>delete" +" all your Claws Mail data</a> to remove this warning." +msgstr "Hvis du allerede har overført dine e-mails til Icedove>/b>, så bør du <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'> slette alle dine Claws Mail data</a> for at fjerne denne advarsel." + +#: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:71 +msgid "Restart" +msgstr "Genstart" -#: config/chroot_local-includes/usr/local/lib/shutdown-helper-applet:40 -msgid "Reboot Immediately" -msgstr "Genstart med det samme" +#: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:74 +msgid "Power Off" +msgstr "Luk ned" #: config/chroot_local-includes/usr/local/bin/tails-about:16 msgid "not available" @@ -284,70 +307,62 @@ msgstr "Opgraderingen fejlede. Dette kan skyldes et netværksproblem. Kontroller msgid "The upgrade was successful." msgstr "Opgraderingen lykkedes." -#: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:52 +#: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:52 msgid "Synchronizing the system's clock" msgstr "Synkroniserer systemets ur" -#: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:53 +#: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:53 msgid "" "Tor needs an accurate clock to work properly, especially for Hidden " "Services. Please wait..." msgstr "Tor behøver et akkurat ur for at fungere korrekt, specielt for skjulte servicer. Vent venligst..." -#: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:87 +#: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:87 msgid "Failed to synchronize the clock!" msgstr "Kunne ikke synkronisere uret!" -#: config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:38 -msgid "Network connection blocked?" -msgstr "Netværksforbindelse blokeret?" - -#: config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:40 -msgid "" -"It looks like you are blocked from the network. This may be related to the " -"MAC spoofing feature. For more information, see the <a " -"href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">MAC" -" spoofing documentation</a>." -msgstr "Det ser ud til at du er blokeret fra netværket. Dette kan være på grund af MAC spoofing funktionaliteten. For mere information, se <a href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">MAC spoofing dokumentationen</a>" - -#: config/chroot_local-includes/usr/local/bin/tails-security-check:151 +#: config/chroot_local-includes/usr/local/bin/tails-security-check:146 msgid "This version of Tails has known security issues:" msgstr "Denne version af Tails har følgende kendte sikkerhedsproblemer:" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:50 +#: config/chroot_local-includes/usr/local/bin/tails-security-check:156 +msgid "Known security issues" +msgstr "Kendte sikkerhedsproblemer" + +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52 #, sh-format msgid "Network card ${nic} disabled" msgstr "Netværkskort ${nic} deaktiveret" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:51 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:53 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" -"You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." -msgstr "MAC spoofing fejlede for netværkskortet ${nic_name} (${nic}), så det er midlertidigt slået fra.\nDu vil måske foretrække at genstarte Tails og slå MAC spoofing fra. Se <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>dokumentationen</a>" +"You might prefer to restart Tails and disable MAC spoofing." +msgstr "MAC spoofing fejlede for netværkskortet ${nic_name} (${nic}), så det er midlertidigt slået fra.\nDu vil måske foretrække at genstarte Tails og slå MAC spoofing fra." -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:60 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:62 msgid "All networking disabled" msgstr "Al brug af netværk er slået fra" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:61 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:63 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" -"You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." -msgstr "MAC spoofing fejlede for netværkskortet ${nic_name} (${nic}). Error recovery fejlede også, så al networking slået fra. \nDu vil måske foretrække at genstarte Tails og slå MAC spoofing fra. Se <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>dokumentationen</a>" +"You might prefer to restart Tails and disable MAC spoofing." +msgstr "MAC spoofing fejlede for netværkskortet ${nic_name} (${nic}). Fejlretning fejlede også, så al netværk er slået fra. \nDu vil måske foretrække at genstarte Tails og slå MAC spoofing fra." -#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:22 +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:24 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27 msgid "error:" msgstr "fejl:" -#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:20 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:23 +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:25 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28 msgid "Error" msgstr "Fejl" -#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:40 +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:45 msgid "" "Not enough memory available to check for upgrades.\n" "\n" @@ -360,141 +375,150 @@ msgid "" "See https://tails.boum.org/doc/first_steps/upgrade#manual" msgstr "Der er ikke nok hukommelse tilgængelig til at søge efter opdateringer.\n\nSørg for at dette system opfylder kravene til at køre Tails. \nSe venligst file:///usr/share/doc/tails/website/doc/about/requirements.en.html for detaljer.\n\nForsøg at genstarte Tails for at søge efter opdateringer.\n\nEller foretag en manuel opdatering.\nSe https://tails.boum.org/doc/first_steps/upgrade#manual for detaljer." -#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:53 +#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:67 msgid "Warning: virtual machine detected!" msgstr "Advarsel: virtuel maskine opdaget!" -#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:55 +#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:69 msgid "" "Both the host operating system and the virtualization software are able to " "monitor what you are doing in Tails." msgstr "Både værtsoperativsystemet og virtualiseringssoftwaren har mulighed for at overvåge hvad du foretager dig i Tails." -#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:57 +#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:72 +msgid "Warning: non-free virtual machine detected!" +msgstr "Advarsel: ikke-fri virtuel maskine opdaget!" + +#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:74 msgid "" -"<a " -"href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html#security'>Learn" -" more...</a>" -msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html#security'>Lær mere...</a>" +"Both the host operating system and the virtualization software are able to " +"monitor what you are doing in Tails. Only free software can be considered " +"trustworthy, for both the host operating system and the virtualization " +"software." +msgstr "Både værtsoperativsystemet og virtualiseringssoftwaren har mulighed for at overvåge hvad du foretager dig i Tails. Kun fri software kan betragtes som værende troværdigt, både for værtsoperativsystemet og virtualiseringssoftwaren." -#: config/chroot_local-includes/usr/local/bin/tor-browser:29 +#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:79 +msgid "Learn more" +msgstr "Lær mere" + +#: config/chroot_local-includes/usr/local/bin/tor-browser:40 msgid "Tor is not ready" msgstr "Tor er ikke klar" -#: config/chroot_local-includes/usr/local/bin/tor-browser:30 +#: config/chroot_local-includes/usr/local/bin/tor-browser:41 msgid "Tor is not ready. Start Tor Browser anyway?" msgstr "Tor er ikke klar. Start Tor Browser alligevel?" -#: config/chroot_local-includes/usr/local/bin/tor-browser:31 +#: config/chroot_local-includes/usr/local/bin/tor-browser:42 msgid "Start Tor Browser" msgstr "Start Tor Browser" -#: config/chroot_local-includes/usr/local/bin/tor-browser:32 +#: config/chroot_local-includes/usr/local/bin/tor-browser:43 msgid "Cancel" msgstr "Annullér" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:33 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38 msgid "Do you really want to launch the Unsafe Browser?" msgstr "Er du sikker på at du vil starte den Usikre Browser?" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40 msgid "" -"Network activity within the Unsafe Browser is not anonymous. Only use" -" the Unsafe Browser if necessary, for example if you have to login or " +"Network activity within the Unsafe Browser is not anonymous.\\nOnly " +"use the Unsafe Browser if necessary, for example\\nif you have to login or " "register to activate your Internet connection." -msgstr "Netværksaktivitet fra den Usikre Browser er ikke anonym. Anvend kun den Usikre Browser hvis nødvendigt, for eksempel hvis du skal logge ind eller registrere for at aktivere din internetforbindelse." +msgstr "Netværksaktivitet fra den Usikre Browser er ikke anonym.\\nAnvend kun den Usikre Browser hvis nødvendigt, for eksempel hvis du skal logge ind eller registrere dig for at aktivere din internetforbindelse." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:47 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51 msgid "Starting the Unsafe Browser..." msgstr "Starter den Usikre Browser..." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52 msgid "This may take a while, so please be patient." msgstr "Dette kan tage et stykke tid, vær venligst tålmodig." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:53 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57 msgid "Shutting down the Unsafe Browser..." msgstr "Afslutter den Usikre Browser" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 msgid "" "This may take a while, and you may not restart the Unsafe Browser until it " "is properly shut down." msgstr "Dette kan tage et stykke tid, og du må ikke genstarte den Usikre Browser indtil den er helt lukket ned." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:66 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70 msgid "Failed to restart Tor." msgstr "Kunne ikke genstarte Tor." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:85 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 msgid "Unsafe Browser" msgstr "Usikker Browser" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:93 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:92 msgid "" "Another Unsafe Browser is currently running, or being cleaned up. Please " "retry in a while." msgstr "En anden Usikker Browser kører eller ryddes op. Forsøg igen om et kort stykke tid." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:105 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:104 msgid "" "NetworkManager passed us garbage data when trying to deduce the clearnet DNS" " server." msgstr "NetworkManager sendte os dårlige data i forsøget på at fjerne clearnet DNS serveren." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:115 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:114 msgid "" "No DNS server was obtained through DHCP or manually configured in " "NetworkManager." msgstr "Ingen DNS server blev fundet gennem DHCP eller den manuelle konfiguration i NetværkManager." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:123 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:122 msgid "Failed to setup chroot." msgstr "Kunne ikke indstille chroot." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:129 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:128 msgid "Failed to configure browser." msgstr "Fejlede i konfigurationen af browseren" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:134 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:133 msgid "Failed to run browser." msgstr "Kørslen af browseren fejlede." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:35 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:34 msgid "I2P failed to start" msgstr "I2P kunne ikke starte" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:36 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:35 msgid "" "Something went wrong when I2P was starting. Check the logs in /var/log/i2p " "for more information." msgstr "Noget gik galt mens I2P startede. Se logfilerne i /var/log/i2p for flere detaljer." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:53 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:52 msgid "I2P's router console is ready" msgstr "I2Ps routerkonsol er klar." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:54 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:53 msgid "You can now access I2P's router console in the I2P Browser." msgstr "Du kan nu tilgå I2P's router konsol i I2P browseren." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:59 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:58 msgid "I2P is not ready" msgstr "I2P er ikke klar" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:59 msgid "" "Eepsite tunnel not built within six minutes. Check the router console in the" " I2P Browser or the logs in /var/log/i2p for more information. Reconnect to " "the network to try again." msgstr "Eepsite tunnellen kunne ikke etableres inden for seks minutter. Kontroller router konsollen i I2P browsereneller logfilerne i /var/log/i2p for yderligere information. Genetabler forbindelse til netværket for at prøve igen." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:72 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:71 msgid "I2P is ready" msgstr "I2P er klar" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:73 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:72 msgid "You can now access services on I2P." msgstr "Du kan nu tilgå tjenester på I2P." @@ -523,22 +547,6 @@ msgstr "I2P-browser" msgid "Learn more about Tails" msgstr "Lær mere om Tails" -#: ../config/chroot_local-includes/usr/share/applications/tails-reboot.desktop.in.h:1 -msgid "Reboot" -msgstr "Genstart" - -#: ../config/chroot_local-includes/usr/share/applications/tails-reboot.desktop.in.h:2 -msgid "Immediately reboot computer" -msgstr "Sluk computeren med det samme" - -#: ../config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in.h:1 -msgid "Power Off" -msgstr "Luk ned" - -#: ../config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in.h:2 -msgid "Immediately shut down computer" -msgstr "Luk computeren ned med det samme" - #: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:1 msgid "Tor Browser" msgstr "Tor Browser"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 02 Sep '16

02 Sep '16

commit 5d54427cd99f8865269263ff09aa96348011c76b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 2 17:16:13 2016 +0000 Update translations for tails-misc --- da.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/da.po b/da.po index 424a612..6dfede6 100644 --- a/da.po +++ b/da.po @@ -10,6 +10,7 @@ # christianflintrup <chr(a)agge.net>, 2014 # Christian Villum <villum(a)autofunk.dk>, 2014-2015 # David Nielsen <gnomeuser(a)gmail.com>, 2014-2015 +# mort3n <nalholm(a)yahoo.dk>, 2016 # Aesthese, 2013 # Aesthese, 2016 # Tommy Gade, 2015 @@ -18,9 +19,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-25 20:25+0200\n" -"PO-Revision-Date: 2016-05-27 10:12+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2016-07-31 10:43+0200\n" +"PO-Revision-Date: 2016-09-02 17:09+0000\n" +"Last-Translator: mort3n <nalholm(a)yahoo.dk>\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -239,21 +240,21 @@ msgstr "Andre beskeder udbudt af GnuPG:" #: config/chroot_local-includes/usr/local/bin/icedove:27 msgid "The Claws Mail persistence feature is activated." -msgstr "" +msgstr "Persistence-funktionaliteten i Claws Mail er aktiveret." #: config/chroot_local-includes/usr/local/bin/icedove:29 msgid "" "If you have emails saved in Claws Mail, you should <a " "href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate" " your data</a> before starting Icedove." -msgstr "" +msgstr "Hvis du har e-mails gemt i Claws Mail, så bør du <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'> overføre dine data</a> før du starter Icedove." #: config/chroot_local-includes/usr/local/bin/icedove:34 msgid "" "If you already migrated your emails to Icedove, you should <a " "href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>delete" " all your Claws Mail data</a> to remove this warning." -msgstr "" +msgstr "Hvis du allerede har overført dine e-mails til Icedove>/b>, så bør du <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'> slette alle dine Claws Mail data</a> for at fjerne denne advarsel." #: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:71 msgid "Restart"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 02 Sep '16

02 Sep '16

commit 648ee4e78a22af3aad0abeeed8990867af08ec80 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 2 17:15:50 2016 +0000 Update translations for mat-gui --- da.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/da.po b/da.po index 3b5ff19..6e9e631 100644 --- a/da.po +++ b/da.po @@ -7,13 +7,14 @@ # Anders Damsgaard <andersd(a)riseup.net>, 2013 # bna1605 <bna1605(a)gmail.com>, 2014 # Caspar Christensen, 2013 +# mort3n <nalholm(a)yahoo.dk>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2016-03-21 16:34+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-09-02 17:15+0000\n" +"Last-Translator: mort3n <nalholm(a)yahoo.dk>\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -77,7 +78,7 @@ msgstr "Reducer den producerede PDF størrelse og kvalitet" #: mat-gui:238 msgid "Remove unsupported file from archives" -msgstr "" +msgstr "Fjern fil der ikke er understøttet fra arkiver" #: mat-gui:241 msgid "Remove non-supported (and so non-anonymised) file from output archive"

1 0

[tor-messenger-build/master] Release version 0.2.0b1
by sukhbir＠torproject.org 02 Sep '16

02 Sep '16

commit 2515efa405b59f4d8a00259ec34e1ef442d84d16 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Sep 2 12:01:49 2016 -0400 Release version 0.2.0b1 --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ace3cbc..1faba19 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Tor Messenger 0.2.0b1 -- +Tor Messenger 0.2.0b1 -- September 02, 2016 * All Platforms * Use the THUNDERBIRD_45_3_0_RELEASE tag on mozilla-esr45 * Use the THUNDERBIRD_45_3_0_RELEASE tag on comm-esr45

1 0

[collector/master] Implements task-19894.
by karsten＠torproject.org 02 Sep '16

02 Sep '16

commit f514a1380db2962fcfbc3444b7643f93159ba3e5 Author: iwakeh <iwakeh(a)torproject.org> Date: Sat Aug 13 15:16:07 2016 +0200 Implements task-19894. Throws a RuntimeException and informs the user that nothing was activated; and then exits. Added a new test and made necessary adaptions to affected tests. --- .../java/org/torproject/collector/conf/Configuration.java | 12 ++++++++++++ src/test/java/org/torproject/collector/MainTest.java | 13 +++++++++++++ .../org/torproject/collector/conf/ConfigurationTest.java | 6 +++++- src/test/resources/junittest.policy | 1 + 4 files changed, 31 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/collector/conf/Configuration.java b/src/main/java/org/torproject/collector/conf/Configuration.java index ee6552c..e55393c 100644 --- a/src/main/java/org/torproject/collector/conf/Configuration.java +++ b/src/main/java/org/torproject/collector/conf/Configuration.java @@ -50,6 +50,7 @@ public class Configuration extends Observable implements Cloneable { try { ft = Files.getLastModifiedTime(confPath); reload(); + anythingActivated(); } catch (IOException e) { throw new ConfigurationException("Cannot watch configuration file. " + "Reason: " + e.getMessage(), e); @@ -81,6 +82,17 @@ public class Configuration extends Observable implements Cloneable { } } + private void anythingActivated() throws ConfigurationException { + if (!(this.getBool(Key.RelaydescsActivated) + || this.getBool(Key.BridgedescsActivated) + || this.getBool(Key.ExitlistsActivated) + || this.getBool(Key.UpdateindexActivated) + || this.getBool(Key.TorperfActivated))) { + throw new ConfigurationException("Nothing is activated!\n" + + "Please edit collector.properties. Exiting."); + } + } + /** Return a copy of all properties. */ public Properties getPropertiesCopy() { return (Properties) props.clone(); diff --git a/src/test/java/org/torproject/collector/MainTest.java b/src/test/java/org/torproject/collector/MainTest.java index 05c16c5..5453dd4 100644 --- a/src/test/java/org/torproject/collector/MainTest.java +++ b/src/test/java/org/torproject/collector/MainTest.java @@ -171,5 +171,18 @@ public class MainTest { } } + @Test(expected = ConfigurationException.class) + public void testNoModuleActivated() throws Exception { + File conf = tmpf.newFile("test.conf"); + try { + assertEquals(0L, conf.length()); + // create default configuration + Main.main(new String[]{conf.toString()}); + } catch (ConfigurationException ce) { + fail("This should not cause a ConfigurationException: " + ce); + } + // no module activated; the following should throw a ConfigurationException + Main.main(new String[]{conf.toString()}); + } } diff --git a/src/test/java/org/torproject/collector/conf/ConfigurationTest.java b/src/test/java/org/torproject/collector/conf/ConfigurationTest.java index 45ab5ed..89a7750 100644 --- a/src/test/java/org/torproject/collector/conf/ConfigurationTest.java +++ b/src/test/java/org/torproject/collector/conf/ConfigurationTest.java @@ -18,6 +18,7 @@ import org.junit.rules.TemporaryFolder; import java.io.ByteArrayInputStream; import java.io.File; import java.lang.reflect.Field; +import java.nio.file.Files; import java.nio.file.Paths; import java.util.Arrays; import java.util.Observable; @@ -182,6 +183,8 @@ public class ConfigurationTest { } }); File confFile = tmpf.newFile("empty"); + Files.write(confFile.toPath(), (Key.RelaydescsActivated.name() + "=true") + .getBytes()); conf.setWatchableSourceAndLoad(confFile.toPath()); MainTest.waitSec(1); confFile.setLastModified(System.currentTimeMillis()); @@ -202,10 +205,11 @@ public class ConfigurationTest { } }); File confFile = tmpf.newFile("empty"); + Files.write(confFile.toPath(), (Key.RelaydescsActivated.name() + "=true") + .getBytes()); conf.setWatchableSourceAndLoad(confFile.toPath()); MainTest.waitSec(1); confFile.delete(); - conf.setProperty(Key.CompressRelayDescriptorDownloads.name(), "false"); conf.setProperty(Key.ImportDirectoryArchives.name(), "false"); Dummy dummy = new Dummy(conf); tmpf.newFolder("empty"); diff --git a/src/test/resources/junittest.policy b/src/test/resources/junittest.policy index 0c7ccac..e2f4a26 100644 --- a/src/test/resources/junittest.policy +++ b/src/test/resources/junittest.policy @@ -7,6 +7,7 @@ grant { permission java.lang.RuntimePermission "accessClassInPackage.sun.nio.fs"; permission java.lang.RuntimePermission "accessDeclaredMembers"; permission java.lang.RuntimePermission "getFileStoreAttributes"; + permission java.lang.RuntimePermission "getStackTrace"; permission java.lang.RuntimePermission "modifyThread"; permission java.lang.reflect.ReflectPermission "suppressAccessChecks"; permission java.lang.RuntimePermission "shutdownHooks";

1 0

[collector/master] Avoid confusing new users; just print usage instead of a stack trace for miss-configuration.
by karsten＠torproject.org 02 Sep '16

02 Sep '16

commit dedb8226f279bb2d889d00858290fdf72eaa2b50 Author: iwakeh <iwakeh(a)torproject.org> Date: Tue Aug 23 17:29:43 2016 +0200 Avoid confusing new users; just print usage instead of a stack trace for miss-configuration. --- src/main/java/org/torproject/collector/Main.java | 34 ++++++++++++++---------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/torproject/collector/Main.java b/src/main/java/org/torproject/collector/Main.java index 96097b3..997ee2a 100644 --- a/src/main/java/org/torproject/collector/Main.java +++ b/src/main/java/org/torproject/collector/Main.java @@ -5,6 +5,7 @@ package org.torproject.collector; import org.torproject.collector.bridgedescs.SanitizedBridgesWriter; import org.torproject.collector.conf.Configuration; +import org.torproject.collector.conf.ConfigurationException; import org.torproject.collector.conf.Key; import org.torproject.collector.cron.CollecTorMain; import org.torproject.collector.cron.Scheduler; @@ -57,22 +58,27 @@ public class Main { * See class description {@link Main}. */ public static void main(String[] args) throws Exception { - Path confPath = null; - if (args == null || args.length == 0) { - confPath = Paths.get(CONF_FILE); - } else if (args.length == 1) { - confPath = Paths.get(args[0]); - } else { - printUsage("CollecTor takes at most one argument."); - return; - } - if (!confPath.toFile().exists() || confPath.toFile().length() < 1L) { - writeDefaultConfig(confPath); + try { + Path confPath = null; + if (args == null || args.length == 0) { + confPath = Paths.get(CONF_FILE); + } else if (args.length == 1) { + confPath = Paths.get(args[0]); + } else { + printUsage("CollecTor takes at most one argument."); + return; + } + if (!confPath.toFile().exists() || confPath.toFile().length() < 1L) { + writeDefaultConfig(confPath); + return; + } else { + conf.setWatchableSourceAndLoad(confPath); + } + Scheduler.getInstance().scheduleModuleRuns(collecTorMains, conf); + } catch (ConfigurationException ce) { + printUsage(ce.getMessage()); return; - } else { - conf.setWatchableSourceAndLoad(confPath); } - Scheduler.getInstance().scheduleModuleRuns(collecTorMains, conf); } private static void printUsage(String msg) {

1 0

[collector/master] Implements task-19895: CollecTor exits after running all activated
by karsten＠torproject.org 02 Sep '16

02 Sep '16

commit 87d17a4207d62b46f25343c181fef968a09789ad Author: iwakeh <iwakeh(a)torproject.org> Date: Sat Aug 13 15:19:46 2016 +0200 Implements task-19895: CollecTor exits after running all activated modules in run-once mode. Scheduler threads are now daemon threads and the config file is not watched when RunOnce is true. --- src/main/java/org/torproject/collector/conf/Configuration.java | 3 +++ src/main/java/org/torproject/collector/cron/Scheduler.java | 1 + 2 files changed, 4 insertions(+) diff --git a/src/main/java/org/torproject/collector/conf/Configuration.java b/src/main/java/org/torproject/collector/conf/Configuration.java index e55393c..4bab136 100644 --- a/src/main/java/org/torproject/collector/conf/Configuration.java +++ b/src/main/java/org/torproject/collector/conf/Configuration.java @@ -55,6 +55,9 @@ public class Configuration extends Observable implements Cloneable { throw new ConfigurationException("Cannot watch configuration file. " + "Reason: " + e.getMessage(), e); } + if (this.getBool(Key.RunOnce)) { // no need to watch + return; + } this.scheduler.scheduleAtFixedRate(new Runnable() { public void run() { logger.trace("Check configuration file."); diff --git a/src/main/java/org/torproject/collector/cron/Scheduler.java b/src/main/java/org/torproject/collector/cron/Scheduler.java index 6c7b6dd..78789f4 100644 --- a/src/main/java/org/torproject/collector/cron/Scheduler.java +++ b/src/main/java/org/torproject/collector/cron/Scheduler.java @@ -125,6 +125,7 @@ public final class Scheduler implements ThreadFactory { @Override public Thread newThread(Runnable runner) { Thread newThread = threads.newThread(runner); + newThread.setDaemon(true); newThread.setName("CollecTor-Scheduled-Thread-" + ++currentThreadNo); logger.info("New Thread created: " + newThread.getName()); return newThread;

1 0

[collector/master] Adapt tests to changes in task-19894.
by karsten＠torproject.org 02 Sep '16

02 Sep '16

commit fe6fbb554d68ab9072412f680a2ebd6d3f2c363b Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Aug 31 11:51:18 2016 +0200 Adapt tests to changes in task-19894. --- .../java/org/torproject/collector/MainTest.java | 53 +++++++++++++++------- 1 file changed, 36 insertions(+), 17 deletions(-) diff --git a/src/test/java/org/torproject/collector/MainTest.java b/src/test/java/org/torproject/collector/MainTest.java index 5453dd4..f65d2fa 100644 --- a/src/test/java/org/torproject/collector/MainTest.java +++ b/src/test/java/org/torproject/collector/MainTest.java @@ -8,17 +8,21 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import org.torproject.collector.conf.Configuration; import org.torproject.collector.conf.ConfigurationException; import org.torproject.collector.conf.Key; import org.torproject.collector.cron.Scheduler; +import org.hamcrest.Matchers; import org.junit.Rule; import org.junit.Test; +import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; import java.io.BufferedWriter; import java.io.File; import java.nio.file.Files; +import java.nio.file.Path; import java.nio.file.Paths; import java.util.List; import java.util.Properties; @@ -28,13 +32,19 @@ public class MainTest { @Rule public TemporaryFolder tmpf = new TemporaryFolder(); - @Test(expected = ConfigurationException.class) + @Rule + public ExpectedException thrown = ExpectedException.none(); + + @Test() public void testInitializationConfigException() throws Exception { - File conf = new File(Main.CONF_FILE); - checkCleanEnv(conf); - Main.main(new String[] {"/tmp/"}); - assertTrue(conf.exists()); - assertTrue(conf.delete()); + File tmpFolder = tmpf.newFolder(); + Configuration conf = new Configuration(); + thrown.expect(ConfigurationException.class); + thrown.expectMessage(Matchers + .containsString("Cannot watch configuration file.")); + + // dir instead of file; the following should throw a ConfigurationException + conf.setWatchableSourceAndLoad(tmpFolder.toPath()); } private void checkCleanEnv(File conf) { @@ -51,10 +61,15 @@ public class MainTest { assertTrue(conf.delete()); } - @Test(expected = RuntimeException.class) + @Test() public void testInitializationUnwritable() throws Exception { File conf = tmpf.newFolder("folder"); + thrown.expect(RuntimeException.class); + thrown.expectMessage(Matchers + .allOf(Matchers.containsString("NoSuchFileException"), + Matchers.containsString("/x/y/z"))); + Main.main(new String[] { Paths.get(conf.toString(), "x", "y", "z").toString()}); } @@ -171,18 +186,22 @@ public class MainTest { } } - @Test(expected = ConfigurationException.class) + @Test() public void testNoModuleActivated() throws Exception { - File conf = tmpf.newFile("test.conf"); - try { - assertEquals(0L, conf.length()); - // create default configuration - Main.main(new String[]{conf.toString()}); - } catch (ConfigurationException ce) { - fail("This should not cause a ConfigurationException: " + ce); - } + Path confPath = tmpf.newFile("test.conf").toPath(); + assertEquals(0L, confPath.toFile().length()); + + // create default configuration + Main.main(new String[]{confPath.toFile().toString()}); + assertTrue(0L < confPath.toFile().length()); + + Configuration conf = new Configuration(); + + thrown.expect(ConfigurationException.class); + thrown.expectMessage(Matchers.containsString("Nothing is activated!")); + // no module activated; the following should throw a ConfigurationException - Main.main(new String[]{conf.toString()}); + conf.setWatchableSourceAndLoad(confPath); } }

1 0

[collector/master] Implements task-19895 run-once functionality.
by karsten＠torproject.org 02 Sep '16

02 Sep '16

commit 95bba76f5adb9defa2b9ae23762b0ff1f0bb737e Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Aug 31 11:52:38 2016 +0200 Implements task-19895 run-once functionality. CollecTorMain implements Callable and scheduler waits for termination of all started Callables. --- .../torproject/collector/cron/CollecTorMain.java | 11 ++++- .../org/torproject/collector/cron/Scheduler.java | 57 +++++++++++++--------- 2 files changed, 44 insertions(+), 24 deletions(-) diff --git a/src/main/java/org/torproject/collector/cron/CollecTorMain.java b/src/main/java/org/torproject/collector/cron/CollecTorMain.java index 26c9671..c7d0c7e 100644 --- a/src/main/java/org/torproject/collector/cron/CollecTorMain.java +++ b/src/main/java/org/torproject/collector/cron/CollecTorMain.java @@ -14,9 +14,11 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.Observable; import java.util.Observer; +import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicBoolean; -public abstract class CollecTorMain implements Observer, Runnable { +public abstract class CollecTorMain implements Callable<Object>, Observer, + Runnable { private static final Logger logger = LoggerFactory.getLogger( CollecTorMain.class); @@ -58,6 +60,13 @@ public abstract class CollecTorMain implements Observer, Runnable { logger.info("Terminating {} module of CollecTor.", module()); } + /** Wrapper for <code>run</code>. */ + @Override + public final Object call() { + run(); + return null; + } + @Override public synchronized void update(Observable obs, Object obj) { newConfigAvailable.set(true); diff --git a/src/main/java/org/torproject/collector/cron/Scheduler.java b/src/main/java/org/torproject/collector/cron/Scheduler.java index 78789f4..12fe1bb 100644 --- a/src/main/java/org/torproject/collector/cron/Scheduler.java +++ b/src/main/java/org/torproject/collector/cron/Scheduler.java @@ -11,8 +11,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.concurrent.Callable; import java.util.concurrent.Executors; import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.ScheduledExecutorService; @@ -51,6 +53,7 @@ public final class Scheduler implements ThreadFactory { */ public void scheduleModuleRuns(Map<Key, Class<? extends CollecTorMain>> collecTorMains, Configuration conf) { + List<Callable<Object>> runOnceMains = new ArrayList<>(); for (Map.Entry<Key, Class<? extends CollecTorMain>> ctmEntry : collecTorMains.entrySet()) { try { @@ -58,9 +61,15 @@ public final class Scheduler implements ThreadFactory { String prefix = ctmEntry.getKey().name().replace(ACTIVATED, ""); CollecTorMain ctm = ctmEntry.getValue() .getConstructor(Configuration.class).newInstance(conf); - scheduleExecutions(conf.getBool(Key.RunOnce), ctm, - conf.getInt(Key.valueOf(prefix + OFFSETMIN)), - conf.getInt(Key.valueOf(prefix + PERIODMIN))); + if (conf.getBool(Key.RunOnce)) { + logger.info("Prepare single run for " + ctm.getClass().getName() + + "."); + runOnceMains.add(Executors.callable(ctm)); + } else { + scheduleExecutions(ctm, + conf.getInt(Key.valueOf(prefix + OFFSETMIN)), + conf.getInt(Key.valueOf(prefix + PERIODMIN))); + } } } catch (ConfigurationException | IllegalAccessException | InstantiationException | InvocationTargetException @@ -70,30 +79,32 @@ public final class Scheduler implements ThreadFactory { + ". Reason: " + ex.getMessage(), ex); } } + try { + if (conf.getBool(Key.RunOnce)) { + scheduler.invokeAll(runOnceMains); + } + } catch (ConfigurationException | InterruptedException + | RejectedExecutionException | NullPointerException ex) { + logger.error("Cannot schedule run-once: " + ex.getMessage(), ex); + } } private static final long MILLIS_IN_A_MINUTE = 60_000L; - private void scheduleExecutions(boolean runOnce, CollecTorMain ctm, - int offset, int period) { - if (runOnce) { - logger.info("Single run for " + ctm.getClass().getName() + "."); - this.scheduler.execute(ctm); - } else { - logger.info("Periodic updater started for " + ctm.getClass().getName() - + "; offset=" + offset + ", period=" + period + "."); - long periodMillis = period * MILLIS_IN_A_MINUTE; - long initialDelayMillis = computeInitialDelayMillis( - System.currentTimeMillis(), offset * MILLIS_IN_A_MINUTE, periodMillis); - - /* Run after initialDelay delay and then every period min. */ - logger.info("Periodic updater will first run in {} and then every {} " - + "minutes.", initialDelayMillis < MILLIS_IN_A_MINUTE - ? "under 1 minute" - : (initialDelayMillis / MILLIS_IN_A_MINUTE) + " minute(s)", period); - this.scheduler.scheduleAtFixedRate(ctm, initialDelayMillis, periodMillis, - TimeUnit.MILLISECONDS); - } + private void scheduleExecutions(CollecTorMain ctm, int offset, int period) { + logger.info("Periodic updater started for " + ctm.getClass().getName() + + "; offset=" + offset + ", period=" + period + "."); + long periodMillis = period * MILLIS_IN_A_MINUTE; + long initialDelayMillis = computeInitialDelayMillis( + System.currentTimeMillis(), offset * MILLIS_IN_A_MINUTE, periodMillis); + + /* Run after initialDelay delay and then every period min. */ + logger.info("Periodic updater will first run in {} and then every {} " + + "minutes.", initialDelayMillis < MILLIS_IN_A_MINUTE + ? "under 1 minute" + : (initialDelayMillis / MILLIS_IN_A_MINUTE) + " minute(s)", period); + this.scheduler.scheduleAtFixedRate(ctm, initialDelayMillis, periodMillis, + TimeUnit.MILLISECONDS); } protected static long computeInitialDelayMillis(long currentMillis,

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits September 2016