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

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 17 Sep '14

17 Sep '14

commit 3285173db7801635a246f96f345a77d593e3960a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 17 20:15:30 2014 +0000 Update translations for tor-launcher-properties --- da/torlauncher.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/da/torlauncher.properties b/da/torlauncher.properties index 2d356fc..8d2d084 100644 --- a/da/torlauncher.properties +++ b/da/torlauncher.properties @@ -3,8 +3,8 @@ torlauncher.error_title=Tor starter -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. +torlauncher.tor_exited=Tor lukkede uventet. Dette kan skyldes en fejl i selve Tor, et andet program i dit system eller en hardware-fejl. Tor-browseren vil ikke være i stand til at forbinde til noget som helst website før du genstarter Tor. Send en kopi af din Tor-log til support-teamet hvis problemet fortsætter. +torlauncher.tor_exited2=Fanebladene i din browser vil ikke blive lukket af at du genstarter Tor. torlauncher.tor_controlconn_failed=Kunne ikke forbinde til Tor kontrol-porten. torlauncher.tor_failed_to_start=Tor kunne ikke starte. torlauncher.tor_control_failed=Det lykkedes ikke at tage kontrol over Tor. @@ -37,7 +37,7 @@ torlauncher.done=Færdig torlauncher.forAssistance=For hjælp, kontakt %S -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=Kopieringen er gennemført. %S logbeskeder fra Tor er klar til at blive sat ind i et tekstdokument eller en e-mail. torlauncher.bootstrapStatus.conn_dir=Tilslutter til relæ mappe torlauncher.bootstrapStatus.handshake_dir=Opretter en krypteret mappe forbindelse

1 0

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

17 Sep '14

