tor-commits March 2014

tor-commits@lists.torproject.org

22 participants
2036 discussions

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 24 Mar '14

24 Mar '14

commit 6ec04cdd96ac3790aba0d31ad36b09895fd02305 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 24 17:15:20 2014 +0000 Update translations for liveusb-creator --- sk/sk.po | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/sk/sk.po b/sk/sk.po index 89d2afd..6cad3a7 100644 --- a/sk/sk.po +++ b/sk/sk.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-17 22:01+0100\n" -"PO-Revision-Date: 2014-03-24 16:45+0000\n" +"PO-Revision-Date: 2014-03-24 17:00+0000\n" "Last-Translator: Svistwarrior273 <romanbeno273(a)gmail.com>\n" "Language-Team: Slovak (http://www.transifex.com/projects/p/torproject/language/sk/)\n" "MIME-Version: 1.0\n" @@ -25,7 +25,7 @@ msgstr "" #: ../liveusb/dialog.py:159 ../liveusb/launcher_ui.py:158 #, python-format msgid "%(distribution)s Installer" -msgstr "" +msgstr "%(distribution)s inštalátor" #: ../liveusb/gui.py:808 #, python-format @@ -35,7 +35,7 @@ msgstr "%(filename)s vybraný" #: ../liveusb/gui.py:439 #, python-format msgid "%(size)s %(label)s" -msgstr "" +msgstr "%(size)s %(label)s" #: ../liveusb/gui.py:445 #, python-format @@ -63,7 +63,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 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;\">Copy the running Tails onto a USB stick or SD card. All data on the target drive will be lost.</span></p></body></html>" -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 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;\">Skopírujte spustený Tails na USB kľúč alebo SD kartu. Všetky dáta na cieľovom disku budú zmazané. </span></p></body></html>" +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 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;\">Skopírujte spustený Tails na USB kľúč alebo SD kartu. Všetky dáta na cieľovom disku budú stratené. </span></p></body></html>" #: ../liveusb/launcher_ui.py:162 msgid "" @@ -205,7 +205,7 @@ msgstr "Ak si nezvolíte už existujúce Live ISO, bude vám stiahnuté vybraté #: ../liveusb/dialog.py:174 msgid "Install Tails" -msgstr "" +msgstr "Nainštalovať Tails" #: ../liveusb/gui.py:630 msgid "Installation complete!" @@ -336,7 +336,7 @@ msgstr "Cieľové zariadenie" msgid "" "The Master Boot Record on your device is blank. Pressing 'Install Tails' " "again will reset the MBR on this device." -msgstr "" +msgstr "Master Boot Record na vašom zariadení je prázdny. Stlačením 'Nainštalovať Tails' znovu sa obnoví MBR na tomto zariadení." #: ../liveusb/gui.py:796 msgid "" @@ -407,7 +407,7 @@ msgstr "Nepodarilo sa nájsť žiadne USB zariadenie" #: ../liveusb/creator.py:1200 msgid "Unable to find any supported device" -msgstr "" +msgstr "Nenašlo sa žiadne podporované zariadenie" #: ../liveusb/creator.py:1040 msgid "Unable to find partition" @@ -484,7 +484,7 @@ msgstr "Odpájajú sa pripojené súborové systémy na zariadení '%(device)s'" #: ../liveusb/creator.py:876 #, python-format msgid "Unsupported device '%(device)s', please report a bug." -msgstr "" +msgstr "Nepodporované zariadenie '%(device)s', prosíme nahláste túto chybu." #: ../liveusb/creator.py:770 ../liveusb/creator.py:893 #, python-format @@ -539,7 +539,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 "Varovanie: Master Boot Record na vašom zariadení sa nezhoduje so syslinux MBR vášho systému. Ak máte problém s bootovaním tohto kľúča, vyskúšajte spustiť liveusb-creator s voľbou --reset-mbr." #: ../liveusb/gui.py:392 msgid "" @@ -558,7 +558,7 @@ msgstr "Zapísané na zariadenie rýchlosťou %(speed)d Mb/s" msgid "" "You are going to install Tails on the %(size)s %(vendor)s %(model)s device " "(%(device)s). All data on the selected device will be lost. Continue?" -msgstr "" +msgstr "Idete inštalovať Tails na %(size)s %(vendor)s %(model)s zariadení (%(device)s). Všetky dáta na vybranom zariadení budú stratené. Pokračovať?" #: ../liveusb/gui.py:719 #, python-format @@ -566,7 +566,7 @@ msgid "" "You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s " "device (%(device)s). Any persistent volume on this device will remain " "unchanged. Continue?" -msgstr "" +msgstr "Idete aktualizovať Tails na %(parent_size)s %(vendor)s %(model)s zariadení (%(device)s). Všetka trvalá kapacita na tomto zariadení bude zachovaná. Pokračovať?" #: ../liveusb/creator.py:604 msgid ""

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 24 Mar '14

24 Mar '14

commit 49a6ed695f5eadda4ebd3777608024805b3056be Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 24 16:45:20 2014 +0000 Update translations for liveusb-creator --- sk/sk.po | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/sk/sk.po b/sk/sk.po index 8f4bc14..89d2afd 100644 --- a/sk/sk.po +++ b/sk/sk.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-17 22:01+0100\n" -"PO-Revision-Date: 2014-03-22 09:10+0000\n" +"PO-Revision-Date: 2014-03-24 16:45+0000\n" "Last-Translator: Svistwarrior273 <romanbeno273(a)gmail.com>\n" "Language-Team: Slovak (http://www.transifex.com/projects/p/torproject/language/sk/)\n" "MIME-Version: 1.0\n" @@ -40,7 +40,7 @@ msgstr "" #: ../liveusb/gui.py:445 #, python-format msgid "%(vendor)s %(model)s (%(details)s) - %(device)s" -msgstr "" +msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s" #: ../liveusb/creator.py:1020 #, python-format @@ -54,7 +54,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/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;\">Potrebujete pomoc? Prečítajte si </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">dokumentáciu</span></a><span style=\" font-size:10pt;\">.</span></p></body></html>" #: ../liveusb/launcher_ui.py:160 msgid "" @@ -63,7 +63,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 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;\">Copy the running Tails onto a USB stick or SD card. All data on the target drive will be lost.</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 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;\">Skopírujte spustený Tails na USB kľúč alebo SD kartu. Všetky dáta na cieľovom disku budú zmazané. </span></p></body></html>" #: ../liveusb/launcher_ui.py:162 msgid "" @@ -72,7 +72,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 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;\">Copy the running Tails onto an already installed Tails device. Other partitions found on the stick are preserved.</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 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;\">Skopírujte spustený Tails na zariadenie, kde už je nainštalovaný. Ostatné partície nájdené na kľúči sú zachované.</span></p></body></html>" #: ../liveusb/launcher_ui.py:164 msgid "" @@ -81,7 +81,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 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;\">Upgrade an already installed Tails device from a new ISO image.</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 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;\">Aktualizujte si zariadenie s už nainštalovaným Tails z nového ISO obrazu.</span></p></body></html>" #: ../liveusb/dialog.py:163 msgid "Alt+B" @@ -97,7 +97,7 @@ msgid "" "will be able to store data and make permanent modifications to your live " "operating system. Without it, you will not be able to save data that will " "persist after a reboot." -msgstr "Alokovaním dodatočného miesta na vašom USB kľúči pre trvalé prekrytie budete schopní ukladať dáta a robiť pernamentné úpravy vášho live operačného systému. Bez toho nebude možné uložiť dáta, ktoré by sa zachovali aj po reboote." +msgstr "Alokovaním dodatočného miesta na vašom USB kľúči pre trvalé úložisko budete schopní ukladať dáta a robiť pernamentné úpravy vášho live operačného systému. Bez toho nebude možné uložiť dáta, ktoré by sa zachovali aj po reboote." #: ../liveusb/creator.py:1122 ../liveusb/creator.py:1385 #, python-format @@ -135,7 +135,7 @@ msgstr "Vytváram %sMB trvalé úložisko" #: ../liveusb/gui.py:567 msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." -msgstr "" +msgstr "Zariadenie zatiaľ nie je pripojené, takže nemôžeme určiť množstvo voľného miesta." #: ../liveusb/dialog.py:166 #, python-format @@ -162,7 +162,7 @@ msgstr "Zariadenie je slučka, preskakujem resetovanie hlavného bootovacieho z #: ../liveusb/creator.py:813 #, python-format msgid "Entering unmount_device for '%(device)s'" -msgstr "" +msgstr "Vkladá sa unmount_device pre zariadenie %(device)s'" #: ../liveusb/creator.py:1198 msgid "Error probing device" @@ -182,7 +182,7 @@ msgstr "Chyba: SHA1 kontrolný súčet Live CD je neplatný. Na preskočenie tej #: ../liveusb/creator.py:145 msgid "Extracting live image to the target device..." -msgstr "" +msgstr "Extrahuje sa live obraz na cieľové zariadenie..." #: ../liveusb/creator.py:1063 #, python-format @@ -263,12 +263,12 @@ msgstr "Partícia je FAT16; obmedzuje veľkosť na 2 GB" #: ../liveusb/gui.py:550 msgid "Partition is FAT32; Restricting overlay size to 4G" -msgstr "" +msgstr "Partícia je FAT32; Veľkosť úložiska sa obmedzuje na 4G" #: ../liveusb/creator.py:226 ../liveusb/creator.py:842 #, python-format msgid "Partitioning device %(device)s" -msgstr "" +msgstr "Rozdeľuje sa zariadenie %(device)s" #: ../liveusb/gui.py:621 msgid "Persistent Storage" @@ -280,7 +280,7 @@ msgstr "Trvalé úložisko (0 MB)" #: ../liveusb/gui.py:702 ../liveusb/gui.py:731 msgid "Please confirm your device selection" -msgstr "" +msgstr "Prosíme potvrďte váš výber zariadenia" #: ../liveusb/gui.py:467 msgid "Refreshing releases..." @@ -317,7 +317,7 @@ msgstr "Nastavuje sa zavádzací súbor OLPC..." msgid "" "Some partitions of the target device %(device)s are mounted. They will be " "unmounted before starting the installation process." -msgstr "" +msgstr "Sú pripojené niektoré partície cieľového zariadenia %(device)s. Pred začatím inštalácie budú odpojené." #: ../liveusb/creator.py:131 msgid "" @@ -364,27 +364,27 @@ 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 "Toto tlačidlo odštartuje proces vytvárania LiveUSB. Zahŕňa to prípadné stiahnutie vydania (ak nebolo zvolené žiadne existujúce), extrahovanie ISO súboru na USB zariadenie, vytvorenie trvalého úložiska a inštaláciu zavádzača." #: ../liveusb/dialog.py:167 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 "Toto je USB kľúč, na ktorom chcete nainštalovať váš Live systém. Zariadenie musí byť naformátované so súborovým systémom FAT." #: ../liveusb/dialog.py:172 msgid "" "This is the progress bar that will indicate how far along in the LiveUSB " "creation process you are" -msgstr "" +msgstr "Táto lišta bude indikovať, ako ďaleko sa momentálne nachádzate v procese vytvárania LiveUSB" #: ../liveusb/dialog.py:171 msgid "This is the status console, where all messages get written to." -msgstr "" +msgstr "Toto je stavová konzola, do ktorej budú vypisované všetky správy." #: ../liveusb/creator.py:879 msgid "Trying to continue anyway." -msgstr "" +msgstr "Snažiť sa napriek tomu pokračovať." #: ../liveusb/creator.py:911 #, python-format @@ -474,12 +474,12 @@ msgstr "Neznáme vydanie: %s" #: ../liveusb/creator.py:827 #, python-format msgid "Unmounting '%(udi)s' on '%(device)s'" -msgstr "" +msgstr "Odpája sa '%(udi)s' na zariadení '%(device)s'" #: ../liveusb/creator.py:823 #, python-format msgid "Unmounting mounted filesystems on '%(device)s'" -msgstr "" +msgstr "Odpájajú sa pripojené súborové systémy na zariadení '%(device)s'" #: ../liveusb/creator.py:876 #, python-format @@ -496,7 +496,7 @@ msgstr "Nepodporovaný súborový systém: %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 "Nepodporovaný súborový systém: %s\nV prípade, že sa pokúšate aktualizovať manuálne nainštalovaný systém Tails (čiže bez pomoci tohto inštalátora), táto voľba nie je podporovaná: potrebujete si nainštalovať namiesto toho nový, napr. zvolením akcie \"Naklonovať & nainštalovať\"." #: ../liveusb/creator.py:1213 #, python-format @@ -507,11 +507,11 @@ msgstr "Nepodporovaný súborový systém: %s\nSpravte zálohu a naformátujte U #: ../liveusb/launcher_ui.py:163 msgid "Upgrade from ISO" -msgstr "" +msgstr "Aktualizovať z ISO" #: ../liveusb/dialog.py:161 msgid "Use existing Live system ISO" -msgstr "" +msgstr "Použiť už existujúce Live systém ISO" #: ../liveusb/creator.py:133 msgid "Verifying ISO MD5 checksum" @@ -532,7 +532,7 @@ msgstr "Kontroluje sa súborový systém..." #: ../liveusb/gui.py:729 msgid "" "Warning: Creating a new persistent overlay will delete your existing one." -msgstr "Upozornenie: Vytvorením nového trvalého úložiska sa vymaže už existujúce." +msgstr "Upozornenie: Vytvorením nového trvalého úložiska sa vymaže to už existujúce." #: ../liveusb/gui.py:681 msgid ""

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 24 Mar '14

24 Mar '14

commit 2e023c8e6f3f9cedf7e599b14c7b64604a061a68 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 24 16:15:48 2014 +0000 Update translations for tails-iuk --- el.po | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/el.po b/el.po index 45b6b70..936e561 100644 --- a/el.po +++ b/el.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Teogramm <theodorewii121(a)hotmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-03-05 15:11+0100\n" -"PO-Revision-Date: 2014-03-06 08:17+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-03-24 16:10+0000\n" +"Last-Translator: Teogramm <theodorewii121(a)hotmail.com>\n" "Language-Team: Greek (http://www.transifex.com/projects/p/torproject/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -62,7 +63,7 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:281 msgid "The system is up-to-date" -msgstr "" +msgstr "Το σύστημα είναι αναβαθμισμένο." #: ../lib/Tails/IUK/Frontend.pm:286 msgid "This version of Tails is outdated, and may have security issues." @@ -90,7 +91,7 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:360 msgid "Error while detecting available upgrades" -msgstr "" +msgstr "Πρόβλημα κατά τον έλεγχο των διαθέσιμων αναβαθμίσεων" #: ../lib/Tails/IUK/Frontend.pm:370 #, perl-brace-format @@ -110,7 +111,7 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:385 msgid "Upgrade available" -msgstr "" +msgstr "Διαθέσιμη αναβάθμιση." #: ../lib/Tails/IUK/Frontend.pm:386 msgid "Upgrade now" @@ -184,19 +185,19 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:579 msgid "Restart Tails" -msgstr "" +msgstr "Επανεκκίνηση του Talis" #: ../lib/Tails/IUK/Frontend.pm:580 msgid "Restart now" -msgstr "" +msgstr "Επανεκκίνηση τώρα" #: ../lib/Tails/IUK/Frontend.pm:581 msgid "Restart later" -msgstr "" +msgstr "Επανεκκίνηση αργότερα" #: ../lib/Tails/IUK/Frontend.pm:592 msgid "Error while restarting the system" -msgstr "" +msgstr "Πρόβλημα κατά την επανεκκίνηση" #: ../lib/Tails/IUK/Frontend.pm:595 msgid "Failed to restart the system"

1 0

[ooni-probe/master] Merge pull request #295 from anadahz/set_deps-fix
by art＠torproject.org 24 Mar '14

24 Mar '14

commit 1c3ee7e0627443000ddf9d9fae974ab44d5b86d0 Merge: 3106820 3c240ee Author: Arturo Filastò <hellais(a)users.noreply.github.com> Date: Mon Mar 24 11:11:58 2014 +0100 Merge pull request #295 from anadahz/set_deps-fix Add required package libpcap0.8-dev setup-dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[ooni-probe/master] Merge pull request #294 from anadahz/ooni-documentation_fix
by art＠torproject.org 24 Mar '14

24 Mar '14

commit d5531273c62b1e26056ad54fafae01c555dce158 Merge: 1c3ee7e f7ebab5 Author: Arturo Filastò <hellais(a)users.noreply.github.com> Date: Mon Mar 24 11:12:29 2014 +0100 Merge pull request #294 from anadahz/ooni-documentation_fix Fix links in Documentation. docs/source/index.rst | 8 ++++---- docs/source/tests/dnsconsistency.rst | 4 ++-- docs/source/tests/dnsspoof.rst | 4 ++-- docs/source/tests/http_header_field_manipulation.rst | 4 ++-- docs/source/tests/http_host.rst | 4 ++-- docs/source/tests/http_invalid_request_line.rst | 4 ++-- docs/source/tests/http_requests.rst | 2 +- docs/source/tests/tcpconnect.rst | 2 +- docs/source/tests/traceroute.rst | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-)

1 0

[ooni-probe/master] Skip tests that require an internet connection if such is not available
by art＠torproject.org 24 Mar '14

24 Mar '14

commit 058dab430435dc8b8b1e7f42796e5f2c95ac296c Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Mar 24 15:59:14 2014 +0100 Skip tests that require an internet connection if such is not available --- ooni/tests/__init__.py | 10 ++++++++++ ooni/tests/test_geoip.py | 3 +++ ooni/tests/test_oonicli.py | 4 ++++ 3 files changed, 17 insertions(+) diff --git a/ooni/tests/__init__.py b/ooni/tests/__init__.py index 5663ccf..2df8646 100644 --- a/ooni/tests/__init__.py +++ b/ooni/tests/__init__.py @@ -1,4 +1,14 @@ +import socket from ooni.settings import config config.logging = False config.advanced.debug = False + +def is_internet_connected(): + s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + try: + s.connect(('torproject.org', 80)) + s.shutdown(2) + return True + except Exception: + return False diff --git a/ooni/tests/test_geoip.py b/ooni/tests/test_geoip.py index 6ae31f3..49d2ea3 100644 --- a/ooni/tests/test_geoip.py +++ b/ooni/tests/test_geoip.py @@ -1,6 +1,7 @@ from twisted.internet import defer from twisted.trial import unittest +from ooni.tests import is_internet_connected from ooni.settings import config from ooni import geoip @@ -17,6 +18,8 @@ class TestGeoIP(unittest.TestCase): @defer.inlineCallbacks def test_probe_ip(self): + if not is_internet_connected(): + self.skipTest("You must be connected to the internet to run this test") probe_ip = geoip.ProbeIP() res = yield probe_ip.lookup() assert len(res.split('.')) == 4 diff --git a/ooni/tests/test_oonicli.py b/ooni/tests/test_oonicli.py index ab10000..7050c5a 100644 --- a/ooni/tests/test_oonicli.py +++ b/ooni/tests/test_oonicli.py @@ -2,10 +2,12 @@ import os import sys import yaml import signal +import socket from twisted.internet import base, defer from twisted.trial import unittest +from ooni.tests import is_internet_connected from ooni.settings import config from ooni.oonicli import runWithDirector @@ -26,6 +28,8 @@ def verify_entry(entry): class TestRunDirector(unittest.TestCase): def setUp(self): + if not is_internet_connected(): + self.skipTest("You must be connected to the internet to run this test") config.tor.socks_port = 9050 config.tor.control_port = None with open('example-input.txt', 'w+') as f:

1 0

[ooni-probe/master] Merge branch 'master' of github.com:TheTorProject/ooni-probe
by art＠torproject.org 24 Mar '14

24 Mar '14

commit 2bf70e5a7485074c03e451c73a755fdb3eb22f94 Merge: 058dab4 d553127 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Mar 24 16:00:33 2014 +0100 Merge branch 'master' of github.com:TheTorProject/ooni-probe * 'master' of github.com:TheTorProject/ooni-probe: Add required package libpcap0.8-dev Fix links in Documentation. docs/source/index.rst | 8 ++++---- docs/source/tests/dnsconsistency.rst | 4 ++-- docs/source/tests/dnsspoof.rst | 4 ++-- docs/source/tests/http_header_field_manipulation.rst | 4 ++-- docs/source/tests/http_host.rst | 4 ++-- docs/source/tests/http_invalid_request_line.rst | 4 ++-- docs/source/tests/http_requests.rst | 2 +- docs/source/tests/tcpconnect.rst | 2 +- docs/source/tests/traceroute.rst | 2 +- setup-dependencies.sh | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-)

1 0

[ooni-probe/master] Make improvements to the setup.py install script.
by art＠torproject.org 24 Mar '14

24 Mar '14

commit b58085b41a655d0b030e5df9d6abac2efa3357e3 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Mar 14 17:21:46 2014 +0100 Make improvements to the setup.py install script. * Download the GeoIP data files directly into the /usr/share directory * Move the logic for overriding the config file keys to settings.py --- ooni/settings.py | 14 +++++++++++- setup.py | 62 ++++++++++++++++++------------------------------------ 2 files changed, 34 insertions(+), 42 deletions(-) diff --git a/ooni/settings.py b/ooni/settings.py index c1071b9..1c4f42d 100644 --- a/ooni/settings.py +++ b/ooni/settings.py @@ -69,7 +69,19 @@ class OConfig(object): target_config_file = os.path.join(self.ooni_home, 'ooniprobe.conf') print "Creating it for you in '%s'." % target_config_file - copyfile(sample_config_file, target_config_file) + usr_share_path = '/usr/share' + if hasattr(sys, 'real_prefix'): + usr_share_path = os.path.abspath(os.path.join(sys.prefix, 'share')) + + with open(sample_config_file) as f: + with open(target_config_file, 'w+') as w: + for line in f: + if line.startswith(' data_dir: '): + w.write(' data_dir: %s\n' % os.path.join(usr_share_path, 'ooni')) + elif line.startswith(' geoip_data_dir: '): + w.write(' geoip_data_dir: %s\n' % os.path.join(usr_share_path, 'GeoIP')) + else: + w.write(line) def read_config_file(self): try: diff --git a/setup.py b/setup.py index 1410dd7..9fff96c 100644 --- a/setup.py +++ b/setup.py @@ -9,14 +9,16 @@ from os.path import join as pj import sys from setuptools import setup -def download_geoip_files(): +def download_geoip_files(dst): urls = [ 'http://www.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz', 'http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat…', 'http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz' ] + if not os.path.exists(dst): + os.makedirs(dst) for url in urls: - target_gz_file = pj('data', os.path.basename(url)) + target_gz_file = pj(dst, os.path.basename(url)) target_file = target_gz_file.replace('.gz', '') if os.path.isfile(target_file): @@ -26,55 +28,35 @@ def download_geoip_files(): print "Downloading %s" % url response = urllib2.urlopen(url) + CHUNK = 4 * 1024 with open(target_gz_file, 'w+') as f: - f.write(response.read()) + while True: + chunk = response.read(CHUNK) + if not chunk: break + f.write(chunk) with open(target_file, 'w+') as f: gf = gzip.open(target_gz_file, 'rb') - f.write(gf.read()) + while True: + chunk = gf.read(CHUNK) + if not chunk: break + f.write(chunk) gf.close() os.unlink(target_gz_file) -download_geoip_files() - -usr_share_path = '/usr/share/ooni' +usr_share_path = '/usr/share' # If this is true then it means we are in a virtualenv # therefore we should not place our data files inside /usr/share/ooni, but # place them inside the virtual env system prefix. if hasattr(sys, 'real_prefix'): - usr_share_path = os.path.abspath(pj(sys.prefix, 'share', 'ooni')) - if not os.path.isdir(usr_share_path): - os.makedirs(usr_share_path) - with open(pj('data', 'ooniprobe.conf.sample.new'), 'w+') as w: - with open(pj('data', 'ooniprobe.conf.sample')) as f: - for line in f: - if line.startswith(' data_dir: '): - w.write(' data_dir: %s\n' % usr_share_path) - elif line.startswith(' geoip_data_dir: '): - w.write(' geoip_data_dir: %s\n' % usr_share_path) - else: - w.write(line) - os.rename(pj('data', 'ooniprobe.conf.sample.new'), - pj('data', 'ooniprobe.conf.sample')) + usr_share_path = os.path.abspath(pj(sys.prefix, 'share')) + +download_geoip_files(pj(usr_share_path, 'GeoIP')) - data_files = [( - usr_share_path + '/', - [ - 'data/GeoIP.dat', - 'data/GeoIPASNum.dat', - 'data/GeoLiteCity.dat' - ] - )] -else: - data_files = [( - '/usr/share/ooni/geoip/', - [ - 'data/GeoIP.dat', - 'data/GeoIPASNum.dat', - 'data/GeoLiteCity.dat' - ] - )] +install_requires = [] +dependency_links = [] +data_files = [] for root, dirs, file_names in os.walk('data/'): files = [] @@ -85,10 +67,8 @@ for root, dirs, file_names in os.walk('data/'): file_name.startswith('Geo'): continue files.append(pj(root, file_name)) - data_files.append([pj(usr_share_path, root.replace('data/', '')), files]) + data_files.append([pj(usr_share_path, 'ooni', root.replace('data/', '')), files]) -install_requires = [] -dependency_links = [] with open('requirements.txt') as f: for line in f: if line.startswith("#"):

1 0

[ooni-probe/master] Add /usr/local/bin to $PATH
by art＠torproject.org 24 Mar '14

24 Mar '14

commit 31068203629bc83d31306da7949d6ebc733121b8 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Mar 19 00:47:23 2014 +0100 Add /usr/local/bin to $PATH --- scripts/install_on_planetlab.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install_on_planetlab.sh b/scripts/install_on_planetlab.sh index 123851f..eb75375 100644 --- a/scripts/install_on_planetlab.sh +++ b/scripts/install_on_planetlab.sh @@ -140,7 +140,7 @@ cat /usr/share/ooni/ooniprobe.conf.sample | sed s/'start_tor: true'/'start_tor: mkdir /home/$USER/bridge_reachability/ # Add cronjob to run ooniprobe daily -{ crontab -l; echo "0 0 * * * /usr/local/bin/ooniprobe -c httpo://e2nl5qgtkzp7cibx.onion blocking/bridge_reachability -f /home/$USER/bridge_reachability/bridges.txt -t 300"; } | crontab +{ crontab -l; echo "PATH=\$PATH:/usr/local/bin/\n0 0 * * * /usr/local/bin/ooniprobe -c httpo://e2nl5qgtkzp7cibx.onion blocking/bridge_reachability -f /home/$USER/bridge_reachability/bridges.txt -t 300"; } | crontab sudo /etc/init.d/crond start sudo /sbin/chkconfig crond on sudo chmod 777 /var/mail

1 0

[ooni-probe/master] Update debian changelog
by art＠torproject.org 24 Mar '14

24 Mar '14

commit eb01352ab3d580147ff23118a320db65269ffcb6 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Mar 14 17:44:23 2014 +0100 Update debian changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 70a154f..150b378 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ooniprobe (1.0.1-1) stable; urgency=low + + * ooniprobe 1.0.1 + + -- OONI Developers (signing key) <ooni-dev(a)lists.torproject.org> Fri, 14 Mar 2014 17:14:46 +0200 + ooniprobe (1.0.0-rc6-1) stable; urgency=low * ooniprobe 1.0.0-rc6

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits March 2014