tor-commits March 2015

tor-commits@lists.torproject.org

23 participants
1889 discussions

[bridgedb/master] Make a note of the developer documentation in README.rst.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 464009411e7ef4ce5c005f88851afbb90df1bf1a Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Mar 21 01:23:34 2015 +0000 Make a note of the developer documentation in README.rst. --- README.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.rst b/README.rst index 01b4e2c..b4472c7 100644 --- a/README.rst +++ b/README.rst @@ -66,6 +66,10 @@ instructions for getting extra Bridges. Maintainer Setup ================ +If you'd like to hack on BridgeDB, you might wish to read BridgeDB's +`developer documentation <https://pythonhosted.org/bridgedb/>`__. The rest of +this document mainly concerns mainenance and installation instructions. + ----------------------------- Dependencies and installation -----------------------------

1 0

[bridgedb/master] Merge branch 'release-0.3.0'
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 6f0f5365f92d3f39db6ee3d52b7a5eedc09176ab Merge: e08b98e cdc0ffa Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Mar 21 02:00:24 2015 +0000 Merge branch 'release-0.3.0' .gitignore | 6 +- .gnupg/TESTING.pub | Bin 0 -> 4622 bytes .gnupg/TESTING.subkeys.sec | Bin 0 -> 7212 bytes .gnupg/bridgedb-offline-key.pub.asc | 113 ++ .gnupg/bridgedb-online-key.pub.asc | 100 ++ .gnupg/gpg.conf | 96 ++ .gnupg/pubring.gpg | Bin 0 -> 4634 bytes .gnupg/secring.gpg | Bin 0 -> 7224 bytes .test.requirements.txt | 2 +- .travis.requirements.txt | 9 +- .travis.yml | 28 +- CHANGELOG | 285 +++- Makefile | 6 +- README.rst | 73 +- TODO | 58 - bridgedb.conf | 87 +- doc/sphinx/source/bridgedb.Tests.rst | 8 - doc/sphinx/source/bridgedb.bridges.rst | 8 + doc/sphinx/source/bridgedb.geo.rst | 8 + doc/sphinx/source/bridgedb.parse.rst | 4 +- doc/sphinx/source/bridgedb.proxy.rst | 8 + doc/sphinx/source/bridgedb.qrcodes.rst | 8 + doc/sphinx/source/bridgedb.rst | 5 +- doc/sphinx/source/conf.py | 11 +- gnupghome/TESTING.subkeys.sec | Bin 7212 -> 0 bytes gnupghome/TESTING.subkeys.sec.EXPIRED-2013-09-11 | Bin 6505 -> 0 bytes gnupghome/bridgedb-offline-key.pub.asc | 113 -- gnupghome/bridgedb-online-signing-key.pub.asc | 148 -- gnupghome/gpg.conf | 96 -- lib/bridgedb/Bridges.py | 686 +-------- lib/bridgedb/Filters.py | 89 +- lib/bridgedb/HTTPServer.py | 37 +- lib/bridgedb/Main.py | 352 ++--- lib/bridgedb/Stability.py | 2 +- lib/bridgedb/Storage.py | 5 +- lib/bridgedb/Tests.py | 780 ----------- lib/bridgedb/bridgerequest.py | 54 +- lib/bridgedb/bridges.py | 1603 ++++++++++++++++++++++ lib/bridgedb/configure.py | 22 +- lib/bridgedb/crypto.py | 328 ++--- lib/bridgedb/email/autoresponder.py | 44 +- lib/bridgedb/email/server.py | 12 +- lib/bridgedb/geo.py | 78 ++ lib/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po | 21 +- lib/bridgedb/i18n/az/LC_MESSAGES/bridgedb.po | 357 +++++ lib/bridgedb/i18n/bg/LC_MESSAGES/bridgedb.po | 357 +++++ lib/bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po | 392 +++++- lib/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po | 367 ++++- lib/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po | 169 ++- lib/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po | 103 +- lib/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po | 20 +- lib/bridgedb/i18n/en/LC_MESSAGES/bridgedb.po | 445 +++++- lib/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po | 387 +++++- lib/bridgedb/i18n/en_US/LC_MESSAGES/bridgedb.po | 447 +++++- lib/bridgedb/i18n/eo/LC_MESSAGES/bridgedb.po | 359 +++++ lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po | 79 +- lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po | 63 +- lib/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po | 63 +- lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po | 61 +- lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po | 64 +- lib/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po | 72 +- lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po | 59 +- lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po | 161 ++- lib/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po | 145 +- lib/bridgedb/i18n/km/LC_MESSAGES/bridgedb.po | 19 +- lib/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po | 20 +- lib/bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po | 161 ++- lib/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po | 170 ++- lib/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po | 100 +- lib/bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po | 64 +- lib/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po | 53 +- lib/bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po | 21 +- lib/bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po | 65 +- lib/bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po | 367 ++++- lib/bridgedb/i18n/sk_SK/LC_MESSAGES/bridgedb.po | 357 +++++ lib/bridgedb/i18n/sl_SI/LC_MESSAGES/bridgedb.po | 359 +++++ lib/bridgedb/i18n/sq/LC_MESSAGES/bridgedb.po | 380 +++++ lib/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po | 61 +- lib/bridgedb/i18n/ta/LC_MESSAGES/bridgedb.po | 357 +++++ lib/bridgedb/i18n/templates/bridgedb.pot | 90 +- lib/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po | 97 +- lib/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po | 184 ++- lib/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po | 121 +- lib/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po | 22 +- lib/bridgedb/parse/addr.py | 7 + lib/bridgedb/parse/descriptors.py | 274 ++++ lib/bridgedb/parse/fingerprint.py | 16 +- lib/bridgedb/parse/networkstatus.py | 280 ---- lib/bridgedb/parse/nickname.py | 58 + lib/bridgedb/persistent.py | 45 +- lib/bridgedb/proxy.py | 470 +++++++ lib/bridgedb/qrcodes.py | 8 +- lib/bridgedb/runner.py | 29 + lib/bridgedb/schedule.py | 6 +- lib/bridgedb/strings.py | 5 +- lib/bridgedb/templates/bridgedb.asc | 226 ++- lib/bridgedb/test/deprecated.py | 520 +++++++ lib/bridgedb/test/deprecated_networkstatus.py | 275 ++++ lib/bridgedb/test/email_helpers.py | 15 +- lib/bridgedb/test/legacy_Tests.py | 725 ++++++++++ lib/bridgedb/test/test_Bridges.py | 199 --- lib/bridgedb/test/test_Main.py | 432 ++++++ lib/bridgedb/test/test_Tests.py | 13 +- lib/bridgedb/test/test_bridgedb.py | 1 + lib/bridgedb/test/test_bridges.py | 1357 ++++++++++++++++++ lib/bridgedb/test/test_crypto.py | 364 ++--- lib/bridgedb/test/test_email_autoresponder.py | 2 +- lib/bridgedb/test/test_geo.py | 96 ++ lib/bridgedb/test/test_https.py | 10 +- lib/bridgedb/test/test_parse_descriptors.py | 653 +++++++++ lib/bridgedb/test/test_parse_networkstatus.py | 414 ------ lib/bridgedb/test/test_parse_nickname.py | 63 + lib/bridgedb/test/test_persistentSaveAndLoad.py | 68 +- lib/bridgedb/test/test_proxy.py | 590 ++++++++ lib/bridgedb/test/test_qrcodes.py | 73 + lib/bridgedb/test/test_smtp.py | 1 + lib/bridgedb/test/test_util.py | 42 + lib/bridgedb/util.py | 10 +- requirements.txt | 3 +- scripts/get-tor-exits | 199 +++ setup.cfg | 4 + setup.py | 5 +- 122 files changed, 15331 insertions(+), 4858 deletions(-)

1 0

[bridgedb/master] Update CHANGELOG entries for bridgedb-0.3.0.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit cdc0ffab82864ca4c2ad75492da029b70927395e Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Mar 21 01:53:50 2015 +0000 Update CHANGELOG entries for bridgedb-0.3.0. --- CHANGELOG | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 081c79d..d0f99e1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -42,6 +42,14 @@ Changes in version 0.3.0 - XXX the Mechanize-based integrations tests in lib/bridgedb/test/test_https.py. hotfix/0.2.4-mechanize-tags + * FIXES part of #12507 https://bugs.torproject.org/12507 + BridgeDB now has semi-automated developer documentation builds at + https://pythonhosted.org/bridgedb/. + + * FIXES #12805 https://bugs.torproject.org/12805 + BridgeDB is now packaged on PyPI, in the hopes that someday other + organisations will be able to run their own BridgeDBs. + * FIXES #12843 https://bugs.torproject.org/12843 BridgeDB will no longer distribute bridges which it believes are located in Iran or Syria.