commit 7228fdea74f671a2075e3d7add19acfec1e49b65 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 17 19:45:54 2014 +0000 Update translations for tails-iuk_completed --- da.po | 81 ++++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 43 insertions(+), 38 deletions(-) diff --git a/da.po b/da.po index b6faf15..e66c8be 100644 --- a/da.po +++ b/da.po @@ -3,17 +3,18 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# andersd <andersd(a)riseup.net>, 2013 +# Anders Damsgaard <andersd(a)riseup.net>, 2013 # bna1605 <bna1605(a)gmail.com>, 2014 -# autofunk78 <villum(a)autofunk.dk>, 2014 +# Christian Villum <villum(a)autofunk.dk>, 2014 +# Mikkel Munch Mortensen <3xm(a)detfalskested.dk>, 2014 # cookiefox <neoleo(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2014-03-05 15:11+0100\n" -"PO-Revision-Date: 2014-03-13 06:30+0000\n" -"Last-Translator: autofunk78 <villum(a)autofunk.dk>\n" +"POT-Creation-Date: 2014-08-31 15:23+0200\n" +"PO-Revision-Date: 2014-09-17 19:30+0000\n" +"Last-Translator: Mikkel Munch Mortensen <3xm(a)detfalskested.dk>\n" "Language-Team: Danish (http://www.transifex.com/projects/p/torproject/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,8 +22,8 @@ msgstr "" "Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../lib/Tails/IUK/Frontend.pm:146 ../lib/Tails/IUK/Frontend.pm:523 -#: ../lib/Tails/IUK/Frontend.pm:667 +#: ../lib/Tails/IUK/Frontend.pm:146 ../lib/Tails/IUK/Frontend.pm:527 +#: ../lib/Tails/IUK/Frontend.pm:671 msgid "For debugging information, see /home/amnesia/.xsession-errors" msgstr "For debugging information, se /home/amnesia/.xsession-errors" @@ -64,39 +65,43 @@ msgstr "systemet har ikke nok tilgængelig hukommelse" msgid "No explanation available for reason '%{reason}s'." msgstr "Ingen forklaring tilgængelig fordi '%{reason}s'." -#: ../lib/Tails/IUK/Frontend.pm:281 +#: ../lib/Tails/IUK/Frontend.pm:279 +msgid "XXX HEJ XXX" +msgstr "XXX HEJ XXX" + +#: ../lib/Tails/IUK/Frontend.pm:285 msgid "The system is up-to-date" msgstr "Systemet er ajour" -#: ../lib/Tails/IUK/Frontend.pm:286 +#: ../lib/Tails/IUK/Frontend.pm:290 msgid "This version of Tails is outdated, and may have security issues." msgstr "Denne version af Tails er forældet, og kan indeholde sikkerhedsproblemer." -#: ../lib/Tails/IUK/Frontend.pm:318 +#: ../lib/Tails/IUK/Frontend.pm:322 #, perl-brace-format msgid "" "The available incremental upgrade requires %{space_needed}s of free space on" " Tails system partition, but only %{free_space}s is available." msgstr "Den tilgængelige gradvise opdatering kræver %{space_needed} ledig plads på Tails system-partitionen, men der er kun %{free_space} til rådighed." -#: ../lib/Tails/IUK/Frontend.pm:334 +#: ../lib/Tails/IUK/Frontend.pm:338 #, perl-brace-format msgid "" "The available incremental upgrade requires %{memory_needed}s of free memory," " but only %{free_memory}s is available." msgstr "Den tilgængelige gradvise opdatering kræver %{memory_needed} ledig hukommelse, men der er kun %{free_memory} til rådighed." -#: ../lib/Tails/IUK/Frontend.pm:356 +#: ../lib/Tails/IUK/Frontend.pm:360 msgid "" "An incremental upgrade is available, but no full upgrade is.\n" "This should not happen. Please report a bug." msgstr "En gradvis opdatering er tilgængelig uden at der eksisterer en tilsvarende komplet opdatering. Dette burde ikke ske. Rapporter venligst fejlen." -#: ../lib/Tails/IUK/Frontend.pm:360 +#: ../lib/Tails/IUK/Frontend.pm:364 msgid "Error while detecting available upgrades" msgstr "Der opstod en fejl mens der blev søgt efter tilgængelige opgraderinger" -#: ../lib/Tails/IUK/Frontend.pm:370 +#: ../lib/Tails/IUK/Frontend.pm:374 #, perl-brace-format msgid "" "You should upgrade to %{name}s %{version}s.\n" @@ -112,19 +117,19 @@ msgid "" "Do you want to upgrade now?" msgstr "Du bør opgradere til %{name}s %{version}s.\n\nFor mere information om denne nye udgave, se %{details_url}s\n\nDet anbefales at lukke alle åbne applikationer under installationen.\nAt hente opgraderingen kan tage fra nogle minutter til få timer.\nNetworking vil blive slået fra efter download af opgraderingen.\n\nDownload størrelse: %{size}s\n\nØnsker du at opgradere nu?" -#: ../lib/Tails/IUK/Frontend.pm:385 +#: ../lib/Tails/IUK/Frontend.pm:389 msgid "Upgrade available" msgstr "Opgradering tilgængelig" -#: ../lib/Tails/IUK/Frontend.pm:386 +#: ../lib/Tails/IUK/Frontend.pm:390 msgid "Upgrade now" msgstr "Opgrader nu" -#: ../lib/Tails/IUK/Frontend.pm:387 +#: ../lib/Tails/IUK/Frontend.pm:391 msgid "Upgrade later" msgstr "Opgrader senere" -#: ../lib/Tails/IUK/Frontend.pm:395 +#: ../lib/Tails/IUK/Frontend.pm:399 #, perl-brace-format msgid "" "You should do a manual upgrade to %{name}s %{version}s.\n" @@ -136,20 +141,20 @@ msgid "" "To learn how to do a manual upgrade, go to https://tails.boum.org/doc/first_steps/upgrade/#manual" msgstr "Du bør manuelt opgradere til %{name}s %{version}s. \n\nFor mere information om denne nye version, gå til %{details_url}s. \n\nDet er ikke muligt at automatisk opgradere din enhed til denne nye version: %{explanation}s. \n\nFor at lære hvordan man opgraderer manuelt, gå til https://tails.boum.org/doc/first_steps/upgrade/#manual" -#: ../lib/Tails/IUK/Frontend.pm:411 +#: ../lib/Tails/IUK/Frontend.pm:415 msgid "New version available" msgstr "En ny version er tilgængelig" -#: ../lib/Tails/IUK/Frontend.pm:468 +#: ../lib/Tails/IUK/Frontend.pm:472 msgid "Downloading upgrade" msgstr "Henter opdatering" -#: ../lib/Tails/IUK/Frontend.pm:471 +#: ../lib/Tails/IUK/Frontend.pm:475 #, perl-brace-format msgid "Downloading the upgrade to %{name}s %{version}s..." msgstr "Downloader opgraderingen til %{name}s %{version}s..." -#: ../lib/Tails/IUK/Frontend.pm:512 +#: ../lib/Tails/IUK/Frontend.pm:516 msgid "" "The upgrade could not be downloaded.\\n\\nCheck your network " "connection, and restart Tails to try upgrading again.\\n\\nIf the problem " @@ -157,26 +162,26 @@ msgid "" "file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" msgstr "Opgraderingen kunne ikke blive downloadet.\\n\\nCheck din netværksforbindelse, og genstart Tails for at prøve igen.\\n\\nHvis problemet ikke forsvinder, gå til file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" -#: ../lib/Tails/IUK/Frontend.pm:528 ../lib/Tails/IUK/Frontend.pm:547 +#: ../lib/Tails/IUK/Frontend.pm:532 ../lib/Tails/IUK/Frontend.pm:551 msgid "Error while downloading the upgrade" msgstr "Fejl under download af opdateringen" -#: ../lib/Tails/IUK/Frontend.pm:540 +#: ../lib/Tails/IUK/Frontend.pm:544 #, perl-brace-format msgid "" "Output file '%{output_file}s' does not exist, but tails-iuk-get-target-file " "did not complain. Please report a bug." msgstr "Output filen '%{output_file}s' eksisterer ikke, men tails-iuk-get-target-file meldte ingen fejl. Rapporter venligst dette som en fejl." -#: ../lib/Tails/IUK/Frontend.pm:559 +#: ../lib/Tails/IUK/Frontend.pm:563 msgid "Error while creating temporary downloading directory" msgstr "Der opstod en fejl under oprettelsen af den midlertidlige download-mappe" -#: ../lib/Tails/IUK/Frontend.pm:562 +#: ../lib/Tails/IUK/Frontend.pm:566 msgid "Failed to create temporary download directory" msgstr "Den midlertidige download mappe kunne ikke oprettes" -#: ../lib/Tails/IUK/Frontend.pm:574 +#: ../lib/Tails/IUK/Frontend.pm:578 msgid "" "Your Tails device was successfully upgraded.\n" "\n" @@ -186,46 +191,46 @@ msgid "" "Do you want to restart now?" msgstr "Dit Tails apperat blev opgraderet med succes.\n\nNogle sikkerheds komponenter blev deaktiveret midlertidigt.\nDu burde genstarte Tails med den nyeste version så snart som muligt.\n\nVil du genstarte nu?" -#: ../lib/Tails/IUK/Frontend.pm:579 +#: ../lib/Tails/IUK/Frontend.pm:583 msgid "Restart Tails" msgstr "Genstart Tails" -#: ../lib/Tails/IUK/Frontend.pm:580 +#: ../lib/Tails/IUK/Frontend.pm:584 msgid "Restart now" msgstr "Genstart nu" -#: ../lib/Tails/IUK/Frontend.pm:581 +#: ../lib/Tails/IUK/Frontend.pm:585 msgid "Restart later" msgstr "Genstart senere" -#: ../lib/Tails/IUK/Frontend.pm:592 +#: ../lib/Tails/IUK/Frontend.pm:596 msgid "Error while restarting the system" msgstr "Der opstod en fejl under genstart af systemet" -#: ../lib/Tails/IUK/Frontend.pm:595 +#: ../lib/Tails/IUK/Frontend.pm:599 msgid "Failed to restart the system" msgstr "Systemet kunne ikke genstartes" -#: ../lib/Tails/IUK/Frontend.pm:610 +#: ../lib/Tails/IUK/Frontend.pm:614 msgid "Error while shutting down the network" msgstr "Der opstod en fejl under nedlukningen af netværket" -#: ../lib/Tails/IUK/Frontend.pm:613 +#: ../lib/Tails/IUK/Frontend.pm:617 msgid "Failed to shutdown network" msgstr "Kunne ikke nedlukke netværket" -#: ../lib/Tails/IUK/Frontend.pm:623 +#: ../lib/Tails/IUK/Frontend.pm:627 msgid "Upgrading the system" msgstr "Opdaterer systemet" -#: ../lib/Tails/IUK/Frontend.pm:625 +#: ../lib/Tails/IUK/Frontend.pm:629 msgid "" "Your Tails device is being upgraded...\n" "\n" "For security reasons, the networking is now disabled." msgstr "Dit Tails apperat bliver opgraderet...\n\nFor sikkerheds årsager er networking blevet deaktiveret." -#: ../lib/Tails/IUK/Frontend.pm:662 +#: ../lib/Tails/IUK/Frontend.pm:666 msgid "" "An error occured while installing the upgrade.\\n\\nYour Tails device" " needs to be repaired and might be unable to restart.\\n\\nPlease follow the" @@ -233,6 +238,6 @@ msgid "" "file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" msgstr "En fejl opstod mens opgraderingen blev installeret.\\n\\nDit Tails apperat har brug for at blive repareret, og kan muligvis ikke genstarte.\\n\\nVær venlig at følge instruktionerne i filen:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" -#: ../lib/Tails/IUK/Frontend.pm:672 +#: ../lib/Tails/IUK/Frontend.pm:676 msgid "Error while installing the upgrade" msgstr "Fejl under installeringen af opdateringen"

