January 2016 - tor-commits - lists.torproject.org

[globe/master] Merge remote-tracking branch 'leivaburto/task-16962'
by isis＠torproject.org 08 Jan '16

08 Jan '16

commit 6b13846efbef46ed2736ef06a57abff3fdf1fda5 Merge: 9673022 9815a16 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jan 8 21:19:23 2016 +0000 Merge remote-tracking branch 'leivaburto/task-16962' src/css/new-style.css | 4 ++++ src/js/models/OnionooDetail.js | 8 ++++++++ src/js/models/defaults.js | 7 ++++--- src/js/templates/relayDetail.hbs | 13 +++++++++---- test/unit/onionoodetail.test.js | 3 ++- 5 files changed, 27 insertions(+), 8 deletions(-)

1 0

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

08 Jan '16

commit da72cc37c558dc9cecffaefd0e4c70a3d0999810 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 8 20:45:48 2016 +0000 Update translations for tails-misc_completed --- nl.po | 43 ++++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/nl.po b/nl.po index 312112e..117a157 100644 --- a/nl.po +++ b/nl.po @@ -18,13 +18,13 @@ # Tjeerd <transifex(a)syrion.net>, 2014 # Tonko Mulder <tonko(a)tonkomulder.nl>, 2015 # Lazlo <transifex(a)lazlo.me>, 2013 -# Volluta <volluta(a)tutanota.com>, 2015 +# Volluta <volluta(a)tutanota.com>, 2015-2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-16 19:49+0100\n" -"PO-Revision-Date: 2015-12-17 18:22+0000\n" +"POT-Creation-Date: 2016-01-04 11:56+0100\n" +"PO-Revision-Date: 2016-01-08 20:19+0000\n" "Last-Translator: Volluta <volluta(a)tutanota.com>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n" @@ -74,11 +74,13 @@ msgid "Do you want to start Electrum anyway?" msgstr "Weet je zeker dat je Electrum wilt starten?" #: config/chroot_local-includes/usr/local/bin/electrum:20 +#: config/chroot_local-includes/usr/local/bin/icedove:22 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:36 msgid "_Launch" msgstr "Start" #: config/chroot_local-includes/usr/local/bin/electrum:21 +#: config/chroot_local-includes/usr/local/bin/icedove:23 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37 msgid "_Exit" msgstr "Sluiten" @@ -240,6 +242,17 @@ msgstr "Uitvoer van GnuPG:" msgid "Other messages provided by GnuPG:" msgstr "Andere berichten die door GnuPG gegeven worden:" +#: config/chroot_local-includes/usr/local/bin/icedove:18 +msgid "The Claws Mail persistence feature is activated." +msgstr "De Claws Mail persistence feature is ingeschakeld." + +#: config/chroot_local-includes/usr/local/bin/icedove:20 +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 "Wanneer u e-mails opgeslagen heeft in Claws Mail wordt aanbevolen om uw data <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>te migreren</a> voordat u Icedoveopstart." + #: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:71 msgid "Restart" msgstr "Herstarten" @@ -292,17 +305,17 @@ msgstr "De upgrade is mislukt. Dit kan komen door een netwerk probleem. Controle msgid "The upgrade was successful." msgstr "De upgrade is succesvol. " -#: 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 "Synchroniseren van de systeemklok " -#: 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 vereist een correcte klok om goed te kunnen functioneren, zeker in verband met de werking van de verborgen diensten.\nEen ogenblik..." -#: 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 "Het synchroniseren van de klok is mislukt!" @@ -314,23 +327,23 @@ msgstr "Deze versie van Tails heeft bekende beveiligings-problemen:" msgid "Known security issues" msgstr "Bekende beveiligingsfouten" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:51 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:51 #, sh-format msgid "Network card ${nic} disabled" msgstr "Netwerkkaart ${nic} uitgeschakeld" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:52 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52 #, 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." msgstr "MAC-spoofing voor het netwerkkaart ${nic_name} (${nic}) is mislukt en daarom tijdelijk uitgeschakeld.\nU kunt ervoor kiezen Tails opnieuw op te starten en MAC-spoofing uit te zetten." -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:61 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:61 msgid "All networking disabled" msgstr "Alle netwerken uitgeschakeld" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:62 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:62 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" @@ -360,21 +373,21 @@ msgid "" "See https://tails.boum.org/doc/first_steps/upgrade#manual" msgstr "Niet genoeg geheugen beschikbaar om voor upgrades te checken.\n\nCheck of dit systeem aan de vereisten voor het uitvoeren van Tails voldoet.\nZie file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nProbeer Tails te restarten om weer voor upgrades te checken.\n\nOf doe een handmatige upgrade.\nZie https://tails.boum.org/doc/first_steps/upgrade#manual" -#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:67 +#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:67 msgid "Warning: virtual machine detected!" msgstr "Waarschuwing: virtuele machine gedetecteerd!" -#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:69 +#: 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 "Zowel het gastbesturingssysteem en de virtualisatiesoftware kunnen nagaan wat jij doet in Tails." -#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:72 +#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:72 msgid "Warning: non-free virtual machine detected!" msgstr "Waarschuwing: niet-gratis virtuele machine gedetecteerd!" -#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:74 +#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:74 msgid "" "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 " @@ -382,7 +395,7 @@ msgid "" "software." msgstr "Zowel het host-besturingssysteem en de virtualisatiesoftware monitoren wat jij doet in Tails. Alleen gratis software kan als betrouwbaar worden gezien door de host-besturingssysteem en de virtualisatiesoftware." -#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:79 +#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:79 msgid "Learn more" msgstr "Meer info"