1 0

[bridgedb/master] Update Latvian (lv) translations.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit eeb4a4ddeaf18ad651ff5af84798fa908e353e59 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Mar 20 01:10:41 2015 +0000 Update Latvian (lv) translations. * THANKS to Ojārs Balcers and ThePirateDuck. --- lib/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po index 252e368..0f70c18 100644 --- a/lib/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po @@ -3,16 +3,16 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Isis <isis(a)torproject.org>, 2014 # Ojārs Balcers <ojars.balcers(a)gmail.com>, 2012 # Ojārs Balcers <ojars.balcers(a)gmail.com>, 2013-2014 +# ThePirateDuck <thepirateduck.w(a)gmail.com>, 2014 msgid "" 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: 2014-06-06 21:46+0000\n" -"PO-Revision-Date: 2014-07-26 02:01+0000\n" -"Last-Translator: Isis <isis(a)torproject.org>\n" +"POT-Creation-Date: 2014-07-26 02:11+0000\n" +"PO-Revision-Date: 2014-10-15 17:11+0000\n" +"Last-Translator: ThePirateDuck <thepirateduck.w(a)gmail.com>\n" "Language-Team: Latvian (http://www.transifex.com/projects/p/torproject/language/lv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -75,7 +75,7 @@ msgstr "Hei, %s!" msgid "Hello, friend!" msgstr "Sveiks, draug!" -#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101 msgid "Public Keys" msgstr "Publiskās atslēgas" @@ -144,7 +144,7 @@ msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s, %s or %s." -msgstr "Vēl cits veids kā saņemt tiltu sarakstus ir nosūtīt e-pastu uz %s. Lūdzu, ievērojiet, ka e-pasts jānosūta no norādīto e-pasta pakalpojumu sniedzēju nodrošinātas adreses:\n%s, %s vai %s." +msgstr "Vēlviens veids kā saņemt tiltus ir nosūtīt e-pastu uz %s. Lūdzu, ievērojiet, ka e-pasts ir\njānosūta no viena no sekojošajiem e-pasta pakalpojumu sniedzējiem:\n%s, %s vai %s." #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" @@ -256,19 +256,19 @@ msgstr "Pieprasīt Pluggable Transport pēc TYPE." msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "Saņemt BridgeDB publiskās GnuPG atslēgas kopiju." -#: lib/bridgedb/templates/base.html:91 +#: lib/bridgedb/templates/base.html:92 msgid "Report a Bug" msgstr "Ziņot par kļūdu" -#: lib/bridgedb/templates/base.html:93 +#: lib/bridgedb/templates/base.html:94 msgid "Source Code" msgstr "Pirmkods" -#: lib/bridgedb/templates/base.html:96 +#: lib/bridgedb/templates/base.html:97 msgid "Changelog" msgstr "Izmaiņu žurnāls" -#: lib/bridgedb/templates/base.html:98 +#: lib/bridgedb/templates/base.html:99 msgid "Contact" msgstr "Sazināties"

1 0

[bridgedb/master] Update Hungarian (hu) translations.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 94d004e50f28745b31f393bddd69f76eee677464 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Mar 20 01:04:33 2015 +0000 Update Hungarian (hu) translations. * THANKS to Blackywantscookies, Lajos Pasztor, Cerbo, and vargaviktor. --- lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po | 59 ++++++++++++++++++-------- 1 file changed, 41 insertions(+), 18 deletions(-) diff --git a/lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po index a2c19e4..5f352bb 100644 --- a/lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po @@ -1,20 +1,20 @@ # Translations template for BridgeDB. -# Copyright (C) 2014 'The Tor Project, Inc.' +# Copyright (C) 2015 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Isis <isis(a)torproject.org>, 2014 -# Blackywantscookies <gaborcika111(a)gmail.com>, 2014 +# Blackywantscookies <gaborcika(a)citromail.hu>, 2014 +# Lajos Pasztor <mrlajos(a)gmail.com>, 2014 # Cerbo <taiurin(a)gmail.com>, 2014 -# vargaviktor <viktor.varga(a)gmail.com>, 2013 +# vargaviktor <viktor.varga(a)gmail.com>, 2013,2015 # vargaviktor <viktor.varga(a)gmail.com>, 2011 msgid "" 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: 2014-06-06 21:46+0000\n" -"PO-Revision-Date: 2014-07-27 14:51+0000\n" -"Last-Translator: Isis <isis(a)torproject.org>\n" +"POT-Creation-Date: 2015-02-03 03:24+0000\n" +"PO-Revision-Date: 2015-03-04 11:11+0000\n" +"Last-Translator: vargaviktor <viktor.varga(a)gmail.com>\n" "Language-Team: Hungarian (http://www.transifex.com/projects/p/torproject/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,9 +34,9 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:121 +#: lib/bridgedb/HTTPServer.py:122 msgid "Sorry! Something went wrong with your request." -msgstr "Elnézést! Valami balul sült el a kérésed közben." +msgstr "Elnézést! Valami rosszul működött a kérésed közben." #: lib/bridgedb/strings.py:18 msgid "[This is an automated message; please do not reply.]" @@ -146,7 +146,7 @@ msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s, %s or %s." -msgstr "Másik módszer hidak beszerzésére email küldésével lehetséges a %s címre. \nKérem vegye figyelembe azt hogy az email küldéséhez használjon egyet az alábbi email szolgáltatók közül. \n%s, %s vagy %s" +msgstr "Egy másik módja, hogy megkapd a bridge listát küldj emailt a %s címre. Kérlek vedd figyelembe\naz emailt az alábbi email szolgáltató címekről küldd:\n%s, %s or %s." #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" @@ -258,15 +258,15 @@ msgstr "Egy csatlakoztatható szállító kérelme TYPE szerint." msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "Másolat szertése a BridgeDB's publikus GnuPG kulcsából." -#: lib/bridgedb/templates/base.html:91 +#: lib/bridgedb/templates/base.html:89 msgid "Report a Bug" msgstr "Hiba jelentése" -#: lib/bridgedb/templates/base.html:93 +#: lib/bridgedb/templates/base.html:92 msgid "Source Code" msgstr "Forrás kód" -#: lib/bridgedb/templates/base.html:96 +#: lib/bridgedb/templates/base.html:95 msgid "Changelog" msgstr "Változások" @@ -274,19 +274,42 @@ msgstr "Változások" msgid "Contact" msgstr "Kapcsolat" +#: lib/bridgedb/templates/bridges.html:81 +msgid "Select All" +msgstr "Mindent kijelöl" + +#: lib/bridgedb/templates/bridges.html:87 +msgid "Show QRCode" +msgstr "QR Kód megjelenítése" + +#: lib/bridgedb/templates/bridges.html:100 +msgid "QRCode for your bridge lines" +msgstr "QR Kód a híd sorokhoz" + #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, #. for Italian, you might translate this into "Mama mia!", #. or for French: "Sacrebleu!". :) -#: lib/bridgedb/templates/bridges.html:66 +#: lib/bridgedb/templates/bridges.html:115 +#: lib/bridgedb/templates/bridges.html:175 msgid "Uh oh, spaghettios!" msgstr "Hoppá!" -#: lib/bridgedb/templates/bridges.html:72 +#: lib/bridgedb/templates/bridges.html:116 +msgid "It seems there was an error getting your QRCode." +msgstr "Úgytűnik a QR Kód hibás." + +#: lib/bridgedb/templates/bridges.html:121 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "Ez a QR Kód a híd sorait tartalmazza. Olvassa be egy QR Kód olvasóval, hogy átmásolja a Híd sorokat mobil és egyéb eszközeire." + +#: lib/bridgedb/templates/bridges.html:181 msgid "There currently aren't any bridges available..." msgstr "Jelenleg nincsenek rendelkezésre álló hidak..." -#: lib/bridgedb/templates/bridges.html:73 +#: lib/bridgedb/templates/bridges.html:182 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " @@ -347,7 +370,7 @@ msgstr "Semmi" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: lib/bridgedb/templates/options.html:130 +#: lib/bridgedb/templates/options.html:127 #, python-format msgid "%sY%ses!" msgstr "%sS%szeretnék!" @@ -355,7 +378,7 @@ msgstr "%sS%szeretnék!" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Please do NOT translate the word "bridge"! -#: lib/bridgedb/templates/options.html:154 +#: lib/bridgedb/templates/options.html:151 #, python-format msgid "%sG%set Bridges" msgstr "%sS%szerezni Bridge -et!"