1 0

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

17 Sep '14

commit f37e41e8981d163bf0f6e079ac70f4ac0c90c064 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 17 19:45:52 2014 +0000 Update translations for tails-iuk --- da.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/da.po b/da.po index 99f5c48..e66c8be 100644 --- a/da.po +++ b/da.po @@ -6,14 +6,15 @@ # Anders Damsgaard <andersd(a)riseup.net>, 2013 # bna1605 <bna1605(a)gmail.com>, 2014 # Christian Villum <villum(a)autofunk.dk>, 2014 +# Mikkel Munch Mortensen <3xm(a)detfalskested.dk>, 2014 # cookiefox <neoleo(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-08-31 15:23+0200\n" -"PO-Revision-Date: 2014-09-01 09:20+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-09-17 19:30+0000\n" +"Last-Translator: Mikkel Munch Mortensen <3xm(a)detfalskested.dk>\n" "Language-Team: Danish (http://www.transifex.com/projects/p/torproject/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -66,7 +67,7 @@ msgstr "Ingen forklaring tilgængelig fordi '%{reason}s'." #: ../lib/Tails/IUK/Frontend.pm:279 msgid "XXX HEJ XXX" -msgstr "" +msgstr "XXX HEJ XXX" #: ../lib/Tails/IUK/Frontend.pm:285 msgid "The system is up-to-date"

