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

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 22 Nov '14

22 Nov '14

commit 1c9162d46d72445a7f4a7e76437f98a6c87fc0c6 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 22 23:15:35 2014 +0000 Update translations for tails-misc --- da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/da.po b/da.po index 3b87171..a75dec3 100644 --- a/da.po +++ b/da.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-15 17:57+0200\n" -"PO-Revision-Date: 2014-11-22 22:40+0000\n" +"PO-Revision-Date: 2014-11-22 22:51+0000\n" "Last-Translator: Whiz Zurrd <Whizzurrd(a)hmamail.com>\n" "Language-Team: Danish (http://www.transifex.com/projects/p/torproject/language/da/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 22 Nov '14

22 Nov '14

commit 9b93015bbc98eb26ea4091c7859382e5cccb9cf1 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 22 22:45:55 2014 +0000 Update translations for torbutton-torbuttondtd --- da/torbutton.dtd | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/da/torbutton.dtd b/da/torbutton.dtd index 6dd6388..df79c6c 100644 --- a/da/torbutton.dtd +++ b/da/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "Klik for at starte Torbutton"> -<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings"> +<!ENTITY torbutton.prefs.privacy_security_settings "Privatlivs- og Sikkerhedsindstillinger"> <!ENTITY torbutton.prefs.block_thread "Bloker for historik læsninger under Tor (afgørende)"> <!ENTITY torbutton.prefs.block_thwrite "Bloker for historik skrivninger under Tor (anbefales)"> <!ENTITY torbutton.prefs.block_nthread "Bloker for historik læsninger uden for Tor (valgfrit)"> @@ -149,9 +149,9 @@ <!ENTITY torbutton.prefs.restrict_thirdparty "Begræns tredjeparts-cookies og andre registreringsdata"> <!ENTITY torbutton.prefs.block_plugins "Slå browser-udvidelser fra (såsom Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Tilpas detaljer som adskiller dig fra andre Tor Browser-brugere"> -<!ENTITY torbutton.prefs.sec_caption "Security Level"> -<!ENTITY torbutton.prefs.sec_low "Low (default)"> -<!ENTITY torbutton.prefs.sec_med_low "Medium-Low"> -<!ENTITY torbutton.prefs.sec_med_high "Medium-High"> -<!ENTITY torbutton.prefs.sec_high "High"> -<!ENTITY torbutton.prefs.sec_custom "Custom Values"> +<!ENTITY torbutton.prefs.sec_caption "Sikkerheds Niveau"> +<!ENTITY torbutton.prefs.sec_low "Lav (standard)"> +<!ENTITY torbutton.prefs.sec_med_low "Mellemlav"> +<!ENTITY torbutton.prefs.sec_med_high "Mellemhøj"> +<!ENTITY torbutton.prefs.sec_high "Høj"> +<!ENTITY torbutton.prefs.sec_custom "Brugervalgte værdier:">

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 22 Nov '14

22 Nov '14

commit 582bf6055580498d40670ce68dc44b01f832902b Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 22 22:45:43 2014 +0000 Update translations for tails-misc_completed --- da.po | 200 ++++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 110 insertions(+), 90 deletions(-) diff --git a/da.po b/da.po index 2aa7b50..3b87171 100644 --- a/da.po +++ b/da.po @@ -9,13 +9,14 @@ # Christian Villum <villum(a)autofunk.dk>, 2014 # David Nielsen <gnomeuser(a)gmail.com>, 2014 # Niels, 2013 +# Whiz Zurrd <Whizzurrd(a)hmamail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-08 19:08+0200\n" -"PO-Revision-Date: 2014-06-23 17:11+0000\n" -"Last-Translator: christianflintrup <chr(a)agge.net>\n" +"POT-Creation-Date: 2014-10-15 17:57+0200\n" +"PO-Revision-Date: 2014-11-22 22:40+0000\n" +"Last-Translator: Whiz Zurrd <Whizzurrd(a)hmamail.com>\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" @@ -23,11 +24,11 @@ msgstr "" "Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:43 +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:42 msgid "Tor is ready" msgstr "Tor er klar" -#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:44 +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:43 msgid "You can now access the Internet." msgstr "Du kan nu forbinde til internettet" @@ -47,7 +48,7 @@ msgid "" "<p>Anyone who can see this reply will probably infer you are\n" "a Tails user. Time to wonder how much you trust your\n" "Internet and mailbox providers?</p>\n" -msgstr "<h1>Hjælp os med at rette din fejl!</h1>\n<p>Se <a href=\"%s\">vores instruktioner vedrørende rapportering af fejl</a>.</p>\n<p><strong>Inkluder ikke flere personlige oplysninger en højest nødvendigt!</strong></p>\n<h2>Om oplysning af din e-mail adresse</h2>\n<p>Hvis du ikke har noget imod at oplyse en del af din identitet til Tails-udviklerne, kan du oplyse din e-mail adresse så vi kan spørge ind til din fejl. Hvis du indtaster din offentlige PGP nøgle, kan vi kryptere fremtidig kommunikation.</p>\n<p>Enhver som kan se dette svar, kan udlede at du bruger Tails. I hvor høj grad kan du stole på din Internet og mail-udbyder?</p>\n" +msgstr "<h1>Hjælp os med at rette din fejl!</h1>\n<p>Se <a href=\"%s\">vores instruktioner vedrørende rapportering af fejl</a>.</p>\n<p><strong>Inkluder ikke flere personlige oplysninger en højest nødvendigt!</strong></p>\n<h2>Om at give os din e-mail adresse</h2>\n<p>Hvis du ikke har noget imod at oplyse en del af din identitet til Tails-udviklerne, kan du oplyse din e-mail adresse så vi kan spørge ind til din fejl. Hvis du indtaster din offentlige PGP nøgle, kan vi kryptere fremtidig kommunikation.</p>\n<p>Enhver som kan se dette svar, vil højst sandsynligt regne sig frem til at du bruger Tails. I hvor høj grad kan du stole på din Internet og mail-udbyder?</p>\n" #: config/chroot_local-includes/usr/local/bin/gpgApplet:136 msgid "OpenPGP encryption applet" @@ -71,7 +72,7 @@ msgstr "Signer/Krypter udklipsholderen med offentlig nøgle" #: config/chroot_local-includes/usr/local/bin/gpgApplet:200 msgid "_Decrypt/Verify Clipboard" -msgstr "Dekrypter/Verificer udklipsholder" +msgstr "Dekrypter/Godkend udklipsholder" #: config/chroot_local-includes/usr/local/bin/gpgApplet:204 msgid "_Manage Keys" @@ -118,8 +119,8 @@ msgstr "Fingeraftryk:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:394 msgid "User ID:" msgid_plural "User IDs:" -msgstr[0] "Bruger IDere" -msgstr[1] "Bruger IDere" +msgstr[0] "Bruger ID:" +msgstr[1] "Bruger ID'er:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:424 msgid "None (Don't sign)" @@ -137,7 +138,7 @@ msgstr "Skjul modtagere:" msgid "" "Hide the user IDs of all recipients of an encrypted message. Otherwise " "anyone that sees the encrypted message can see who the recipients are." -msgstr "Skjul bruger ID'erne af alle modtagere af en krypteret besked. Ellers kan alle der ser den krypterede besked hvem modtagerne er." +msgstr "Skjul bruger ID'erne af alle modtagere af en krypteret besked. Ellers kan alle der ser den krypterede besked se hvem modtagerne er." #: config/chroot_local-includes/usr/local/bin/gpgApplet:504 msgid "Sign message as:" @@ -161,7 +162,7 @@ msgstr[1] "Stoler ikke fuldt på de følgende nøgler:" msgid "Do you trust this key enough to use it anyway?" msgid_plural "Do you trust these keys enough to use them anyway?" msgstr[0] "Stoler du tilstrækkeligt på disse nøgler til alligevel at anvende dem?" -msgstr[1] "Stoler du tilstrækkeligt på disse nøgler til alligevel at anvende dem?" +msgstr[1] "Stoler du tilstrækkeligt på disse nøgler til at anvende dem alligevel?" #: config/chroot_local-includes/usr/local/bin/gpgApplet:582 msgid "No keys selected" @@ -202,22 +203,6 @@ msgstr "GnuPG's output:" msgid "Other messages provided by GnuPG:" msgstr "Andre beskeder udbudt af GnuPG:" -#: config/chroot_local-includes/usr/local/bin/iceweasel:12 -msgid "Tor is not ready" -msgstr "Tor er ikke klar" - -#: config/chroot_local-includes/usr/local/bin/iceweasel:13 -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/iceweasel:14 -msgid "Start Tor Browser" -msgstr "Start Tor Browser" - -#: config/chroot_local-includes/usr/local/bin/iceweasel:15 -msgid "Cancel" -msgstr "Annullér" - #: config/chroot_local-includes/usr/local/lib/shutdown-helper-applet:39 msgid "Shutdown Immediately" msgstr "Luk ned med det samme" @@ -237,7 +222,7 @@ msgstr "Tails" #: config/chroot_local-includes/usr/local/bin/tails-about:24 msgid "The Amnesic Incognito Live System" -msgstr "Det hukommelsesløse, inkognito live system" +msgstr "Det Hukommelsestabende Inkognito Live System" #: config/chroot_local-includes/usr/local/bin/tails-about:25 #, python-format @@ -313,7 +298,7 @@ msgstr "MAC spoofing fejlede for netværkskortet ${nic_name} (${nic}), så det e #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:39 msgid "All networking disabled" -msgstr "Al networking er slået fra" +msgstr "Al brug af netværk er slået fra" #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:40 #, sh-format @@ -322,38 +307,13 @@ msgid "" "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>" -#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:62 -msgid "Starting I2P..." -msgstr "Starter I2P..." - -#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:63 -msgid "The I2P router console will be opened on start." -msgstr "I2P router konsollen åbnes ved start." - -#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:82 -#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:124 -msgid "I2P failed to start" -msgstr "I2P kunne ikke start" - -#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:83 -msgid "" -"Make sure that you have a working Internet connection, then try to start I2P" -" again." -msgstr "Vær sikker på at din internetforbindelse fungerer, og prøv at starte I2P igen." - -#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:125 -msgid "" -"Something went wrong when I2P was starting. Look in the logs in the " -"following directory for more information:" -msgstr "Noget gik galt da I2P startede. Se i log-filen i den følgende mappe for mere information:" - #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:62 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:58 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:63 msgid "Error" msgstr "Fejl" @@ -368,11 +328,11 @@ msgid "" "\n" "Or do a manual upgrade.\n" "See https://tails.boum.org/doc/first_steps/upgrade#manual" -msgstr "<b>Der er ikke nok hukommelse til at søge efter opdateringer.</b>\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 for fortag en manuel opdatering.\nSe venligst https://tails.boum.org/doc/first_steps/upgrade#manual for detaljer." +msgstr "<b>Der er ikke nok hukommelse tilgængelig til at søge efter opdateringer.</b>\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 msgid "Warning: virtual machine detected!" -msgstr "Advarsel: virtuel maskine detekteret!" +msgstr "Advarsel: virtuel maskine opdaget!" #: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:55 msgid "" @@ -387,77 +347,133 @@ msgid "" " more...</a>" msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html'>Læs mere...</a>" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:68 +#: config/chroot_local-includes/usr/local/bin/tor-browser:18 +msgid "Tor is not ready" +msgstr "Tor er ikke klar" + +#: config/chroot_local-includes/usr/local/bin/tor-browser:19 +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:20 +msgid "Start Tor Browser" +msgstr "Start Tor Browser" + +#: config/chroot_local-includes/usr/local/bin/tor-browser:21 +msgid "Cancel" +msgstr "Annullér" + +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:73 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:70 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:75 msgid "" "Network activity within the Unsafe Browser is <b>not anonymous</b>. Only use" " the Unsafe Browser if necessary, for example if you have to login or " "register to activate your Internet connection." -msgstr "Netværksaktivitet fra den Usikre Browser er <b>ikke anonym</b>. Anvend kun den Usikre Browser om nødvendigt, hvis du eksempelvis skal logge ind eller registrere for at aktivere din internetforbindelse." +msgstr "Netværksaktivitet fra den Usikre Browser er <b>ikke anonym</b>. Anvend kun den Usikre Browser hvis nødvendigt, for eksempel hvis du skal logge ind eller registrere for at aktivere din internetforbindelse." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:71 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:76 msgid "_Launch" msgstr "_Start" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:72 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:77 msgid "_Exit" msgstr "_Afslut" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:82 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:87 msgid "Starting the Unsafe Browser..." msgstr "Starter den Usikre Browser..." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:83 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88 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:101 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:106 msgid "Failed to setup chroot." msgstr "Kunne ikke indstille chroot." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:175 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:180 #: ../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:215 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:236 msgid "Shutting down the Unsafe Browser..." msgstr "Afslutter den Usikre Browser" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:216 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:237 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:228 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:249 msgid "Failed to restart Tor." msgstr "Kunne ikke genstarte Tor." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:236 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:257 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 lidt." +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:249 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:270 msgid "" "No DNS server was obtained through DHCP or manually configured in " "NetworkManager." -msgstr "Ingen DNS server kunne findes gennem DHCP eller den manuelle konfiguration i Netværksmanageren." +msgstr "Ingen DNS server blev fundet gennem DHCP eller den manuelle konfiguration i NetværkManager." #: config/chroot_local-includes/usr/share/tails/truecrypt-wrapper.disabled:11 -msgid "TrueCrypt will soon be removed from Tails" -msgstr "TrueCrypt fjernes snart fra Tails" +msgid "TrueCrypt will be removed in Tails 1.2.1" +msgstr "TrueCrypt vil blive fjernet i Tails 1.2.1" #: config/chroot_local-includes/usr/share/tails/truecrypt-wrapper.disabled:12 msgid "" -"TrueCrypt will soon be removed from Tails due to license and development " -"concerns." -msgstr "TrueCrypt fjernes snart fra Tails på grund af bekymringer over licens og udvikling." +"TrueCrypt is no longer maintained and is said to be insecure by its own " +"authors. Therefore, it will be removed in Tails 1.2.1 (November 25). We " +"recommend that you learn how to <a " +"href='file:///usr/share/doc/tails/website/doc/encryption_and_privacy/truecrypt.en.html#cryptsetup'>open" +" TrueCrypt volumes with cryptsetup</a> as soon as possible." +msgstr "TrueCrypt bliver ikke længere vedligeholdt, og det kaldes usikkert af dets udviklere, derfor vil det blive fjernet i Tails 1.2.1 (25. november). Vi anbefaler at du lærer hvordan man <a href='file:///usr/share/doc/tails/website/doc/encryption_and_privacy/truecrypt.en.html#cryptsetup'>åbner TrueCrypt partitioner med cryptsetup</a> snarest muligt." + +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:30 +msgid "I2P failed to start" +msgstr "I2P kunne ikke starte" + +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:31 +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:42 +msgid "I2P's router console is ready" +msgstr "I2Ps routerkonsol er klar." + +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:43 +msgid "You can now access I2P's router console on http://127.0.0.1:7657." +msgstr "Du kan få adgang til I2Ps router konsol på http://127.0.0.1:7657." + +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:48 +msgid "I2P is not ready" +msgstr "I2P er ikke klar" + +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:49 +msgid "" +"Eepsite tunnel not built within six minutes. Check the router console at " +"http://127.0.0.1:7657/logs or the logs in /var/log/i2p for more information." +" Reconnect to the network to try again." +msgstr "Eepsite tunnelen blev ikke bygget inden for seks minutter. Du kan undersøge router konsollen ved http://127.0.0.1:7657/logs/ eller loggene i /var/log/i2p for mere information.\nGenopret forbindelsen til netværket og prøv igen" + +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:59 +msgid "I2P is ready" +msgstr "I2P er klar" + +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 +msgid "You can now access services on I2P." +msgstr "Du kan nu tilgå tjenester på I2P." #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1 msgid "Report an error" @@ -472,17 +488,13 @@ msgstr "Tails dokumentation" msgid "Learn how to use Tails" msgstr "Lær hvordan man bruger Tails" -#: ../config/chroot_local-includes/usr/share/applications/i2p.desktop.in.h:1 -msgid "Anonymous overlay network " -msgstr "Anonymt overlejringsnetværk" +#: ../config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in.h:1 +msgid "Anonymous overlay network browser" +msgstr "Anonym webbrowser" -#: ../config/chroot_local-includes/usr/share/applications/i2p.desktop.in.h:2 -msgid "i2p" -msgstr "i2p" - -#: ../config/chroot_local-includes/usr/share/applications/i2p.desktop.in.h:3 -msgid "Anonymous overlay network" -msgstr "Anonymt overlejringsnetværk" +#: ../config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in.h:2 +msgid "I2P Browser" +msgstr "I2P-browser" #: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:2 msgid "Learn more about Tails" @@ -504,6 +516,14 @@ msgstr "Luk ned" 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" + +#: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:2 +msgid "Anonymous Web Browser" +msgstr "Anonym webbrowser" + #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:2 msgid "Browse the World Wide Web without anonymity" msgstr "Surf på internettet uden anonymitet" @@ -514,4 +534,4 @@ msgstr "Usikker webbrowser" #: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:2 msgid "Tails specific tools" -msgstr "Specifikke værktøjer i Tails" +msgstr " Tailsspecifikke værktøjer"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 22 Nov '14

22 Nov '14

commit 5ae50b304b0a3916f8b064c95744f7460a9a0f29 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 22 22:45:40 2014 +0000 Update translations for tails-misc --- da.po | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/da.po b/da.po index b3431ec..3b87171 100644 --- a/da.po +++ b/da.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-15 17:57+0200\n" -"PO-Revision-Date: 2014-11-22 22:15+0000\n" +"PO-Revision-Date: 2014-11-22 22:40+0000\n" "Last-Translator: Whiz Zurrd <Whizzurrd(a)hmamail.com>\n" "Language-Team: Danish (http://www.transifex.com/projects/p/torproject/language/da/)\n" "MIME-Version: 1.0\n" @@ -48,7 +48,7 @@ msgid "" "<p>Anyone who can see this reply will probably infer you are\n" "a Tails user. Time to wonder how much you trust your\n" "Internet and mailbox providers?</p>\n" -msgstr "<h1>Hjælp os med at rette din fejl!</h1>\n<p>Se <a href=\"%s\">vores instruktioner vedrørende rapportering af fejl</a>.</p>\n<p><strong>Inkluder ikke flere personlige oplysninger en højest nødvendigt!</strong></p>\n<h2>Om oplysning af din e-mail adresse</h2>\n<p>Hvis du ikke har noget imod at oplyse en del af din identitet til Tails-udviklerne, kan du oplyse din e-mail adresse så vi kan spørge ind til din fejl. Hvis du indtaster din offentlige PGP nøgle, kan vi kryptere fremtidig kommunikation.</p>\n<p>Enhver som kan se dette svar, kan udlede at du bruger Tails. I hvor høj grad kan du stole på din Internet og mail-udbyder?</p>\n" +msgstr "<h1>Hjælp os med at rette din fejl!</h1>\n<p>Se <a href=\"%s\">vores instruktioner vedrørende rapportering af fejl</a>.</p>\n<p><strong>Inkluder ikke flere personlige oplysninger en højest nødvendigt!</strong></p>\n<h2>Om at give os din e-mail adresse</h2>\n<p>Hvis du ikke har noget imod at oplyse en del af din identitet til Tails-udviklerne, kan du oplyse din e-mail adresse så vi kan spørge ind til din fejl. Hvis du indtaster din offentlige PGP nøgle, kan vi kryptere fremtidig kommunikation.</p>\n<p>Enhver som kan se dette svar, vil højst sandsynligt regne sig frem til at du bruger Tails. I hvor høj grad kan du stole på din Internet og mail-udbyder?</p>\n" #: config/chroot_local-includes/usr/local/bin/gpgApplet:136 msgid "OpenPGP encryption applet" @@ -72,7 +72,7 @@ msgstr "Signer/Krypter udklipsholderen med offentlig nøgle" #: config/chroot_local-includes/usr/local/bin/gpgApplet:200 msgid "_Decrypt/Verify Clipboard" -msgstr "Dekrypter/Verificer udklipsholder" +msgstr "Dekrypter/Godkend udklipsholder" #: config/chroot_local-includes/usr/local/bin/gpgApplet:204 msgid "_Manage Keys" @@ -119,8 +119,8 @@ msgstr "Fingeraftryk:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:394 msgid "User ID:" msgid_plural "User IDs:" -msgstr[0] "Bruger IDere" -msgstr[1] "Bruger IDere" +msgstr[0] "Bruger ID:" +msgstr[1] "Bruger ID'er:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:424 msgid "None (Don't sign)" @@ -138,7 +138,7 @@ msgstr "Skjul modtagere:" msgid "" "Hide the user IDs of all recipients of an encrypted message. Otherwise " "anyone that sees the encrypted message can see who the recipients are." -msgstr "Skjul bruger ID'erne af alle modtagere af en krypteret besked. Ellers kan alle der ser den krypterede besked hvem modtagerne er." +msgstr "Skjul bruger ID'erne af alle modtagere af en krypteret besked. Ellers kan alle der ser den krypterede besked se hvem modtagerne er." #: config/chroot_local-includes/usr/local/bin/gpgApplet:504 msgid "Sign message as:" @@ -162,7 +162,7 @@ msgstr[1] "Stoler ikke fuldt på de følgende nøgler:" msgid "Do you trust this key enough to use it anyway?" msgid_plural "Do you trust these keys enough to use them anyway?" msgstr[0] "Stoler du tilstrækkeligt på disse nøgler til alligevel at anvende dem?" -msgstr[1] "Stoler du tilstrækkeligt på disse nøgler til alligevel at anvende dem?" +msgstr[1] "Stoler du tilstrækkeligt på disse nøgler til at anvende dem alligevel?" #: config/chroot_local-includes/usr/local/bin/gpgApplet:582 msgid "No keys selected" @@ -222,7 +222,7 @@ msgstr "Tails" #: config/chroot_local-includes/usr/local/bin/tails-about:24 msgid "The Amnesic Incognito Live System" -msgstr "Det hukommelsesløse, inkognito live system" +msgstr "Det Hukommelsestabende Inkognito Live System" #: config/chroot_local-includes/usr/local/bin/tails-about:25 #, python-format @@ -298,7 +298,7 @@ msgstr "MAC spoofing fejlede for netværkskortet ${nic_name} (${nic}), så det e #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:39 msgid "All networking disabled" -msgstr "Al networking er slået fra" +msgstr "Al brug af netværk er slået fra" #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:40 #, sh-format @@ -328,11 +328,11 @@ msgid "" "\n" "Or do a manual upgrade.\n" "See https://tails.boum.org/doc/first_steps/upgrade#manual" -msgstr "<b>Der er ikke nok hukommelse til at søge efter opdateringer.</b>\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 for fortag en manuel opdatering.\nSe venligst https://tails.boum.org/doc/first_steps/upgrade#manual for detaljer." +msgstr "<b>Der er ikke nok hukommelse tilgængelig til at søge efter opdateringer.</b>\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 msgid "Warning: virtual machine detected!" -msgstr "Advarsel: virtuel maskine detekteret!" +msgstr "Advarsel: virtuel maskine opdaget!" #: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:55 msgid "" @@ -372,7 +372,7 @@ msgid "" "Network activity within the Unsafe Browser is <b>not anonymous</b>. Only use" " the Unsafe Browser if necessary, for example if you have to login or " "register to activate your Internet connection." -msgstr "Netværksaktivitet fra den Usikre Browser er <b>ikke anonym</b>. Anvend kun den Usikre Browser om nødvendigt, hvis du eksempelvis skal logge ind eller registrere for at aktivere din internetforbindelse." +msgstr "Netværksaktivitet fra den Usikre Browser er <b>ikke anonym</b>. Anvend kun den Usikre Browser hvis nødvendigt, for eksempel hvis du skal logge ind eller registrere for at aktivere din internetforbindelse." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:76 msgid "_Launch" @@ -417,13 +417,13 @@ msgstr "Kunne ikke genstarte Tor." 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 lidt." +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:270 msgid "" "No DNS server was obtained through DHCP or manually configured in " "NetworkManager." -msgstr "Ingen DNS server kunne findes gennem DHCP eller den manuelle konfiguration i Netværksmanageren." +msgstr "Ingen DNS server blev fundet gennem DHCP eller den manuelle konfiguration i NetværkManager." #: config/chroot_local-includes/usr/share/tails/truecrypt-wrapper.disabled:11 msgid "TrueCrypt will be removed in Tails 1.2.1" @@ -440,13 +440,13 @@ msgstr "TrueCrypt bliver ikke længere vedligeholdt, og det kaldes usikkert af d #: config/chroot_local-includes/usr/local/sbin/tails-i2p:30 msgid "I2P failed to start" -msgstr "I2P kunne ikke start" +msgstr "I2P kunne ikke starte" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:31 msgid "" "Something went wrong when I2P was starting. Check the logs in /var/log/i2p " "for more information." -msgstr "En fejl opstod da I2P startede. Se logfilerne i /var/log/i2p for flere detaljer." +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:42 msgid "I2P's router console is ready" @@ -490,7 +490,7 @@ msgstr "Lær hvordan man bruger Tails" #: ../config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in.h:1 msgid "Anonymous overlay network browser" -msgstr "" +msgstr "Anonym webbrowser" #: ../config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in.h:2 msgid "I2P Browser" @@ -534,4 +534,4 @@ msgstr "Usikker webbrowser" #: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:2 msgid "Tails specific tools" -msgstr "Specifikke værktøjer i Tails" +msgstr " Tailsspecifikke værktøjer"

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 22 Nov '14

22 Nov '14

commit 8faffacbf4ba82b9a9e6c5509e78c66b4be78127 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 22 22:45:21 2014 +0000 Update translations for tails-persistence-setup_completed --- da/da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/da/da.po b/da/da.po index 8c73699..75da7c7 100644 --- a/da/da.po +++ b/da/da.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-10-08 21:13+0200\n" -"PO-Revision-Date: 2014-11-22 22:00+0000\n" +"PO-Revision-Date: 2014-11-22 22:31+0000\n" "Last-Translator: Whiz Zurrd <Whizzurrd(a)hmamail.com>\n" "Language-Team: Danish (http://www.transifex.com/projects/p/torproject/language/da/)\n" "MIME-Version: 1.0\n" @@ -215,7 +215,7 @@ msgid "" "understood. Tails can't help you if you use it wrong! See <a " "href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>Tails" " documentation about persistence</a> to learn more." -msgstr "<B>Vær opmærksom!</b> Brug af vedholdenhed har konsekvenser der er kritisk at forstå for brugeren. Tails kan ikke hjælpe dig, hvis det bruges forkert. Se <a href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'> Tails dokumentationen om vedholdenhed </a> for at lære mere." +msgstr "<B>Vær opmærksom!</b> Brug af vedholdenhed har konsekvenser der er kritiske at forstå for brugeren. Tails kan ikke hjælpe dig, hvis det bruges forkert. Se <a href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'> Tails dokumentationen om vedholdenhed </a> for at lære mere." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:144 msgid "Passphrase:"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 22 Nov '14

22 Nov '14

commit 97b5be3095805276d7d767fcfc6259e4e7860b79 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 22 22:45:18 2014 +0000 Update translations for tails-persistence-setup --- da/da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/da/da.po b/da/da.po index 8c73699..75da7c7 100644 --- a/da/da.po +++ b/da/da.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-10-08 21:13+0200\n" -"PO-Revision-Date: 2014-11-22 22:00+0000\n" +"PO-Revision-Date: 2014-11-22 22:31+0000\n" "Last-Translator: Whiz Zurrd <Whizzurrd(a)hmamail.com>\n" "Language-Team: Danish (http://www.transifex.com/projects/p/torproject/language/da/)\n" "MIME-Version: 1.0\n" @@ -215,7 +215,7 @@ msgid "" "understood. Tails can't help you if you use it wrong! See <a " "href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>Tails" " documentation about persistence</a> to learn more." -msgstr "<B>Vær opmærksom!</b> Brug af vedholdenhed har konsekvenser der er kritisk at forstå for brugeren. Tails kan ikke hjælpe dig, hvis det bruges forkert. Se <a href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'> Tails dokumentationen om vedholdenhed </a> for at lære mere." +msgstr "<B>Vær opmærksom!</b> Brug af vedholdenhed har konsekvenser der er kritiske at forstå for brugeren. Tails kan ikke hjælpe dig, hvis det bruges forkert. Se <a href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'> Tails dokumentationen om vedholdenhed </a> for at lære mere." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:144 msgid "Passphrase:"

1 0

[arm/master] Moving in the join() util
by atagar＠torproject.org 22 Nov '14

22 Nov '14

commit 1a30fd663f49c9464c98d64a285015b977eda7ea Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Nov 22 14:35:14 2014 -0800 Moving in the join() util Presently only used by the graph panel so I'm really itching to kill it entirely, but guess I'll let it live a little longer to see if keeping it around is useful. --- arm/graph_panel.py | 8 ++++---- arm/util/__init__.py | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/arm/graph_panel.py b/arm/graph_panel.py index dca6ed6..7779945 100644 --- a/arm/graph_panel.py +++ b/arm/graph_panel.py @@ -19,7 +19,7 @@ import arm.controller import arm.popups import arm.util.tracker -from arm.util import bandwidth_from_state, msg, panel, tor_controller +from arm.util import bandwidth_from_state, join, msg, panel, tor_controller from stem.control import EventType, Listener from stem.util import conf, enum, log, str_tools, system @@ -549,19 +549,19 @@ class GraphPanel(panel.Panel): if self.is_title_visible(): title = CONFIG['attr.graph.title'].get(self.displayed_stat, '') - title_stats = str_tools.join(param.title_stats, ', ', width - len(title) - 4) + title_stats = join(param.title_stats, ', ', width - len(title) - 4) title = '%s (%s):' % (title, title_stats) if title_stats else '%s:' % title self.addstr(0, 0, title, curses.A_STANDOUT) # top labels primary_header = CONFIG['attr.graph.header.primary'].get(self.displayed_stat, '') - primary_header_stats = str_tools.join(param.primary_header_stats, '', (width / 2) - len(primary_header) - 4) + primary_header_stats = join(param.primary_header_stats, '', (width / 2) - len(primary_header) - 4) left = '%s (%s):' % (primary_header, primary_header_stats) if primary_header_stats else '%s:' % primary_header self.addstr(1, 0, left, curses.A_BOLD, PRIMARY_COLOR) secondary_header = CONFIG['attr.graph.header.secondary'].get(self.displayed_stat, '') - secondary_header_stats = str_tools.join(param.secondary_header_stats, '', (width / 2) - len(secondary_header) - 4) + secondary_header_stats = join(param.secondary_header_stats, '', (width / 2) - len(secondary_header) - 4) right = '%s (%s):' % (secondary_header, secondary_header_stats) if secondary_header_stats else '%s:' % secondary_header self.addstr(1, graph_column + 5, right, curses.A_BOLD, SECONDARY_COLOR) diff --git a/arm/util/__init__.py b/arm/util/__init__.py index 9546642..9a62617 100644 --- a/arm/util/__init__.py +++ b/arm/util/__init__.py @@ -64,6 +64,44 @@ def init_controller(*args, **kwargs): return TOR_CONTROLLER +def join(entries, joiner = ' ', size = None): + """ + Joins a series of strings similar to str.join(), but only up to a given size. + This returns an empty string if none of the entries will fit. For example... + + >>> join(['This', 'is', 'a', 'looooong', 'message'], size = 18) + 'This is a looooong' + + >>> join(['This', 'is', 'a', 'looooong', 'message'], size = 17) + 'This is a' + + >>> join(['This', 'is', 'a', 'looooong', 'message'], size = 2) + '' + + :param list entries: strings to be joined + :param str joiner: strings to join the entries with + :param int size: maximum length the result can be, there's no length + limitation if **None** + + :returns: **str** of the joined entries up to the given length + """ + + if size is None: + return joiner.join(entries) + + result = '' + + for entry in entries: + new_result = joiner.join((result, entry)) if result else entry + + if len(new_result) > size: + break + else: + result = new_result + + return result + + @uses_settings def msg(message, config, **attr): """

1 0

[stem/master] Dropping stem.util.str_tools.join()
by atagar＠torproject.org 22 Nov '14

22 Nov '14

commit 4bf82dbc66809775af6ba28cf51b5236f715aa04 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Nov 22 14:31:57 2014 -0800 Dropping stem.util.str_tools.join() This helper on reflection is really specialized for arm's use case. It doesn't belong in Stem. Thankfully it wasn't part of any release yet so we can just drop it. --- docs/change_log.rst | 1 - stem/descriptor/remote.py | 6 +++--- stem/util/str_tools.py | 39 --------------------------------------- test/unit/doctest.py | 1 - 4 files changed, 3 insertions(+), 44 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 8b9086b..e0e765b 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -64,7 +64,6 @@ The following are only available within Stem's `git repository * Added support for directories to :func:`stem.util.conf.Config.load`. * Changed :func:`stem.util.conf.uses_settings` to only provide a 'config' keyword arument if the decorated function would accept it. * Added :func:`stem.util.str_tools.crop` - * Added :func:`stem.util.str_tools.join` * Added :func:`stem.util.proc.file_descriptors_used` * Dropped the 'get_*' prefix from most function names. Old names will still work, but are a deprecated alias. diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index 02f09d2..0e912aa 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -645,6 +645,9 @@ class DirectoryAuthority(object): network. They in turn use this to construct their circuits and use the network. + .. versionchanged:: 1.3.0 + Added the is_bandwidth_authority attribute. + :var str nickname: nickname of the authority :var str address: IP address of the authority, presently they're all IPv4 but this may not always be the case @@ -764,9 +767,6 @@ def get_authorities(): The directory information hardcoded into Tor and occasionally changes, so the information this provides might not necessarily match your version of tor. - .. versionchanged:: 1.3.0 - Added the is_bandwidth_authority attribute. - :returns: dict of str nicknames to :class:`~stem.descriptor.remote.DirectoryAuthority` instances """ diff --git a/stem/util/str_tools.py b/stem/util/str_tools.py index d669753..16681d5 100644 --- a/stem/util/str_tools.py +++ b/stem/util/str_tools.py @@ -13,7 +13,6 @@ Toolkit for various string activity. :: crop - shortens string to a given length - join - joins a series of strings up to a given length size_label - human readable label for a number of bytes time_label - human readable label for a number of seconds @@ -258,44 +257,6 @@ def crop(msg, size, min_word_length = 4, min_crop = 0, ending = Ending.ELLIPSE, return (return_msg, remainder) if get_remainder else return_msg -def join(entries, joiner = ' ', size = None): - """ - Joins a series of strings similar to str.join(), but only up to a given size. - This returns an empty string if none of the entries will fit. For example... - - >>> join(['This', 'is', 'a', 'looooong', 'message'], size = 18) - 'This is a looooong' - - >>> join(['This', 'is', 'a', 'looooong', 'message'], size = 17) - 'This is a' - - >>> join(['This', 'is', 'a', 'looooong', 'message'], size = 2) - '' - - :param list entries: strings to be joined - :param str joiner: strings to join the entries with - :param int size: maximum length the result can be, there's no length - limitation if **None** - - :returns: **str** of the joined entries up to the given length - """ - - if size is None: - return joiner.join(entries) - - result = '' - - for entry in entries: - new_result = joiner.join((result, entry)) if result else entry - - if len(new_result) > size: - break - else: - result = new_result - - return result - - def size_label(byte_count, decimal = 0, is_long = False, is_bytes = True): """ Converts a number of bytes into a human readable label in its most diff --git a/test/unit/doctest.py b/test/unit/doctest.py index 090b273..e3e53d8 100644 --- a/test/unit/doctest.py +++ b/test/unit/doctest.py @@ -60,7 +60,6 @@ class TestDocumentation(unittest.TestCase): args['globs'] = { '_to_camel_case': stem.util.str_tools._to_camel_case, 'crop': stem.util.str_tools.crop, - 'join': stem.util.str_tools.join, 'size_label': stem.util.str_tools.size_label, 'time_label': stem.util.str_tools.time_label, 'time_labels': stem.util.str_tools.time_labels,

1 0

[tor-messenger-build/master] instantbird: remove fix-mingw-build.mozpatch
by boklm＠torproject.org 22 Nov '14

22 Nov '14

commit d3b44d658ba849773562e64d36870e2536dc14d2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sat Nov 22 15:02:21 2014 +0100 instantbird: remove fix-mingw-build.mozpatch The mingw build issues have now been fixed upstream. --- projects/instantbird/config | 2 -- projects/instantbird/fix-mingw-build.mozpatch | 39 ------------------------- 2 files changed, 41 deletions(-) diff --git a/projects/instantbird/config b/projects/instantbird/config index c188103..075b115 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -63,8 +63,6 @@ input_files: - filename: picture.patch - filename: branding.patch - filename: prepare-messages-for-displaying.patch - - filename: fix-mingw-build.mozpatch - enable: '[% c("var/windows") %]' - filename: 'mozconfig-[% c("var/osname") %]' name: mozconfig - name: python diff --git a/projects/instantbird/fix-mingw-build.mozpatch b/projects/instantbird/fix-mingw-build.mozpatch deleted file mode 100644 index b44b1ff..0000000 --- a/projects/instantbird/fix-mingw-build.mozpatch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/dom/media/gmp/GMPChild.cpp b/dom/media/gmp/GMPChild.cpp -index 560ab8c2dae5..bd9718ef9582 100644 ---- a/dom/media/gmp/GMPChild.cpp -+++ b/dom/media/gmp/GMPChild.cpp -@@ -356,7 +356,7 @@ GMPChild::PreLoadLibraries(const std::string& aPluginPath) - infoFile->GetPath(path); - - std::ifstream stream; -- stream.open(path.get()); -+ stream.open(NS_ConvertUTF16toUTF8(path).get()); - if (!stream.good()) { - NS_WARNING("Failure opening info file for required DLLs"); - return false; -diff --git a/dom/media/gmp/rlz/base/memory/scoped_ptr.h b/dom/media/gmp/rlz/base/memory/scoped_ptr.h -index 47204742c0a3..c837e04b34f6 100644 ---- a/dom/media/gmp/rlz/base/memory/scoped_ptr.h -+++ b/dom/media/gmp/rlz/base/memory/scoped_ptr.h -@@ -18,7 +18,7 @@ public: - scoped_array(T* t) : nsAutoArrayPtr<T>(t) {} - void reset(T* t) { - scoped_array<T> other(t); -- operator=(other); -+ this->operator=(other); - } - }; - -diff --git a/dom/media/gmp/rlz/win/lib/machine_id_win.cc b/dom/media/gmp/rlz/win/lib/machine_id_win.cc -index 668910e5cd8c..fb5454274ec4 100644 ---- a/dom/media/gmp/rlz/win/lib/machine_id_win.cc -+++ b/dom/media/gmp/rlz/win/lib/machine_id_win.cc -@@ -3,7 +3,7 @@ - // found in the COPYING file. - - #include <windows.h> --#include <Sddl.h> // For ConvertSidToStringSidW. -+#include <sddl.h> // For ConvertSidToStringSidW. - #include <string> - - #include "base/memory/scoped_ptr.h"

1 0

[tor-messenger-build/master] instantbird: add nspr patch to fix mingw build
by boklm＠torproject.org 22 Nov '14

22 Nov '14

commit 7b9ee2edad86d23bca2ecef5b5ae0a6adae7bd74 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sat Nov 22 23:28:58 2014 +0100 instantbird: add nspr patch to fix mingw build --- projects/instantbird/build | 7 ++++ projects/instantbird/config | 2 ++ projects/instantbird/fix-mingw-build.nsprpatch | 44 ++++++++++++++++++++++++ 3 files changed, 53 insertions(+) diff --git a/projects/instantbird/build b/projects/instantbird/build index 4233a88..353961c 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -46,6 +46,13 @@ then done fi cd .. + +[% IF c("var/windows") %] +cd mozilla/nsprpub +patch -p1 < $rootdir/fix-mingw-build.nsprpatch +cd ../.. +[% END %] + cp ../[% c('input_files_by_name/mozconfig') %] .mozconfig ./mozilla/mach build || ./mozilla/mach build ./mozilla/mach package diff --git a/projects/instantbird/config b/projects/instantbird/config index 075b115..d32a255 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -63,6 +63,8 @@ input_files: - filename: picture.patch - filename: branding.patch - filename: prepare-messages-for-displaying.patch + - filename: fix-mingw-build.nsprpatch + enable: '[% c("var/windows") %]' - filename: 'mozconfig-[% c("var/osname") %]' name: mozconfig - name: python diff --git a/projects/instantbird/fix-mingw-build.nsprpatch b/projects/instantbird/fix-mingw-build.nsprpatch new file mode 100644 index 0000000..76040a5 --- /dev/null +++ b/projects/instantbird/fix-mingw-build.nsprpatch @@ -0,0 +1,44 @@ + +# HG changeset patch +# User Jacek Caban <jacek(a)codeweavers.com> +# Date 1412876662 14400 +# Node ID 133b835b9ad96b3314535a0159bf2909c5429025 +# Parent 84acbf6789fb2f82aefbf605f151888a13211f2d +Bug 1060401 - change import library name under mingw. r=ted + +diff --git a/config/rules.mk b/config/rules.mk +--- a/config/rules.mk ++++ b/config/rules.mk +@@ -78,25 +78,29 @@ ifeq (,$(filter-out WINNT WINCE OS2,$(OS + + # + # Win95 and OS/2 require library names conforming to the 8.3 rule. + # other platforms do not. + # + ifeq (,$(filter-out WIN95 WINCE WINMO OS2,$(OS_TARGET))) + LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX) + SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) +-IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX) + SHARED_LIB_PDB = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).pdb + else + LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX) + SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) +-IMPORT_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX) + SHARED_LIB_PDB = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).pdb + endif + ++ifdef MSC_VER ++IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX) ++else ++IMPORT_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX) ++endif ++ + else + + LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX) + ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1) + SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_shr.a + else + ifdef MKSHLIB + SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) +

1 0