August 2013 - tor-commits - lists.torproject.org

[bridgedb/master] Do not print "bridge" on the bridge line
by isis＠torproject.org 09 Aug '13

09 Aug '13

commit 792cfd99bb3a4d5a116202e76532232aba6e6312 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Wed Aug 7 14:59:00 2013 +0000 Do not print "bridge" on the bridge line Vidalia does not need/want/ask that the bridge line start with "bridge". Users expect to be able to copy and paste what they see on their screen and that it will work. Presently, this is not the case. #5851 states that we print "bridge" so that users can easily copy and paste the line directly into their torrc, however most users do not do this, so we should not add this string. TorButton will preserve this functionality. This patch can be reverted if the functionality in TBB3.x is changed. (cherry picked from commit dcb2a2515e360310a31887260278ea146db1c4f7) Signed-off-by: Isis Lovecruft <isis(a)torproject.org> Edited-by: Isis Lovecruft <isis(a)torproject.org> Reason: Remove EOL whitespace from L193 and extra newline at L194. --- lib/bridgedb/Bridges.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index cf46b3b..98724d8 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -188,10 +188,9 @@ class Bridge: orport = portlist[pos % len(portlist)] if includeFingerprint: - return "bridge %s:%d %s" % (ip, orport, self.fingerprint) + return "%s:%d %s" % (ip, orport, self.fingerprint) else: - return "bridge %s:%d" % (ip, orport) - + return "%s:%d" % (ip, orport) def getAllConfigLines(self,includeFingerprint=False): """Generator. Iterate over all valid config lines for this bridge."""

1 0

[torbrowser/master] Update versions file for 2.x and 3.x TBBs.
by mikeperry＠torproject.org 09 Aug '13

09 Aug '13

commit dc6d25326344bbea1e64a210396e96b3f8580fc2 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Aug 9 21:03:41 2013 +0200 Update versions file for 2.x and 3.x TBBs. --- build-scripts/recommended-versions | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index faa7563..b7d8838 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,12 +1,11 @@ [ -"2.3.25-10-MacOS", -"2.3.25-10-Windows", -"2.3.25-10-Linux", -"2.3.25-10-Linux", -"2.4.15-beta-1-MacOS", -"2.4.15-beta-1-Windows", -"2.4.15-beta-1-Linux", -"3.0-alpha-2-Linux", -"3.0-alpha-2-MacOS", -"3.0-alpha-2-Windows" +"2.3.25-11-MacOS", +"2.3.25-11-Windows", +"2.3.25-11-Linux", +"2.4.15-beta-2-MacOS", +"2.4.15-beta-2-Windows", +"2.4.15-beta-2-Linux", +"3.0-alpha-3-Linux", +"3.0-alpha-3-MacOS", +"3.0-alpha-3-Windows" ]

1 0

[torbrowser/master] Merge branch 'maint-2.4'
by mikeperry＠torproject.org 09 Aug '13

09 Aug '13

commit 57fae9c8d32f3cc014bf7fc087f9a352c09e0a8a Merge: e3d5bf4 dc6d253 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Aug 9 21:04:10 2013 +0200 Merge branch 'maint-2.4' build-scripts/recommended-versions | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)

1 0

[torbrowser/maint-2.4] Update versions file for 2.x and 3.x TBBs.
by mikeperry＠torproject.org 09 Aug '13

09 Aug '13

commit dc6d25326344bbea1e64a210396e96b3f8580fc2 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Aug 9 21:03:41 2013 +0200 Update versions file for 2.x and 3.x TBBs. --- build-scripts/recommended-versions | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index faa7563..b7d8838 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,12 +1,11 @@ [ -"2.3.25-10-MacOS", -"2.3.25-10-Windows", -"2.3.25-10-Linux", -"2.3.25-10-Linux", -"2.4.15-beta-1-MacOS", -"2.4.15-beta-1-Windows", -"2.4.15-beta-1-Linux", -"3.0-alpha-2-Linux", -"3.0-alpha-2-MacOS", -"3.0-alpha-2-Windows" +"2.3.25-11-MacOS", +"2.3.25-11-Windows", +"2.3.25-11-Linux", +"2.4.15-beta-2-MacOS", +"2.4.15-beta-2-Windows", +"2.4.15-beta-2-Linux", +"3.0-alpha-3-Linux", +"3.0-alpha-3-MacOS", +"3.0-alpha-3-Windows" ]

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 09 Aug '13

09 Aug '13