1 0

[bridgedb/master] Update Dutch (nl) translations.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 03e7497d04a7542e1f95a6805095be334f29b5df Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Mar 20 01:14:15 2015 +0000 Update Dutch (nl) translations. * THANKS to Adriaan Callaerts, Ann Boen, Cleveridge, Dick, Johann Behrens, Shondoit Walker, Marco Brohet, guryman, Marco Brohet, Tom Becht, Tonko Mulder, math1985, and BBLN. --- lib/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po | 170 +++++++++++++++++--------- 1 file changed, 109 insertions(+), 61 deletions(-) diff --git a/lib/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po index aa534e9..ac46c7e 100644 --- a/lib/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po @@ -1,25 +1,26 @@ # Translations template for BridgeDB. -# Copyright (C) 2014 'The Tor Project, Inc.' +# Copyright (C) 2015 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Isis <isis(a)torproject.org>, 2014 # Adriaan Callaerts <adriaan.callaerts(a)gmail.com>, 2013 # Ann Boen <ann.boen(a)gmail.com>, 2014 -# erwindelaat <erwin.de.laat(a)cleveridge.org>, 2014 -# WMRKameleon <info(a)wmrkameleon.nl>, 2013 +# Cleveridge <erwin.de.laat(a)cleveridge.org>, 2014 +# Dick, 2014 +# Johann Behrens <info(a)wmrkameleon.nl>, 2013 # Shondoit Walker <shondoit(a)gmail.com>, 2011 -# Marco Brohet <therbom(a)gmail.com>, 2012 -# guryman <tombecht(a)live.nl>, 2014 +# Marco Brohet <inactive+therbom(a)transifex.com>, 2012 +# Tom Becht <tombecht(a)live.nl>, 2014 +# Tonko Mulder <tonko(a)tonkomulder.nl>, 2015 # math1985 <transifex(a)matthijsmelissen.nl>, 2013 # BBLN <webmaster(a)bbln.nl>, 2014 msgid "" 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: 2014-05-16 18:39+0000\n" -"PO-Revision-Date: 2014-07-27 02:02+0000\n" -"Last-Translator: Isis <isis(a)torproject.org>\n" +"POT-Creation-Date: 2015-02-03 03:24+0000\n" +"PO-Revision-Date: 2015-02-14 09:50+0000\n" +"Last-Translator: Tonko Mulder <tonko(a)tonkomulder.nl>\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/torproject/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,19 +31,16 @@ msgstr "" #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in #. any string (regardless of capitalization and/or punctuation): -#. "bridge" -#. "bridges" #. "BridgeDB" #. "pluggable transport" #. "pluggable transports" #. "obfs2" #. "obfs3" #. "scramblesuit" -#. "fte" +#. "fteproxy" #. "Tor" #. "Tor Browser" -#. "TBB" -#: lib/bridgedb/HTTPServer.py:124 +#: lib/bridgedb/HTTPServer.py:122 msgid "Sorry! Something went wrong with your request." msgstr "Sorry! Er is iets mis gegaan met je verzoek." @@ -66,39 +64,44 @@ msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" msgstr "COMMANDs: (combineer commando's om meerdere opties tegelijkertijd te specificeren)" -#: lib/bridgedb/strings.py:27 +#. TRANSLATORS: Please DO NOT translate the word "BridgeDB". +#: lib/bridgedb/strings.py:28 msgid "Welcome to BridgeDB!" msgstr "Welkom bij BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: lib/bridgedb/strings.py:29 +#: lib/bridgedb/strings.py:30 msgid "Currently supported transport TYPEs:" msgstr "Huidig ondersteunde transport TYPEs:" -#: lib/bridgedb/strings.py:30 +#: lib/bridgedb/strings.py:31 #, python-format msgid "Hey, %s!" msgstr "Hoi, %s!" -#: lib/bridgedb/strings.py:31 +#: lib/bridgedb/strings.py:32 msgid "Hello, friend!" msgstr "Hallo, vriend!" -#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100 +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 msgid "Public Keys" msgstr "Publieke Sleutels" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles #. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." -#: lib/bridgedb/strings.py:36 +#: lib/bridgedb/strings.py:37 #, python-format msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." msgstr "Deze email is gegenereerd met regenbogen, eenhoorns, en fonkelingen voor %s op %s om %s." -#: lib/bridgedb/strings.py:42 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor". +#. TRANSLATORS: Please DO NOT translate "Tor Network". +#: lib/bridgedb/strings.py:47 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -108,14 +111,20 @@ msgid "" "\n" msgstr "BridgeDB kan voorzien in bridges met meerdere Pluggable Transports%s %stypes,\ndie helpen bij het verduisteren van uw connecties naar het Tor netwerk,\nwaardoor het moeilijker wordt voor anderen om uw internet traffic te bekijken en vast te stellen dat u Tor gebruikt.\n\n" -#: lib/bridgedb/strings.py:48 +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#: lib/bridgedb/strings.py:54 msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" msgstr "Sommige bridges met IPv6 adressen zijn eveneens beschikbaar, maar sommige Pluggable\nTransports bieden geen ondersteuning voor IPv6.\n" -#: lib/bridgedb/strings.py:52 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, +#. regular, or unexciting". Like vanilla ice cream. It refers to bridges +#. which do not have Pluggable Transports, and only speak the regular, +#. boring Tor protocol. Translate it as you see fit. Have fun with it. +#: lib/bridgedb/strings.py:63 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" @@ -124,96 +133,104 @@ msgid "" "\n" msgstr "Verder heeft BridgeDB genoeg oude vanilla bridges %s zonder enige\nPluggable Transports %s wat mogelijk niet zo cool klinkt, maar deze kunnen nog steeds helpen bij het omzeilen van internetcensuur in de meeste gevallen.\n\n" -#: lib/bridgedb/strings.py:65 +#: lib/bridgedb/strings.py:76 msgid "What are bridges?" msgstr "Wat zijn bridges?" -#: lib/bridgedb/strings.py:66 +#: lib/bridgedb/strings.py:77 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "%s Bridges %s zijn Tor relays die je helpen censuur te omzeilen." -#: lib/bridgedb/strings.py:71 +#: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" msgstr "Ik heb een alternatieve manier nodig om bridges te verkrijgen!" -#: lib/bridgedb/strings.py:72 +#: lib/bridgedb/strings.py:83 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s, %s or %s." -msgstr "Een andere manier om bridges te bemachtingen is door een email te sturen naar %s. \nHoudt er rekening mee dat u een email moet sturen door gebruik te maken van een adres van een de volgende providers:\n%s, %s of %s." +msgstr "Een alternatieve manier om bridges te verkrijgen is door een email te sturen naar %s. Houd er wel rekening mee dat je\nde email verstuurd via een van de volgende email aanbieders:\n%s, %s of %s." -#: lib/bridgedb/strings.py:79 +#: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" msgstr "Mijn bridges werken niet! Ik heb hulp nodig!" -#: lib/bridgedb/strings.py:80 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:92 #, python-format msgid "If your Tor doesn't work, you should email %s." msgstr "Als uw Tor niet werkt, email dan naar %s." -#: lib/bridgedb/strings.py:81 +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:96 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 "Probeer zoveel mogelijk informatie toe te voegen over je situatie als je kan, waaronder de lijst met \nbridges en Pluggable Transports die je geprobeerd hebt te gebruiken, je Tor Browser versie,\nen alle meldingen welke Tor heeft uitgegeven, etc." -#: lib/bridgedb/strings.py:88 +#: lib/bridgedb/strings.py:103 msgid "Here are your bridge lines:" msgstr "Hier zijn je bridge regels:" -#: lib/bridgedb/strings.py:89 +#: lib/bridgedb/strings.py:104 msgid "Get Bridges!" msgstr "Krijg Bridges!" -#: lib/bridgedb/strings.py:93 +#: lib/bridgedb/strings.py:108 msgid "Please select options for bridge type:" msgstr "Selecteer opties voor bridge type:" -#: lib/bridgedb/strings.py:94 +#: lib/bridgedb/strings.py:109 msgid "Do you need IPv6 addresses?" msgstr "Heeft u IPv6 adressen nodig?" -#: lib/bridgedb/strings.py:95 +#: lib/bridgedb/strings.py:110 #, python-format msgid "Do you need a %s?" msgstr "Heeft u een %s nodig?" -#: lib/bridgedb/strings.py:99 +#: lib/bridgedb/strings.py:114 msgid "Your browser is not displaying images properly." msgstr "Uw browser vertoont afbeeldingen niet naar behoren." -#: lib/bridgedb/strings.py:100 +#: lib/bridgedb/strings.py:115 msgid "Enter the characters from the image above..." msgstr "Voer de karakters in van de afbeelding hier beneden..." -#: lib/bridgedb/strings.py:104 +#: lib/bridgedb/strings.py:119 msgid "How to start using your bridges" msgstr "Hoe te starten met het gebruik van je bridges" -#: lib/bridgedb/strings.py:105 +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#: lib/bridgedb/strings.py:121 #, python-format msgid "" "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" "Browser download page %s to start Tor Browser." msgstr "Om bridges toe te voegen in Tor Browser, volg de instructies op de %s Tor\nBrowser download pagina %s om de Tor Browser te starten." -#: lib/bridgedb/strings.py:108 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:125 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "Wanneer de 'Tor Network Settings' dialoog opent, klik 'Configure' en volg\nde wizard totdat deze vraagt om:" -#: lib/bridgedb/strings.py:111 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:129 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "Blokkeert of censureert je internetprovider (ISP) verbindingen\nnaar het Tor netwerk?" -#: lib/bridgedb/strings.py:114 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:133 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" @@ -221,36 +238,41 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "Selecteer 'Ja' en klik vervolgens 'Next'. Om je nieuwe bridges te configureren, kopieer en\nplak je de bridge regels in het invoerveld. Vervolgens klik je 'Connect', en\nben je klaar om te gaan! Als je problemen ervaart, klik dan de 'Help'\nknop in de 'Tor Network Settings' wizard voor verdere hulp." -#: lib/bridgedb/strings.py:122 +#: lib/bridgedb/strings.py:141 msgid "Displays this message." msgstr "Toont dit bericht." -#: lib/bridgedb/strings.py:123 +#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the +#. same non-Pluggable Transport bridges described above as being +#. "plain-ol'-vanilla" bridges. +#: lib/bridgedb/strings.py:145 msgid "Request vanilla bridges." msgstr "Vraag vanilla bridges aan." -#: lib/bridgedb/strings.py:124 +#: lib/bridgedb/strings.py:146 msgid "Request IPv6 bridges." msgstr "Verzoek IPv6 bridges" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:126 +#: lib/bridgedb/strings.py:148 msgid "Request a Pluggable Transport by TYPE." msgstr "Vraag een Pluggable Transport op TYPE aan." -#: lib/bridgedb/strings.py:127 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "GnuPG". +#: lib/bridgedb/strings.py:151 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "Verkrijg een kopie van BridgeDB's publieke GnuPG key." -#: lib/bridgedb/templates/base.html:91 +#: lib/bridgedb/templates/base.html:89 msgid "Report a Bug" msgstr "Rapporteer een bug" -#: lib/bridgedb/templates/base.html:93 +#: lib/bridgedb/templates/base.html:92 msgid "Source Code" msgstr "Broncode" -#: lib/bridgedb/templates/base.html:96 +#: lib/bridgedb/templates/base.html:95 msgid "Changelog" msgstr "Wijzigingslogboek" @@ -258,15 +280,42 @@ msgstr "Wijzigingslogboek" msgid "Contact" msgstr "Contact" -#: lib/bridgedb/templates/bridges.html:65 +#: lib/bridgedb/templates/bridges.html:81 +msgid "Select All" +msgstr "Alles selecteren" + +#: lib/bridgedb/templates/bridges.html:87 +msgid "Show QRCode" +msgstr "Laat de QRCode zien" + +#: lib/bridgedb/templates/bridges.html:100 +msgid "QRCode for your bridge lines" +msgstr "QRCode voor je bridge regels" + +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: lib/bridgedb/templates/bridges.html:115 +#: lib/bridgedb/templates/bridges.html:175 msgid "Uh oh, spaghettios!" msgstr "Helaas pindakaas!" -#: lib/bridgedb/templates/bridges.html:70 +#: lib/bridgedb/templates/bridges.html:116 +msgid "It seems there was an error getting your QRCode." +msgstr "Er was een fout tijdens het ophalen van je QRCode" + +#: lib/bridgedb/templates/bridges.html:121 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "Deze QRCode bevat je bridge regels. Scan het met een QRCode lezer om je bridge regels te kopiëren naar een mobiel of andere apparaten." + +#: lib/bridgedb/templates/bridges.html:181 msgid "There currently aren't any bridges available..." msgstr "Er zijn momenteel geen bridges beschikbaar..." -#: lib/bridgedb/templates/bridges.html:71 +#: lib/bridgedb/templates/bridges.html:182 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " @@ -307,28 +356,27 @@ msgstr "Nu %s voeg de bridges toe aan Tor Browser %s" #. beginning of words are present in your final translation. Thanks! #. (These are used to insert HTML5 underlining tags, to mark accesskeys #. for disabled users.) -#. TRANSLATORS: Please do NOT translate the word "bridges"! -#: lib/bridgedb/templates/options.html:39 +#: lib/bridgedb/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" msgstr "Geef me %sg%sewoon bridges!" -#: lib/bridgedb/templates/options.html:53 +#: lib/bridgedb/templates/options.html:52 msgid "Advanced Options" msgstr "Geavanceerde Opties" -#: lib/bridgedb/templates/options.html:89 +#: lib/bridgedb/templates/options.html:88 msgid "No" msgstr "Nee" -#: lib/bridgedb/templates/options.html:90 +#: lib/bridgedb/templates/options.html:89 msgid "none" msgstr "geen" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: lib/bridgedb/templates/options.html:131 +#: lib/bridgedb/templates/options.html:127 #, python-format msgid "%sY%ses!" msgstr "%sJ%sa!" @@ -336,7 +384,7 @@ msgstr "%sJ%sa!" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Please do NOT translate the word "bridge"! -#: lib/bridgedb/templates/options.html:155 +#: lib/bridgedb/templates/options.html:151 #, python-format msgid "%sG%set Bridges" msgstr "%sK%srijg Bridges"