1 0

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

08 Jan '16

commit 9347ad14052026bc061b39118948cd73736fae06 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 8 20:45:42 2016 +0000 Update translations for tails-misc --- nl.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nl.po b/nl.po index 93f3cec..117a157 100644 --- a/nl.po +++ b/nl.po @@ -18,14 +18,14 @@ # Tjeerd <transifex(a)syrion.net>, 2014 # Tonko Mulder <tonko(a)tonkomulder.nl>, 2015 # Lazlo <transifex(a)lazlo.me>, 2013 -# Volluta <volluta(a)tutanota.com>, 2015 +# Volluta <volluta(a)tutanota.com>, 2015-2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-01-04 11:56+0100\n" -"PO-Revision-Date: 2016-01-06 09:25+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-01-08 20:19+0000\n" +"Last-Translator: Volluta <volluta(a)tutanota.com>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -244,14 +244,14 @@ msgstr "Andere berichten die door GnuPG gegeven worden:" #: config/chroot_local-includes/usr/local/bin/icedove:18 msgid "The Claws Mail persistence feature is activated." -msgstr "" +msgstr "De Claws Mail persistence feature is ingeschakeld." #: config/chroot_local-includes/usr/local/bin/icedove:20 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 "Wanneer u e-mails opgeslagen heeft in Claws Mail wordt aanbevolen om uw data <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>te migreren</a> voordat u Icedoveopstart." #: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:71 msgid "Restart"

1 0

[webwml/master] Add donation redirect for Jake.
by mikeperry＠torproject.org 08 Jan '16

08 Jan '16