commit de1e9c86f1c04b99ce8aa243b447e4834f7c9235 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 9 16:46:15 2013 +0000 Update translations for liveusb-creator --- eu/eu.po | 7 ++++--- tr/tr.po | 10 +++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/eu/eu.po b/eu/eu.po index 407bbe1..bf93172 100644 --- a/eu/eu.po +++ b/eu/eu.po @@ -6,13 +6,14 @@ # Antxon Baldarra <baldarra(a)lavabit.com>, 2012-2013 # Antxon Baldarra <baldarra(a)lavabit.com>, 2013 # totorika93 <totorika93(a)gmail.com>, 2012 +# unaizalakain <unai(a)gisa-elkartea.org>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-08-07 16:08+0200\n" -"PO-Revision-Date: 2013-08-08 09:40+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-08-09 16:30+0000\n" +"Last-Translator: unaizalakain <unai(a)gisa-elkartea.org>\n" "Language-Team: Basque (http://www.transifex.com/projects/p/torproject/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -42,7 +43,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" "<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Need help? Read the </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/usb_installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a><span style=\" font-size:10pt;\">.</span></p></body></html>" -msgstr "" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">⏎\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">⏎\np, li { white-space: pre-wrap; }⏎\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">⏎\n<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Laguntza behar duzu? Irakurri </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/usb_installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">dokumentazioa</span></a><span style=\" font-size:10pt;\">.</span></p></body></html>" #: ../liveusb/launcher_ui.py:151 msgid "" diff --git a/tr/tr.po b/tr/tr.po index 360d1aa..13c5242 100644 --- a/tr/tr.po +++ b/tr/tr.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-08-07 16:08+0200\n" -"PO-Revision-Date: 2013-08-09 16:15+0000\n" +"PO-Revision-Date: 2013-08-09 16:30+0000\n" "Last-Translator: Bloodia <aycaom(a)hotmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/torproject/language/tr/)\n" "MIME-Version: 1.0\n" @@ -193,7 +193,7 @@ msgstr "ISO MD5 checksum onaylanması başarısız" msgid "" "If you do not select an existing Live ISO, the selected release will be " "downloaded for you." -msgstr "" +msgstr "Eğer mevcut bir Live ISO seçmezseniz, seçili olan sürüm indirilecektir." #: ../liveusb/gui.py:619 msgid "Installation complete!" @@ -348,7 +348,7 @@ msgid "" "This button allows you to browse for an existing Live system ISO that you " "have previously downloaded. If you do not select one, a release will be " "downloaded for you automatically." -msgstr "" +msgstr "Bu tuş sizin daha önce yüklediğiniz mevcut Live sistem ISO'larınıza göz atmanıza olanak verir. Eğer hiç bir şey seçili değilse, bir sürüm otomatik olarak indirilmeye başlayacaktır." #: ../liveusb/dialog.py:164 msgid "" @@ -356,13 +356,13 @@ msgid "" "optionally downloading a release (if an existing one wasn't selected), " "extracting the ISO to the USB device, creating the persistent overlay, and " "installing the bootloader." -msgstr "" +msgstr "Bu tuş Live USB yaratma sürecini başlatacaktır. Bu süreç, bir sürümün indirilmesi (eğer mevcut olan bir versiyon seçilmediyse), ISO imajının USB cihazına çıkarılması, kalıcı overlay'in oluşturulması ve bootloader'in yüklenmesini içerir." #: ../liveusb/dialog.py:158 msgid "" "This is the USB stick that you want to install your Live system on. This " "device must be formatted with the FAT filesystem." -msgstr "" +msgstr "Bu Live sisteminizi yüklemek istediğiniz USB cihazı. Bu cihaz FAT dosya sistemi ile formatlanmalıdır. " #: ../liveusb/dialog.py:163 msgid ""

1 0

r26293: {website} bump all stable and beta TBB versions for Firefox 17.0.8esr (website/trunk/include)
by Erinn Clark 09 Aug '13

09 Aug '13

Author: erinn Date: 2013-08-09 16:45:04 +0000 (Fri, 09 Aug 2013) New Revision: 26293 Modified: website/trunk/include/versions.wmi Log: bump all stable and beta TBB versions for Firefox 17.0.8esr Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2013-08-09 15:44:30 UTC (rev 26292) +++ website/trunk/include/versions.wmi 2013-08-09 16:45:04 UTC (rev 26293) @@ -23,38 +23,38 @@ <define-tag version-osx-ppc-stable whitespace=delete>0.2.3.25</define-tag> <define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.15-rc</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>2.3.25-10</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>2.3.25-11</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.3.25</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.0k</define-tag> -<define-tag version-torbrowser-firefox whitespace=delete>17.0.7esr</define-tag> +<define-tag version-torbrowser-firefox whitespace=delete>17.0.8esr</define-tag> <define-tag version-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> <define-tag version-torbrowser-pidgin whitespace=delete>2.7.5</define-tag> <define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag> <define-tag version-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlealpha whitespace=delete>2.4.15-beta-1</define-tag> +<define-tag version-torbrowserbundlealpha whitespace=delete>2.4.15-beta-2</define-tag> <define-tag version-torobfsbundlealpha whitespace=delete>2.4.12-alpha-2-pt1</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.3.25-10</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.3.25-10</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.3.25-11</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.3.25-11</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.3.25</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.0k</define-tag> -<define-tag version-gnu-torbrowser-firefox whitespace=delete>17.0.7esr</define-tag> +<define-tag version-gnu-torbrowser-firefox whitespace=delete>17.0.8esr</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> -<define-tag version-torbrowserbundlelinux32alpha whitespace=delete>2.4.15-beta-1</define-tag> -<define-tag version-torbrowserbundlelinux64alpha whitespace=delete>2.4.15-beta-1</define-tag> +<define-tag version-torbrowserbundlelinux32alpha whitespace=delete>2.4.15-beta-2</define-tag> +<define-tag version-torbrowserbundlelinux64alpha whitespace=delete>2.4.15-beta-2</define-tag> <define-tag version-torobfsbundlelinux32alpha whitespace=delete>2.4.12-alpha-2-pt1</define-tag> <define-tag version-torobfsbundlelinux64alpha whitespace=delete>2.4.12-alpha-2-pt1</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>2.3.25-10</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>2.3.25-10</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>2.3.25-11</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>2.3.25-11</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.3.25</define-tag> -<define-tag version-osx-torbrowser-firefox whitespace=delete>17.0.7esr</define-tag> +<define-tag version-osx-torbrowser-firefox whitespace=delete>17.0.8esr</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> -<define-tag version-torbrowserbundleosx32alpha whitespace=delete>2.4.15-beta-1</define-tag> -<define-tag version-torbrowserbundleosx64alpha whitespace=delete>2.4.15-beta-1</define-tag> +<define-tag version-torbrowserbundleosx32alpha whitespace=delete>2.4.15-beta-2</define-tag> +<define-tag version-torbrowserbundleosx64alpha whitespace=delete>2.4.15-beta-2</define-tag> <define-tag version-torobfsbundleosx32alpha whitespace=delete>2.4.12-alpha-2-pt1</define-tag> <define-tag version-torobfsbundleosx64alpha whitespace=delete>2.4.12-alpha-2-pt1</define-tag>

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 09 Aug '13