1 0

[bridgedb/master] Update Italian (it) translations.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit c1589333a367abb23d4e6ac670bb071d9b157ff2 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Mar 20 01:06:23 2015 +0000 Update Italian (it) translations. * THANKS to fetidyoo, Francesca Ciceri, HostFat, ironbishop, and Jacob Appelbaum. --- lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po | 161 +++++++++++++++++--------- 1 file changed, 104 insertions(+), 57 deletions(-) diff --git a/lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po index 3fd8817..c2b1bf8 100644 --- a/lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po @@ -1,11 +1,11 @@ # Translations template for BridgeDB. -# Copyright (C) 2014 'The Tor Project, Inc.' +# Copyright (C) 2015 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Isis <isis(a)torproject.org>, 2014 # fetidyoo <tru74368(a)yahoo.com>, 2011 # Francesca Ciceri <madamezou(a)zouish.org>, 2014 +# HostFat <hostfat(a)gmail.com>, 2015 # ironbishop <ironbishop(a)fsfe.org>, 2011 # ironbishop <ironbishop(a)fsfe.org>, 2011 # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009 @@ -19,9 +19,9 @@ msgid "" 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: 2014-05-16 18:39+0000\n" -"PO-Revision-Date: 2014-07-26 02:01+0000\n" -"Last-Translator: Isis <isis(a)torproject.org>\n" +"POT-Creation-Date: 2015-02-03 03:24+0000\n" +"PO-Revision-Date: 2015-03-02 02:41+0000\n" +"Last-Translator: HostFat <hostfat(a)gmail.com>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/torproject/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,19 +32,16 @@ msgstr "" #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in #. any string (regardless of capitalization and/or punctuation): -#. "bridge" -#. "bridges" #. "BridgeDB" #. "pluggable transport" #. "pluggable transports" #. "obfs2" #. "obfs3" #. "scramblesuit" -#. "fte" +#. "fteproxy" #. "Tor" #. "Tor Browser" -#. "TBB" -#: lib/bridgedb/HTTPServer.py:124 +#: lib/bridgedb/HTTPServer.py:122 msgid "Sorry! Something went wrong with your request." msgstr "Siamo spiacenti ma qualcosa è andato storto con la tua richiesta." @@ -68,39 +65,44 @@ msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" msgstr "COMMANDs: (combina i COMMANDs per specificare opzioni multiple simultaneamente)" -#: lib/bridgedb/strings.py:27 +#. TRANSLATORS: Please DO NOT translate the word "BridgeDB". +#: lib/bridgedb/strings.py:28 msgid "Welcome to BridgeDB!" msgstr "Benvenuto/a su BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: lib/bridgedb/strings.py:29 +#: lib/bridgedb/strings.py:30 msgid "Currently supported transport TYPEs:" msgstr "Transport TYPEs attualmente supportati:" -#: lib/bridgedb/strings.py:30 +#: lib/bridgedb/strings.py:31 #, python-format msgid "Hey, %s!" msgstr "Hey, %s!" -#: lib/bridgedb/strings.py:31 +#: lib/bridgedb/strings.py:32 msgid "Hello, friend!" msgstr "Ciao amico!" -#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100 +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 msgid "Public Keys" msgstr "Chiavi Pubbliche" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles #. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." -#: lib/bridgedb/strings.py:36 +#: lib/bridgedb/strings.py:37 #, python-format msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." msgstr "Questa email è stata generata con arcobaleni, unicorni e scintille\nper %s il %s alle %s." -#: lib/bridgedb/strings.py:42 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor". +#. TRANSLATORS: Please DO NOT translate "Tor Network". +#: lib/bridgedb/strings.py:47 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -110,14 +112,20 @@ msgid "" "\n" msgstr "BridgeDB può fornire dei bridge con numerosi %stipi di Pluggable Transports%s,\ni quali possono aiutare ad offuscare la tua connessione alla Rete Tor, rendendo\npiù difficile a chiunque vedere il tuo traffico internet per determinare che stai\nusando Tor.\n\n" -#: lib/bridgedb/strings.py:48 +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#: lib/bridgedb/strings.py:54 msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" msgstr "Sono disponibili anche alcuni bridge con indirizzi IPv6, sebbene alcuni Pluggable\nTransports non siano compatibili con IPv6.\n\n" -#: lib/bridgedb/strings.py:52 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, +#. regular, or unexciting". Like vanilla ice cream. It refers to bridges +#. which do not have Pluggable Transports, and only speak the regular, +#. boring Tor protocol. Translate it as you see fit. Have fun with it. +#: lib/bridgedb/strings.py:63 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" @@ -126,96 +134,104 @@ msgid "" "\n" msgstr "In aggiunta, BridgeDB ha anche numerosi bridge vanilla %s senza alcun\nPluggable Transports %s, il che forse non suona bene, ma possono ancora\naiutare ad aggirare la censura in internet in molti casi.\n\n" -#: lib/bridgedb/strings.py:65 +#: lib/bridgedb/strings.py:76 msgid "What are bridges?" msgstr "Cosa sono i bridge?" -#: lib/bridgedb/strings.py:66 +#: lib/bridgedb/strings.py:77 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "%s Bridge %s sono relay di Tor che ti aiutano ad aggirare la censura." -#: lib/bridgedb/strings.py:71 +#: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" msgstr "Mi serve un altro modo per avere dei bridge!" -#: lib/bridgedb/strings.py:72 +#: lib/bridgedb/strings.py:83 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s, %s or %s." -msgstr "Un altro modo per ottenere dei bridge è inviare un'email a %s. Nota che devi\ninviare l'email usando un indirizzo tra uno dei seguenti provider di email:\n%s, %s o %s." +msgstr "Un altro modo di ottenere i bridge è inviare un'email a %s. Nota che devi\ninviare l'email usando uno degli indirizzi tra i seguenti provider email:\n%s, %s o %s." -#: lib/bridgedb/strings.py:79 +#: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" msgstr "I miei bridge non funzionano! Mi serve aiuto!" -#: lib/bridgedb/strings.py:80 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:92 #, python-format msgid "If your Tor doesn't work, you should email %s." msgstr "Se Tor non ti funziona, manda un'email a %s." -#: lib/bridgedb/strings.py:81 +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:96 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 "Cerca di includere più informazioni possibili sul tuo caso, incluso l'elenco di\nbridge e Pluggable Transports che hai provato a usare, la versione di Tor Browser,\nqualsiasi messaggio ti abbia mostrato Tor, ecc." -#: lib/bridgedb/strings.py:88 +#: lib/bridgedb/strings.py:103 msgid "Here are your bridge lines:" msgstr "Ecco le tue linee bridge:" -#: lib/bridgedb/strings.py:89 +#: lib/bridgedb/strings.py:104 msgid "Get Bridges!" msgstr "Ottieni dei Bridge!" -#: lib/bridgedb/strings.py:93 +#: lib/bridgedb/strings.py:108 msgid "Please select options for bridge type:" msgstr "Seleziona le opzioni per il tipo di bridge:" -#: lib/bridgedb/strings.py:94 +#: lib/bridgedb/strings.py:109 msgid "Do you need IPv6 addresses?" msgstr "Ti servono indirizzi IPv6?" -#: lib/bridgedb/strings.py:95 +#: lib/bridgedb/strings.py:110 #, python-format msgid "Do you need a %s?" msgstr "Ti serve un %s?" -#: lib/bridgedb/strings.py:99 +#: lib/bridgedb/strings.py:114 msgid "Your browser is not displaying images properly." msgstr "Il tuo browser non mostra le immagini in modo corretto." -#: lib/bridgedb/strings.py:100 +#: lib/bridgedb/strings.py:115 msgid "Enter the characters from the image above..." msgstr "Inserisci i caratteri nell'immagine sopra..." -#: lib/bridgedb/strings.py:104 +#: lib/bridgedb/strings.py:119 msgid "How to start using your bridges" msgstr "Come iniziare a usare i tuoi bridge" -#: lib/bridgedb/strings.py:105 +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#: lib/bridgedb/strings.py:121 #, python-format msgid "" "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" "Browser download page %s to start Tor Browser." msgstr "Per inserire i bridge nel Tor Browser, segui le istruzioni nella %s pagina\ndi download di Tor Browser %s per avviare Tor Browser." -#: lib/bridgedb/strings.py:108 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:125 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "Quando appare la finestra delle 'Impostazioni Rete Tor', clicca 'Configura' e\nsegui la procedura giudata finchè non chiede:" -#: lib/bridgedb/strings.py:111 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:129 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "Il tuo Internet Service Provider (ISP) blocca o censura le connessioni alla\nrete Tor?" -#: lib/bridgedb/strings.py:114 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:133 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" @@ -223,36 +239,41 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "Seleziona 'Sì' e poi clicca 'Avanti'. Per configurare i nuovi bridge, copia e\nincolla le linee bridge nella casella di testo. Infine, clicca 'Connetti' e dovrebbe\nessere tutto pronto! Se avrai problemi, prova a cliccare il pulsante 'Aiuto'\nnella procedura guidata 'Impostazioni Rete Tor' per avere assistenza." -#: lib/bridgedb/strings.py:122 +#: lib/bridgedb/strings.py:141 msgid "Displays this message." msgstr "Mostra questo messaggio." -#: lib/bridgedb/strings.py:123 +#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the +#. same non-Pluggable Transport bridges described above as being +#. "plain-ol'-vanilla" bridges. +#: lib/bridgedb/strings.py:145 msgid "Request vanilla bridges." msgstr "Richiedi bridge vanilla." -#: lib/bridgedb/strings.py:124 +#: lib/bridgedb/strings.py:146 msgid "Request IPv6 bridges." msgstr "Richiedi bridge IPv6." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:126 +#: lib/bridgedb/strings.py:148 msgid "Request a Pluggable Transport by TYPE." msgstr "Richiedi un Pluggable Transport by TYPE." -#: lib/bridgedb/strings.py:127 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "GnuPG". +#: lib/bridgedb/strings.py:151 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "Ottieni una copia della chiave pubblica GnuPG di BridgeDB." -#: lib/bridgedb/templates/base.html:91 +#: lib/bridgedb/templates/base.html:89 msgid "Report a Bug" msgstr "Segnala un Errore" -#: lib/bridgedb/templates/base.html:93 +#: lib/bridgedb/templates/base.html:92 msgid "Source Code" msgstr "Codice Sorgente" -#: lib/bridgedb/templates/base.html:96 +#: lib/bridgedb/templates/base.html:95 msgid "Changelog" msgstr "Changelog" @@ -260,15 +281,42 @@ msgstr "Changelog" msgid "Contact" msgstr "Contatti" -#: lib/bridgedb/templates/bridges.html:65 +#: lib/bridgedb/templates/bridges.html:81 +msgid "Select All" +msgstr "Seleziona tutto" + +#: lib/bridgedb/templates/bridges.html:87 +msgid "Show QRCode" +msgstr "Mostra QRCode" + +#: lib/bridgedb/templates/bridges.html:100 +msgid "QRCode for your bridge lines" +msgstr "QRCode per le tue linee ponte" + +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: lib/bridgedb/templates/bridges.html:115 +#: lib/bridgedb/templates/bridges.html:175 msgid "Uh oh, spaghettios!" msgstr "Uh oh, spaghettios!" -#: lib/bridgedb/templates/bridges.html:70 +#: lib/bridgedb/templates/bridges.html:116 +msgid "It seems there was an error getting your QRCode." +msgstr "Sembra esserci stato un errore nell'ottenere il tuo QRCode." + +#: lib/bridgedb/templates/bridges.html:121 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "Questo QRCode contiene le tue linee ponte. Scansionalo con un lettore QRCode per copiare le tue linee ponte su mobile o altri dispositivi." + +#: lib/bridgedb/templates/bridges.html:181 msgid "There currently aren't any bridges available..." msgstr "Non ci sono bridge disponibili al momento..." -#: lib/bridgedb/templates/bridges.html:71 +#: lib/bridgedb/templates/bridges.html:182 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " @@ -309,28 +357,27 @@ msgstr "Ora %s aggiungi i bridge a Tor Browser %s" #. beginning of words are present in your final translation. Thanks! #. (These are used to insert HTML5 underlining tags, to mark accesskeys #. for disabled users.) -#. TRANSLATORS: Please do NOT translate the word "bridges"! -#: lib/bridgedb/templates/options.html:39 +#: lib/bridgedb/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" msgstr "%sD%sammi i bridge e basta!" -#: lib/bridgedb/templates/options.html:53 +#: lib/bridgedb/templates/options.html:52 msgid "Advanced Options" msgstr "Opzioni Avanzate" -#: lib/bridgedb/templates/options.html:89 +#: lib/bridgedb/templates/options.html:88 msgid "No" msgstr "No" -#: lib/bridgedb/templates/options.html:90 +#: lib/bridgedb/templates/options.html:89 msgid "none" msgstr "nessuno" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: lib/bridgedb/templates/options.html:131 +#: lib/bridgedb/templates/options.html:127 #, python-format msgid "%sY%ses!" msgstr "%sS%sì!" @@ -338,7 +385,7 @@ msgstr "%sS%sì!" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Please do NOT translate the word "bridge"! -#: lib/bridgedb/templates/options.html:155 +#: lib/bridgedb/templates/options.html:151 #, python-format msgid "%sG%set Bridges" msgstr "%sO%sttieni Bridge"