commit 5ce492e5fd8707163774f40cf87501c5d14dd59d Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Jan 8 10:44:03 2016 -0800 Add donation redirect for Jake. --- .htaccess | 1 + 1 file changed, 1 insertion(+) diff --git a/.htaccess b/.htaccess index 582b07c..73a8e95 100644 --- a/.htaccess +++ b/.htaccess @@ -68,6 +68,7 @@ RewriteRule ^donate/donate-blog-benw(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-ellsberg(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-alison(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-snowden(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate/donate-appelbaum(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-chaos(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-nanni(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-landau(.*) /donate/donate$1 [R=302,L] diff --git a/donate/en/donate-appelbaum.wml b/donate/en/donate-appelbaum.wml new file mode 100644 index 0000000..e69de29

1 0

[stem/master] Rename RTT Prober to NavigaTor
by atagar＠torproject.org 08 Jan '16

08 Jan '16

commit d41616d0db3f3beaa1f7f9e6a88fbd17261efcff Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 8 08:29:02 2016 -0800 Rename RTT Prober to NavigaTor Renaming one of the projects that use us as per Robert's request. --- docs/tutorials/double_double_toil_and_trouble.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorials/double_double_toil_and_trouble.rst b/docs/tutorials/double_double_toil_and_trouble.rst index 818a4b2..a1d897e 100644 --- a/docs/tutorials/double_double_toil_and_trouble.rst +++ b/docs/tutorials/double_double_toil_and_trouble.rst @@ -58,7 +58,7 @@ Applications =========================================================================================================== ========== `BeagleBone for Secret Agents <https://github.com/jbdatko/beagle-bone-for-secret-agents>`_ Bridge with a `bandwidth monitor <https://github.com/jbdatko/beagle-bone-for-secret-agents/blob/master/ch2/be…>`_ on a BeagleBoard. -`RTT Prober <https://bitbucket.org/ra_/tor-rtt/>`_ Measures round-trip times for Tor circuits. +`NavigaTor <https://naviga-tor.github.io>`_ Measures round-trip times for Tor circuits. `TorPS <https://www.torproject.org/getinvolved/volunteer.html.en#project-torps>`_ Tor path simulator. `Metrics Tasks <https://gitweb.torproject.org/metrics-tasks.git/tree>`_ One-off tasks related to Tor metrics. These mostly involve using descriptor information to answer a particular question. Tasks that involve Stem are: `1854 <https://gitweb.torproject.org/metrics-tasks.git/blob/HEAD:/task-1854/pylinf…>`_, `6232 <https://gitweb.torproject.org/metrics-tasks.git/tree/task-6232/pyentropy.py>`_, and `7241 <https://gitweb.torproject.org/metrics-tasks.git/tree/task-7241/first_pass.py>`_. `check_tor <http://anonscm.debian.org/gitweb/?p=users/lunar/check_tor.git;a=blob;f=chec…>`_ Nagios check to verify that a relay is participating in the Tor network.

1 0

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

08 Jan '16

commit d9f1a5ad708cdfe71890b5f9b7cc52b87584a0ef Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 8 15:15:46 2016 +0000 Update translations for tails-misc_completed --- fr.po | 136 +++++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 74 insertions(+), 62 deletions(-) diff --git a/fr.po b/fr.po index 8321294..4494f0e 100644 --- a/fr.po +++ b/fr.po @@ -9,20 +9,21 @@ # apaddlingduck, 2014 # Athorcis, 2015 # Emmanuel Simond, 2014 +# Gwennole Hangard <gwennole.hangard(a)gmail.com>, 2015 # Jean-Yves Toumit <saiolar-c(a)yahoo.fr>, 2013 # Lidija <llazic.bgd(a)gmail.com>, 2015 # Onizuka, 2013 # mosira <romain.moisan(a)gmail.com>, 2014 # Sabrina Cater <sabcat(a)gmx.fr>, 2015 -# Towinet, 2013-2015 +# Towinet, 2013-2016 # Trans-fr, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-20 19:32+0200\n" -"PO-Revision-Date: 2015-10-13 15:33+0000\n" -"Last-Translator: Lidija <llazic.bgd(a)gmail.com>\n" +"POT-Creation-Date: 2016-01-04 11:56+0100\n" +"PO-Revision-Date: 2016-01-08 15:05+0000\n" +"Last-Translator: Towinet\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,15 +31,15 @@ msgstr "" "Language: fr\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 est opérationnel" -#: 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 "Vous pouvez maintenant accéder à Internet." -#: 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" @@ -71,11 +72,13 @@ msgid "Do you want to start Electrum anyway?" msgstr "Voulez-vous démarrer Electrum malgré tout ?" #: config/chroot_local-includes/usr/local/bin/electrum:20 +#: config/chroot_local-includes/usr/local/bin/icedove:22 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:36 msgid "_Launch" msgstr "_Lancer" #: config/chroot_local-includes/usr/local/bin/electrum:21 +#: config/chroot_local-includes/usr/local/bin/icedove:23 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37 msgid "_Exit" msgstr "_Sortir" @@ -237,13 +240,25 @@ msgstr "Voici la sortie de GnuPG :" msgid "Other messages provided by GnuPG:" msgstr "Autres messages fournis par GnuPG :" -#: config/chroot_local-includes/usr/local/lib/shutdown-helper-applet:39 -msgid "Shutdown Immediately" -msgstr "Éteindre immédiatement" +#: config/chroot_local-includes/usr/local/bin/icedove:18 +msgid "The Claws Mail persistence feature is activated." +msgstr "La fonctionnalité persistance de Claws Mail est activée." -#: config/chroot_local-includes/usr/local/lib/shutdown-helper-applet:40 -msgid "Reboot Immediately" -msgstr "Redémarrer immédiatement" +#: config/chroot_local-includes/usr/local/bin/icedove:20 +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 "Si vous avez des emails sauvegardés dans Claws Mail, vous devriez <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrer vos données</a> avant de démarrer Icedove." + +#: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:71 +msgid "Restart" +msgstr "Redémarrer" + +#: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:74 +#: ../config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in.h:1 +msgid "Power Off" +msgstr "Éteindre" #: config/chroot_local-includes/usr/local/bin/tails-about:16 msgid "not available" @@ -288,70 +303,62 @@ msgstr "La mise à jour a échouée. Cela peut être dû à un problème de rés msgid "The upgrade was successful." msgstr "La mise à jour a été réalisée avec succès." -#: 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 "Synchronisation de l'horloge système..." -#: 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 a besoin d'une horloge réglée avec précision pour fonctionner correctement, en particulier pour les services cachés. Veuillez patienter..." -#: 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 "Échec de la synchronisation de l'horloge !" -#: config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:38 -msgid "Network connection blocked?" -msgstr "Votre connexion réseau est-elle bloquée ?" - -#: 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 "Il semble que votre connexion au réseau est bloquée. Cela peut être lié à la fonction d'usurpation d'adresse MAC. Pour plus d'informations, reportez vous à la <a href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">documentation sur l'usurpation d'adresse MAC</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 "Cette version de Tails a des problèmes de sécurité avérés :" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:45 +#: config/chroot_local-includes/usr/local/bin/tails-security-check:156 +msgid "Known security issues" +msgstr "Problèmes de sécurité connus" + +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:51 #, sh-format msgid "Network card ${nic} disabled" msgstr "Carte réseau ${nic} désactivée" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:46 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52 #, 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 "L'usurpation MAC a échoué pour la carte réseau ${nic_name} (${nic}), cette fonctionnalité est donc temporairement désactivée.\nVous pouvez néanmoins redémarrer Tails et désactiver complètement la fonctionnalité d'usurpation MAC. Consultez la <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." +"You might prefer to restart Tails and disable MAC spoofing." +msgstr "L'usurpation MAC a échoué pour la carte réseau ${nic_name} (${nic}), cette fonctionnalité est donc temporairement désactivée.\nVous pouvez néanmoins redémarrer Tails et désactiver complètement la fonctionnalité d'usurpation MAC." -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:55 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:61 msgid "All networking disabled" msgstr "Toutes les connexions réseau sont désactivées" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:56 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:62 #, 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 "L'usurpation MAC a échoué pour la carte réseau ${nic_name} (${nic}). La récupération d'erreur a également échouée et les fonctionnalités réseau ont donc été désactivées.\nVous pouvez redémarrer Tails et désactiver l'usurpation MAC. Consultez la <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." +"You might prefer to restart Tails and disable MAC spoofing." +msgstr "L'usurpation MAC a échoué pour la carte réseau ${nic_name} (${nic}). La récupération d'erreur a également échouée et les fonctionnalités réseau ont donc été désactivées.\nVous pouvez redémarrer Tails et désactiver l'usurpation MAC." -#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19 +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:18 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:22 msgid "error:" msgstr "erreur :" -#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:20 +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:23 msgid "Error" msgstr "Erreur" -#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:40 +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:39 msgid "" "Not enough memory available to check for upgrades.\n" "\n" @@ -364,22 +371,31 @@ msgid "" "See https://tails.boum.org/doc/first_steps/upgrade#manual" msgstr "Pas assez de mémoire disponible pour vérifier les mises à jour.\n\nAssurez vous que votre système correspond aux pré-requis pour lancer Tails.\nAllez sur file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nEssayez de redémarrer Tails afin de vérifier les mises à jour à nouveau.\n\nOu bien exécutez la mise à jour manuellement.\nAllez ici: https://tails.boum.org/doc/first_steps/upgrade#manual" -#: 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 "Attention : machine virtuelle détectée !" -#: 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 "Le système d'exploitation \"hôte\" et le logiciel de virtualisation peuvent surveiller ce que vous faites dans 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 "Attention : machine virtuelle occupée détectée !" + +#: 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'>En savoir davantage ...</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 "Le système d'exploitation \"hôte\" et le logiciel de virtualisation peuvent surveiller ce que vous faites dans Tails. Seuls les logiciels libres peuvent être considérés digne de confiance pour à la fois le système d'exploitation \"hôte\" et le logiciel de virtualisation." + +#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:79 +msgid "Learn more" +msgstr "En savoir plus" #: config/chroot_local-includes/usr/local/bin/tor-browser:29 msgid "Tor is not ready" @@ -403,10 +419,10 @@ msgstr "Êtes-vous sûr de vouloir utiliser le Navigateur Non-sécurisé ?" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35 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 "La navigation via le navigateur non-sécurisé n'est pas anonyme. N'utilisez le navigateur non-sécurisé que si c'est nécessaire, par exemple si vous devez vous identifier ou vous enregistrer pour activer votre accès à Internet." +msgstr "La navigation via le navigateur non-sécurisé n'est pas anonyme. \\nN'utilisez le navigateur non-sécurisé que si c'est nécessaire, par exemple\\n si vous devez vous identifier ou vous enregistrer pour activer votre accès à Internet." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:47 msgid "Starting the Unsafe Browser..." @@ -465,40 +481,40 @@ msgstr "Échec de configuration du navigateur." msgid "Failed to run browser." msgstr "Échec de démarrage du navigateur." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:31 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:35 msgid "I2P failed to start" msgstr "Le démarrage d'I2P a échoué." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:32 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:36 msgid "" "Something went wrong when I2P was starting. Check the logs in /var/log/i2p " "for more information." msgstr "Une erreur s'est produite au démarrage de I2P. Vérifiez les logs dans /var/log/i2p pour plus d'information." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:43 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:53 msgid "I2P's router console is ready" msgstr "La console du routeur I2P est prête" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:44 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:54 msgid "You can now access I2P's router console in the I2P Browser." msgstr "Vous pouvez maintenant accéder à la console du routeur dans le navigateur I2P." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:49 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:59 msgid "I2P is not ready" msgstr "I2P n'est pas prêt" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:50 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 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 "Le tunnel Eepsite n'a pas été construit en six minutes.\nVérifier la console du routeur dans le navigateur I2P ou dans les journaux à /var/log/I2p pour plus d'informations.\nReconnectez-vous au réseau à nouveau." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:72 msgid "I2P is ready" msgstr "I2P est prêt" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:61 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:73 msgid "You can now access services on I2P." msgstr "Vous pouvez maintenant accéder aux services sur I2P." @@ -535,10 +551,6 @@ msgstr "Redémarrer" msgid "Immediately reboot computer" msgstr "Redémarrer immédiatement l'ordinateur" -#: ../config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in.h:1 -msgid "Power Off" -msgstr "Éteindre" - #: ../config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in.h:2 msgid "Immediately shut down computer" msgstr "Éteindre immédiatement l'ordinateur"

1 0

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

08 Jan '16

commit fa089c323b8c7bacca57cae83be3db8cf02dedab Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 8 15:15:41 2016 +0000 Update translations for tails-misc --- fr.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fr.po b/fr.po index b68f59a..4494f0e 100644 --- a/fr.po +++ b/fr.po @@ -15,15 +15,15 @@ # Onizuka, 2013 # mosira <romain.moisan(a)gmail.com>, 2014 # Sabrina Cater <sabcat(a)gmx.fr>, 2015 -# Towinet, 2013-2015 +# Towinet, 2013-2016 # Trans-fr, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-01-04 11:56+0100\n" -"PO-Revision-Date: 2016-01-06 09:25+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-01-08 15:05+0000\n" +"Last-Translator: Towinet\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -242,14 +242,14 @@ msgstr "Autres messages fournis par GnuPG :" #: config/chroot_local-includes/usr/local/bin/icedove:18 msgid "The Claws Mail persistence feature is activated." -msgstr "" +msgstr "La fonctionnalité persistance de Claws Mail est activée." #: config/chroot_local-includes/usr/local/bin/icedove:20 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 "Si vous avez des emails sauvegardés dans Claws Mail, vous devriez <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrer vos données</a> avant de démarrer Icedove." #: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:71 msgid "Restart"

1 0

[webwml/master] Adding new TBB versions
by gk＠torproject.org 08 Jan '16

08 Jan '16

commit 53ded8f2d44ecb21bdd6f13632a51cc57c9de0fd Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 8 08:42:34 2016 +0000 Adding new TBB versions --- include/versions.wmi | 10 +++++----- projects/torbrowser/RecommendedTBBVersions | 8 +++++++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index f073126..b7a21f6 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -19,10 +19,10 @@ <define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.17-rc</define-tag> <define-tag version-torbrowserbundledir whitespace=delete>5.0.7</define-tag> -<define-tag version-torbrowserbundlebetadir whitespace=delete>5.5a5</define-tag> +<define-tag version-torbrowserbundlebetadir whitespace=delete>5.5a6</define-tag> <define-tag version-torbrowserbundle whitespace=delete>5.0.7</define-tag> -<define-tag version-torbrowserbundlebeta whitespace=delete>5.5a5</define-tag> +<define-tag version-torbrowserbundlebeta whitespace=delete>5.5a6</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.1e</define-tag> <define-tag version-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> @@ -33,8 +33,8 @@ <define-tag version-torbrowserbundlelinux32 whitespace=delete>5.0.7</define-tag> <define-tag version-torbrowserbundlelinux64 whitespace=delete>5.0.7</define-tag> -<define-tag version-torbrowserbundlelinux32beta whitespace=delete>5.5a5</define-tag> -<define-tag version-torbrowserbundlelinux64beta whitespace=delete>5.5a5</define-tag> +<define-tag version-torbrowserbundlelinux32beta whitespace=delete>5.5a6</define-tag> +<define-tag version-torbrowserbundlelinux64beta whitespace=delete>5.5a6</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.0k</define-tag> <define-tag version-gnu-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> @@ -42,7 +42,7 @@ <define-tag version-torbrowserbundleosx32 whitespace=delete>5.0.7</define-tag> <define-tag version-torbrowserbundleosx64 whitespace=delete>5.0.7</define-tag> -<define-tag version-torbrowserbundleosx64beta whitespace=delete>5.5a5</define-tag> +<define-tag version-torbrowserbundleosx64beta whitespace=delete>5.5a6</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-osx-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 632d039..501c1f6 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -8,5 +8,11 @@ "5.5a5-MacOS", "5.5a5-Windows", "5.5a5-hardened", -"5.5a5-hardened-Linux" +"5.5a5-hardened-Linux", +"5.5a6", +"5.5a6-Linux", +"5.5a6-MacOS", +"5.5a6-Windows", +"5.5a6-hardened", +"5.5a6-hardened-Linux" ]

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 08 Jan '16

08 Jan '16

commit 6f85ca43fa0bbc3548ec18a7d1b9eaaadc899519 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 8 04:15:09 2016 +0000 Update translations for bridgedb_completed --- zh_TW/LC_MESSAGES/bridgedb.po | 42 ++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/zh_TW/LC_MESSAGES/bridgedb.po b/zh_TW/LC_MESSAGES/bridgedb.po index 7acc4d6..7563cb5 100644 --- a/zh_TW/LC_MESSAGES/bridgedb.po +++ b/zh_TW/LC_MESSAGES/bridgedb.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-01-08 03:44+0000\n" +"PO-Revision-Date: 2016-01-08 03:53+0000\n" "Last-Translator: Agustín Wu <losangwuyts(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -236,7 +236,7 @@ msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" -msgstr "有些具有 IPv6 位址的橋接也可用，雖然有些 Pluggable\nTransports 與 IPv6 不相容。\n\n" +msgstr "有些具有 IPv6 位址的橋接器也可使用，雖然有些 Pluggable\nTransports 與 IPv6 不相容。\n\n" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, @@ -250,20 +250,20 @@ msgid "" "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" "help to circumvent internet censorship in many cases.\n" "\n" -msgstr "此外，BridgeDB 有普通的橋接 %s，沒有任何\nPluggable Transports %s，這也許聽起來不酷，但它\n仍有助於規避在許多情況下的網路審查。\n" +msgstr "此外，BridgeDB 有普通的橋接器 %s，沒有任何\nPluggable Transports %s，這也許聽起來不酷，但它\n仍有助於規避在許多情況下的網路審查。\n" #: bridgedb/strings.py:101 msgid "What are bridges?" -msgstr "什麼是橋接?" +msgstr "什麼是橋接器？" #: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "%s 橋接 %s 是 Tor 中繼，可幫您規避審查。" +msgstr "%s 橋接器 %s 是洋蔥路由的中繼結點，可幫您規避審查。" #: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" -msgstr "我需要使用其他方式取得橋接!" +msgstr "我需要使用其他方式取得橋接器！" #: bridgedb/strings.py:108 #, python-format @@ -275,13 +275,13 @@ msgstr "另一種取得橋接的方式為發送電子郵件至 %s。請注意， #: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" -msgstr "橋接無法正常執行，我需要幫助!" +msgstr "橋接器無法正常執行，我需要幫助！" #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." -msgstr "如果您的 Tor 無法運作，您應該發送電子郵件給 %s。" +msgstr "如果您的洋蔥路由無法運作，您應該發送電子郵件給 %s。" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser". @@ -291,28 +291,28 @@ msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." -msgstr "試著包含有關您情況的盡可能多的資訊，包含您嘗試使用過的 \n橋接和 Pluggable Transports 清單，您的 Tor 瀏覽器版本， \n以及 Tor 給出的任何訊息。" +msgstr "試著包含有關您情況的盡可能多的資訊，包含您嘗試使用過的 \n橋接和 Pluggable Transports 清單，您的洋蔥路由瀏覽器版本， \n以及洋蔥路由給出的任何訊息。" #: bridgedb/strings.py:128 msgid "Here are your bridge lines:" -msgstr "這裡是您的橋接線路:" +msgstr "這裡是您的橋接線路：" #: bridgedb/strings.py:129 msgid "Get Bridges!" -msgstr "取得橋接!" +msgstr "取得橋接器：" #: bridgedb/strings.py:133 msgid "Please select options for bridge type:" -msgstr "請選擇橋接類型的選項:" +msgstr "請選擇橋接器類型的選項：" #: bridgedb/strings.py:134 msgid "Do you need IPv6 addresses?" -msgstr "您需要 IPv6 位址嗎?" +msgstr "您需要 IPv6 位址嗎？" #: bridgedb/strings.py:135 #, python-format msgid "Do you need a %s?" -msgstr "您需要 %s 嗎?" +msgstr "您需要 %s 嗎？" #: bridgedb/strings.py:139 msgid "Your browser is not displaying images properly." @@ -320,11 +320,11 @@ msgstr "您的瀏覽器不能正確顯示圖像。" #: bridgedb/strings.py:140 msgid "Enter the characters from the image above..." -msgstr "從上面的圖像中輸入字元..." +msgstr "從上面的圖像中輸入字元....." #: bridgedb/strings.py:144 msgid "How to start using your bridges" -msgstr "如何開始使用您的橋接" +msgstr "如何開始使用您的橋接器" #. TRANSLATORS: Please DO NOT translate "Tor Browser". #: bridgedb/strings.py:146 @@ -340,14 +340,14 @@ msgstr "將橋接輸入到Tor 瀏覽器中，首先轉到 %s Tor 瀏覽器下載 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" -msgstr "當「Tor 網路設定」對話彈出時，按一下〔設定〕，然後按照精靈，直到它要求:" +msgstr "當「洋蔥路由網路設定」對話彈出時，按一下〔設定〕，然後按照精靈，直到它要求：" #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:155 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" -msgstr "您的網際網路服務供應者(ISP)阻擋或審查 Tor 網路連線?" +msgstr "您的網際網路服務供應者(ISP)阻擋或過濾洋蔥路由網路的連線？" #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:159 @@ -356,7 +356,7 @@ msgid "" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" "you should be good to go! If you experience trouble, try clicking the 'Help'\n" "button in the 'Tor Network Settings' wizard for further assistance." -msgstr "選擇〔是〕，然後按一下〔下一步〕。要設定您的新橋接，複製和\n將橋接線路貼上到文字輸入方塊中。最後，按一下〔連接〕就好。\n如果您遇到麻煩，請嘗試按一下「Tor 網路設定」精靈中的〔説明〕\n按鈕尋求進一步的協助。" +msgstr "選擇〔是〕，然後按一下〔下一步〕。要設定您的新橋接器，複製和\n將橋接線路貼上到文字輸入方塊中。最後，按一下〔連接〕就好。\n如果您遇到麻煩，請嘗試按一下「洋蔥路由網路設定」精靈中的〔説明〕\n按鈕尋求進一步的協助。" #: bridgedb/strings.py:167 msgid "Displays this message." @@ -367,11 +367,11 @@ msgstr "顯示此訊息。" #. "plain-ol'-vanilla" bridges. #: bridgedb/strings.py:171 msgid "Request vanilla bridges." -msgstr "請求 vanilla 橋接。" +msgstr "請求 vanilla 橋接器。" #: bridgedb/strings.py:172 msgid "Request IPv6 bridges." -msgstr "請求 IPv6 橋接。" +msgstr "請求 IPv6 橋接器。" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". #: bridgedb/strings.py:174

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 08 Jan '16

08 Jan '16

commit f2102e8ad56f83fd7d4559dbf47e4c4032f88a63 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 8 04:15:03 2016 +0000 Update translations for bridgedb --- zh_TW/LC_MESSAGES/bridgedb.po | 42 ++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/zh_TW/LC_MESSAGES/bridgedb.po b/zh_TW/LC_MESSAGES/bridgedb.po index 7acc4d6..7563cb5 100644 --- a/zh_TW/LC_MESSAGES/bridgedb.po +++ b/zh_TW/LC_MESSAGES/bridgedb.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-01-08 03:44+0000\n" +"PO-Revision-Date: 2016-01-08 03:53+0000\n" "Last-Translator: Agustín Wu <losangwuyts(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -236,7 +236,7 @@ msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" -msgstr "有些具有 IPv6 位址的橋接也可用，雖然有些 Pluggable\nTransports 與 IPv6 不相容。\n\n" +msgstr "有些具有 IPv6 位址的橋接器也可使用，雖然有些 Pluggable\nTransports 與 IPv6 不相容。\n\n" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, @@ -250,20 +250,20 @@ msgid "" "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" "help to circumvent internet censorship in many cases.\n" "\n" -msgstr "此外，BridgeDB 有普通的橋接 %s，沒有任何\nPluggable Transports %s，這也許聽起來不酷，但它\n仍有助於規避在許多情況下的網路審查。\n" +msgstr "此外，BridgeDB 有普通的橋接器 %s，沒有任何\nPluggable Transports %s，這也許聽起來不酷，但它\n仍有助於規避在許多情況下的網路審查。\n" #: bridgedb/strings.py:101 msgid "What are bridges?" -msgstr "什麼是橋接?" +msgstr "什麼是橋接器？" #: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "%s 橋接 %s 是 Tor 中繼，可幫您規避審查。" +msgstr "%s 橋接器 %s 是洋蔥路由的中繼結點，可幫您規避審查。" #: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" -msgstr "我需要使用其他方式取得橋接!" +msgstr "我需要使用其他方式取得橋接器！" #: bridgedb/strings.py:108 #, python-format @@ -275,13 +275,13 @@ msgstr "另一種取得橋接的方式為發送電子郵件至 %s。請注意， #: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" -msgstr "橋接無法正常執行，我需要幫助!" +msgstr "橋接器無法正常執行，我需要幫助！" #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." -msgstr "如果您的 Tor 無法運作，您應該發送電子郵件給 %s。" +msgstr "如果您的洋蔥路由無法運作，您應該發送電子郵件給 %s。" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser". @@ -291,28 +291,28 @@ msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." -msgstr "試著包含有關您情況的盡可能多的資訊，包含您嘗試使用過的 \n橋接和 Pluggable Transports 清單，您的 Tor 瀏覽器版本， \n以及 Tor 給出的任何訊息。" +msgstr "試著包含有關您情況的盡可能多的資訊，包含您嘗試使用過的 \n橋接和 Pluggable Transports 清單，您的洋蔥路由瀏覽器版本， \n以及洋蔥路由給出的任何訊息。" #: bridgedb/strings.py:128 msgid "Here are your bridge lines:" -msgstr "這裡是您的橋接線路:" +msgstr "這裡是您的橋接線路：" #: bridgedb/strings.py:129 msgid "Get Bridges!" -msgstr "取得橋接!" +msgstr "取得橋接器：" #: bridgedb/strings.py:133 msgid "Please select options for bridge type:" -msgstr "請選擇橋接類型的選項:" +msgstr "請選擇橋接器類型的選項：" #: bridgedb/strings.py:134 msgid "Do you need IPv6 addresses?" -msgstr "您需要 IPv6 位址嗎?" +msgstr "您需要 IPv6 位址嗎？" #: bridgedb/strings.py:135 #, python-format msgid "Do you need a %s?" -msgstr "您需要 %s 嗎?" +msgstr "您需要 %s 嗎？" #: bridgedb/strings.py:139 msgid "Your browser is not displaying images properly." @@ -320,11 +320,11 @@ msgstr "您的瀏覽器不能正確顯示圖像。" #: bridgedb/strings.py:140 msgid "Enter the characters from the image above..." -msgstr "從上面的圖像中輸入字元..." +msgstr "從上面的圖像中輸入字元....." #: bridgedb/strings.py:144 msgid "How to start using your bridges" -msgstr "如何開始使用您的橋接" +msgstr "如何開始使用您的橋接器" #. TRANSLATORS: Please DO NOT translate "Tor Browser". #: bridgedb/strings.py:146 @@ -340,14 +340,14 @@ msgstr "將橋接輸入到Tor 瀏覽器中，首先轉到 %s Tor 瀏覽器下載 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" -msgstr "當「Tor 網路設定」對話彈出時，按一下〔設定〕，然後按照精靈，直到它要求:" +msgstr "當「洋蔥路由網路設定」對話彈出時，按一下〔設定〕，然後按照精靈，直到它要求：" #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:155 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" -msgstr "您的網際網路服務供應者(ISP)阻擋或審查 Tor 網路連線?" +msgstr "您的網際網路服務供應者(ISP)阻擋或過濾洋蔥路由網路的連線？" #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:159 @@ -356,7 +356,7 @@ msgid "" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" "you should be good to go! If you experience trouble, try clicking the 'Help'\n" "button in the 'Tor Network Settings' wizard for further assistance." -msgstr "選擇〔是〕，然後按一下〔下一步〕。要設定您的新橋接，複製和\n將橋接線路貼上到文字輸入方塊中。最後，按一下〔連接〕就好。\n如果您遇到麻煩，請嘗試按一下「Tor 網路設定」精靈中的〔説明〕\n按鈕尋求進一步的協助。" +msgstr "選擇〔是〕，然後按一下〔下一步〕。要設定您的新橋接器，複製和\n將橋接線路貼上到文字輸入方塊中。最後，按一下〔連接〕就好。\n如果您遇到麻煩，請嘗試按一下「洋蔥路由網路設定」精靈中的〔説明〕\n按鈕尋求進一步的協助。" #: bridgedb/strings.py:167 msgid "Displays this message." @@ -367,11 +367,11 @@ msgstr "顯示此訊息。" #. "plain-ol'-vanilla" bridges. #: bridgedb/strings.py:171 msgid "Request vanilla bridges." -msgstr "請求 vanilla 橋接。" +msgstr "請求 vanilla 橋接器。" #: bridgedb/strings.py:172 msgid "Request IPv6 bridges." -msgstr "請求 IPv6 橋接。" +msgstr "請求 IPv6 橋接器。" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". #: bridgedb/strings.py:174

1 0