November 2012 - tor-commits - lists.torproject.org

[torspec/master] Two fixes to 214 from weasel.
by nickm＠torproject.org 07 Nov '12

07 Nov '12

commit 93f2cb444e0fd730679ed1595c0f9bcc98e2bcea Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 7 14:30:47 2012 -0500 Two fixes to 214 from weasel. "To avoid any conflicts, one party could maybe get assigned the upper half? :)" --- proposals/214-longer-circids.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/proposals/214-longer-circids.txt b/proposals/214-longer-circids.txt index 9b42424..e7b87fe 100644 --- a/proposals/214-longer-circids.txt +++ b/proposals/214-longer-circids.txt @@ -21,7 +21,7 @@ Status: Open Payload [509 bytes] Variable-length cell [Length+5 bytes] - CircID [4 bytes] + CircID [2 bytes] Command [1 byte] Length [2 bytes] Payload [Length bytes] @@ -58,7 +58,7 @@ Status: Open whose RSA public key has the lower modulus. How ridiculous! Instead, I propose that when the version 4 link protocol is in use, the connection initiator use the low half of the circuit ID space, - and the responder use the low half of the circuit ID space. + and the responder use the high half of the circuit ID space. 3. Discussion

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 07 Nov '12

07 Nov '12

commit a1deea04832826336fb0add9fd14881878af6f96 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 7 19:15:52 2012 +0000 Update translations for liveusb-creator --- ar/ar.po | 637 +++++++++++++++++++++++++------------------------------------- 1 files changed, 253 insertions(+), 384 deletions(-) diff --git a/ar/ar.po b/ar/ar.po index c3c8c96..ab85e5f 100644 --- a/ar/ar.po +++ b/ar/ar.po @@ -1,136 +1,132 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Fadi Mansour <fadi.redeemer.mansour(a)gmail.com>, 2012. # Tareq Al Jurf <taljurf(a)fedoraproject.org>, 2009. -# msgid "" msgstr "" -"Project-Id-Version: ar_new\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-25 18:41+0200\n" -"PO-Revision-Date: 2009-11-28 00:00+0300\n" -"Last-Translator: Tareq Al Jurf <taljurf(a)fedoraproject.org>\n" -"Language-Team: Arabic <fedora-trans-ar(a)redhat.com>\n" -"Language: ar\n" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2012-04-13 14:16+0200\n" +"PO-Revision-Date: 2012-11-07 18:59+0000\n" +"Last-Translator: Fadi Mansour <fadi.redeemer.mansour(a)gmail.com>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ar\n" +"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" -#: ../liveusb/dialog.py:150 ../liveusb/launcher_ui.py:149 -#, fuzzy, python-format -msgid "%(distribution)s LiveUSB Creator" -msgstr "صانع قرص (USB) فيدورا الذاتي" +#: ../liveusb/gui.py:80 +#, python-format +msgid "Unknown release: %s" +msgstr "إصدار غير معروف: %s" -#: ../liveusb/gui.py:743 -#, fuzzy, python-format -msgid "%(filename)s selected" -msgstr "الصورة المختارة: %s" +#: ../liveusb/gui.py:84 +#, python-format +msgid "Downloading %s..." +msgstr "جاري التحميل %s..." -#: ../liveusb/creator.py:1017 +#: ../liveusb/gui.py:197 #, python-format -msgid "%s already bootable" -msgstr "" +msgid "Device is too small: it must be at least %s MiB." +msgstr "وسيط التخزين هذا صغير جداً، يجب أن يكون على الأقل %s ميغابايت" -#: ../liveusb/launcher_ui.py:156 +#: ../liveusb/gui.py:226 msgid "" -"<!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\">\n" -"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 "" +"Error: Cannot set the label or obtain the UUID of your device. Unable to " +"continue." +msgstr "خطأ: لا يمكن ضبط العنوان أو الحصول على رقم UUID لجهازك. ﻻ يمكن المتابعة." -#: ../liveusb/launcher_ui.py:151 -msgid "" -"<!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\">\n" -"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. All data on the target drive will be lost.</span></p></body></html>" -msgstr "" +#: ../liveusb/gui.py:276 +#, python-format +msgid "Installation complete! (%s)" +msgstr "تم التنصيب! (%s)" -#: ../liveusb/launcher_ui.py:153 -msgid "" -"<!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\">\n" -"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 USB stick. Other partitions found on the stick are preserved.</span></p></body></html>" -msgstr "" +#: ../liveusb/gui.py:281 +msgid "LiveUSB creation failed!" +msgstr "فشل إنشاء قرص USB ذاتي التشغيل" -#: ../liveusb/launcher_ui.py:155 +#: ../liveusb/gui.py:388 msgid "" -"<!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\">\n" -"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 USB stick from a new ISO image.</span></p></body></html>" -msgstr "" +"Warning: This tool needs to be run as an Administrator. To do this, right " +"click on the icon and open the Properties. Under the Compatibility tab, " +"check the \"Run this program as an administrator\" box." +msgstr "تنبيه: يجب تنفيذ هذه الأداة بصلاحيات مدير النظام. لعمل هذا، انقر باليمين على الأيقونة وافتح الخصائص. في صفحة \"Compatibility/التوافقية\"، فعل الخيار \"Run this program as an administrator/قم بتشغيل هذا التطبيق كمدير\"." -#: ../liveusb/dialog.py:154 -msgid "Alt+B" -msgstr "" - -#: ../liveusb/dialog.py:153 -msgid "Browse" -msgstr "تصفح" +#: ../liveusb/gui.py:413 +msgid "Unable to find any USB drive" +msgstr "لم يتم العثور على أي قرص USB." -#: ../liveusb/dialog.py:160 -msgid "By allocating extra space on your USB stick for a persistent overlay, you 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 "بتخصيص مساحة إضافية على الـ USB للمساحة المستمرة سوف تستطيع أن تخزن بيانات وإجراء تعديلات دائمة للنظام الذاتي. بدونها لن تستطيع تخزين البيانات التي ستستمر بعد إعادة الإقلاع." +#: ../liveusb/gui.py:521 +msgid "" +"Device is not yet mounted, so we cannot determine the amount of free space." +" Setting a maximum limit of 8G for the persistent storage." +msgstr "لم يتم تركيب هذا الجهاز بعد، لذلك لا يمكن تحديد المساحة المتاحة. سيتم تثبيت 8 غيغا كقيمة عظمى لحيز التخزين الدائم (الذي لا يتم حذفه عند إعادة التشغيل)." -#: ../liveusb/creator.py:1119 ../liveusb/creator.py:1382 +#: ../liveusb/gui.py:528 #, python-format -msgid "Calculating the SHA1 of %s" +msgid "No free space on device %(device)s" +msgstr "لا توجد مساحة فارغة على الجهاز %(device)s" + +#: ../liveusb/gui.py:533 +msgid "Partition is FAT16; Restricting overlay size to 2G" msgstr "" -#: ../liveusb/creator.py:1330 -#, fuzzy -msgid "Cannot find" -msgstr "لا يمكن إيجاد الجهاز %s" +#: ../liveusb/gui.py:577 +msgid "Persistent Storage" +msgstr "حيز التخزين الدائم" -#: ../liveusb/creator.py:573 -#, python-format -msgid "Cannot find device %s" -msgstr "لا يمكن إيجاد الجهاز %s" +#: ../liveusb/gui.py:586 +msgid "Installation complete!" +msgstr "تم التنصيب!" -#: ../liveusb/launcher_ui.py:150 +#: ../liveusb/gui.py:587 +msgid "Installation was completed. Press OK to close this program." +msgstr "تم التنصيب. اضغط \"موافق\" لإغلاق هذا التطبيق." + +#: ../liveusb/gui.py:610 msgid "" -"Clone\n" -"&&\n" -"Install" -msgstr "" +"The Master Boot Record on your device is blank. Pressing 'Create Live USB' " +"again will reset the MBR on this device." +msgstr "سجل الإقلاع الرئيسي (MBR) على جهازك فارغ. الضغط على 'إنشاء قرص USB حي' سيقوم بإعادة تأهيل الـMBR على هذا الجهاز." -#: ../liveusb/launcher_ui.py:152 +#: ../liveusb/gui.py:624 msgid "" -"Clone\n" -"&&\n" -"Upgrade" +"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 "" -#: ../liveusb/dialog.py:165 -msgid "Create Live USB" -msgstr "اصنع USB ذاتي" - -#: ../liveusb/creator.py:428 -#, fuzzy, python-format -msgid "Creating %sMB persistent overlay" -msgstr "جاري إنشاء %d م.ب من المساحة الدائمة..." +#: ../liveusb/gui.py:638 +msgid "Unable to mount device" +msgstr "" -#: ../liveusb/gui.py:521 -msgid "Device is not yet mounted, so we cannot determine the amount of free space. Setting a maximum limit of 8G for the persistent storage." +#: ../liveusb/gui.py:644 +msgid "Warning: All data on the selected drive will be lost." msgstr "" -#: ../liveusb/gui.py:197 -#, python-format -msgid "Device is too small: it must be at least %s MiB." +#: ../liveusb/gui.py:646 ../liveusb/gui.py:663 +msgid "Press 'Next' if you wish to continue." msgstr "" -#: ../liveusb/dialog.py:157 -#, python-format -msgid "Download %(distribution)s" +#: ../liveusb/gui.py:648 ../liveusb/gui.py:665 +msgid "Next" msgstr "" +#: ../liveusb/gui.py:658 +msgid "" +"Your device already contains a LiveOS.\n" +"If you continue, this will be overwritten." +msgstr "يحتوي جهازك على نظام تشغيل تلقائي.\nإذا استمررت، سوف يتم الكتابة محله." + +#: ../liveusb/gui.py:661 +msgid "" +"Warning: Creating a new persistent overlay will delete your existing one." +msgstr "تحذير: إنشاء مساحة دائمة جديدة سوف يحذف الموجودة أصلاً." + #: ../liveusb/gui.py:717 msgid "Download complete!" msgstr "اكتمل التنزيل!" @@ -139,399 +135,272 @@ msgstr "اكتمل التنزيل!" msgid "Download failed: " msgstr "فشل التنزيل: " -#: ../liveusb/gui.py:84 -#, python-format -msgid "Downloading %s..." -msgstr "جاري التحميل %s..." - -#: ../liveusb/creator.py:1115 -msgid "Drive is a loopback, skipping MBR reset" -msgstr "" - -#: ../liveusb/creator.py:1195 -msgid "Error probing device" -msgstr "" - -#: ../liveusb/gui.py:226 -msgid "Error: Cannot set the label or obtain the UUID of your device. Unable to continue." -msgstr "خطأ: لا يمكن ضبط العنوان أو الحصول على رقم UUID لجهازك. ﻻ يمكن المتابعة." - -#: ../liveusb/creator.py:404 -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 "خطأ: إن الـ SHA1 لقرص التشغيل التلقائي غير صالح. تستطيع تشغيل هذا البرنامج باستخدام المعطى --noverify لتجاوز فحص التحقق." - -#: ../liveusb/creator.py:144 -msgid "Extracting live image to USB device..." -msgstr "جاري استخراج الصورة الحية إلى جهاز USB..." - -#: ../liveusb/creator.py:1060 -#, python-format -msgid "Formatting %(device)s as FAT32" -msgstr "" +#: ../liveusb/gui.py:722 +msgid "You can try again to resume your download" +msgstr "تستطيع المحاولة مرة أخرى لاستئناف التحميل" -#: ../liveusb/creator.py:139 -msgid "ISO MD5 checksum passed" -msgstr "" +#: ../liveusb/gui.py:728 +msgid "Select Live ISO" +msgstr "اختر الصورة ذاتية التشغيل (ISO)" -#: ../liveusb/creator.py:137 -msgid "ISO MD5 checksum verification failed" +#: ../liveusb/gui.py:731 +msgid "" +"The selected file is unreadable.Please fix its permissions or select another" +" file." msgstr "" -#: ../liveusb/dialog.py:156 -#, fuzzy -msgid "If you do not select an existing Live ISO, the selected release will be downloaded for you." -msgstr "إذا لم تختر صورة ذاتية موجودة، فإن الإصدار المُختار سوف يتم تنزيله لك." - -#: ../liveusb/gui.py:586 -#, fuzzy -msgid "Installation complete!" -msgstr "اكتمل التنزيل!" - -#: ../liveusb/gui.py:276 -#, fuzzy, python-format -msgid "Installation complete! (%s)" -msgstr "اكتمل التنزيل!" - -#: ../liveusb/gui.py:587 -msgid "Installation was completed. Press OK to close this program." +#: ../liveusb/gui.py:737 +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 "" -#: ../liveusb/creator.py:912 ../liveusb/creator.py:1236 -#, fuzzy -msgid "Installing bootloader..." -msgstr "جاري تهيئة وتنصيب محمل الإقلاع..." - -#: ../liveusb/gui.py:281 -msgid "LiveUSB creation failed!" -msgstr "فشل إنشاء قرص USB ذاتي التشغيل" - -#: ../liveusb/creator.py:1331 -#, fuzzy -msgid "Make sure to extract the entire liveusb-creator zip file before running this program." -msgstr "لا يمكن إيجاد '%s'. تأكد من استخراج ملف liveusb-creator zip كاملاً قبل تشغيل هذا البرنامج." - -#: ../liveusb/creator.py:1207 -msgid "Make sure your USB key is plugged in and formatted with the FAT filesystem" -msgstr "تأكد أن قرص الـ USB موصول بالجهاز ومهيأ بنظام الملفات FAT" - -#: ../liveusb/creator.py:846 +#: ../liveusb/gui.py:743 #, python-format -msgid "Mount %s exists after unmounting" +msgid "%(filename)s selected" msgstr "" -#: ../liveusb/gui.py:648 ../liveusb/gui.py:665 -msgid "Next" +#: ../liveusb/creator.py:91 +msgid "You must run this application as root" msgstr "" -#: ../liveusb/gui.py:528 -#, fuzzy, python-format -msgid "No free space on device %(device)s" -msgstr "ليس هناك مساحة كافية على الجهاز." - -#: ../liveusb/creator.py:823 -msgid "No mount points found" +#: ../liveusb/creator.py:130 +msgid "" +"Source type does not support verification of ISO MD5 checksum, skipping" msgstr "" -#: ../liveusb/creator.py:421 -msgid "Not enough free space on device." -msgstr "ليس هناك مساحة كافية على الجهاز." - -#: ../liveusb/gui.py:533 -msgid "Partition is FAT16; Restricting overlay size to 2G" +#: ../liveusb/creator.py:132 +msgid "Verifying ISO MD5 checksum" msgstr "" -#: ../liveusb/gui.py:577 -#, fuzzy -msgid "Persistent Storage" -msgstr "التخزين الدائم (0 م.ب)" - -#: ../liveusb/dialog.py:161 -#, fuzzy -msgid "Persistent Storage (0 MB)" -msgstr "التخزين الدائم (%d م.ب)" - -#: ../liveusb/gui.py:646 ../liveusb/gui.py:663 -#, fuzzy -msgid "Press 'Next' if you wish to continue." -msgstr "اضغط 'أنشئ قرص تشغيل USB' مرة أخرى إذا كنت تريد المتابعة." +#: ../liveusb/creator.py:137 +msgid "ISO MD5 checksum verification failed" +msgstr "" -#: ../liveusb/creator.py:935 ../liveusb/creator.py:1254 -#, python-format -msgid "Removing %(file)s" +#: ../liveusb/creator.py:139 +msgid "ISO MD5 checksum passed" msgstr "" -#: ../liveusb/creator.py:497 -#, fuzzy -msgid "Removing existing Live OS" -msgstr "جاري إزالة نظام التشغيل التلقائي الموجود..." +#: ../liveusb/creator.py:144 +msgid "Extracting live image to USB device..." +msgstr "جاري استخراج الصورة الحية إلى جهاز USB..." -#: ../liveusb/creator.py:1109 +#: ../liveusb/creator.py:151 #, python-format -msgid "Resetting Master Boot Record of %s" +msgid "Wrote to device at %(speed)d MB/sec" msgstr "" -#: ../liveusb/gui.py:728 -msgid "Select Live ISO" -msgstr "اختر الصورة ذاتية التشغيل (ISO)" - #: ../liveusb/creator.py:181 msgid "Setting up OLPC boot file..." msgstr "" -#: ../liveusb/creator.py:737 +#: ../liveusb/creator.py:365 #, python-format -msgid "Some partitions of USB device %(device)s are mounted. They will be unmounted before starting the installation process." +msgid "" +"There was a problem executing the following command: `%(command)s`.\n" +"A more detailed error log has been written to '%(filename)s'." msgstr "" -#: ../liveusb/creator.py:130 -msgid "Source type does not support verification of ISO MD5 checksum, skipping" +#: ../liveusb/creator.py:384 +msgid "Verifying SHA1 checksum of LiveCD image..." msgstr "" -#: ../liveusb/creator.py:1143 -msgid "Synchronizing data on disk..." +#: ../liveusb/creator.py:388 +msgid "Verifying SHA256 checksum of LiveCD image..." msgstr "" -#: ../liveusb/dialog.py:159 -msgid "Target Device" -msgstr "الجهاز المستهدف" +#: ../liveusb/creator.py:404 +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 "خطأ: إن الـ SHA1 لقرص التشغيل التلقائي غير صالح. تستطيع تشغيل هذا البرنامج باستخدام المعطى --noverify لتجاوز فحص التحقق." -#: ../liveusb/gui.py:610 -msgid "The Master Boot Record on your device is blank. Pressing 'Create Live USB' again will reset the MBR on this device." +#: ../liveusb/creator.py:410 +msgid "Unknown ISO, skipping checksum verification" msgstr "" -#: ../liveusb/gui.py:731 -msgid "The selected file is unreadable. Please fix its permissions or select another file." -msgstr "" +#: ../liveusb/creator.py:421 +msgid "Not enough free space on device." +msgstr "ليس هناك مساحة كافية على الجهاز." -#: ../liveusb/creator.py:365 -#, fuzzy, python-format -msgid "" -"There was a problem executing the following command: `%(command)s`.\n" -"A more detailed error log has been written to '%(filename)s'." +#: ../liveusb/creator.py:428 +#, python-format +msgid "Creating %sMB persistent overlay" msgstr "" -"حدثت مشكلة أثناء تنفيذ الأمر التالي: `%s`\n" -"تمت كتابة سجل مفصل للخلل في 'liveusb-creator.log'" - -#: ../liveusb/dialog.py:151 -#, fuzzy -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 "هذا الزر يسمح لك بالتصفح لاختيار صورة حية ISO موجودة قمت بتحميلها مسبقاً. إذا لم تختر واحدة، سوف يتم تنزيل إصدار بشكل تلقائي." - -#: ../liveusb/dialog.py:164 -msgid "This button will begin the LiveUSB creation process. This entails 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 "هذا الزر سيبدأ عملية إنشاء قرص USB ذاتي. وهذا يتضمنتنزيل إصدار اختياريا (إذا لم يتم اختيار إصدار موجود)، استخراج الصورة إلى جهاز الـ USB، إنشاء المساحة الدائمة وتنصيب محمل الإقلاع." - -#: ../liveusb/dialog.py:158 -#, fuzzy -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 "هذا هو الـ USB الذي تريد تنصيب الصورة الذاتية عليه. هذا الجهاز يجب أن يتم تهيئته بنظام الملفات FAT." - -#: ../liveusb/dialog.py:163 -msgid "This is the progress bar that will indicate how far along in the LiveUSB creation process you are" -msgstr "هذا هو شريط التقدم الذي سيظهر أين وصلت في عملية إنشاء الـUSB الذاتي" - -#: ../liveusb/dialog.py:162 -msgid "This is the status console, where all messages get written to." -msgstr "هذه هي لوحة مراقبة الحالة، حيث تكتب جميع الرسائل." - -#: ../liveusb/creator.py:907 -#, fuzzy, python-format -msgid "Unable to change volume label: %(message)s" -msgstr "لا يمكن تحميل الجهاز: %s" - -#: ../liveusb/creator.py:506 ../liveusb/creator.py:517 -#, fuzzy, python-format -msgid "Unable to chmod %(file)s: %(message)s" -msgstr "لا يمكن تحميل الجهاز: %s" #: ../liveusb/creator.py:487 -#, fuzzy, python-format +#, python-format msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s" -msgstr "لا يمكن تحميل الجهاز: %s" - -#: ../liveusb/gui.py:413 -#, fuzzy -msgid "Unable to find any USB drive" -msgstr "لا يمكن إيجاد أي جهاز USB" - -#: ../liveusb/creator.py:1197 -#, fuzzy -msgid "Unable to find any removable device" -msgstr "لا يمكن إيجاد أي جهاز قابل للإزالة" - -#: ../liveusb/creator.py:1037 -#, fuzzy -msgid "Unable to find partition" -msgstr "لا يمكن إيجاد نظام ذاتي على الصورة (ISO)" +msgstr "" -#: ../liveusb/creator.py:1277 -msgid "Unable to get Win32_LogicalDisk; win32com query did not return any results" +#: ../liveusb/creator.py:497 +msgid "Removing existing Live OS" msgstr "" -#: ../liveusb/gui.py:638 -#, fuzzy -msgid "Unable to mount device" -msgstr "لا يمكن تحميل الجهاز: %s" +#: ../liveusb/creator.py:506 ../liveusb/creator.py:517 +#, python-format +msgid "Unable to chmod %(file)s: %(message)s" +msgstr "" -#: ../liveusb/creator.py:811 -#, fuzzy, python-format -msgid "Unable to mount device: %(message)s" -msgstr "لا يمكن تحميل الجهاز: %s" +#: ../liveusb/creator.py:510 +#, python-format +msgid "Unable to remove file from previous LiveOS: %(message)s" +msgstr "" #: ../liveusb/creator.py:522 -#, fuzzy, python-format +#, python-format msgid "Unable to remove directory from previous LiveOS: %(message)s" -msgstr "لا يمكن إزالة النظام الذاتي السابق: %s" +msgstr "" -#: ../liveusb/creator.py:510 -#, fuzzy, python-format -msgid "Unable to remove file from previous LiveOS: %(message)s" -msgstr "لا يمكن إزالة النظام الذاتي السابق: %s" +#: ../liveusb/creator.py:573 +#, python-format +msgid "Cannot find device %s" +msgstr "لا يمكن إيجاد الجهاز %s" -#: ../liveusb/creator.py:1112 -msgid "Unable to reset MBR. You may not have the `syslinux` package installed." +#: ../liveusb/creator.py:635 +msgid "" +"You are using an old version of syslinux-extlinux that does not support the " +"ext4 filesystem" msgstr "" -#: ../liveusb/gui.py:737 -#, fuzzy -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 "المعذرة، إنني أواجه مشاكل في ترميز اسم الملف للصورة الحية. قد يكون لك حظ أوفر إذا قمت بنقل الصورة ISO إلى الجذر الخاص بمحرك الأقراص (مثال: :\\C)" - #: ../liveusb/creator.py:718 -#, fuzzy, python-format +#, python-format msgid "Unable to write on %(device)s, skipping." -msgstr "لا يمكن تحميل الجهاز: %s" - -#: ../liveusb/creator.py:410 -msgid "Unknown ISO, skipping checksum verification" msgstr "" -#: ../liveusb/creator.py:807 +#: ../liveusb/creator.py:737 #, python-format -msgid "Unknown dbus exception while trying to mount device: %(message)s" +msgid "" +"Some partitions of USB device %(device)s are mounted. They will be unmounted" +" before starting the installation process." msgstr "" #: ../liveusb/creator.py:786 ../liveusb/creator.py:886 -#, fuzzy msgid "Unknown filesystem. Your device may need to be reformatted." -msgstr "نظام الملفات على %s غير معروف. قد يحتاج جهازك إلى إعادة تهيئة." +msgstr "" -#: ../liveusb/gui.py:80 +#: ../liveusb/creator.py:789 #, python-format -msgid "Unknown release: %s" -msgstr "إصدار غير معروف: %s" - -#: ../liveusb/creator.py:834 -#, fuzzy, python-format -msgid "Unmounting %(device)s" -msgstr "لا يمكن تحميل الجهاز: %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 Tails\" action instead." +msgstr "" #: ../liveusb/creator.py:791 ../liveusb/creator.py:889 #, python-format msgid "Unsupported filesystem: %s" msgstr "نظام ملفات غير مدعوم: %s" -#: ../liveusb/creator.py:789 +#: ../liveusb/creator.py:807 #, python-format -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 Tails\" action instead." +msgid "Unknown dbus exception while trying to mount device: %(message)s" msgstr "" -#: ../liveusb/creator.py:1210 +#: ../liveusb/creator.py:811 #, python-format -msgid "" -"Unsupported filesystem: %s\n" -"Please backup and format your USB key with the FAT filesystem." +msgid "Unable to mount device: %(message)s" msgstr "" -"نظام ملفات غير مدعوم: %s\n" -"الرجاء نسخ قرص USB نسخة احتياطية ثم تهيئته بنظام الملفات FAT" -#: ../liveusb/launcher_ui.py:154 -msgid "Upgrade from ISO" +#: ../liveusb/creator.py:823 +msgid "No mount points found" msgstr "" -#: ../liveusb/dialog.py:152 -#, fuzzy -msgid "Use existing Live system ISO" -msgstr "استخدم الصورة الذاتية (Live CD) الموجودة حاليا" - -#: ../liveusb/creator.py:132 -msgid "Verifying ISO MD5 checksum" +#: ../liveusb/creator.py:834 +#, python-format +msgid "Unmounting %(device)s" msgstr "" -#: ../liveusb/creator.py:384 -#, fuzzy -msgid "Verifying SHA1 checksum of LiveCD image..." -msgstr "جاري التحقق من SHA1 لصورة قرص التشغيل التلقائي..." - -#: ../liveusb/creator.py:388 -#, fuzzy -msgid "Verifying SHA256 checksum of LiveCD image..." -msgstr "جاري التحقق من SHA1 لصورة قرص التشغيل التلقائي..." +#: ../liveusb/creator.py:846 +#, python-format +msgid "Mount %s exists after unmounting" +msgstr "" #: ../liveusb/creator.py:883 ../liveusb/creator.py:1203 msgid "Verifying filesystem..." msgstr "جاري التحقق من نظام الملفات" -#: ../liveusb/gui.py:644 -msgid "Warning: All data on the selected drive will be lost." +#: ../liveusb/creator.py:907 +#, python-format +msgid "Unable to change volume label: %(message)s" msgstr "" -#: ../liveusb/gui.py:661 -msgid "Warning: Creating a new persistent overlay will delete your existing one." -msgstr "تحذير: إنشاء مساحة دائمة جديدة سوف يحذف الموجودة أصلاً." - -#: ../liveusb/gui.py:624 -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." +#: ../liveusb/creator.py:912 ../liveusb/creator.py:1236 +msgid "Installing bootloader..." msgstr "" -#: ../liveusb/gui.py:388 -msgid "Warning: This tool needs to be run as an Administrator. To do this, right click on the icon and open the Properties. Under the Compatibility tab, check the \"Run this program as an administrator\" box." +#: ../liveusb/creator.py:935 ../liveusb/creator.py:1254 +#, python-format +msgid "Removing %(file)s" msgstr "" -#: ../liveusb/creator.py:151 +#: ../liveusb/creator.py:1017 #, python-format -msgid "Wrote to device at %(speed)d MB/sec" +msgid "%s already bootable" msgstr "" -#: ../liveusb/creator.py:635 -msgid "You are using an old version of syslinux-extlinux that does not support the ext4 filesystem" +#: ../liveusb/creator.py:1037 +msgid "Unable to find partition" msgstr "" -#: ../liveusb/gui.py:722 -msgid "You can try again to resume your download" -msgstr "تستطيع المحاولة مرة أخرى لاستئناف التحميل" +#: ../liveusb/creator.py:1060 +#, python-format +msgid "Formatting %(device)s as FAT32" +msgstr "" -#: ../liveusb/creator.py:91 -msgid "You must run this application as root" +#: ../liveusb/creator.py:1109 +#, python-format +msgid "Resetting Master Boot Record of %s" msgstr "" -#: ../liveusb/gui.py:658 +#: ../liveusb/creator.py:1112 msgid "" -"Your device already contains a LiveOS.\n" -"If you continue, this will be overwritten." +"Unable to reset MBR. You may not have the `syslinux` package installed." msgstr "" -"يحتوي جهازك على نظام تشغيل تلقائي.\n" -"إذا استمررت، سوف يتم الكتابة محله." -#: ../liveusb/dialog.py:155 -msgid "or" -msgstr "أو" +#: ../liveusb/creator.py:1115 +msgid "Drive is a loopback, skipping MBR reset" +msgstr "" -#~ msgid "Complete! (%s)" -#~ msgstr "اكنمل! (%s)" +#: ../liveusb/creator.py:1119 ../liveusb/creator.py:1382 +#, python-format +msgid "Calculating the SHA1 of %s" +msgstr "" -#~ msgid "Download Fedora" -#~ msgstr "حمّل فيدورا" +#: ../liveusb/creator.py:1143 +msgid "Synchronizing data on disk..." +msgstr "" -#~ msgid "Filesystem for %s unknown!" -#~ msgstr "نظام الملفات لـ %s غير معروف!" +#: ../liveusb/creator.py:1195 +msgid "Error probing device" +msgstr "" -#, fuzzy -#~ msgid "Installing bootloader" -#~ msgstr "جاري تهيئة وتنصيب محمل الإقلاع..." +#: ../liveusb/creator.py:1197 +msgid "Unable to find any removable device" +msgstr "" -#, fuzzy -#~ msgid "persistent overlay" -#~ msgstr "جاري إنشاء %sم.ب من المساحة الدائمة" +#: ../liveusb/creator.py:1207 +msgid "" +"Make sure your USB key is plugged in and formatted with the FAT filesystem" +msgstr "تأكد أن قرص الـ USB موصول بالجهاز ومهيأ بنظام الملفات FAT" + +#: ../liveusb/creator.py:1210 +#, python-format +msgid "" +"Unsupported filesystem: %s\n" +"Please backup and format your USB key with the FAT filesystem." +msgstr "نظام ملفات غير مدعوم: %s\nالرجاء نسخ قرص USB نسخة احتياطية ثم تهيئته بنظام الملفات FAT" + +#: ../liveusb/creator.py:1277 +msgid "" +"Unable to get Win32_LogicalDisk; win32com query did not return any results" +msgstr "" + +#: ../liveusb/creator.py:1330 +msgid "Cannot find" +msgstr "" + +#: ../liveusb/creator.py:1331 +msgid "" +"Make sure to extract the entire liveusb-creator zip file before running this" +" program." +msgstr ""