1 0

[bridgedb/master] Update Khmer (km) translations.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 66719426b6fe4801008a5eb4e817306d5f942a2a Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Mar 20 01:09:51 2015 +0000 Update Khmer (km) translations. * THANKS to Seng Sutha, Sokhem Khoem, and Sok Sophea. --- lib/bridgedb/i18n/km/LC_MESSAGES/bridgedb.po | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/lib/bridgedb/i18n/km/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/km/LC_MESSAGES/bridgedb.po index 671aef4..261d478 100644 --- a/lib/bridgedb/i18n/km/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/km/LC_MESSAGES/bridgedb.po @@ -3,7 +3,6 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Isis <isis(a)torproject.org>, 2014 # Seng Sutha <sutha(a)open.org.kh>, 2014 # Sokhem Khoem <sokhem(a)open.org.kh>, 2014 # Sok Sophea <sksophea(a)gmail.com>, 2014 @@ -12,9 +11,9 @@ msgid "" 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: 2014-06-06 21:46+0000\n" -"PO-Revision-Date: 2014-07-27 02:03+0000\n" -"Last-Translator: Isis <isis(a)torproject.org>\n" +"POT-Creation-Date: 2014-07-26 02:11+0000\n" +"PO-Revision-Date: 2014-10-15 17:11+0000\n" +"Last-Translator: Sokhem Khoem <sokhem(a)open.org.kh>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -77,7 +76,7 @@ msgstr "ហេ, %s!" msgid "Hello, friend!" msgstr "សួស្ដី, មិត្តភ័ក្ដិ!" -#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101 msgid "Public Keys" msgstr "សោសាធារណៈ" @@ -146,7 +145,7 @@ msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s, %s or %s." -msgstr "Another way to get bridges is to send an email to %s. Please note that you must\nsend the email using an address from one of the following email providers:\n%s, %s or %s." +msgstr "វិធីមួយទៀតដើម្បីទទួល bridges គឺត្រូវផ្ញើអ៊ីមែលទៅ %s ។ សូមចំណាំថា អ្នកត្រូវតែផ្ញើអ៊ីមែលដោយប្រើអាសយដ្ឋានពីក្រុមហ៊ុនផ្ដល់អ៊ីមែលមួយក្នុងចំណោមក្រុមហ៊ុនខាងក្រោម៖\n%s, %s ឬ %s ។" #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" @@ -258,19 +257,19 @@ msgstr "ស្នើការផ្ទេរដែលអាចដ msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "Get a copy of BridgeDB's public GnuPG key." -#: lib/bridgedb/templates/base.html:91 +#: lib/bridgedb/templates/base.html:92 msgid "Report a Bug" msgstr "របាយការណ៍កំហុស" -#: lib/bridgedb/templates/base.html:93 +#: lib/bridgedb/templates/base.html:94 msgid "Source Code" msgstr "កូដប្រភព" -#: lib/bridgedb/templates/base.html:96 +#: lib/bridgedb/templates/base.html:97 msgid "Changelog" msgstr "Changelog" -#: lib/bridgedb/templates/base.html:98 +#: lib/bridgedb/templates/base.html:99 msgid "Contact" msgstr "ទំនាក់ទំនង"