1 0

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

17 Sep '14

commit b74686f652858f02a3b7a00ee5d30845146cdac4 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 17 19:45:48 2014 +0000 Update translations for torbutton-torbuttonproperties --- da/torbutton.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/da/torbutton.properties b/da/torbutton.properties index d0b3ca6..d61fe4b 100644 --- a/da/torbutton.properties +++ b/da/torbutton.properties @@ -48,10 +48,10 @@ torbutton.popup.confirm_plugins = Udvidelsesmoduler såsom Flash kan skade sikke torbutton.popup.never_ask_again = Spørg mig aldrig igen # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data? -canvas.notNow=Not Now +canvas.siteprompt=Dette website (%S) forsøgte at uddrage HTML5 canvas-billeddata, hvilket kan bruges til unikt at identificere din computer.\n\nSkal Tor Browseren tillade dette websted at uddrage HTML5 canvas-billeddata? +canvas.notNow=Ikke nu canvas.notNowAccessKey=N -canvas.allow=Allow in the future +canvas.allow=Tillad i fremtiden canvas.allowAccessKey=T -canvas.never=Never for this site (recommended) +canvas.never=Aldrig for dette site (anbefalet) canvas.neverAccessKey=L

1 0

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

17 Sep '14

commit 8d1a931a257a86e011caa43499fb154fe04a0ad8 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 17 19:45:36 2014 +0000 Update translations for tor-launcher-network-settings_completed --- da/network-settings.dtd | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/da/network-settings.dtd b/da/network-settings.dtd index 33250cd..0ca0980 100644 --- a/da/network-settings.dtd +++ b/da/network-settings.dtd @@ -8,8 +8,8 @@ <!ENTITY torSettings.no "Nej"> <!ENTITY torSettings.firstQuestion "Hvilke af de følgende beskriver bedst din situation?"> -<!ENTITY torSettings.configurePrompt1 "Denne computers internetforbindelse er censureret, filtreret, eller føres igennem en proxy."> -<!ENTITY torSettings.configurePrompt2 "Jeg ønsker at konfigurere bro, firewall eller proxy indstillinger"> +<!ENTITY torSettings.configurePrompt1 "Denne computers internetforbindelse er censureret eller er etableret gennem en proxy."> +<!ENTITY torSettings.configurePrompt2 "Jeg skal konfigurere bro- eller proxy-indstillinger."> <!ENTITY torSettings.configure "Indstil"> <!ENTITY torSettings.connectPrompt2 "Jeg vil forbinde direkte til Tor netværket."> <!ENTITY torSettings.connectPrompt3 "Dette vil virker i de fleste situationer"> @@ -19,9 +19,6 @@  <!ENTITY torSettings.proxyHelp "Hvis du ikke kender svaret på dette spørgsmål, så kig på internetindstillingerne i en anden browser for at se om den er konfigureret til at bruge en proxy."> <!ENTITY torSettings.enterProxy "Indtast proxy-indstillinger."> -<!ENTITY torSettings.firewallQuestion "Går denne computers internetforbindelse igennem en firewall som kun tillader forbindelse til visse porte?"> -<!ENTITY torSettings.firewallHelp "Hvis du ikke er sikker på hvordan du skal svare på dette spørgsmål, vælg Nej. Hvis du løber ind i problemer med at forbinde til Tor netværket, skal du ændre denne indstilling."> -<!ENTITY torSettings.enterFirewall "Indtast en komma-separeret liste over porte der er tilladt på firewallen."> <!ENTITY torSettings.bridgeQuestion "Blokerer eller censurerer din internetudbyder (ISP) forbindelser til Tor netværket?"> <!ENTITY torSettings.bridgeHelp "Hvis du er usikker på svaret til dette spørgsmål, vælg No.  Hvis du vælger Ja, vil du blive bedt om at konfigurere Tor Broer, der er ulistede relays, som gør det sværere at blokere forbindelser til Tor Netværket."> <!ENTITY torSettings.bridgeSettingsPrompt "Du kan bruge det tildelte sæt broer eller du kan hente og indtaste et skræddersyet sæt broer."> @@ -59,6 +56,7 @@ <!ENTITY torsettings.bridgeHelp2Heading "På nettet"> <!ENTITY torsettings.bridgeHelp2 "Brug en browser og besøg https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Via den automatiske email service"> -<!ENTITY torsettings.bridgeHelp3 "Send en email til bridges(a)torproject.org kun bestående af linjen 'get bridges' i indholdet.  For at gøre det sværere at få kendskab til alle bro adresser med henblik på blokering er det kun muligt at sende fra en gmail.com eller yahoo.com email adresse."> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Send e-mail til bridges(a)torproject.org med linjen 'get bridges' som det eneste i beskedteksten.  Men, for at gøre det sværere for en angriber at få kendskab til en masse broadresser, skal du sende din forespørgsel fra en af de følgende e-mailudbydere (i foretrukket rækkefølge):"> +<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com eller https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Via vores Help Desk"> <!ENTITY torsettings.bridgeHelp4 "Som en sidste mulighed kan du bede om at få en bro adresse tilsendt ved at sende en venlig email to help(a)rt.torproject.org.  Bemærk venligst at alle emails besvares manuelt.">