1 0

[ooni-probe/master] Rename advancedOptParameters to usageOptions
by art＠torproject.org 07 Nov '12

07 Nov '12

commit 9d67a329fda4b81a4a0f0ad9f25f349f86ba4ea5 Author: Arturo Filastò <arturo(a)filasto.net> Date: Wed Nov 7 20:09:00 2012 +0100 Rename advancedOptParameters to usageOptions * Change all references to the new name --- nettests/bridge_reachability/bridget.py | 2 +- nettests/core/http_host.py | 11 +++++++---- ooni/nettest.py | 4 ++-- ooni/runner.py | 6 +++--- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/nettests/bridge_reachability/bridget.py b/nettests/bridge_reachability/bridget.py index 6bad316..acf3dff 100644 --- a/nettests/bridge_reachability/bridget.py +++ b/nettests/bridge_reachability/bridget.py @@ -109,7 +109,7 @@ class BridgetTest(nettest.NetTestCase): author = "Isis Lovecruft <isis(a)torproject.org>" version = "0.1" description = "Use a Tor process to test connecting to bridges or relays" - advancedOptParameters = BridgetArgs + usageOptions = BridgetArgs def setUp(self): """ diff --git a/nettests/core/http_host.py b/nettests/core/http_host.py index 62b50ca..07c7019 100644 --- a/nettests/core/http_host.py +++ b/nettests/core/http_host.py @@ -11,6 +11,13 @@ from ooni.templates import httpt +class UsageOptions(usage.Options): + optParameters = [ + ['url', 'u', 'http://torproject.org/', 'Test single site'], + ['backend', 'b', 'http://ooni.nu/test/', 'Test backend to use'], + ] + + class HTTPHost(httpt.HTTPTest): """ This test is aimed at detecting the presence of a transparent HTTP proxy @@ -20,10 +27,6 @@ class HTTPHost(httpt.HTTPTest): author = "Arturo Filastò" version = 0.1 - optParameters = [['url', 'u', 'http://torproject.org/', 'Test single site'], - ['backend', 'b', 'http://ooni.nu/test/', 'Test backend to use'], - ] - inputFile = ['urls', 'f', None, 'Urls file'] def test_send_host_header(self): diff --git a/ooni/nettest.py b/ooni/nettest.py index 3534a32..dc7188d 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -113,7 +113,7 @@ class NetTestCase(unittest.TestCase): | optParameters = [['outfile', 'O', 'outfile.log', 'Description...']] - * advancedOptParameters: a subclass of twisted.python.usage.Options for more advanced command line arguments fun. + * usageOptions: a subclass of twisted.python.usage.Options for more advanced command line arguments fun. """ name = "I Did Not Change The Name" @@ -128,7 +128,7 @@ class NetTestCase(unittest.TestCase): optFlags = None optParameters = None - advancedOptParameters = None + usageOptions = None requiresRoot = False diff --git a/ooni/runner.py b/ooni/runner.py index 797a9d4..29ed831 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -42,7 +42,7 @@ def processTest(obj, cmd_line_options): raise Exception("This test requires root to run") if obj.optParameters or input_file \ - or obj.advancedOptParameters or obj.optFlags: + or obj.usageOptions or obj.optFlags: if not obj.optParameters: obj.optParameters = [] @@ -50,9 +50,9 @@ def processTest(obj, cmd_line_options): if input_file: obj.optParameters.append(input_file) - if obj.advancedOptParameters: + if obj.usageOptions: log.debug("Got advanced options") - options = obj.advancedOptParameters() + options = obj.usageOptions() else: log.debug("Got optParameters") class Options(usage.Options):

1 0

[ooni-probe/master] Refactor the Scapy test template.
by art＠torproject.org 07 Nov '12

07 Nov '12

commit f4a065da96af966e01126be4c3013780da1b7579 Author: Arturo Filastò <arturo(a)filasto.net> Date: Wed Nov 7 19:49:08 2012 +0100 Refactor the Scapy test template. * Now is it much more simple For the time being the txscapy send and receiver will be disabled in sake of KISS principle. --- nettests/examples/example_scapyt.py | 25 ++------- ooni/templates/scapyt.py | 103 ++++++++++++++++++----------------- 2 files changed, 56 insertions(+), 72 deletions(-) diff --git a/nettests/examples/example_scapyt.py b/nettests/examples/example_scapyt.py index ce32ac3..51ffd02 100644 --- a/nettests/examples/example_scapyt.py +++ b/nettests/examples/example_scapyt.py @@ -5,30 +5,13 @@ from ooni.utils import log from ooni.templates import scapyt -from scapy.all import * +from scapy.all import IP, TCP -class ExampleScapy(scapyt.ScapyTest): +class ExampleBasicScapy(scapyt.BaseScapyTest): name = "Example Scapy Test" author = "Arturo Filastò" version = 0.1 - inputs = [IP(dst="8.8.8.8")/TCP(dport=31337), - IP(dst="ooni.nu")/TCP(dport=31337)] - - requiresRoot = True - - def test_sendReceive(self): + def test_send_raw_ip_frame(self): log.msg("Running send receive") - if self.receive: - log.msg("Sending and receiving packets.") - d = self.sendReceivePackets(self.buildPackets()) - else: - log.msg("Sending packets.") - d = self.sendPackets(self.buildPackets()) - - def finished(data): - log.msg("Finished sending") - return data - - d.addCallback(finished) - return + ans, unans = self.sr(IP(dst='8.8.8.8')/TCP(), timeout=1) diff --git a/ooni/templates/scapyt.py b/ooni/templates/scapyt.py index 9e18fbd..8683a8e 100644 --- a/ooni/templates/scapyt.py +++ b/ooni/templates/scapyt.py @@ -9,14 +9,61 @@ from twisted.python import usage from twisted.plugin import IPlugin from twisted.internet import protocol, defer, threads -from scapy.all import IP, TCP, send, sr +from scapy.all import send, sr, IP, TCP from ooni.nettest import NetTestCase from ooni.utils import log from ooni.lib.txscapy import TXScapy -class ScapyTest(NetTestCase): +def createPacketReport(packet_list): + """ + Takes as input a packet a list containing a dict with the packet + summary and the raw packet. + """ + report = [] + for packet in packet_list: + report.append({'raw_packet': str(packet), + 'summary': str(packet.summary())}) + return report + +class BaseScapyTest(NetTestCase): + """ + The report of a test run with scapy looks like this: + + report: + sent_packets: [{'raw_packet': BASE64Encoding of packet, + 'summary': 'IP / TCP 192.168.2.66:ftp_data > 8.8.8.8:http S'] + answered_packets: [] + + """ + name = "Base Scapy Test" + version = 0.1 + + requiresRoot = True + + sentPackets = [] + answeredPackets = [] + + def sr(self, *arg, **kw): + """ + Wrapper around scapy.sendrecv.sr for sending and receiving of packets + at layer 3. + """ + answered_packets, sent_packets = sr(*arg, **kw) + self.report['answered_packets'] = createPacketReport(answered_packets) + self.report['sent_packets'] = createPacketReport(sent_packets) + return (answered_packets, sent_packets) + + def send(self, *arg, **kw): + """ + Wrapper around scapy.sendrecv.send for sending of packets at layer 3 + """ + sent_packets = send(*arg, **kw) + self.report['sent_packets'] = createPacketReport(sent_packets) + return sent_packets + +class TXScapyTest(BaseScapyTest): """ A utility class for writing scapy driven OONI tests. @@ -25,8 +72,10 @@ class ScapyTest(NetTestCase): * timeout: timeout in ms of when we should stop waiting to receive packets * receive: if we should also receive packets and not just send + + XXX This is currently not working """ - name = "Scapy Test" + name = "TX Scapy Test" version = 0.1 receive = True @@ -38,15 +87,6 @@ class ScapyTest(NetTestCase): answered = None unanswered = None - - def setUp(self): - if not self.reactor: - from twisted.internet import reactor - self.reactor = reactor - self.questions = [] - self.answers = [] - self.processInputs() - def processInputs(self): """ Place here the logic for validating and processing of inputs and @@ -105,42 +145,3 @@ class ScapyTest(NetTestCase): """ pass -class BlockingScapyTest(ScapyTest): - """ - This is a very basic Scapy Test template that does not do all the - multithreading kung-fu of txscapy, but maintains the same API. - - This will allow tests implemented using the BlockingScapyTest API to easily - migrate to the new API. - """ - name = "Blocking Scapy Test" - version = 0.1 - - timeout = None - - answered = None - unanswered = None - - def sendReceivePackets(self): - packets = self.buildPackets() - - log.debug("Sending and receiving %s" % packets) - - self.answered, self.unanswered = sr(packets, timeout=self.timeout) - - log.debug("%s %s" % (ans, unans)) - - def sendPackets(self): - packets = self.buildPackets() - - log.debug("Sending packets %s" % packets) - - send(packets) - - - def buildPackets(self): - """ - Override this method to build scapy packets. - """ - pass -

1 0

[ooni-probe/master] Make the relevant changes to the ping test by isis
by art＠torproject.org 07 Nov '12

07 Nov '12

commit 768bdbdc3dfe9f775981eb6320de325b1b3a13ad Author: Arturo Filastò <arturo(a)filasto.net> Date: Wed Nov 7 20:01:31 2012 +0100 Make the relevant changes to the ping test by isis * It appears to be broken in multiple points, so I just made the changes that are relevant to the test template changes. --- nettests/bridge_reachability/echo.py | 35 +++------------------------------ 1 files changed, 4 insertions(+), 31 deletions(-) diff --git a/nettests/bridge_reachability/echo.py b/nettests/bridge_reachability/echo.py index 0c20a3f..0440f2c 100644 --- a/nettests/bridge_reachability/echo.py +++ b/nettests/bridge_reachability/echo.py @@ -28,20 +28,11 @@ try: from scapy.all import sr1, IP, ICMP ## XXX v4/v6? from ooni.lib import txscapy from ooni.lib.txscapy import txsr, txsend - from ooni.templates.scapyt import ScapyTest + from ooni.templates.scapyt import BaseScapyTest except: log.msg("This test requires scapy, see www.secdev.org/projects/scapy") -## xxx TODO: move these to a utility function for determining OSes -LINUX=sys.platform.startswith("linux") -OPENBSD=sys.platform.startswith("openbsd") -FREEBSD=sys.platform.startswith("freebsd") -NETBSD=sys.platform.startswith("netbsd") -DARWIN=sys.platform.startswith("darwin") -SOLARIS=sys.platform.startswith("sunos") -WINDOWS=sys.platform.startswith("win32") - -class EchoTest(ScapyTest): +class EchoTest(BaseScapyTest): """ xxx fill me in """ @@ -172,24 +163,6 @@ class EchoTest(ScapyTest): else: raise IfaceError("Could not find a working network interface.") - def buildPackets(self): - log.debug("self.input is %s" % self.input) - log.debug("self.hosts is %s" % self.hosts) - for addr in self.input: - packet = IP(dst=self.input)/ICMP() - self.request.append(packet) - return packet - def test_icmp(self): - if self.recieve: - self.buildPackets() - all = [] - for packet in self.request: - d = self.sendReceivePackets(packets=packet) - all.append(d) - self.response.update({packet: d}) - d_list = defer.DeferredList(all) - return d_list - else: - d = self.sendPackets() - return d + self.sr(IP(dst=self.input)/ICMP()) +

1 0

[metrics-lib/master] Add support for parsing geoip6-db-digest lines.
by karsten＠torproject.org 07 Nov '12

07 Nov '12

commit 43b939025031706ab1eeca9d1a72fc9ce9554e45 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 7 13:55:23 2012 -0500 Add support for parsing geoip6-db-digest lines. --- .../torproject/descriptor/ExtraInfoDescriptor.java | 4 ++++ .../descriptor/impl/ExtraInfoDescriptorImpl.java | 17 +++++++++++++++++ .../impl/ExtraInfoDescriptorImplTest.java | 19 +++++++++++++++++++ 3 files changed, 40 insertions(+), 0 deletions(-) diff --git a/src/org/torproject/descriptor/ExtraInfoDescriptor.java b/src/org/torproject/descriptor/ExtraInfoDescriptor.java index 05707a5..0e19425 100644 --- a/src/org/torproject/descriptor/ExtraInfoDescriptor.java +++ b/src/org/torproject/descriptor/ExtraInfoDescriptor.java @@ -32,6 +32,10 @@ public interface ExtraInfoDescriptor extends Descriptor { * null if no GeoIP database digest is included. */ public String getGeoipDbDigest(); + /* Return the SHA1 digest of the GeoIPv6 database used by this relay, or + * null if no GeoIPv6 database digest is included. */ + public String getGeoip6DbDigest(); + /* Return the end of the included directory request statistics interval, * or -1 if no directory request statistics are included. */ public long getDirreqStatsEndMillis(); diff --git a/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java b/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java index 45848d2..d84a5e2 100644 --- a/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java @@ -104,6 +104,8 @@ public class ExtraInfoDescriptorImpl extends DescriptorImpl this.parseWriteHistoryLine(line, lineNoOpt, partsNoOpt); } else if (keyword.equals("geoip-db-digest")) { this.parseGeoipDbDigestLine(line, lineNoOpt, partsNoOpt); + } else if (keyword.equals("geoip6-db-digest")) { + this.parseGeoip6DbDigestLine(line, lineNoOpt, partsNoOpt); } else if (keyword.equals("geoip-start-time")) { this.parseGeoipStartTimeLine(line, lineNoOpt, partsNoOpt); } else if (keyword.equals("geoip-client-origins")) { @@ -229,6 +231,16 @@ public class ExtraInfoDescriptorImpl extends DescriptorImpl partsNoOpt[1]); } + private void parseGeoip6DbDigestLine(String line, String lineNoOpt, + String[] partsNoOpt) throws DescriptorParseException { + if (partsNoOpt.length != 2) { + throw new DescriptorParseException("Illegal line '" + line + + "' in extra-info descriptor."); + } + this.geoip6DbDigest = ParseHelper.parseTwentyByteHexString(line, + partsNoOpt[1]); + } + private void parseGeoipStartTimeLine(String line, String lineNoOpt, String[] partsNoOpt) throws DescriptorParseException { if (partsNoOpt.length != 3) { @@ -656,6 +668,11 @@ public class ExtraInfoDescriptorImpl extends DescriptorImpl return this.geoipDbDigest; } + private String geoip6DbDigest; + public String getGeoip6DbDigest() { + return this.geoip6DbDigest; + } + private long dirreqStatsEndMillis = -1L; public long getDirreqStatsEndMillis() { return this.dirreqStatsEndMillis; diff --git a/test/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java b/test/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java index c8df3ce..a2becd2 100644 --- a/test/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java +++ b/test/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java @@ -77,6 +77,13 @@ public class ExtraInfoDescriptorImplTest { db.geoipDbDigestLine = line; return new ExtraInfoDescriptorImpl(db.buildDescriptor(), true); } + private String geoip6DbDigestLine = null; + private static ExtraInfoDescriptor createWithGeoip6DbDigestLine( + String line) throws DescriptorParseException { + DescriptorBuilder db = new DescriptorBuilder(); + db.geoip6DbDigestLine = line; + return new ExtraInfoDescriptorImpl(db.buildDescriptor(), true); + } private String geoipStatsLines = null; private static ExtraInfoDescriptor createWithGeoipStatsLines( String lines) throws DescriptorParseException { @@ -170,6 +177,9 @@ public class ExtraInfoDescriptorImplTest { if (this.geoipDbDigestLine != null) { sb.append(this.geoipDbDigestLine + "\n"); } + if (this.geoip6DbDigestLine != null) { + sb.append(this.geoip6DbDigestLine + "\n"); + } if (this.geoipStatsLines != null) { sb.append(this.geoipStatsLines + "\n"); } @@ -832,6 +842,15 @@ public class ExtraInfoDescriptorImplTest { } @Test() + public void testGeoip6DbDigestValid() throws DescriptorParseException { + ExtraInfoDescriptor descriptor = DescriptorBuilder. + createWithGeoip6DbDigestLine("geoip6-db-digest " + + "916A3CA8B7DF61473D5AE5B21711F35F301CE9E8"); + assertEquals("916A3CA8B7DF61473D5AE5B21711F35F301CE9E8", + descriptor.getGeoip6DbDigest()); + } + + @Test() public void testGeoipStatsValid() throws DescriptorParseException { ExtraInfoDescriptor descriptor = GeoipStatsBuilder. createWithDefaultLines();

1 0

[translation/orbot_completed] Update translations for orbot_completed
by translation＠torproject.org 07 Nov '12

07 Nov '12

commit 0a52eba2538bc8c0188611b449868c9a5b8855d7 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 7 18:45:15 2012 +0000 Update translations for orbot_completed --- values-ar/strings.xml | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/values-ar/strings.xml b/values-ar/strings.xml index f56d446..149b0ed 100644 --- a/values-ar/strings.xml +++ b/values-ar/strings.xml @@ -25,6 +25,8 @@ <string name="menu_stop">إيقاف</string> <string name="menu_about">حول</string> <string name="menu_wizard">Wizard</string> + <string name="main_layout_download">تحميل</string> + <string name="main_layout_upload">تحميل</string> <string name="button_help">مساعدة</string> <string name="button_close">إغلاق</string> <string name="button_about">حول</string> @@ -72,6 +74,12 @@ <string name="wizard_tips_msg">نشجعكم على تحميل واستخدام التطبيقات التي تعرف كيفية الاتصال مباشرة بأوربوت. اضغط على الأزرار في الأسفل للتثبيت.</string> <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string> <string name="wizard_tips_proxy">إعدادات الوكيل - تعلم كيفية تكوين التطبيقات لتعمل مع أوربوت</string> + <string name="wizard_tips_duckgo">تطبيق محرك البحث DuckDuckGo</string> + <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_firefox">الإضافة \"Proxy Mobile\" لفايرفوكس (http://tinyurl.com/getproxymob)</string> + <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string> + <string name="wizard_tips_twitter">اضبط تويتر بروكسي لمضيف محلي والمدخل 8118</string> + <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> <string name="wizard_proxy_help_info">إعدادات الوكيل</string> <string name="wizard_proxy_help_msg">اذا كان تطبيق أندرويد الذي تستخدمه يمكن ان يدعم استخدام وكيل HTTP او SOCKS , عندها يمكنك تكوينه للإتصال بأوربوت واستخدام تور.\n\n\n اعدادات المستضيف هي 127.0.0.1 او \"المستضيف المحلي\". بالنسبة الى HTTP, فإن ضبط المنفذ هو 8118. بالنسبة الى SOCKS, فإن الوكيل هو 9050. يجب عليك استخدام SOCKS4A او SOCKS5 اذا امكن.\n \n\n\n يمكنك معرفة المزيد عن عملية توكيل غير مرئية للأندرويد عن طريق الأسئلة المتداولة (FAQ) في: http://tinyurl.com/proxyandroid\n </string> <string name="wizard_final">أوربوت جاهز!</string> @@ -100,6 +108,8 @@ <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> <string name="wizard_tips_orweb">ORWEB (أندرويد 1.x فقط) - متصفح مصمّم للخصوصية لأوربوت </string> <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> + <string name="wizard_tips_play">ستجد جميع تطبيقات مشروع \"جاردين\" على \"جوجل بلاي\"</string> + <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject\n</string> <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string> <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 07 Nov '12

07 Nov '12

commit 7b79aca6abfd962f77d683b5b9c8315e1dc42bcb Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 7 18:45:13 2012 +0000 Update translations for orbot --- values-ar/strings.xml | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/values-ar/strings.xml b/values-ar/strings.xml index 6d401fa..149b0ed 100644 --- a/values-ar/strings.xml +++ b/values-ar/strings.xml @@ -76,6 +76,7 @@ <string name="wizard_tips_proxy">إعدادات الوكيل - تعلم كيفية تكوين التطبيقات لتعمل مع أوربوت</string> <string name="wizard_tips_duckgo">تطبيق محرك البحث DuckDuckGo</string> <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> + <string name="wizard_tips_firefox">الإضافة \"Proxy Mobile\" لفايرفوكس (http://tinyurl.com/getproxymob)</string> <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string> <string name="wizard_tips_twitter">اضبط تويتر بروكسي لمضيف محلي والمدخل 8118</string> <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>

1 0

[translation/vidalia_alpha_completed] Update translations for vidalia_alpha_completed
by translation＠torproject.org 07 Nov '12

07 Nov '12

commit ff796c8b8e33fc9d23866496ae169cd9fc0205c8 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 7 18:15:21 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 6ed7c6b..b5daeff 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-07 16:44+0000\n" +"PO-Revision-Date: 2012-11-07 17:47+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -138,7 +138,7 @@ msgstr "Almacenar datos de Tor en la siguiente carpeta" msgctxt "AdvancedPage" msgid "Select the directory used to store data for the Tor software" -msgstr "Seleccione la carpeta que se usará para almacenar los datos de Tor" +msgstr "Seleccione la carpeta que se utilizará para almacenar los datos de Tor" msgctxt "AdvancedPage" msgid "Tor Control"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 07 Nov '12

07 Nov '12

commit 06a7a0041409f40621cee2598709362271d5a418 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 7 18:15:18 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 6ed7c6b..b5daeff 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-07 16:44+0000\n" +"PO-Revision-Date: 2012-11-07 17:47+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -138,7 +138,7 @@ msgstr "Almacenar datos de Tor en la siguiente carpeta" msgctxt "AdvancedPage" msgid "Select the directory used to store data for the Tor software" -msgstr "Seleccione la carpeta que se usará para almacenar los datos de Tor" +msgstr "Seleccione la carpeta que se utilizará para almacenar los datos de Tor" msgctxt "AdvancedPage" msgid "Tor Control"

1 0