09 Aug '13

commit a31d0dc5c31126fffd5252d13e062afcc85ad90d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 9 16:16:13 2013 +0000 Update translations for liveusb-creator --- tr/tr.po | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/tr/tr.po b/tr/tr.po index de532ea..360d1aa 100644 --- a/tr/tr.po +++ b/tr/tr.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-08-07 16:08+0200\n" -"PO-Revision-Date: 2013-08-09 15:46+0000\n" +"PO-Revision-Date: 2013-08-09 16:15+0000\n" "Last-Translator: Bloodia <aycaom(a)hotmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/torproject/language/tr/)\n" "MIME-Version: 1.0\n" @@ -127,7 +127,7 @@ msgstr "" #: ../liveusb/gui.py:556 msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." -msgstr "" +msgstr "Cihaz henüz takılı değil, bu yüzden boş alan hesaplanması şu an mümkün değil." #: ../liveusb/dialog.py:157 #, python-format @@ -170,11 +170,11 @@ msgstr "Hata: Etiket ayarlanamıyor veya aygıtınızın UUID'si alınamıyor. D msgid "" "Error: The SHA1 of your Live CD is invalid. You can run this program with " "the --noverify argument to bypass this verification check." -msgstr "" +msgstr "Hata: Live CD'nizin SHA1'i geçersizdir. Bu programı --noverify argümanıyla çalıştırarak bu onaylama adımını atlayabilirsiniz." #: ../liveusb/creator.py:145 msgid "Extracting live image to USB device..." -msgstr "" +msgstr "Live .iso imajı USB cihazına çıkarılıyor..." #: ../liveusb/creator.py:1047 #, python-format @@ -255,12 +255,12 @@ msgstr "" #: ../liveusb/gui.py:539 msgid "Partition is FAT32; Restricting overlay size to 4G" -msgstr "" +msgstr "Partisyon FAT32 formatında; Overlay boyutu 4G'a sınırlanıyor" #: ../liveusb/creator.py:226 ../liveusb/creator.py:837 #, python-format msgid "Partitioning device %(device)s" -msgstr "" +msgstr "Cihaz partisyonlanıyor %(device)s" #: ../liveusb/gui.py:610 msgid "Persistent Storage" @@ -268,7 +268,7 @@ msgstr "Kalıcı Depo" #: ../liveusb/dialog.py:161 msgid "Persistent Storage (0 MB)" -msgstr "" +msgstr "Kalici Depo (0 MB)" #: ../liveusb/gui.py:679 ../liveusb/gui.py:696 msgid "Press 'Next' if you wish to continue." @@ -289,7 +289,7 @@ msgstr " %(file)s siliniyor" #: ../liveusb/creator.py:469 msgid "Removing existing Live OS" -msgstr "" +msgstr "Mevcut Live OS kaldırılıyor" #: ../liveusb/creator.py:1096 #, python-format @@ -322,7 +322,7 @@ msgstr "Diskteki veriler senkronize ediliyor..." #: ../liveusb/dialog.py:159 msgid "Target Device" -msgstr "" +msgstr "Hedef Cihaz" #: ../liveusb/gui.py:643 msgid "" @@ -341,7 +341,7 @@ msgstr "Seçilen dosya okunamıyor. Lütfen izinlerini kontrol edin veya başka msgid "" "There was a problem executing the following command: `%(command)s`.\n" "A more detailed error log has been written to '%(filename)s'." -msgstr "" +msgstr "Aşağıdaki komutun yürütülmesinde bir problem çıktı:\n`%(command)s`.⏎\nDaha detaylı bir hata raporu '%(filename)s' adlı dosyaya yazıldı: " #: ../liveusb/dialog.py:151 msgid "" @@ -387,7 +387,7 @@ msgstr "chmod başarısız %(file)s: %(message)s" #: ../liveusb/creator.py:459 #, python-format msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s" -msgstr "" +msgstr "%(infile)s %(outfile)s'a kopyalanamadı: %(message)s" #: ../liveusb/gui.py:418 msgid "Unable to find any USB drive" @@ -413,17 +413,17 @@ msgstr "Cihaza bağlanılamadı" #: ../liveusb/creator.py:785 #, python-format msgid "Unable to mount device: %(message)s" -msgstr "" +msgstr "Cihaz takılamıyor: %(message)s" #: ../liveusb/creator.py:494 #, python-format msgid "Unable to remove directory from previous LiveOS: %(message)s" -msgstr "" +msgstr "Önceki LiveOS'den klasör silinmesi başarısız: %(message)s" #: ../liveusb/creator.py:482 #, python-format msgid "Unable to remove file from previous LiveOS: %(message)s" -msgstr "" +msgstr "Önceki LiveOS'den dosya silinmesi başarısız: %(message)s" #: ../liveusb/creator.py:1099 msgid "" @@ -434,7 +434,7 @@ msgstr "MBR sıfırlanamadı. Bilgisayarınızda 'syslinux' paketi yüklenmemiş msgid "" "Unable to use the selected file. You may have better luck if you move your " "ISO to the root of your drive (ie: C:\\)" -msgstr "Seçilen dosya kullanılamadı. ISO imajınızı diskinizin kök dizinine (root) taşımayı deneyiniz. (örnek: C:\\)" +msgstr "Seçilen dosya kullanılamadı. ISO imajınızı diskinizin kök dizinine <root> taşımayı deneyiniz. (örnek: C:\\)" #: ../liveusb/creator.py:692 #, python-format @@ -448,7 +448,7 @@ msgstr "Bilinmeyen ISO, checksum onaylanması atlanıyor" #: ../liveusb/creator.py:781 #, python-format msgid "Unknown dbus exception while trying to mount device: %(message)s" -msgstr "" +msgstr "Cihaz takılmasına ilişkin bilinmeyen dbus istisnası: %(message)s" #: ../liveusb/creator.py:760 ../liveusb/creator.py:874 msgid "Unknown filesystem. Your device may need to be reformatted." @@ -462,12 +462,12 @@ msgstr "Bilinmeyen sürüm: %s" #: ../liveusb/creator.py:822 #, python-format msgid "Unmounting '%(udi)s' on '%(device)s'" -msgstr "" +msgstr " '%(device)s' dan '%(udi)s' çıkarılıyor." #: ../liveusb/creator.py:818 #, python-format msgid "Unmounting mounted filesystems on '%(device)s'" -msgstr "" +msgstr " '%(device)s' deki takılı dosya sistemleri çıkarılıyor." #: ../liveusb/creator.py:765 ../liveusb/creator.py:877 #, python-format @@ -479,7 +479,7 @@ msgstr "Desteklenmeyen dosya sistemi: %s" msgid "" "Unsupported filesystem: %s\n" "In case you are trying to upgrade a manually installed Tails system (that is, if it was installed without this installer), this option is not supported: you need to install it anew to start with, e.g. by choosing the \"Clone & Install\" action instead." -msgstr "" +msgstr "Desteklenmeyen dosya sistemi: %s⏎\nEğer elle yüklenmiş olan bir Tails sistemini güncelleştirmeye çalışıyorsanız (yani Tails'i bu kur sihirbazı ile kurmadıysanız) bu seçeneği kullanamazsınız. Yüklemeye baştan başlamanız gerekiyor, örneğin \"Klonla ve Kur\" seçeneğini kullanarak. " #: ../liveusb/creator.py:1197 #, python-format @@ -490,11 +490,11 @@ msgstr "" #: ../liveusb/launcher_ui.py:154 msgid "Upgrade from ISO" -msgstr "" +msgstr "ISO'dan güncelleştir" #: ../liveusb/dialog.py:152 msgid "Use existing Live system ISO" -msgstr "" +msgstr "Mevcut olan Live sistem ISO'sunu kullan" #: ../liveusb/creator.py:133 msgid "Verifying ISO MD5 checksum" @@ -562,4 +562,4 @@ msgstr "Cihazınız zaten bir LiveOS barındırıyor.\nDevam ederseniz üzerine #: ../liveusb/dialog.py:155 msgid "or" -msgstr "" +msgstr "ya da"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 09 Aug '13