1 0

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

17 Sep '14

commit 6749ee97bd8e41dfa3c91c476a30b4e4a8818f84 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 17 19:45:33 2014 +0000 Update translations for tor-launcher-network-settings --- da/network-settings.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/da/network-settings.dtd b/da/network-settings.dtd index 0c8817a..0ca0980 100644 --- a/da/network-settings.dtd +++ b/da/network-settings.dtd @@ -8,8 +8,8 @@ <!ENTITY torSettings.no "Nej"> <!ENTITY torSettings.firstQuestion "Hvilke af de følgende beskriver bedst din situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> +<!ENTITY torSettings.configurePrompt1 "Denne computers internetforbindelse er censureret eller er etableret gennem en proxy."> +<!ENTITY torSettings.configurePrompt2 "Jeg skal konfigurere bro- eller proxy-indstillinger."> <!ENTITY torSettings.configure "Indstil"> <!ENTITY torSettings.connectPrompt2 "Jeg vil forbinde direkte til Tor netværket."> <!ENTITY torSettings.connectPrompt3 "Dette vil virker i de fleste situationer"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.bridgeHelp2Heading "På nettet"> <!ENTITY torsettings.bridgeHelp2 "Brug en browser og besøg https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Via den automatiske email service"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Send e-mail til bridges(a)torproject.org med linjen 'get bridges' som det eneste i beskedteksten.  Men, for at gøre det sværere for en angriber at få kendskab til en masse broadresser, skal du sende din forespørgsel fra en af de følgende e-mailudbydere (i foretrukket rækkefølge):"> +<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com eller https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Via vores Help Desk"> <!ENTITY torsettings.bridgeHelp4 "Som en sidste mulighed kan du bede om at få en bro adresse tilsendt ved at sende en venlig email to help(a)rt.torproject.org.  Bemærk venligst at alle emails besvares manuelt.">