1 0

[bridgedb/master] Update Portuguese (pt) translations.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit b2f8f9061e29a7522e244a60e42e56610d3ff27f Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Mar 20 01:19:28 2015 +0000 Update Portuguese (pt) translations. * THANKS to alfalb.as, André Monteiro, kagazz, Manuela Silva, alfalb_mansil, Andrew_Melim, Pedro Albuquerque, Sérgio Marques, and TiagoJMMC. --- lib/bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po | 64 ++++++++++++++++++-------- 1 file changed, 44 insertions(+), 20 deletions(-) diff --git a/lib/bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po index 2c00039..48229a7 100644 --- a/lib/bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po @@ -1,22 +1,23 @@ # Translations template for BridgeDB. -# Copyright (C) 2014 'The Tor Project, Inc.' +# Copyright (C) 2015 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Isis <isis(a)torproject.org>, 2014 +# alfalb.as, 2015 # André Monteiro <andre.monteir(a)gmail.com>, 2014 # kagazz <lourenxo_619(a)hotmail.com>, 2014 -# Manuela Silva <manuela.silva(a)sky.com>, 2014 +# alfalb_mansil, 2014 # Andrew_Melim <nokostya.translation(a)gmail.com>, 2014 +# Pedro Albuquerque <palbuquerque73(a)gmail.com>, 2014-2015 # Sérgio Marques <smarquespt(a)gmail.com>, 2014 # TiagoJMMC <tiagojmmc(a)gmail.com>, 2014 msgid "" 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: 2014-06-06 21:46+0000\n" -"PO-Revision-Date: 2014-07-26 02:04+0000\n" -"Last-Translator: Isis <isis(a)torproject.org>\n" +"POT-Creation-Date: 2015-02-03 03:24+0000\n" +"PO-Revision-Date: 2015-02-23 16:31+0000\n" +"Last-Translator: alfalb.as\n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/torproject/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,13 +37,13 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:121 +#: lib/bridgedb/HTTPServer.py:122 msgid "Sorry! Something went wrong with your request." -msgstr "Pedimos desculpa, mas ocorreu algo errado com o seu pedido!" +msgstr "Desculpe! Ocorreu algo de errado com o seu pedido." #: lib/bridgedb/strings.py:18 msgid "[This is an automated message; please do not reply.]" -msgstr "[Esta é uma mensagem automática; por favor não responda.]" +msgstr "[Esta é uma mensagem automática; por favor, não responda.]" #: lib/bridgedb/strings.py:20 msgid "Here are your bridges:" @@ -81,7 +82,7 @@ msgstr "Olá, amigo!" #: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 msgid "Public Keys" -msgstr "Chaves públicas" +msgstr "Chaves Públicas" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles @@ -148,11 +149,11 @@ msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s, %s or %s." -msgstr "Outro método para obter pontes é escrever uma mensagem para %s. Tenha em atenção\nque tem de enviar a mensagem através de um dos seguintes fornecedores de correio:\n%s, %s ou %s." +msgstr "Outra forma de obter pontes é enviar uma mensagem para %s. Por favor, note que\na mensagem tem de ser enviada de um dos seguintes fornecedores de serviço:\n%s, %s ou %s." #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" -msgstr "As minhas pontes não funcionam! Preciso de ajuda!" +msgstr "As minhas pontes não funcionam! Eu preciso de ajuda!" #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:92 @@ -260,15 +261,15 @@ msgstr "Solicita um Pluggable Transport por TYPE." msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "Obter uma cópia da chave pública GnuPG da BridgeDB." -#: lib/bridgedb/templates/base.html:91 +#: lib/bridgedb/templates/base.html:89 msgid "Report a Bug" msgstr "Reportar um erro" -#: lib/bridgedb/templates/base.html:93 +#: lib/bridgedb/templates/base.html:92 msgid "Source Code" msgstr "Código fonte" -#: lib/bridgedb/templates/base.html:96 +#: lib/bridgedb/templates/base.html:95 msgid "Changelog" msgstr "Registo de alterações" @@ -276,19 +277,42 @@ msgstr "Registo de alterações" msgid "Contact" msgstr "Contactos" +#: lib/bridgedb/templates/bridges.html:81 +msgid "Select All" +msgstr "Escolher todos" + +#: lib/bridgedb/templates/bridges.html:87 +msgid "Show QRCode" +msgstr "Mostrar QRCode" + +#: lib/bridgedb/templates/bridges.html:100 +msgid "QRCode for your bridge lines" +msgstr "QRCode para as suas linhas de ponte" + #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, #. for Italian, you might translate this into "Mama mia!", #. or for French: "Sacrebleu!". :) -#: lib/bridgedb/templates/bridges.html:66 +#: lib/bridgedb/templates/bridges.html:115 +#: lib/bridgedb/templates/bridges.html:175 msgid "Uh oh, spaghettios!" msgstr "Ocorreu um erro!" -#: lib/bridgedb/templates/bridges.html:72 +#: lib/bridgedb/templates/bridges.html:116 +msgid "It seems there was an error getting your QRCode." +msgstr "Parece que ocorreu um erro ao obter o seu QRCode." + +#: lib/bridgedb/templates/bridges.html:121 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "Este QRCode contém as suas linhas de ponte. Leia-o com um leitor de QRCode para copiar as linhas de ponte para dispositivos móveis." + +#: lib/bridgedb/templates/bridges.html:181 msgid "There currently aren't any bridges available..." msgstr "Atualmente não existem pontes livres..." -#: lib/bridgedb/templates/bridges.html:73 +#: lib/bridgedb/templates/bridges.html:182 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " @@ -349,7 +373,7 @@ msgstr "nenhuma" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: lib/bridgedb/templates/options.html:130 +#: lib/bridgedb/templates/options.html:127 #, python-format msgid "%sY%ses!" msgstr "%sS%sim!" @@ -357,7 +381,7 @@ msgstr "%sS%sim!" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Please do NOT translate the word "bridge"! -#: lib/bridgedb/templates/options.html:154 +#: lib/bridgedb/templates/options.html:151 #, python-format msgid "%sG%set Bridges" msgstr "%sO%sbter pontes"