09 Aug '13

commit ca3bff569b4a2d01773a3a3639dce313e8fbbb0b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 9 15:46:15 2013 +0000 Update translations for liveusb-creator --- tr/tr.po | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/tr/tr.po b/tr/tr.po index 5a697e4..de532ea 100644 --- a/tr/tr.po +++ b/tr/tr.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-08-07 16:08+0200\n" -"PO-Revision-Date: 2013-08-09 15:10+0000\n" +"PO-Revision-Date: 2013-08-09 15:46+0000\n" "Last-Translator: Bloodia <aycaom(a)hotmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/torproject/language/tr/)\n" "MIME-Version: 1.0\n" @@ -73,7 +73,7 @@ msgstr "" #: ../liveusb/dialog.py:154 msgid "Alt+B" -msgstr "" +msgstr "Alt+B" #: ../liveusb/dialog.py:153 msgid "Browse" @@ -106,18 +106,18 @@ msgid "" "Clone\n" "&&\n" "Install" -msgstr "" +msgstr "Klonla\n&&\nKur" #: ../liveusb/launcher_ui.py:152 msgid "" "Clone\n" "&&\n" "Upgrade" -msgstr "" +msgstr "Klonla\n&&\nGüncelle" #: ../liveusb/dialog.py:165 msgid "Create Live USB" -msgstr "" +msgstr "Live USB oluştur" #: ../liveusb/creator.py:400 #, python-format @@ -187,7 +187,7 @@ msgstr "ISO MD5 checksum başarılı" #: ../liveusb/creator.py:138 msgid "ISO MD5 checksum verification failed" -msgstr "" +msgstr "ISO MD5 checksum onaylanması başarısız" #: ../liveusb/dialog.py:156 msgid "" @@ -210,7 +210,7 @@ msgstr "Kutulum tamamlandı. Lütfen programı kapatmak için TAMAM butonuna bas #: ../liveusb/creator.py:900 ../liveusb/creator.py:1223 msgid "Installing bootloader..." -msgstr "" +msgstr "Bootloader yükleniyor..." #: ../liveusb/gui.py:284 msgid "LiveUSB creation failed!" @@ -264,7 +264,7 @@ msgstr "" #: ../liveusb/gui.py:610 msgid "Persistent Storage" -msgstr "" +msgstr "Kalıcı Depo" #: ../liveusb/dialog.py:161 msgid "Persistent Storage (0 MB)" @@ -294,7 +294,7 @@ msgstr "" #: ../liveusb/creator.py:1096 #, python-format msgid "Resetting Master Boot Record of %s" -msgstr "" +msgstr "%s'in Master Boot Record'ı sıfırlanıyor" #: ../liveusb/gui.py:761 msgid "Select Live ISO" @@ -314,7 +314,7 @@ msgstr "" #: ../liveusb/creator.py:131 msgid "" "Source type does not support verification of ISO MD5 checksum, skipping" -msgstr "" +msgstr "Kaynak ISO MD5 checksum'ını onaylamasını desteklemiyor, atlanıyor." #: ../liveusb/creator.py:1130 msgid "Synchronizing data on disk..." @@ -328,7 +328,7 @@ msgstr "" msgid "" "The Master Boot Record on your device is blank. Pressing 'Create Live USB' " "again will reset the MBR on this device." -msgstr "" +msgstr "Cihazınızın Master Boot Record'u boş. \"Live USB oluştur\"a yeniden tıklamak, bu cihazın MBR'sini sıfırlayacaktır." #: ../liveusb/gui.py:764 msgid "" @@ -395,7 +395,7 @@ msgstr "Herhangi bir USB sürücü bulunamadı" #: ../liveusb/creator.py:1184 msgid "Unable to find any removable device" -msgstr "" +msgstr "Kaldırılabilir bir cihaz bulunamadı" #: ../liveusb/creator.py:1024 msgid "Unable to find partition" @@ -428,13 +428,13 @@ msgstr "" #: ../liveusb/creator.py:1099 msgid "" "Unable to reset MBR. You may not have the `syslinux` package installed." -msgstr "" +msgstr "MBR sıfırlanamadı. Bilgisayarınızda 'syslinux' paketi yüklenmemiş olabilir." #: ../liveusb/gui.py:770 msgid "" "Unable to use the selected file. You may have better luck if you move your " "ISO to the root of your drive (ie: C:\\)" -msgstr "" +msgstr "Seçilen dosya kullanılamadı. ISO imajınızı diskinizin kök dizinine (root) taşımayı deneyiniz. (örnek: C:\\)" #: ../liveusb/creator.py:692 #, python-format @@ -452,7 +452,7 @@ msgstr "" #: ../liveusb/creator.py:760 ../liveusb/creator.py:874 msgid "Unknown filesystem. Your device may need to be reformatted." -msgstr "" +msgstr "Bilinmeyen dosya sistemi. Cihazınızın yeniden formatlanması gerekebilir." #: ../liveusb/gui.py:84 #, python-format @@ -472,7 +472,7 @@ msgstr "" #: ../liveusb/creator.py:765 ../liveusb/creator.py:877 #, python-format msgid "Unsupported filesystem: %s" -msgstr "" +msgstr "Desteklenmeyen dosya sistemi: %s" #: ../liveusb/creator.py:763 #, python-format @@ -498,7 +498,7 @@ msgstr "" #: ../liveusb/creator.py:133 msgid "Verifying ISO MD5 checksum" -msgstr "" +msgstr "ISO MD5 checksum'ı onaylanıyor" #: ../liveusb/creator.py:356 msgid "Verifying SHA1 checksum of LiveCD image..." @@ -510,7 +510,7 @@ msgstr "LiveCD imajının SHA256 checksum'ı onaylanıyor..." #: ../liveusb/creator.py:871 ../liveusb/creator.py:1190 msgid "Verifying filesystem..." -msgstr "" +msgstr "Dosya sistemi onaylanıyor..." #: ../liveusb/gui.py:677 msgid "Warning: All data on the selected drive will be lost." @@ -526,7 +526,7 @@ msgid "" "Warning: The Master Boot Record on your device does not match your system's " "syslinux MBR. If you have trouble booting this stick, try running the " "liveusb-creator with the --reset-mbr option." -msgstr "" +msgstr "Uyarı: Cihazınızın Master Boot Record'u sisteminizin syslinux Master Boot Record'u ile uyuşmuyor. Bu cihazı başlatmada sorun yaşiyorsaniz, liveusb-creator'ı --reset-mbr seçeneği ile çalıştırmayı deneyiniz." #: ../liveusb/gui.py:392 msgid "" @@ -538,7 +538,7 @@ msgstr "Uyarı: Bu aracı Yönetici olarak çalıştırmak zorundasınız. Bunu #: ../liveusb/creator.py:152 #, python-format msgid "Wrote to device at %(speed)d MB/sec" -msgstr "" +msgstr "Cihaza %(speed)d MB/saniye hızında yazıldı" #: ../liveusb/creator.py:607 msgid "" @@ -548,7 +548,7 @@ msgstr "syslinux-extlinux'un ext4 dosya sistemini desteklemeyen eski bir versiyo #: ../liveusb/gui.py:755 msgid "You can try again to resume your download" -msgstr "" +msgstr "İndirmeye devam etmeyi yeniden deneyebilirsiniz" #: ../liveusb/creator.py:92 msgid "You must run this application as root"