1 0

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

17 Sep '14

commit a6e193b6323aa6262db0f28ec5b4af837129b01e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 17 18:45:44 2014 +0000 Update translations for torbutton-torbuttonproperties --- zh_CN/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/torbutton.properties b/zh_CN/torbutton.properties index 619b638..6425d8c 100644 --- a/zh_CN/torbutton.properties +++ b/zh_CN/torbutton.properties @@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = 点击启用插件 torbutton.panel.plugins.enabled = 点击禁用插件 torbutton.panel.label.disabled = Tor 已禁用 torbutton.panel.label.enabled = Tor 已启用 -extensions.torbutton(a)torproject.org.description = Torbutton 提供了一个按钮，可对“Tor 设置”进行配置，并可快速而方便地清除浏览器隐私数据。 +extensions.torbutton(a)torproject.org.description = Torbutton 是一个可以配置Tor并能简单快速清理个人浏览数据的按钮。 torbutton.popup.history.warning = Torbutton 屏蔽了在其他 Tor 状态下加载的标签的活动。\n\n这是用于暂时解决 Firefox Bug 409737 和 417869。\n如果这个弹出窗口在您不知情的情况下弹出，则您的标签之一正试图在后台重新载入自己，然而这样的行为是被屏蔽的。\n\n要刷新当前 Tor 状态下的标签，将焦点置于在地址栏并按回车键。\n\n torbutton.popup.plugin.warning = Torbutton 阻止了浏览器戴 Tor 时直接加载需要插件支持的内容。\n\n请使用“另存为”(保存后浏览)。\n\n torbutton.popup.confirm_ca_certs = Torbutton 注意：浏览器似乎缺少自定义的CA(证书颁发机构)。检查CA列表是一项耗时的操作，障碍Tor的切换。您是否希望禁用对CA证书的隔离？)如果您不懂，可以选择“确定”)

