July 2015 - tor-commits - lists.torproject.org

[translation/tor-messenger-ircproperties_completed] Update translations for tor-messenger-ircproperties_completed
by translation＠torproject.org 26 Jul '15

26 Jul '15

commit b5218fa0f46bfa1968b27572b6f9f08bf318fadc Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 26 08:46:23 2015 +0000 Update translations for tor-messenger-ircproperties_completed --- pt_BR/irc.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_BR/irc.properties b/pt_BR/irc.properties index 64a8d60..8d2b5f7 100644 --- a/pt_BR/irc.properties +++ b/pt_BR/irc.properties @@ -163,15 +163,15 @@ error.unavailable=%S está temporariamente indisponível. error.channelBanned=Você foi excluído de %S. error.cannotSendToChannel=Você não pode enviar mensagens para %S. error.channelFull=O canal %S está cheio. -error.inviteOnly=Você deve ser convidado para participar %S. +error.inviteOnly=Para participar de %S, você tem que receber um convite. error.nonUniqueTarget=%S não é um usuário único ou apelido que você tentou entrar em muitos canais ao mesmo tempo. error.notChannelOp=Você não é um operador de canal no %S. error.notChannelOwner=Você não é um proprietário de canal de %S. -error.wrongKey=Não pode participar %S , senha de canal inválida. +error.wrongKey=Não é possível participar de %S , a senha de canal é inválida. error.sendMessageFailed=Um erro ocorreu ao enviar sua última mensagem. Por favor, tente outra vez quando a conexão estiver sido restabelecida. # %1$S is the channel the user tried to join, %2$S is the channel # he was forwarded to. -error.channelForward=Você não pode participar %1$S, e foi automaticamente redirecionada para %2$S. +error.channelForward=Você não pode participar de %1$S, e foi automaticamente redirecionada para %2$S. # LOCALIZATION NOTE (tooltip.*): # These are the descriptions given in a tooltip with information received

1 0

[translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties
by translation＠torproject.org 26 Jul '15

26 Jul '15

commit ecc59b2fcc1dc2dfc41a7ee28f467f02e439c324 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 26 08:46:19 2015 +0000 Update translations for tor-messenger-ircproperties --- pt_BR/irc.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_BR/irc.properties b/pt_BR/irc.properties index 64a8d60..8d2b5f7 100644 --- a/pt_BR/irc.properties +++ b/pt_BR/irc.properties @@ -163,15 +163,15 @@ error.unavailable=%S está temporariamente indisponível. error.channelBanned=Você foi excluído de %S. error.cannotSendToChannel=Você não pode enviar mensagens para %S. error.channelFull=O canal %S está cheio. -error.inviteOnly=Você deve ser convidado para participar %S. +error.inviteOnly=Para participar de %S, você tem que receber um convite. error.nonUniqueTarget=%S não é um usuário único ou apelido que você tentou entrar em muitos canais ao mesmo tempo. error.notChannelOp=Você não é um operador de canal no %S. error.notChannelOwner=Você não é um proprietário de canal de %S. -error.wrongKey=Não pode participar %S , senha de canal inválida. +error.wrongKey=Não é possível participar de %S , a senha de canal é inválida. error.sendMessageFailed=Um erro ocorreu ao enviar sua última mensagem. Por favor, tente outra vez quando a conexão estiver sido restabelecida. # %1$S is the channel the user tried to join, %2$S is the channel # he was forwarded to. -error.channelForward=Você não pode participar %1$S, e foi automaticamente redirecionada para %2$S. +error.channelForward=Você não pode participar de %1$S, e foi automaticamente redirecionada para %2$S. # LOCALIZATION NOTE (tooltip.*): # These are the descriptions given in a tooltip with information received

1 0

[webwml/master] Unrecommend 5.0a2.
by mikeperry＠torproject.org 26 Jul '15

26 Jul '15

commit e9d8bf938c1924f02a820cf731c57ce327dcb7a3 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun Jul 26 01:42:54 2015 -0700 Unrecommend 5.0a2. Hrmm, we seem to have missed this. --- projects/torbrowser/RecommendedTBBVersions | 4 ---- 1 file changed, 4 deletions(-) diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index fcb8837..c12fa8a 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -3,10 +3,6 @@ "4.5.3-Linux", "4.5.3-MacOS", "4.5.3-Windows", -"5.0a2", -"5.0a2-Linux", -"5.0a2-MacOS", -"5.0a2-Windows", "5.0a3", "5.0a3-Linux", "5.0a3-MacOS",

1 0

[stem/master] Don't retain whitespace when showing pyflake issues
by atagar＠torproject.org 26 Jul '15

26 Jul '15

commit 2518917325ca9e74263e384544d1d38b5fb5d383 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 25 18:02:37 2015 -0700 Don't retain whitespace when showing pyflake issues While it's neat that we now show the code pyflake issues are citing, the whitespace isn't helpful. The ending newline is especially pesky since it double spaces the entries. --- stem/util/test_tools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stem/util/test_tools.py b/stem/util/test_tools.py index 9081dcd..dac9fc7 100644 --- a/stem/util/test_tools.py +++ b/stem/util/test_tools.py @@ -295,7 +295,7 @@ def pyflakes_issues(paths): def _register_issue(self, path, line_number, issue, line): if not self._is_ignored(path, issue): if path and line_number and not line: - line = linecache.getline(path, line_number) + line = linecache.getline(path, line_number).strip() issues.setdefault(path, []).append(Issue(line_number, issue, line))

1 0

[translation/tor-messenger-privproperties_completed] Update translations for tor-messenger-privproperties_completed
by translation＠torproject.org 26 Jul '15

26 Jul '15

commit 3a34e86685004e993ee4ddda95eb17cde68e7952 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jul 25 22:46:33 2015 +0000 Update translations for tor-messenger-privproperties_completed --- bg/priv.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/bg/priv.properties b/bg/priv.properties new file mode 100644 index 0000000..c7070ee --- /dev/null +++ b/bg/priv.properties @@ -0,0 +1 @@ +priv.account=Създаване на личен ключ за %S (%S) ...

1 0

[bridgedb/master] Update CHANGELOG for BridgeDB 0.3.3.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit d05744c4b87be8f3d625c56c45b15eab47df2a35 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jul 25 01:11:04 2015 +0000 Update CHANGELOG for BridgeDB 0.3.3. --- CHANGELOG | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 4dc04f0..d99f3f7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,104 @@ +Changes in version 0.3.3 - 2015-07-25 + + * FIXES #12029 https://bugs.torproject.org/12029 + BridgeDB now has an API for creating Bridge Distributors. + See the bridgedb.distribute module, or its developer documentation + at https://pythonhosted.org/bridgedb/bridgedb.distribute.html. + + * FIXES PART OF #12506 https://bugs.torproject.org/12506 + BridgeDB's two Distributors (HTTPS and Email) are now entirely + modularised and self-contained within separate subdirectories in + the source code. This is the first step to redesigning these + Distributors into their own separate processes, which will allow + the Distributors to remain functional while BridgeDB is reparsing + bridge descriptors. + + * FIXES #15968 https://bugs.torproject.org/15968 + BridgeDB now sends a Content-Security-Policy header which + explicitly allows Javascript, images, CSS, and fonts, from + https://bridges.torproject.org. All other types of content are + forbidden, including: + - embedding https://bridges.torproject.org within + <iframe>, <embed>, or <object>, and attempting to source + additional resources into its embedded context + - inline Javascript, including Javascript within SVG files + - inline CSS + - externally hosted fonts + - inline SVG, e.g. via the HTML5 <svg> tag + - any and all connections made via Javascript XMLHttpRequests, + WebSockets, sendBeacon(), and Web Workers + - plugins + - applets + BridgeDB's Content-Security-Policy does not yet make use of + certain newer, lesser supported, Content-Security-Policy v2.0 + directives, such as "reflected-xss" and "frame-ancestors", but may + someday. + + * FIXES #16273 https://bugs.torproject.org/16273 + Several links to Tor Project gitweb URLs within the developer + documentation were outdated in that they still used the old gitweb + URL format. These are now updated. + Thanks to David Fifield for the bug report and patches. + + * FIXES #16330 https://bugs.torproject.org/16330 + BridgeDB can now handle bridge-server-descriptors with + extra-info-digest fields which have two values, as well as both + bridge-server-descriptors and bridge-extrainfo descriptors which + contain Ed25519 key material and signatures. See Tor proposals + #220 and #228 for more information on the changes to these + descriptors. Note that BridgeDB can now parse this information, + but does not yet make use of any Ed25519 cryptographic material + within bridge descriptors. + https://gitweb.torproject.org/torspec.git/tree/proposals/220-ecc-id-keys.txt + https://gitweb.torproject.org/torspec.git/tree/proposals/228-cross-certific… + Thanks to Atagar for patching Stem. + + * FIXES #16616 https://bugs.torproject.org/16616 + The HSDir flag can now be included within bridge-networkstatus + documents. BridgeDB now has unittests which guarantee that its + parsers safely ignore this flag, as well as any flags unknown to + BridgeDB which may appear in the future. + Thanks to Roger Dingledine for alerting me about the change. + + * FIXES #16649 https://bugs.torproject.org/16649 + Mobile users, and other users with small screen pixel ratios, will + find that the UI of BridgeDB's HTTPS Distributor has greatly + increased in usability and readability. + + +And includes the following general changes: + + * FIXES an error when requesting the non-HTML version of the + bridges page (e.g. https://bridges.torproject.org/bridges?format=plain) + + * REMOVES the `bridgedb test` commandline option. + BridgeDB's tests can be run via `python setup.py test` or `make + test` (or `make coverage` for generating HTML test coverage + statistics). + + * CHANGES the HTTPS Distributor to HTML-encode Bridge Lines. + Previously, a malicious Pluggable Transport Bridge could include + in its PT arguments something like "evil=<script>[…]</script>" and + if such a Bridge were to be distributed to a user, that user's web + browser would execute the script (if Javacript was enabled). + Other characters, including non-ASCII, control characters, double + quotes, and backslashes, are also sanitised from Bridge Lines. + Thanks to Robert Ransom for the patches. + + * CHANGES BridgeDB's module/package version numbers to be + compliant with PEP440. + + * CHANGES the layout of BridgeDB's source code directories. + Rather than storing BridgeDB's source in "lib/bridgedb/", it is + now kept in "bridgedb/". Similarly, the directory containing + BridgeDB's tests has been moved from "lib/bridgedb/test/" to + "test/", which means that the tests are no longer installed when + running `python setup.py install` or `make install`. + + * ADDS several improvements to the developer documentation at + https://pythonhosted.org/bridgedb. + + Changes in version 0.3.2 - 2015-05-01 * FIXES a problem with the calculation of Levenshtein distances

1 0

[bridgedb/master] Update Turkish (tr) translations.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit d19400b05520cbec57a4c06d767b6fef61b8f39d Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jul 25 02:09:00 2015 +0000 Update Turkish (tr) translations. * THANKS TO Bullgeschichte and Fomas. --- bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po | 73 ++++++++++++++++-------------- 1 file changed, 38 insertions(+), 35 deletions(-) diff --git a/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po index 031ac6b..23c5743 100644 --- a/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po +++ b/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po @@ -3,10 +3,12 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Bullgeschichte <bullgeschichte(a)riseup.net>, 2015 # eromytsatiffird <driffitastymore(a)gmail.com>, 2014 # Emir Sarı <bitigchi(a)openmailbox.org>, 2014 # Emre <conan(a)operamail.com>, 2013 # erg26 <ergungorler(a)gmail.com>, 2012 +# Fomas <fomas.adana(a)gmail.com>, 2015 # Idil Yuksel <perfectionne(a)gmail.com>, 2014 # Sercan Altundaş <>, 2012 # ozkansib <s.ozkan(a)gyte.edu.tr>, 2014 @@ -17,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: 2015-02-03 03:24+0000\n" -"PO-Revision-Date: 2015-02-14 11:40+0000\n" -"Last-Translator: Volkan Gezer <volkangezer(a)gmail.com>\n" +"POT-Creation-Date: 2015-03-19 22:13+0000\n" +"PO-Revision-Date: 2015-06-20 14:58+0000\n" +"Last-Translator: Fomas <fomas.adana(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/torproject/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -39,7 +41,7 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:122 +#: lib/bridgedb/HTTPServer.py:107 msgid "Sorry! Something went wrong with your request." msgstr "Üzgünüz! İsteğinizle ilgili bir hata oluştu." @@ -56,7 +58,7 @@ msgstr "İşte köprüleriniz:" msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." -msgstr "Hız limitini aştınız. Lütfen yavaşlayın! E-postalar arasındaki minimum zaman %s saattir.\nBu süre içinde göndereceğiniz e-postalarınız yok sayılacaktır." +msgstr "E-posta kotanızı aştınız. Lütfen yavaşlayın! E-postalar arasındaki minimum zaman %s saattir.\nBu süre içinde göndereceğiniz diğer e-postalarınız yok sayılacaktır." #: lib/bridgedb/strings.py:25 msgid "" @@ -71,7 +73,7 @@ msgstr "BridgeDB'ye Hoş Geldiniz!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: lib/bridgedb/strings.py:30 msgid "Currently supported transport TYPEs:" -msgstr "Şu an desteklenen transport TYPEs:" +msgstr "Şu an desteklenen taşıyıcı TYPEları:" #: lib/bridgedb/strings.py:31 #, python-format @@ -80,7 +82,7 @@ msgstr "Selam, %s!" #: lib/bridgedb/strings.py:32 msgid "Hello, friend!" -msgstr "Merhaba dostum!" +msgstr "Selam, arkadaş!" #: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 msgid "Public Keys" @@ -134,16 +136,16 @@ msgstr "Ek olarak BridgeDB %s hiçbir Eklenebilir Aktarıma sahip olmayan %s bir #: lib/bridgedb/strings.py:76 msgid "What are bridges?" -msgstr "Köprüler nedir?" +msgstr "Köprü nedir?" #: lib/bridgedb/strings.py:77 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "%s Köprüler %s sansürü aşmanıza yardımcı olan Tor aynalarıdır." +msgstr "%s Köprüler %s sansürü aşmanıza yardımcı olan Tor aktarıcılarıdır." #: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" -msgstr "Köprüler edinmek için başka bir yola gereksinimim var!" +msgstr "Köprü adresi edinmek için başka bir yola gereksinimim var!" #: lib/bridgedb/strings.py:83 #, python-format @@ -171,11 +173,11 @@ 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 "Durumunuz hakkında olabildiğince fazla bilgi içermeyi deneyin.\nÖrneğin kullanmaya çalıştığınız Eklenebilir Aktarımlar, Tor Tarayıcı sürümünüz ve\nTor'un gösterdiği tüm hata iletileri vb." +msgstr "Durumunuz hakkında olabildiğince fazla bilgi verin.\nÖrneğin kullanmaya çalıştığınız Eklenebilir Taşıyıcılar, Tor Browser sürümünüz, Tor'un gösterdiği tüm hata iletileri vb." #: lib/bridgedb/strings.py:103 msgid "Here are your bridge lines:" -msgstr "İşte köprü çizgileriniz:" +msgstr "İşte köprü satırlarınız:" #: lib/bridgedb/strings.py:104 msgid "Get Bridges!" @@ -200,7 +202,7 @@ msgstr "Tarayıcınız resimleri düzgün görüntülemiyor." #: lib/bridgedb/strings.py:115 msgid "Enter the characters from the image above..." -msgstr "Yukarıdaki görüntüdeki karakterlerini giriniz..." +msgstr "Yukarıdaki görseldeki karakterlerini giriniz..." #: lib/bridgedb/strings.py:119 msgid "How to start using your bridges" @@ -210,62 +212,63 @@ msgstr "Köprülerinizi kullanmaya nasıl başlarsınız" #: 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 Tarayıcı içerisine köprüleri girmek için Tor Tarayıcı'yı başlatmak üzere\n%s Tor Tarayıcı indirme sayfasındaki %s yönergeleri izleyin." +"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" +"page %s and then follow the instructions there for downloading and starting\n" +"Tor Browser." +msgstr "Tor Browser'a köprü tanımlamak için önce %s Tor Browser indirme sayfasına %s gidip, oradaki Tor Browser'ı indirme ve başlatma yönergelerini izleyin." #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:125 +#: lib/bridgedb/strings.py:126 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" -msgstr "'Tor Ağ Ayarları' penceresi açıldığında, 'Yapılandır' tıklayın ve şunu soruncaya dek\nsihirbazı izleyin:" +msgstr "'Tor Ağ Ayarları' penceresi açıldığında, 'Yapılandır'ı tıklayın ve şunu soruncaya dek\nsihirbazı izleyin:" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:129 +#: lib/bridgedb/strings.py:130 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "İnternet Servis Sağlayıcınız (ISP) Tor ağına bağlantıyı engelliyor\nveya başka şekillerde sansür uyguluyor mu?" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:133 +#: lib/bridgedb/strings.py:134 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" "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 "'Evet' ve ardından 'İleri' tıklayın. Yeni köprülerinizi yapılandırmak için,\nköprü satırlarını kopyalayarak metin kutusu girdisine yapıştırın. Son olarak\n'Bağlan' tıkladığınızda başlamak için hazır olmalısınız! Eğer sorun yaşıyorsanız,\ndaha fazla yardım için 'Tor Ağ Ayarları' sihirbazındaki 'Yardım' düğmesine\ntıklamayı deneyin." +msgstr "'Evet' ve ardından 'İleri' tıklayın. Yeni köprülerinizi yapılandırmak için,\nköprü satırlarını kopyalayarak metin kutusuna yapıştırın. 'Bağlan'ı da tıkladığınızda artık hazırsınız! Eğer sorun yaşıyorsanız, daha fazla yardım için 'Tor Ağ Ayarları' sihirbazındaki 'Yardım' düğmesine tıklamayı deneyin." -#: lib/bridgedb/strings.py:141 +#: lib/bridgedb/strings.py:142 msgid "Displays this message." msgstr "Bu iletiyi görüntüler." #. 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 +#: lib/bridgedb/strings.py:146 msgid "Request vanilla bridges." -msgstr "Özelliksiz köprüleri talep et." +msgstr "Normal köprüler iste." -#: lib/bridgedb/strings.py:146 +#: lib/bridgedb/strings.py:147 msgid "Request IPv6 bridges." -msgstr "IPv6 köprüleri talep et." +msgstr "IPv6 köprüleri iste." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:148 +#: lib/bridgedb/strings.py:149 msgid "Request a Pluggable Transport by TYPE." -msgstr "TYPE tarafından eklenebilir bir aktarım talep et." +msgstr "TYPE uyumlu bir eklenebilir taşıyıcı talep et." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: lib/bridgedb/strings.py:151 +#: lib/bridgedb/strings.py:152 msgid "Get a copy of BridgeDB's public GnuPG key." -msgstr "BridgeDB'nin ortak bir GnuPG anahtar kopyasını al." +msgstr "BridgeDB'nin ortak GnuPG anahtar kopyasını al." #: lib/bridgedb/templates/base.html:89 msgid "Report a Bug" -msgstr "Bir hata Bildir" +msgstr "Bir Hata Bildir" #: lib/bridgedb/templates/base.html:92 msgid "Source Code" @@ -289,7 +292,7 @@ msgstr "QR Kodunu Göster" #: lib/bridgedb/templates/bridges.html:100 msgid "QRCode for your bridge lines" -msgstr "Köprü hatlarınız için QR Kodu" +msgstr "Köprü satırlarınız için QR Kodu" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, @@ -308,7 +311,7 @@ msgstr "QR Kodunuzu alınırken bir hata olmuş gibi görünüyor." msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." -msgstr "Bu QR Kodu köprü hatlarınızı içeriyor. Köprü hatlarınızı bir mobil cihaza veya diğer cihazlara kopyalamak için bir QR Tarayıcı kullanın." +msgstr "Bu QR Kodu köprü satırlarınızı içeriyor. Köprü satırlarınızı bir mobil cihaza veya diğer cihazlara kopyalamak için bir QR Tarayıcı kullanın." #: lib/bridgedb/templates/bridges.html:181 msgid "There currently aren't any bridges available..." @@ -324,12 +327,12 @@ msgstr "Belki %s geri dönmeyi %s ve farklı bir köprü türü seçmeyi denemel #: lib/bridgedb/templates/index.html:11 #, python-format msgid "Step %s1%s" -msgstr "%s1%s adım" +msgstr "Adım %s1%s" #: lib/bridgedb/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "%s Tor Tarayıcı'yı %s İndirin" +msgstr "%s Tor Browser'ı %s İndirin" #: lib/bridgedb/templates/index.html:25 #, python-format

1 0

[bridgedb/master] Update Taiwanese Mandarin (zh_TW) translations.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit bea886a559bad930337803c8f9288a569bf1d285 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jul 25 01:57:56 2015 +0000 Update Taiwanese Mandarin (zh_TW) translations. * THANKS TO x4r. --- bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po | 54 +++++++++++++++++++-------- 1 file changed, 39 insertions(+), 15 deletions(-) diff --git a/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po index acda44c..c36c522 100644 --- a/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po +++ b/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po @@ -1,17 +1,18 @@ # 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: # danfong <danfong.hsieh(a)gmail.com>, 2014 # LNDDYL, 2014 +# x4r <xatierlike(a)gmail.com>, 2015 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-07-26 02:11+0000\n" -"PO-Revision-Date: 2014-11-24 09:10+0000\n" -"Last-Translator: LNDDYL\n" +"POT-Creation-Date: 2015-02-03 03:24+0000\n" +"PO-Revision-Date: 2015-03-23 08:01+0000\n" +"Last-Translator: x4r <xatierlike(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,7 +32,7 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:121 +#: lib/bridgedb/HTTPServer.py:122 msgid "Sorry! Something went wrong with your request." msgstr "抱歉!您的請求發生錯誤。" @@ -74,7 +75,7 @@ msgstr "嘿，%s!" msgid "Hello, friend!" msgstr "朋友，您好!" -#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101 +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 msgid "Public Keys" msgstr "公開金鑰" @@ -255,35 +256,58 @@ msgstr "按照 TYPE 請求 Pluggable Transport。" msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "取得 BridgeDB 的公共 GnuPG 金鑰副本。" -#: lib/bridgedb/templates/base.html:92 +#: lib/bridgedb/templates/base.html:89 msgid "Report a Bug" msgstr "回報錯誤" -#: lib/bridgedb/templates/base.html:94 +#: lib/bridgedb/templates/base.html:92 msgid "Source Code" msgstr "原始程式碼" -#: lib/bridgedb/templates/base.html:97 +#: lib/bridgedb/templates/base.html:95 msgid "Changelog" msgstr "變更記錄" -#: lib/bridgedb/templates/base.html:99 +#: lib/bridgedb/templates/base.html:98 msgid "Contact" msgstr "聯絡資訊" +#: lib/bridgedb/templates/bridges.html:81 +msgid "Select All" +msgstr "選擇全部" + +#: lib/bridgedb/templates/bridges.html:87 +msgid "Show QRCode" +msgstr "出示 QRCode" + +#: lib/bridgedb/templates/bridges.html:100 +msgid "QRCode for your bridge lines" +msgstr "您的橋接的 QRCode" + #. 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 "有問題!" -#: lib/bridgedb/templates/bridges.html:72 +#: lib/bridgedb/templates/bridges.html:116 +msgid "It seems there was an error getting your QRCode." +msgstr "掃描 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 "這個 QRCode 還有您的橋接資訊。在行動裝置上掃描以獲得您的橋接資訊" + +#: lib/bridgedb/templates/bridges.html:181 msgid "There currently aren't any bridges available..." msgstr "目前沒有任何橋接可用..." -#: 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 " @@ -344,7 +368,7 @@ 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:130 +#: lib/bridgedb/templates/options.html:127 #, python-format msgid "%sY%ses!" msgstr "%sY%ses!" @@ -352,7 +376,7 @@ msgstr "%sY%ses!" #. 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 "%sG%set Bridges"

1 0

[bridgedb/master] Update Chinese Mandarin (zh_CN) translations.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit fec3696d6826c8e8227e5286ffda5502249d3fc3 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jul 25 02:04:56 2015 +0000 Update Chinese Mandarin (zh_CN) translations. * THANKS TO khi. --- bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po | 49 ++++++++++++++------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po index 11bcc18..e2bc012 100644 --- a/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po +++ b/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po @@ -3,22 +3,22 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Wu Ming Shi, 2013 -# Wu Ming Shi, 2013 -# Wu Ming Shi, 2013 +# khi, 2013 +# khi, 2013 +# khi, 2013 # Christopher Meng <cickumqt(a)gmail.com>, 2012 # hanl <iamh4n(a)gmail.com>, 2011 # Meng3, 2014 # leungsookfan <leung.sookfan(a)riseup.net>, 2014 -# Wu Ming Shi, 2014-2015 +# khi, 2014-2015 # YF <yfdyh000(a)gmail.com>, 2014-2015 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: 2015-02-03 03:24+0000\n" -"PO-Revision-Date: 2015-03-08 19:30+0000\n" -"Last-Translator: Wu Ming Shi\n" +"POT-Creation-Date: 2015-03-19 22:13+0000\n" +"PO-Revision-Date: 2015-06-16 14:41+0000\n" +"Last-Translator: khi\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -38,7 +38,7 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:122 +#: lib/bridgedb/HTTPServer.py:107 msgid "Sorry! Something went wrong with your request." msgstr "抱歉，你的邮件请求出现问题。" @@ -70,7 +70,7 @@ msgstr "欢迎来到 BridgeDB！" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: lib/bridgedb/strings.py:30 msgid "Currently supported transport TYPEs:" -msgstr "支持的 transport TYPE：" +msgstr "目前可用的 transport 类型：" #: lib/bridgedb/strings.py:31 #, python-format @@ -115,7 +115,7 @@ msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" -msgstr "一些使用IPv6地址的bridges（网桥）也能使用，但是\nPluggable Transports并不兼容IPv6。\n" +msgstr "另外提供一些IPv6格式的网桥，不过某些 Pluggable Transports 类型目前还不支持IPv6。\n" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, @@ -138,7 +138,7 @@ msgstr "什么是网桥？" #: lib/bridgedb/strings.py:77 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "%s Bridges %s 是帮助你绕过审查或封锁的 Tor relay（中继点）。" +msgstr "%s网桥%s即 Tor 中继节点，用于帮助用户绕过审查或封锁。" #: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" @@ -170,7 +170,7 @@ 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 "请尽量描述你的情况，包括你尝试过的bridges和Pluggable Transports，你的Tor浏览器版本，还有任何Tor显示过的信息等等。" +msgstr "请尽量详细地描述你的情况，包括所用的网桥及其类型，Tor 浏览器版本以及任何 Tor 显示的信息等等。" #: lib/bridgedb/strings.py:103 msgid "Here are your bridge lines:" @@ -209,26 +209,27 @@ msgstr "如何使用网桥" #: 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 浏览器中添加网桥，请先根据 %s Tor 浏览器下载页面 %s 的说明来启动Tor 浏览器。" +"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" +"page %s and then follow the instructions there for downloading and starting\n" +"Tor Browser." +msgstr "如需在 Tor 浏览器中添加网桥，请先根据 %s Tor 浏览器下载页面 %s 的说明下载和启动 Tor 浏览器。" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:125 +#: lib/bridgedb/strings.py:126 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "当“Tor 网络设置” 对话框出现时，点击“配置” ，然后根据向导操作，直到看到下面的问题：" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:129 +#: lib/bridgedb/strings.py:130 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "网络提供商（ISP）或其他人是否对 Tor 网络连接进行审查或封锁？" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:133 +#: lib/bridgedb/strings.py:134 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" @@ -236,29 +237,29 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "选择“是”，然后点击“下一步”。如下添加新的网桥，请将网桥地址行通过复制粘贴的方式输入到文本输入框。最后，点击“连接”就可以连接至 Tor 网络。如有问题需要帮助，请点击“Tor 网络设置”向导窗口中的“帮助”按钮。" -#: lib/bridgedb/strings.py:141 +#: lib/bridgedb/strings.py:142 msgid "Displays this message." msgstr "显示这条信息。" #. 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 +#: lib/bridgedb/strings.py:146 msgid "Request vanilla bridges." msgstr "请求普通网桥。" -#: lib/bridgedb/strings.py:146 +#: lib/bridgedb/strings.py:147 msgid "Request IPv6 bridges." msgstr "请求IPv6网络。" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:148 +#: lib/bridgedb/strings.py:149 msgid "Request a Pluggable Transport by TYPE." -msgstr "根据TYPE 请求Pluggable Transport。" +msgstr "按照类型请求不同的 Pluggable Transport 网桥。" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: lib/bridgedb/strings.py:151 +#: lib/bridgedb/strings.py:152 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "获取 BridgeDB 的 GnuPG 公共密匙。"

1 0

[bridgedb/master] Update Ukranian (uk) translations.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 718a97a19249fc46dd1185b2486b970f94f8c8e3 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jul 25 02:06:49 2015 +0000 Update Ukranian (uk) translations. * THANKS TO Yasha. --- bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po | 32 ++++++++++++++++-------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po index 00b8d59..1de17e2 100644 --- a/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po +++ b/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po @@ -7,14 +7,15 @@ # LinuxChata, 2014-2015 # Oleksii Golub <sclub2018(a)yandex.ua>, 2015 # Oleksii Golub <sclub2018(a)yandex.ua>, 2013 +# Yasha <yasha88888(a)hotmail.com>, 2015 # Андрій Бандура <andriykopanytsia(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: 2015-02-03 03:24+0000\n" -"PO-Revision-Date: 2015-03-14 12:34+0000\n" -"Last-Translator: LinuxChata\n" +"POT-Creation-Date: 2015-03-19 22:13+0000\n" +"PO-Revision-Date: 2015-07-13 17:46+0000\n" +"Last-Translator: Yasha <yasha88888(a)hotmail.com>\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/torproject/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,7 +35,7 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:122 +#: lib/bridgedb/HTTPServer.py:107 msgid "Sorry! Something went wrong with your request." msgstr "Ми приносимо наші вибачення! Щось пішло не так з Вашим запитом." @@ -205,26 +206,27 @@ msgstr "Як почати користуватися Вашими мостами #: 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 "Для введення bridges у браузері Tor, дотримуйтесь інструкцій %s на сторінці \nзавантаження браузера Tor %s для запуску браузера Tor." +"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" +"page %s and then follow the instructions there for downloading and starting\n" +"Tor Browser." +msgstr "Щоб додати ретранслятори у Tor Browser, спочатку ідіть на %s сторінку завантаження Tor Browser %s а потім слідуйте інструкціям для скачування і запуску Tor Browser." #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:125 +#: lib/bridgedb/strings.py:126 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "Коли діалог \"Налаштування мережі Tor\" відкриється, натисніть \"Налаштувати\" і дотримуйтесь\nпідказкам майстра, допоки він не запросить:" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:129 +#: lib/bridgedb/strings.py:130 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "Вашій інтернет-провайдер (ISP) блокує або цензурує з'єднання\nдо мережі Tor?" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:133 +#: lib/bridgedb/strings.py:134 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" @@ -232,29 +234,29 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "Виберіть \"Так\", а потім натисніть \"Далі\". Для налаштування нових bridges, скопіюйте і\nвставте лінії bridge у поле для введення тексту. Потім, натисніть 'Підключатися', і\nвсе повинно працювати! Якщо у Вас виникли проблеми, спробуйте натиснути \"Довідка\" \nв майстрові \"Мережеві параметри Tor' для отримання додаткової допомоги." -#: lib/bridgedb/strings.py:141 +#: lib/bridgedb/strings.py:142 msgid "Displays this message." msgstr "Відображає це повідомлення." #. 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 +#: lib/bridgedb/strings.py:146 msgid "Request vanilla bridges." msgstr "Запит на отримання vanilla bridges." -#: lib/bridgedb/strings.py:146 +#: lib/bridgedb/strings.py:147 msgid "Request IPv6 bridges." msgstr "Запит на отримання IPv6 bridges." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:148 +#: lib/bridgedb/strings.py:149 msgid "Request a Pluggable Transport by TYPE." msgstr "Запит на отримання Pluggable Transport по TYPE." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: lib/bridgedb/strings.py:151 +#: lib/bridgedb/strings.py:152 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "Отримати копію відкритого GnuPG ключа для BridgeDB."

1 0