1 0

r26292: {check} short-circuit the tor check, to provide quick answers (check/trunk/cgi-bin)
by Roger Dingledine 09 Aug '13

09 Aug '13

Author: arma Date: 2013-08-09 15:44:30 +0000 (Fri, 09 Aug 2013) New Revision: 26292 Modified: check/trunk/cgi-bin/TorCheck-off.py Log: short-circuit the tor check, to provide quick answers Modified: check/trunk/cgi-bin/TorCheck-off.py =================================================================== --- check/trunk/cgi-bin/TorCheck-off.py 2013-08-09 15:24:27 UTC (rev 26291) +++ check/trunk/cgi-bin/TorCheck-off.py 2013-08-09 15:44:30 UTC (rev 26292) @@ -48,6 +48,9 @@ DNS.DiscoverNameServers() def isUsingTor(clientIp, ELPort): + # Short-circuit the check, so we can return quickly. + return 2 + # This is the exit node ip address # This is where we want to dynamically recieve this from Apache splitIp = clientIp.split('.') @@ -298,10 +301,10 @@ req.write('<img alt="' + _("Sorry, your query failed or an unexpected response was received.") + '" '\ 'src="/images/tor-off.png">\n<br>') req.write('<h1 style="color: #A00">\n') - req.write(_('Sorry, your query failed or an unexpected response was received.')) + req.write(_('Sorry, the check website is temporarily overloaded. (If you are reading this message in Tor Browser Bundle, it is very likely that your Tor is working just fine.)')) req.write('<br>\n') req.write('</h1>') - req.write(_('A temporary service outage prevents us from determining if your source IP address is a <a href="https://www.torproject.org/">Tor</a> node.')) +# req.write(_('A temporary service outage prevents us from determining if your source IP address is a <a href="https://www.torproject.org/">Tor</a> node.')) req.write('<br>\n<br>\n') # Now we'll close up this html rat hole