1 0

[tor/master] Fix a windows unused-arg warning
by nickm＠torproject.org 17 Sep '14

17 Sep '14

commit 3f9fac7ee40f8cf7b335c2d5808406b5d8697a47 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 17 11:00:27 2014 -0400 Fix a windows unused-arg warning --- src/test/test_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index ae96be4..9d9b393 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1432,10 +1432,10 @@ test_util_threads(void *arg) time_t started; #ifndef _WIN32 struct timeval tv; - (void)arg; tv.tv_sec=0; tv.tv_usec=100*1000; #endif + (void)arg; thread_test_mutex_ = tor_mutex_new(); thread_test_start1_ = tor_mutex_new(); thread_test_start2_ = tor_mutex_new();

1 0

[tor/master] Replace the remaining test_n?eq_ptr calls
by nickm＠torproject.org 17 Sep '14

17 Sep '14

commit 1146a6a1c5e194cc05944622628188c82771a3d4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 15 21:25:27 2014 -0400 Replace the remaining test_n?eq_ptr calls --- src/test/test.h | 2 -- src/test/test_crypto.c | 8 ++++---- src/test/test_util.c | 6 +++--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/test/test.h b/src/test/test.h index 71cbb03..799f208 100644 --- a/src/test/test.h +++ b/src/test/test.h @@ -25,9 +25,7 @@ #define test_assert(expr) tt_assert(expr) #define test_eq(expr1, expr2) tt_int_op((expr1), ==, (expr2)) -#define test_eq_ptr(expr1, expr2) tt_ptr_op((expr1), ==, (expr2)) #define test_neq(expr1, expr2) tt_int_op((expr1), !=, (expr2)) -#define test_neq_ptr(expr1, expr2) tt_ptr_op((expr1), !=, (expr2)) #define test_streq(expr1, expr2) tt_str_op((expr1), ==, (expr2)) #define test_strneq(expr1, expr2) tt_str_op((expr1), !=, (expr2)) diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index 274a268..86ed86f 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -128,9 +128,9 @@ test_crypto_aes(void *arg) memset(data2, 0, 1024); memset(data3, 0, 1024); env1 = crypto_cipher_new(NULL); - test_neq_ptr(env1, 0); + tt_ptr_op(env1, !=, NULL); env2 = crypto_cipher_new(crypto_cipher_get_key(env1)); - test_neq_ptr(env2, 0); + tt_ptr_op(env2, !=, NULL); /* Try encrypting 512 chars. */ crypto_cipher_encrypt(env1, data2, data1, 512); @@ -161,7 +161,7 @@ test_crypto_aes(void *arg) memset(data3, 0, 1024); env2 = crypto_cipher_new(crypto_cipher_get_key(env1)); - test_neq_ptr(env2, NULL); + tt_ptr_op(env2, !=, NULL); for (j = 0; j < 1024-16; j += 17) { crypto_cipher_encrypt(env2, data3+j, data1+j, 17); } @@ -498,7 +498,7 @@ test_crypto_pk(void) crypto_pk_free(pk2); pk2 = crypto_pk_copy_full(pk1); tt_assert(pk2 != NULL); - test_neq_ptr(pk1, pk2); + tt_ptr_op(pk1, !=, pk2); tt_assert(crypto_pk_cmp_keys(pk1,pk2) == 0); done: diff --git a/src/test/test_util.c b/src/test/test_util.c index b819d53..d3ac0cc 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -810,7 +810,7 @@ test_util_config_line_escaped_content(void) str = buf5; str = parse_config_line_from_str(str, &k, &v); - test_eq_ptr(str, NULL); + tt_ptr_op(str, ==, NULL); tor_free(k); tor_free(v); #endif @@ -1199,7 +1199,7 @@ test_util_strmisc(void) const char *s = "abcdefghijklmnopqrstuvwxyz"; cp_tmp = tor_strndup(s, 30); tt_str_op(cp_tmp,==, s); /* same string, */ - test_neq_ptr(cp_tmp, s); /* but different pointers. */ + tt_ptr_op(cp_tmp,!=,s); /* but different pointers. */ tor_free(cp_tmp); cp_tmp = tor_strndup(s, 5); @@ -1209,7 +1209,7 @@ test_util_strmisc(void) s = "a\0b\0c\0d\0e\0"; cp_tmp = tor_memdup(s,10); tt_mem_op(cp_tmp,==, s, 10); /* same ram, */ - test_neq_ptr(cp_tmp, s); /* but different pointers. */ + tt_ptr_op(cp_tmp,!=,s); /* but different pointers. */ tor_free(cp_tmp); }