1 0

[bridgedb/master] Update Japanese (ja) translations.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 00c48814a18542935d78192b886d56df11227e43 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Mar 20 01:08:21 2015 +0000 Update Japanese (ja) translations. * THANKS to brt, ABE Tsunehiko, タカハシ, Masaki Saito, and 藤前　甲. --- lib/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po | 145 +++++++++++++++----------- 1 file changed, 85 insertions(+), 60 deletions(-) diff --git a/lib/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po index af8fb84..e552128 100644 --- a/lib/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po @@ -3,18 +3,19 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Isis <isis(a)torproject.org>, 2014 # brt <87(a)itokei.info>, 2013 -# plazmism <gomidori(a)live.jp>, 2013 -# plazmism <gomidori(a)live.jp>, 2014 +# ABE Tsunehiko, 2014 +# タカハシ <gomidori(a)live.jp>, 2013 +# タカハシ <gomidori(a)live.jp>, 2014 # Masaki Saito <rezoolab(a)gmail.com>, 2013 +# 藤前　甲 <m1440809437(a)hiru-dea.com>, 2014 msgid "" 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: 2014-05-16 18:39+0000\n" -"PO-Revision-Date: 2014-07-27 02:02+0000\n" -"Last-Translator: Isis <isis(a)torproject.org>\n" +"POT-Creation-Date: 2014-07-26 02:11+0000\n" +"PO-Revision-Date: 2014-12-26 04:42+0000\n" +"Last-Translator: 藤前　甲 <m1440809437(a)hiru-dea.com>\n" "Language-Team: Japanese (http://www.transifex.com/projects/p/torproject/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,19 +26,16 @@ msgstr "" #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in #. any string (regardless of capitalization and/or punctuation): -#. "bridge" -#. "bridges" #. "BridgeDB" #. "pluggable transport" #. "pluggable transports" #. "obfs2" #. "obfs3" #. "scramblesuit" -#. "fte" +#. "fteproxy" #. "Tor" #. "Tor Browser" -#. "TBB" -#: lib/bridgedb/HTTPServer.py:124 +#: lib/bridgedb/HTTPServer.py:121 msgid "Sorry! Something went wrong with your request." msgstr "申し訳ありませんが、リクエストに問題がありました。" @@ -61,39 +59,44 @@ msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" msgstr "コマンド: (コマンドを組み合わせて、同時に複数のオプションを指定する)" -#: lib/bridgedb/strings.py:27 +#. TRANSLATORS: Please DO NOT translate the word "BridgeDB". +#: lib/bridgedb/strings.py:28 msgid "Welcome to BridgeDB!" msgstr "BridgeDB へようこそ！" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: lib/bridgedb/strings.py:29 +#: lib/bridgedb/strings.py:30 msgid "Currently supported transport TYPEs:" msgstr "現在サポートされているトランスポートタイプ:" -#: lib/bridgedb/strings.py:30 +#: lib/bridgedb/strings.py:31 #, python-format msgid "Hey, %s!" msgstr "どうも %s さん！" -#: lib/bridgedb/strings.py:31 +#: lib/bridgedb/strings.py:32 msgid "Hello, friend!" -msgstr "どうもこんにちは！" +msgstr "どうも、こんにちは！" -#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100 +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101 msgid "Public Keys" msgstr "公開鍵" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles #. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." -#: lib/bridgedb/strings.py:36 +#: lib/bridgedb/strings.py:37 #, python-format msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." msgstr "このメールは %s に %s %s に rainbow 及び unicorn 、 sparkle で生成されました。" -#: lib/bridgedb/strings.py:42 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor". +#. TRANSLATORS: Please DO NOT translate "Tor Network". +#: lib/bridgedb/strings.py:47 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -103,14 +106,20 @@ msgid "" "\n" msgstr "BridgeDB は、%sタイプの Pluggable Transports%s でブリッジを提供します。\nTor ネットワークへの接続を悟られづらくすることに役立ち、あなたの\nインターネットトラフィックを監視している誰かがあなたが Tor を使用していることを判別することがさらに難しくなります。\n\n" -#: lib/bridgedb/strings.py:48 +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#: lib/bridgedb/strings.py:54 msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" msgstr "IPv6 のアドレスのブリッジも利用できるものがありますが、 Pluggable Transports には IPv6 に互換性がないものもあります。\n\n" -#: lib/bridgedb/strings.py:52 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, +#. regular, or unexciting". Like vanilla ice cream. It refers to bridges +#. which do not have Pluggable Transports, and only speak the regular, +#. boring Tor protocol. Translate it as you see fit. Have fun with it. +#: lib/bridgedb/strings.py:63 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" @@ -119,96 +128,104 @@ msgid "" "\n" msgstr "加えて、 BridgeDB は、 %s Pluggable Transport %s のない多くの何の変哲もない\n通常のブリッジを持ち、それはクールには思えないかもしれません。しかし、多くの場合、インターネット検閲を回避するのになお有効です。\n" -#: lib/bridgedb/strings.py:65 +#: lib/bridgedb/strings.py:76 msgid "What are bridges?" msgstr "ブリッジとは？" -#: lib/bridgedb/strings.py:66 +#: lib/bridgedb/strings.py:77 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "%s ブリッジ %s は、インターネット検閲を回避する助けとなる Tor リレーです。" -#: lib/bridgedb/strings.py:71 +#: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" msgstr "ブリッジを得る他の方法が必要です!" -#: lib/bridgedb/strings.py:72 +#: lib/bridgedb/strings.py:83 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s, %s or %s." -msgstr "ブリッジを入手する別のやり方は %s までメールを送ることです。以下のメールプロバイダのうちの1つのアドレスを使用してメールを送信しなければならないことにご注意ください: %s、%s または %s" +msgstr "ブリッジを入手する別のやり方は %s までメールを送ることです。\n以下のメールプロバイダのうちの1つのアドレスを使用してメールを送信しなければならないことにご注意ください:\n %s 、 %s または %s" -#: lib/bridgedb/strings.py:79 +#: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" msgstr "私のブリッジが動きません! 助けてください!" -#: lib/bridgedb/strings.py:80 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:92 #, python-format msgid "If your Tor doesn't work, you should email %s." msgstr "Tor がうまく動作しない場合、 %s までメールを下さい。" -#: lib/bridgedb/strings.py:81 +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:96 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 "あなたが使おうとしたブリッジや Pluggable Transports 、ご利用の Tor Browser バージョン、そして Tor が出力したメッセージ等などを含み、出来る限りあなたのケースに関する多くの情報を含めてみてください。" -#: lib/bridgedb/strings.py:88 +#: lib/bridgedb/strings.py:103 msgid "Here are your bridge lines:" msgstr "あなたのブリッジラインはこちらです:" -#: lib/bridgedb/strings.py:89 +#: lib/bridgedb/strings.py:104 msgid "Get Bridges!" msgstr "ブリッジを入手！" -#: lib/bridgedb/strings.py:93 +#: lib/bridgedb/strings.py:108 msgid "Please select options for bridge type:" msgstr "ブリッジタイプのオプションを選択してください:" -#: lib/bridgedb/strings.py:94 +#: lib/bridgedb/strings.py:109 msgid "Do you need IPv6 addresses?" msgstr "IPv6 アドレスが必要ですか？" -#: lib/bridgedb/strings.py:95 +#: lib/bridgedb/strings.py:110 #, python-format msgid "Do you need a %s?" msgstr "%s が必要ですか？" -#: lib/bridgedb/strings.py:99 +#: lib/bridgedb/strings.py:114 msgid "Your browser is not displaying images properly." msgstr "ご利用のブラウザは適切に画像を表示していません。" -#: lib/bridgedb/strings.py:100 +#: lib/bridgedb/strings.py:115 msgid "Enter the characters from the image above..." msgstr "上記の画像から文字を入力してください..." -#: lib/bridgedb/strings.py:104 +#: lib/bridgedb/strings.py:119 msgid "How to start using your bridges" msgstr "ブリッジ使用の始め方" -#: lib/bridgedb/strings.py:105 +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#: lib/bridgedb/strings.py:121 #, python-format msgid "" "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" "Browser download page %s to start Tor Browser." msgstr "Tor Browser にブリッジ情報を入力するには、 %s Tor Browser のダウンロードページ %s の指示に従って Tor Browser を起動してください。" -#: lib/bridgedb/strings.py:108 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:125 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "「Tor ネットワーク設定」ダイアログがポップアップした際、設定をクリックして\n聞かれるまでウィザードに従ってください。" -#: lib/bridgedb/strings.py:111 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:129 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "ご利用のインターネットサービスプロバイダー (ISP) は Tor ネットワークへの接続をブロックないし\n別のやり方で検閲していますか？" -#: lib/bridgedb/strings.py:114 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:133 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" @@ -216,52 +233,61 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "「はい」を選択して、「次」をクリックしてください。新しいブリッジを構成するために、テキスト\n入力ボックスにブリッジラインをコピーペーストしてください。最後に、「接続」をクリックして、\nさあ準備が出来たはずです！何か問題があったら、さらなる助けを得るために「Tor\nネットワーク設定」ウィザード内「ヘルプ」ボタンをクリックしてください。" -#: lib/bridgedb/strings.py:122 +#: lib/bridgedb/strings.py:141 msgid "Displays this message." msgstr "この画像を表示" -#: lib/bridgedb/strings.py:123 +#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the +#. same non-Pluggable Transport bridges described above as being +#. "plain-ol'-vanilla" bridges. +#: lib/bridgedb/strings.py:145 msgid "Request vanilla bridges." msgstr "vanilla ブリッジをリクエスト" -#: lib/bridgedb/strings.py:124 +#: lib/bridgedb/strings.py:146 msgid "Request IPv6 bridges." msgstr "IPv6 ブリッジをリクエスト" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:126 +#: lib/bridgedb/strings.py:148 msgid "Request a Pluggable Transport by TYPE." msgstr "タイプごとに Pluggable Transport をリクエスト" -#: lib/bridgedb/strings.py:127 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "GnuPG". +#: lib/bridgedb/strings.py:151 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "BridgeDB の GnuPG 公開鍵のコピーを手に入れましょう。" -#: lib/bridgedb/templates/base.html:91 +#: lib/bridgedb/templates/base.html:92 msgid "Report a Bug" msgstr "バグを報告する" -#: lib/bridgedb/templates/base.html:93 +#: lib/bridgedb/templates/base.html:94 msgid "Source Code" msgstr "ソースコード" -#: lib/bridgedb/templates/base.html:96 +#: lib/bridgedb/templates/base.html:97 msgid "Changelog" msgstr "変更履歴" -#: lib/bridgedb/templates/base.html:98 +#: lib/bridgedb/templates/base.html:99 msgid "Contact" msgstr "お問い合わせ" -#: lib/bridgedb/templates/bridges.html:65 +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: lib/bridgedb/templates/bridges.html:66 msgid "Uh oh, spaghettios!" msgstr "おっとスパゲッティ！" -#: lib/bridgedb/templates/bridges.html:70 +#: lib/bridgedb/templates/bridges.html:72 msgid "There currently aren't any bridges available..." msgstr "今の時点では利用できるブリッジがありません..." -#: lib/bridgedb/templates/bridges.html:71 +#: lib/bridgedb/templates/bridges.html:73 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " @@ -302,28 +328,27 @@ msgstr "%s Tor Browser にブリッジを追加します %s" #. beginning of words are present in your final translation. Thanks! #. (These are used to insert HTML5 underlining tags, to mark accesskeys #. for disabled users.) -#. TRANSLATORS: Please do NOT translate the word "bridges"! -#: lib/bridgedb/templates/options.html:39 +#: lib/bridgedb/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" msgstr "%sあ%sの、ください、 bridges!" -#: lib/bridgedb/templates/options.html:53 +#: lib/bridgedb/templates/options.html:52 msgid "Advanced Options" msgstr "高度な設定" -#: lib/bridgedb/templates/options.html:89 +#: lib/bridgedb/templates/options.html:88 msgid "No" msgstr "いいえ" -#: lib/bridgedb/templates/options.html:90 +#: lib/bridgedb/templates/options.html:89 msgid "none" msgstr "なし" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: lib/bridgedb/templates/options.html:131 +#: lib/bridgedb/templates/options.html:130 #, python-format msgid "%sY%ses!" msgstr "%sは%sい！" @@ -331,7 +356,7 @@ msgstr "%sは%sい！" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Please do NOT translate the word "bridge"! -#: lib/bridgedb/templates/options.html:155 +#: lib/bridgedb/templates/options.html:154 #, python-format msgid "%sG%set Bridges" msgstr "%sG%set Bridges"

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits March 2015