1 0

r26291: {} fork torcheck to make a (much faster) version that doesn't a (check/trunk/cgi-bin)
by Roger Dingledine 09 Aug '13

09 Aug '13

Author: arma Date: 2013-08-09 15:24:27 +0000 (Fri, 09 Aug 2013) New Revision: 26291 Added: check/trunk/cgi-bin/TorCheck-off.py Log: fork torcheck to make a (much faster) version that doesn't actually check Copied: check/trunk/cgi-bin/TorCheck-off.py (from rev 26290, check/trunk/cgi-bin/TorCheck.py) =================================================================== --- check/trunk/cgi-bin/TorCheck-off.py (rev 0) +++ check/trunk/cgi-bin/TorCheck-off.py 2013-08-09 15:24:27 UTC (rev 26291) @@ -0,0 +1,351 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +""" + TorCheck.py + + https://check.torproject.org - originally in perl, rewritten in python + + By Jacob Appelbaum <jacob(a)appelbaum.net> + Written at ToorCon Seattle 2008 (Thanks for the great time h1kari!) + Thanks to Crispen for a power outlet :-) + + Additional python suggestions from nickm + + Best used with the Debian packages: + python-dns + libapache2-mod-python + locales-all + +""" + +__program__ = 'TorCheck.py' +__version__ = '20100429.01' +__url__ = 'https://svn.torproject.org/svn/check/' +__author__ = 'Jacob Appelbaum <jacob(a)appelbaum.net>' +__copyright__ = 'Copyright (c) 2008, Jacob Appelbaum' +__license__ = 'See LICENSE for licensing information' + +try: + from future import antigravity +except ImportError: + antigravity = None + +import cgi +import DNS +from DNS import DNSError +# This is pydns and can be downloaded from http://pydns.sourceforge.net/ +# Or use the Debian package listed above +import cgitb; cgitb.enable() +import gettext +import locale +import os + +#os.environ['LOCPATH']='/usr/share/locale:/srv/check.torproject.org/trunk/i18n/locale' +localedir ='/srv/check.torproject.org/trunk/i18n/locale' + +# We could also explictly query the remote EL server +# This is not as good as using a cache for obvious reasons +DNS.DiscoverNameServers() + +def isUsingTor(clientIp, ELPort): + # This is the exit node ip address + # This is where we want to dynamically recieve this from Apache + splitIp = clientIp.split('.') + splitIp.reverse() + ELExitNode = ".".join(splitIp) + + # We'll attempt to reach this port on the Target host + # ELPort is now set by the caller + + # We'll try to reach this host + ElTarget = "38.229.70.31" + + # This is the ExitList DNS server we want to query + ELHost = "ip-port.exitlist.torproject.org" + + # Prepare the question as an A record request + ELQuestion = ELExitNode + "." + ELPort + "." + ElTarget + "." + ELHost + request = DNS.DnsRequest(name=ELQuestion,qtype='A') + + # Ask the question and load the data into our answer + try: + answer=request.req() + except DNSError: + return 2 + + # Parse the answer and decide if it's allowing exits + # 127.0.0.2 is an exit and NXDOMAIN is not + if answer.header['status'] == "NXDOMAIN": + # We're not exiting from a Tor exit + return 1 + else: + if not answer.answers: + # We're getting unexpected data - fail closed + return 2 + for a in answer.answers: + if a['data'] != "127.0.0.2": + return 2 + # If we're here, we've had a positive exit answer + return 0 + + +def isUpToDate(queryString): + """ + determine if TBB is aware of newer versions + """ + if 'uptodate=1' in queryString.lower(): + return True + if 'uptodate=0' in queryString.lower(): + return False + # This will be true until Torbutton 1.4.4 is released + if 'small=1' in queryString.lower(): + return False + + # The default case; No update information to provide + return True + + +def getLocales(): + locale_descriptions = { + 'ar' : 'عربية (Arabiya)', + 'bms' : 'Burmese', + 'cs' : 'česky', + 'da' : 'dansk', + 'de' : 'Deutsch', + 'el' : 'Ελληνικά (Ellinika)', + 'en_US' : 'English', + 'es' : 'español', + 'et' : 'Estonian', + 'fa_IR' : 'فارسی (Fārsī)', + 'fr' : 'français', + 'it_IT' : 'Italiano', + 'ja' : '日本語 (Nihongo)', + 'nb' : 'norsk (bokmål)', + 'nl' : 'Nederlands', + 'pl' : 'polski', + 'pt' : 'Português', + 'pt_BR' : 'Português do Brasil', + 'ro' : 'română', + 'fi' : 'suomi', + 'ru' : 'Русский (Russkij)', + 'th' : 'Thai', + 'tr' : 'Türkçe', + 'uk' : 'українська (ukrajins\'ka)', + 'vi' : 'Vietnamese', + 'zh_CN' : '中文(简)' } + return locale_descriptions + +def getLocaleName(lang): + # If the user passes in a locale that matches what we support, good + # However, anything that we don't support will result in us using a default locale + # + # Important! lang is tainted data, don't forget this! + # + + default_locale = "en_US" + + # We'd really like these additional locales to be translated: + # locales = ( 'ar', 'fr', 'nl', 'pt-PT', 'ru' ) + + # Make sure we have a valid language + if not lang: + return default_locale + + # This is to deal with Mozilla and Debian having different ideas about + # what it means to be a locale + lang = lang.replace("-", "_") + + # Do a case insensitive match + lang = lang.lower() + + # Check for an exact match of language_country + for item in getLocales().keys(): + if item.lower() == lang: + return item + + # Check for just the language + lang = lang.split("_", 1)[0] + for item in getLocales().keys(): + if item.lower().startswith(lang): + return item + + # Fall back to default + return default_locale + +def showLogo(formSubmission): + # By default, we'll show a logo + show_logo = True + hide_logo = formSubmission.getfirst("small", None) + # hide_logo isn't cleaned - do not use it for anything else + if hide_logo: + return False + return show_logo + +def parseLang(formSubmission): + user_supplied_lang = formSubmission.getfirst("lang", None) + + # Find the best match for the requested language + locale = getLocaleName(user_supplied_lang) + + # i18n with Unicode! + # Ensure you have properly installed TorCheck.{po,pot,mo} files + lang = gettext.translation('TorCheck', localedir=localedir, languages=[locale], fallback=True) + lang.install() + +def printTorButton(req, UsingTor): + req.write('<html xmlns="http://www.w3.org/1999/xhtml"><body>') + if UsingTor == 0: + req.write('<a id="TorCheckResult" target="success" href="/"></a>') + elif UsingTor == 1: + req.write('<a id="TorCheckResult" target="failure" href="/"></a>\n') + else: + req.write('<a id="TorCheckResult" target="unknown" href="/"></a>\n') + req.write('</body></html>') + +# Now that we know everything we need, lets print the website +def handler(req, environ, start_response): + # Make a DNS request to the EL and decide what to tell the user + UsingTor = isUsingTor(environ['REMOTE_ADDR'], "80") + # Try to hit a cornercase where the user can exit to 443 but not 80 + if UsingTor != 0: + UsingTor = isUsingTor(environ['REMOTE_ADDR'], "443") + + # figure out if the client passed uptodate=0 or uptodate=1 + # defaults to 1 if uptodate was not present in the query string + UpToDate = isUpToDate(environ['QUERY_STRING']) + + response_headers = [('Content-type', 'text/html; charset=utf-8')] + start_response('200 OK', response_headers) + + # We want to catch TorButton queries so they don't output overhead + # This is to make all the data fit into one cell + formSubmission = cgi.FieldStorage(fp=environ['wsgi.input'], environ=environ) + if formSubmission.getfirst("TorButton", None): + printTorButton(req, UsingTor) + return + + # First lets construct the simple webpage: + req.write('<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" '\ + '"http://www.w3.org/TR/REC-html40/loose.dtd">\n') + req.write('<html>\n') + req.write('<head>\n') + req.write('<meta http-equiv="content-type" content="text/html; '\ + 'charset=utf-8">\n') + req.write('<title>Are you using Tor?</title>\n') + req.write('<link rel="shortcut icon" type="image/x-icon" '\ + 'href="./favicon.ico">\n') + req.write('<style type="text/css">\n') + req.write('img,acronym {\n') + req.write(' border: 0;') + req.write(' text-decoration: none;') + req.write('}') + req.write('</style>') + req.write('</head>\n') + req.write('<body>\n') + + parseLang(formSubmission) + hideLogo = showLogo(formSubmission) + + req.write('<center>\n') + + if UsingTor == 0: + if UpToDate: + req.write('\n') + if hideLogo: + req.write('<img alt="' + _("Congratulations. Your browser is configured to use Tor.") + \ + '" src="/images/tor-on.png">\n<br>') + req.write('<h1 style="color: #0A0">\n') + req.write(_('Congratulations. Your browser is configured to use Tor.')) + req.write('<br>\n<br>\n') + req.write('</h1>\n') + req.write(_('Please refer to the <a href="https://www.torproject.org/">Tor website</a> for further information about using Tor safely. You are now free to browse the Internet anonymously.')) + req.write('<br>\n<br>\n') + else: + req.write('\n') + if hideLogo: + req.write('<img alt="' + _("Congratulations. Your browser is configured to use Tor.") + \ + '" src="/images/tor-on.png">\n<br>') + req.write('<h1 style="color: #0A0">\n') + req.write(_('Congratulations. Your browser is configured to use Tor.')) + req.write('<br>\n<br>\n') + req.write('</h1>\n') + req.write('<h1 style="color: #FA0">\n') + req.write(_('There is a security update available for the Tor Browser Bundle.')) + req.write('<br>\n<br>\n') + req.write(_('<a href="https://www.torproject.org/download/download-easy.html">Click here to go to the download page</a>')) + req.write('<br>\n<br>\n') + req.write('</h1>\n') + req.write(_('Please refer to the <a href="https://www.torproject.org/">Tor website</a> for further information about using Tor safely. You are now free to browse the Internet anonymously.')) + req.write('<br>\n<br>\n') + + # This is the case where we have an NXDOMAIN and they aren't using Tor + elif UsingTor == 1: + req.write('\n') + if hideLogo: + req.write('<img alt="' + _("Sorry. You are not using Tor.") + '" '\ + 'src="/images/tor-off.png">\n<br>') + req.write('<h1 style="color: #A00">') + req.write(_('Sorry. You are not using Tor.')) + req.write('<br>\n<br>\n') + req.write('</h1>') + req.write(_('If you are attempting to use a Tor client, please refer to the <a href="https://www.torproject.org/">Tor website</a> and specifically the <a href="https://www.torproject.org/docs/faq#DoesntWork">instructions for configuring your Tor client</a>.')) + req.write('<br>\n<br>\n') + + # This means we have some strange data response we don't understand + # It's better that we fail closed and let the user know everything went wrong + elif UsingTor == 2: + req.write('\n') + req.write('<img alt="' + _("Sorry, your query failed or an unexpected response was received.") + '" '\ + 'src="/images/tor-off.png">\n<br>') + req.write('<h1 style="color: #A00">\n') + req.write(_('Sorry, your query failed or an unexpected response was received.')) + req.write('<br>\n') + req.write('</h1>') + req.write(_('A temporary service outage prevents us from determining if your source IP address is a <a href="https://www.torproject.org/">Tor</a> node.')) + req.write('<br>\n<br>\n') + + # Now we'll close up this html rat hole + req.write('\n') + req.write('<br>\n'); + req.write(_('Your IP address appears to be: ')) + req.write('<b>%s</b><br>\n' % environ['REMOTE_ADDR'] ) + req.write('<small>\n') + req.write('<tt>') +# req.write(_('Additional information: ')) +# req.write('<br>\n') +# req.write(_('This small script is powered by <a href="http://exitlist.torproject.org/">tordnsel</a>')) +# req.write('<br>') +# req.write(_('You may also be interested in the <a href="/cgi-bin/TorBulkExitList.py">Tor Bulk Exit List Exporter</a>')) +# req.write('<br><br>') +# req.write(_('This server does not log <i>any</i> information about visitors.')) + req.write('<br>\n<br>\n') + # We want to display little pretty images so users can choose their language + locales = getLocales() + + req.write('<p>This page is also available in the following languages:') + req.write('</p><p>') + for item in sorted(locales.keys()): + req.write('<a href="?lang=%s" ' % item ) + req.write('hreflang="%s" ' % item ) + req.write('lang="%s" rel="alternate">' % item ) + req.write('%s</a> ' % locales[item] ) + req.write('</p>') + req.write('</tt>') + req.write('</small>') + req.write('</center>\n') + req.write('</body>') + req.write('</html>') + + +class FakeReq(list): + def write(self, str): + self.append(str) + +def application(environ, start_response): + req = FakeReq() + handler(req, environ, start_response) + return req + +# vim:set ts=4: +# vim:set et: +# vim:set shiftwidth=4:

1 0