1 0

[tor/master] Replace remaining uses of deprecated test_mem* functions
by nickm＠torproject.org 17 Sep '14

17 Sep '14

commit 0d654d23559b84961b88d5e13fc1393e0f8108bc Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 15 21:27:23 2014 -0400 Replace remaining uses of deprecated test_mem* functions --- src/test/test.h | 8 +------- src/test/test_extorport.c | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/test/test.h b/src/test/test.h index 799f208..5d0c062 100644 --- a/src/test/test.h +++ b/src/test/test.h @@ -29,12 +29,6 @@ #define test_streq(expr1, expr2) tt_str_op((expr1), ==, (expr2)) #define test_strneq(expr1, expr2) tt_str_op((expr1), !=, (expr2)) -#define test_mem_op(expr1, op, expr2, len) \ - tt_mem_op((expr1), op, (expr2), (len)) - -#define test_memeq(expr1, expr2, len) test_mem_op((expr1), ==, (expr2), len) -#define test_memneq(expr1, expr2, len) test_mem_op((expr1), !=, (expr2), len) - /* As test_mem_op, but decodes 'hex' before comparing. There must be a * local char* variable called mem_op_hex_tmp for this to work. */ #define test_mem_op_hex(expr1, op, hex) \ @@ -44,7 +38,7 @@ mem_op_hex_tmp = tor_malloc(length/2); \ tor_assert((length&1)==0); \ base16_decode(mem_op_hex_tmp, length/2, hex, length); \ - test_mem_op(expr1, op, mem_op_hex_tmp, length/2); \ + tt_mem_op(expr1, op, mem_op_hex_tmp, length/2); \ STMT_END #define test_memeq_hex(expr1, hex) test_mem_op_hex(expr1, ==, hex) diff --git a/src/test/test_extorport.c b/src/test/test_extorport.c index 698bced..35e7fe5 100644 --- a/src/test/test_extorport.c +++ b/src/test/test_extorport.c @@ -406,7 +406,7 @@ handshake_start(or_connection_t *conn, int receiving) tt_int_op(buf_datalen(TO_CONN(conn)->outbuf), ==, (n)); \ if ((n)) { \ fetch_from_buf(b, (n), TO_CONN(conn)->outbuf); \ - test_memeq(b, (s), (n)); \ + tt_mem_op(b, ==, (s), (n)); \ } \ } while (0)

1 0