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

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 06 Dec '12

06 Dec '12

commit 42eee25623c76af62400cb7c48e3fcb599c3a97b Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 6 19:15:59 2012 +0000 Update translations for tails-persistence-setup_completed --- he/he.po | 327 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 327 insertions(+), 0 deletions(-) diff --git a/he/he.po b/he/he.po new file mode 100644 index 0000000..3a1a029 --- /dev/null +++ b/he/he.po @@ -0,0 +1,327 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Tails developers +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# <yaelgogol(a)gmail.com>, 2012. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2012-11-27 21:00+0100\n" +"PO-Revision-Date: 2012-12-06 18:56+0000\n" +"Last-Translator: blackbird <yaelgogol(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: he\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:48 +msgid "Personal Data" +msgstr "מידע אישי" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:50 +msgid "Keep files stored in the `Persistent' directory" +msgstr "שמור קבצים מאוחסנים בתיקיית `Persistent'" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:58 +msgid "GnuPG" +msgstr "GnuPG" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:60 +msgid "GnuPG keyrings and configuration" +msgstr "מחזיקי מפתחות והגדרות של GnuPG" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:68 +msgid "SSH Client" +msgstr "לקוח SSH" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:70 +msgid "SSH keys, configuration and known hosts" +msgstr "מפתחות SSH, הגדרות ושרתים ידועים" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:78 +msgid "Pidgin" +msgstr "Pidgin" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:80 +msgid "Pidgin profiles and OTR keyring" +msgstr "פרופילי Pidgin ומחזיקי מפתחות OTR" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:88 +msgid "Claws Mail" +msgstr "Claws Mail" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:90 +msgid "Claws Mail profiles and locally stored email" +msgstr "פרופילים ודואר מאוחסן מקומית של Claws Mail" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:98 +msgid "GNOME Keyring" +msgstr "מחזיק מפתחות GNOME" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:100 +msgid "Secrets stored by GNOME Keyring" +msgstr "סודות השמורים במחזיק המפתחות של GNOME" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:108 +msgid "Network Connections" +msgstr "חיבורי רשת" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:110 +msgid "Configuration of network devices and connections" +msgstr "הגדרות של חיבורים והתקני רשת" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:118 +msgid "Browser bookmarks" +msgstr "סימניות דפדפן" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:120 +msgid "Bookmarks saved in Iceweasel browser" +msgstr "סימניות שמורות בדפדפן Iceweasel" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:128 +msgid "APT Packages" +msgstr "חבילות APT" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:130 +msgid "Packages downloaded by APT" +msgstr "חבילות שהורדו ע\"י APT" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:138 +msgid "APT Lists" +msgstr "רשימות APT" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 +msgid "Lists downloaded by APT" +msgstr "רשימות שהורדו ע\"י APT" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:148 +msgid "Dotfiles" +msgstr "Dotfiles" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:150 +msgid "" +"Symlink into $HOME every file or directory found in the `dotfiles' directory" +msgstr "צור קיצור דרך מ $ HOMEלכל קובץ או תיקייה בתיקיית `dotfiles' " + +#: ../lib/Tails/Persistence/Setup.pm:259 +msgid "" +"The device Tails is running from cannot be found. Maybe you used the `toram'" +" option?" +msgstr "לא ניתן למצוא את ההתקן שTails רץ ממנו. האם בחרת באפשרות `toram' ?" + +#: ../lib/Tails/Persistence/Setup.pm:284 +msgid "'Unparseable partition path.'" +msgstr "מסלול למחיצה לא ניתן להבנה" + +#: ../lib/Tails/Persistence/Setup.pm:298 +msgid "Setup Tails persistent volume" +msgstr "התקנת התקן עיקש של Tails" + +#: ../lib/Tails/Persistence/Setup.pm:442 +#, perl-format +msgid "Device %s already has a persistent volume." +msgstr "בהתקן %s כבר יש התקן עיקש" + +#: ../lib/Tails/Persistence/Setup.pm:450 +#, perl-format +msgid "Device %s has not enough unallocated space." +msgstr "אין מספיק מקום מוקצה להתקן %s" + +#: ../lib/Tails/Persistence/Setup.pm:458 ../lib/Tails/Persistence/Setup.pm:472 +#, perl-format +msgid "Device %s has no persistent volume." +msgstr "בהתקן %s אין התקן עיקש" + +#: ../lib/Tails/Persistence/Setup.pm:464 +msgid "" +"Cannot delete the persistent volume while in use. You should restart Tails " +"without persistence." +msgstr "לא ניתן למחוק התקן עיקש בזמן השימוש. עליך לאתחל את Tails ללא התקן עיקש" + +#: ../lib/Tails/Persistence/Setup.pm:483 +msgid "Persistence volume is not unlocked." +msgstr "התקן עיקש נעול" + +#: ../lib/Tails/Persistence/Setup.pm:488 +msgid "Persistence volume is not mounted." +msgstr "התקן עיקש לא מחובר" + +#: ../lib/Tails/Persistence/Setup.pm:493 +msgid "Persistence volume is not readable. Permissions or ownership problems?" +msgstr "לא ניתן לקרוא מהתקן עיקש, האם יש בעיית הרשאות או בעלות?" + +#: ../lib/Tails/Persistence/Setup.pm:498 +msgid "Persistence volume is not writable. Maybe it was mounted read-only?" +msgstr "לא ניתן לכתוב להתקן עיקש. האם חובר כהתקן לקריאה בלבד?" + +#: ../lib/Tails/Persistence/Setup.pm:507 +#, perl-format +msgid "Tails is running from non-USB device %s." +msgstr "Tails מופעל מהתקן שאינו USB %s." + +#: ../lib/Tails/Persistence/Setup.pm:513 +#, perl-format +msgid "Device %s is optical." +msgstr "%s הוא אתקן אופטי." + +#: ../lib/Tails/Persistence/Setup.pm:520 +#, perl-format +msgid "Device %s was not created using Tails USB installer." +msgstr "התקן %s לא נוצר בשימוש מתקין הUSB של Tails." + +#: ../lib/Tails/Persistence/Setup.pm:554 +msgid "Error" +msgstr "שגיאה" + +#: ../lib/Tails/Persistence/Setup.pm:861 +msgid "Persistence wizard - Finished" +msgstr "אשף העיקשות - הסתיים" + +#: ../lib/Tails/Persistence/Setup.pm:864 +msgid "" +"Any changes you have made will only take effect after restarting Tails.\n" +"\n" +"You may now close this application." +msgstr "כל שינוי שנעשה יבוא לידי ביטוי רק לאחר הפעלת Tails מחדש. ⏎ ⏎ באפשרותך לצאת מהישום כעת. " + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:54 +msgid "Persistence wizard - Persistent volume creation" +msgstr "אשף העיקשות - יצירת אחסון עיקש." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:57 +msgid "Choose a passphrase to protect the persistent volume" +msgstr "בחר סיסמה להגנת האחסון העיקש" + +#. TRANSLATORS: size, device vendor, device model +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:61 +#, perl-format +msgid "" +"A %s persistent volume will be created on the %s %s device. Data on " +"this volume will be stored in an encrypted form protected by a passphrase." +msgstr " %s כרך עיקש יווצר ב %s %s התקן. המידע בכרך זה יוצפן ויוגן על ידי סיסמה." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:66 +msgid "Create" +msgstr "צור" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:110 +msgid "" +"Beware! Using persistence has consequences that must be well " +"understood. Tails can't help you if you use it wrong! See <a " +"href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>Tails" +" documentation about persistence</a> to learn more." +msgstr "הזהר! לשימוש בזיכרון עיקש יש תוצאות החייבות להיות מובנות היטב לפני השימוש. Tails לא יכול להועיל במקרה ונעשה בו שימוש לא נכון! ראה:<a href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>תיעוד שלTails בקשר לעיקשות </a>." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:144 +msgid "Passphrase:" +msgstr "סיסמא:" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:154 +msgid "Verify Passphrase:" +msgstr "וודא סיסמא:" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:167 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:231 +msgid "Passphrase can't be empty" +msgstr "הסיסמא לא יכולה להיות ריקה" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:222 +msgid "Passphrases do not match" +msgstr "הסיסמאות לא תואמות" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:262 +#: ../lib/Tails/Persistence/Step/Configure.pm:189 +msgid "Failed" +msgstr "נכשל" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:269 +#: ../lib/Tails/Persistence/Step/Delete.pm:84 +msgid "Correcting attributes on Tails system partition." +msgstr "מתקן מאפיינים על מחיצת המערכת של Tails" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:272 +#: ../lib/Tails/Persistence/Step/Delete.pm:87 +msgid "The attributes of the Tails system partition will be corrected." +msgstr "מאפייני מחיצת המערכת של Tails יתוקנו." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:280 +msgid "Mounting Tails persistence partition." +msgstr "מחבר מחיצת Tails עיקשת" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 +msgid "The Tails persistence partition will be mounted." +msgstr "מחיצת Tails עיקשת תחובר." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:304 +msgid "Creating..." +msgstr "יוצר..." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:307 +msgid "Creating the persistent volume..." +msgstr "יוצר כרך עיקש..." + +#: ../lib/Tails/Persistence/Step/Configure.pm:60 +msgid "Persistence wizard - Persistent volume configuration" +msgstr "אשף העיקשות - הגדרת כרך עיקש" + +#: ../lib/Tails/Persistence/Step/Configure.pm:63 +msgid "Specify the files that will be saved in the persistent volume" +msgstr "פרט אילו קבצים ישמרו בכרך העיקש" + +#. TRANSLATORS: partition, size, device vendor, device model +#: ../lib/Tails/Persistence/Step/Configure.pm:67 +#, perl-format +msgid "" +"The selected files will be stored in the encrypted partition %s (%s), on the" +" %s %s device." +msgstr "הקבצים שנבחרו ישמרו במחיצה מוצפנת %s (%s), על %s %s ההתקן." + +#: ../lib/Tails/Persistence/Step/Configure.pm:73 +msgid "Save" +msgstr "שמור" + +#: ../lib/Tails/Persistence/Step/Configure.pm:135 +msgid "Make custom directory persistent (absolute path):" +msgstr "צור תיקייה עיקשת מותאמת אישית (כתובת מוחלטת):" + +#: ../lib/Tails/Persistence/Step/Configure.pm:141 +msgid "Destination:" +msgstr "יעד:" + +#: ../lib/Tails/Persistence/Step/Configure.pm:204 +msgid "Saving..." +msgstr "שומר..." + +#: ../lib/Tails/Persistence/Step/Configure.pm:207 +msgid "Saving persistence configuration..." +msgstr "שומר הגדרות העיקשות..." + +#: ../lib/Tails/Persistence/Step/Delete.pm:41 +msgid "Persistence wizard - Persistent volume deletion" +msgstr "אשף העיקשות - מחיקת כרך עיקש" + +#: ../lib/Tails/Persistence/Step/Delete.pm:44 +msgid "Your persistent data will be deleted." +msgstr "המידע העיקש שלך ימחק." + +#: ../lib/Tails/Persistence/Step/Delete.pm:48 +#, perl-format +msgid "" +"The persistent volume %s (%s), on the %s %s device, will be deleted." +msgstr "הכרך העיקש %s (%s), אשר ב %s %s התקן, ימחק." + +#: ../lib/Tails/Persistence/Step/Delete.pm:54 +msgid "Delete" +msgstr "מחיקה" + +#: ../lib/Tails/Persistence/Step/Delete.pm:99 +msgid "Deleting..." +msgstr "מוחק..." + +#: ../lib/Tails/Persistence/Step/Delete.pm:102 +msgid "Deleting the persistent volume..." +msgstr "מוחק את הכרך העיקש..."

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 06 Dec '12

06 Dec '12

commit 4b61f6653d677738f978300a293d91297f71498a Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 6 19:15:57 2012 +0000 Update translations for tails-persistence-setup --- he/he.po | 48 ++++++++++++++++++++++++------------------------ 1 files changed, 24 insertions(+), 24 deletions(-) diff --git a/he/he.po b/he/he.po index 7c760b6..3a1a029 100644 --- a/he/he.po +++ b/he/he.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-11-27 21:00+0100\n" -"PO-Revision-Date: 2012-12-06 18:45+0000\n" +"PO-Revision-Date: 2012-12-06 18:56+0000\n" "Last-Translator: blackbird <yaelgogol(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -76,11 +76,11 @@ msgstr "הגדרות של חיבורים והתקני רשת" #: ../lib/Tails/Persistence/Configuration/Presets.pm:118 msgid "Browser bookmarks" -msgstr "" +msgstr "סימניות דפדפן" #: ../lib/Tails/Persistence/Configuration/Presets.pm:120 msgid "Bookmarks saved in Iceweasel browser" -msgstr "" +msgstr "סימניות שמורות בדפדפן Iceweasel" #: ../lib/Tails/Persistence/Configuration/Presets.pm:128 msgid "APT Packages" @@ -202,7 +202,7 @@ msgstr "בחר סיסמה להגנת האחסון העיקש" msgid "" "A %s persistent volume will be created on the %s %s device. Data on " "this volume will be stored in an encrypted form protected by a passphrase." -msgstr "" +msgstr " %s כרך עיקש יווצר ב %s %s התקן. המידע בכרך זה יוצפן ויוגן על ידי סיסמה." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:66 msgid "Create" @@ -214,7 +214,7 @@ msgid "" "understood. Tails can't help you if you use it wrong! See <a " "href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>Tails" " documentation about persistence</a> to learn more." -msgstr "" +msgstr "הזהר! לשימוש בזיכרון עיקש יש תוצאות החייבות להיות מובנות היטב לפני השימוש. Tails לא יכול להועיל במקרה ונעשה בו שימוש לא נכון! ראה:<a href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>תיעוד שלTails בקשר לעיקשות </a>." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:144 msgid "Passphrase:" @@ -246,31 +246,31 @@ msgstr "מתקן מאפיינים על מחיצת המערכת של Tails" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:272 #: ../lib/Tails/Persistence/Step/Delete.pm:87 msgid "The attributes of the Tails system partition will be corrected." -msgstr "" +msgstr "מאפייני מחיצת המערכת של Tails יתוקנו." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:280 msgid "Mounting Tails persistence partition." -msgstr "" +msgstr "מחבר מחיצת Tails עיקשת" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 msgid "The Tails persistence partition will be mounted." -msgstr "" +msgstr "מחיצת Tails עיקשת תחובר." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:304 msgid "Creating..." -msgstr "" +msgstr "יוצר..." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:307 msgid "Creating the persistent volume..." -msgstr "" +msgstr "יוצר כרך עיקש..." #: ../lib/Tails/Persistence/Step/Configure.pm:60 msgid "Persistence wizard - Persistent volume configuration" -msgstr "" +msgstr "אשף העיקשות - הגדרת כרך עיקש" #: ../lib/Tails/Persistence/Step/Configure.pm:63 msgid "Specify the files that will be saved in the persistent volume" -msgstr "" +msgstr "פרט אילו קבצים ישמרו בכרך העיקש" #. TRANSLATORS: partition, size, device vendor, device model #: ../lib/Tails/Persistence/Step/Configure.pm:67 @@ -278,50 +278,50 @@ msgstr "" msgid "" "The selected files will be stored in the encrypted partition %s (%s), on the" " %s %s device." -msgstr "" +msgstr "הקבצים שנבחרו ישמרו במחיצה מוצפנת %s (%s), על %s %s ההתקן." #: ../lib/Tails/Persistence/Step/Configure.pm:73 msgid "Save" -msgstr "" +msgstr "שמור" #: ../lib/Tails/Persistence/Step/Configure.pm:135 msgid "Make custom directory persistent (absolute path):" -msgstr "" +msgstr "צור תיקייה עיקשת מותאמת אישית (כתובת מוחלטת):" #: ../lib/Tails/Persistence/Step/Configure.pm:141 msgid "Destination:" -msgstr "" +msgstr "יעד:" #: ../lib/Tails/Persistence/Step/Configure.pm:204 msgid "Saving..." -msgstr "" +msgstr "שומר..." #: ../lib/Tails/Persistence/Step/Configure.pm:207 msgid "Saving persistence configuration..." -msgstr "" +msgstr "שומר הגדרות העיקשות..." #: ../lib/Tails/Persistence/Step/Delete.pm:41 msgid "Persistence wizard - Persistent volume deletion" -msgstr "" +msgstr "אשף העיקשות - מחיקת כרך עיקש" #: ../lib/Tails/Persistence/Step/Delete.pm:44 msgid "Your persistent data will be deleted." -msgstr "" +msgstr "המידע העיקש שלך ימחק." #: ../lib/Tails/Persistence/Step/Delete.pm:48 #, perl-format msgid "" "The persistent volume %s (%s), on the %s %s device, will be deleted." -msgstr "" +msgstr "הכרך העיקש %s (%s), אשר ב %s %s התקן, ימחק." #: ../lib/Tails/Persistence/Step/Delete.pm:54 msgid "Delete" -msgstr "" +msgstr "מחיקה" #: ../lib/Tails/Persistence/Step/Delete.pm:99 msgid "Deleting..." -msgstr "" +msgstr "מוחק..." #: ../lib/Tails/Persistence/Step/Delete.pm:102 msgid "Deleting the persistent volume..." -msgstr "" +msgstr "מוחק את הכרך העיקש..."

1 0

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

06 Dec '12

commit a8080e7e87a07c1d52654da5b10b0287d4479823 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 6 19:15:54 2012 +0000 Update translations for liveusb-creator --- ar/ar.po | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ar/ar.po b/ar/ar.po index 77bbb3f..54d9827 100644 --- a/ar/ar.po +++ b/ar/ar.po @@ -11,8 +11,8 @@ msgstr "" "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-19 16:50+0000\n" -"Last-Translator: abo0ody <abo0ody2689(a)gmail.com>\n" +"PO-Revision-Date: 2012-12-06 19:01+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" @@ -204,11 +204,11 @@ msgstr "كان هناك مشكلة في تنفيذ الأمر التالي: `%( #: ../liveusb/creator.py:384 msgid "Verifying SHA1 checksum of LiveCD image..." -msgstr "" +msgstr "التحقق من المجموع SHA1 لصورة القرص الحي..." #: ../liveusb/creator.py:388 msgid "Verifying SHA256 checksum of LiveCD image..." -msgstr "" +msgstr "التحقق من المجموع SHA256 لصورة القرص الحي..." #: ../liveusb/creator.py:404 msgid "" @@ -218,7 +218,7 @@ msgstr "خطأ: إن الـ SHA1 لقرص التشغيل التلقائي غير #: ../liveusb/creator.py:410 msgid "Unknown ISO, skipping checksum verification" -msgstr "" +msgstr "ملف ISO غير معروف، سيتم تجاوز التحقق من مجموع التأكد (checksum)." #: ../liveusb/creator.py:421 msgid "Not enough free space on device." @@ -227,31 +227,31 @@ msgstr "ليس هناك مساحة كافية على الجهاز." #: ../liveusb/creator.py:428 #, python-format msgid "Creating %sMB persistent overlay" -msgstr "" +msgstr "يتم إنشاء مكان تخزين دائم بحجم %s ميغا بايت" #: ../liveusb/creator.py:487 #, python-format msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s" -msgstr "" +msgstr "لا يمكن نسخ الملف %(infile)s لـ%(outfile)s: %(message)s" #: ../liveusb/creator.py:497 msgid "Removing existing Live OS" -msgstr "" +msgstr "إزالة نظام التشغيل الحي الموجود أصلاً." #: ../liveusb/creator.py:506 ../liveusb/creator.py:517 #, python-format msgid "Unable to chmod %(file)s: %(message)s" -msgstr "" +msgstr "لا يمكن تغيير صلاحيات الملف %(file)s: %(message)s" #: ../liveusb/creator.py:510 #, python-format msgid "Unable to remove file from previous LiveOS: %(message)s" -msgstr "" +msgstr "لا يمكن إزالة ملف من نظام التشغيل الحي السابق: %(message)s" #: ../liveusb/creator.py:522 #, python-format msgid "Unable to remove directory from previous LiveOS: %(message)s" -msgstr "" +msgstr "لا يمكن إزالة مجلد من نظام التشغيل الحي السابق: %(message)s" #: ../liveusb/creator.py:573 #, python-format @@ -262,12 +262,12 @@ msgstr "لا يمكن إيجاد الجهاز %s" msgid "" "You are using an old version of syslinux-extlinux that does not support the " "ext4 filesystem" -msgstr "" +msgstr "أنت تستخدم نسخة قديمة من syslinux-extlinux، وهي لا تدعم نظام الملفات ext4." #: ../liveusb/creator.py:718 #, python-format msgid "Unable to write on %(device)s, skipping." -msgstr "" +msgstr "لا يمكن الكتابة على الجهاز %(device)s، سيتم التجاوز." #: ../liveusb/creator.py:737 #, python-format

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 06 Dec '12

06 Dec '12

commit d2b1dd5b3a590fc4f797865c045770e45bfa4825 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 6 18:45:58 2012 +0000 Update translations for tails-persistence-setup --- he/he.po | 327 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 327 insertions(+), 0 deletions(-) diff --git a/he/he.po b/he/he.po new file mode 100644 index 0000000..7c760b6 --- /dev/null +++ b/he/he.po @@ -0,0 +1,327 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Tails developers +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# <yaelgogol(a)gmail.com>, 2012. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2012-11-27 21:00+0100\n" +"PO-Revision-Date: 2012-12-06 18:45+0000\n" +"Last-Translator: blackbird <yaelgogol(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: he\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:48 +msgid "Personal Data" +msgstr "מידע אישי" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:50 +msgid "Keep files stored in the `Persistent' directory" +msgstr "שמור קבצים מאוחסנים בתיקיית `Persistent'" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:58 +msgid "GnuPG" +msgstr "GnuPG" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:60 +msgid "GnuPG keyrings and configuration" +msgstr "מחזיקי מפתחות והגדרות של GnuPG" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:68 +msgid "SSH Client" +msgstr "לקוח SSH" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:70 +msgid "SSH keys, configuration and known hosts" +msgstr "מפתחות SSH, הגדרות ושרתים ידועים" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:78 +msgid "Pidgin" +msgstr "Pidgin" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:80 +msgid "Pidgin profiles and OTR keyring" +msgstr "פרופילי Pidgin ומחזיקי מפתחות OTR" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:88 +msgid "Claws Mail" +msgstr "Claws Mail" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:90 +msgid "Claws Mail profiles and locally stored email" +msgstr "פרופילים ודואר מאוחסן מקומית של Claws Mail" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:98 +msgid "GNOME Keyring" +msgstr "מחזיק מפתחות GNOME" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:100 +msgid "Secrets stored by GNOME Keyring" +msgstr "סודות השמורים במחזיק המפתחות של GNOME" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:108 +msgid "Network Connections" +msgstr "חיבורי רשת" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:110 +msgid "Configuration of network devices and connections" +msgstr "הגדרות של חיבורים והתקני רשת" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:118 +msgid "Browser bookmarks" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:120 +msgid "Bookmarks saved in Iceweasel browser" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:128 +msgid "APT Packages" +msgstr "חבילות APT" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:130 +msgid "Packages downloaded by APT" +msgstr "חבילות שהורדו ע\"י APT" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:138 +msgid "APT Lists" +msgstr "רשימות APT" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 +msgid "Lists downloaded by APT" +msgstr "רשימות שהורדו ע\"י APT" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:148 +msgid "Dotfiles" +msgstr "Dotfiles" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:150 +msgid "" +"Symlink into $HOME every file or directory found in the `dotfiles' directory" +msgstr "צור קיצור דרך מ $ HOMEלכל קובץ או תיקייה בתיקיית `dotfiles' " + +#: ../lib/Tails/Persistence/Setup.pm:259 +msgid "" +"The device Tails is running from cannot be found. Maybe you used the `toram'" +" option?" +msgstr "לא ניתן למצוא את ההתקן שTails רץ ממנו. האם בחרת באפשרות `toram' ?" + +#: ../lib/Tails/Persistence/Setup.pm:284 +msgid "'Unparseable partition path.'" +msgstr "מסלול למחיצה לא ניתן להבנה" + +#: ../lib/Tails/Persistence/Setup.pm:298 +msgid "Setup Tails persistent volume" +msgstr "התקנת התקן עיקש של Tails" + +#: ../lib/Tails/Persistence/Setup.pm:442 +#, perl-format +msgid "Device %s already has a persistent volume." +msgstr "בהתקן %s כבר יש התקן עיקש" + +#: ../lib/Tails/Persistence/Setup.pm:450 +#, perl-format +msgid "Device %s has not enough unallocated space." +msgstr "אין מספיק מקום מוקצה להתקן %s" + +#: ../lib/Tails/Persistence/Setup.pm:458 ../lib/Tails/Persistence/Setup.pm:472 +#, perl-format +msgid "Device %s has no persistent volume." +msgstr "בהתקן %s אין התקן עיקש" + +#: ../lib/Tails/Persistence/Setup.pm:464 +msgid "" +"Cannot delete the persistent volume while in use. You should restart Tails " +"without persistence." +msgstr "לא ניתן למחוק התקן עיקש בזמן השימוש. עליך לאתחל את Tails ללא התקן עיקש" + +#: ../lib/Tails/Persistence/Setup.pm:483 +msgid "Persistence volume is not unlocked." +msgstr "התקן עיקש נעול" + +#: ../lib/Tails/Persistence/Setup.pm:488 +msgid "Persistence volume is not mounted." +msgstr "התקן עיקש לא מחובר" + +#: ../lib/Tails/Persistence/Setup.pm:493 +msgid "Persistence volume is not readable. Permissions or ownership problems?" +msgstr "לא ניתן לקרוא מהתקן עיקש, האם יש בעיית הרשאות או בעלות?" + +#: ../lib/Tails/Persistence/Setup.pm:498 +msgid "Persistence volume is not writable. Maybe it was mounted read-only?" +msgstr "לא ניתן לכתוב להתקן עיקש. האם חובר כהתקן לקריאה בלבד?" + +#: ../lib/Tails/Persistence/Setup.pm:507 +#, perl-format +msgid "Tails is running from non-USB device %s." +msgstr "Tails מופעל מהתקן שאינו USB %s." + +#: ../lib/Tails/Persistence/Setup.pm:513 +#, perl-format +msgid "Device %s is optical." +msgstr "%s הוא אתקן אופטי." + +#: ../lib/Tails/Persistence/Setup.pm:520 +#, perl-format +msgid "Device %s was not created using Tails USB installer." +msgstr "התקן %s לא נוצר בשימוש מתקין הUSB של Tails." + +#: ../lib/Tails/Persistence/Setup.pm:554 +msgid "Error" +msgstr "שגיאה" + +#: ../lib/Tails/Persistence/Setup.pm:861 +msgid "Persistence wizard - Finished" +msgstr "אשף העיקשות - הסתיים" + +#: ../lib/Tails/Persistence/Setup.pm:864 +msgid "" +"Any changes you have made will only take effect after restarting Tails.\n" +"\n" +"You may now close this application." +msgstr "כל שינוי שנעשה יבוא לידי ביטוי רק לאחר הפעלת Tails מחדש. ⏎ ⏎ באפשרותך לצאת מהישום כעת. " + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:54 +msgid "Persistence wizard - Persistent volume creation" +msgstr "אשף העיקשות - יצירת אחסון עיקש." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:57 +msgid "Choose a passphrase to protect the persistent volume" +msgstr "בחר סיסמה להגנת האחסון העיקש" + +#. TRANSLATORS: size, device vendor, device model +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:61 +#, perl-format +msgid "" +"A %s persistent volume will be created on the %s %s device. Data on " +"this volume will be stored in an encrypted form protected by a passphrase." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:66 +msgid "Create" +msgstr "צור" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:110 +msgid "" +"Beware! Using persistence has consequences that must be well " +"understood. Tails can't help you if you use it wrong! See <a " +"href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>Tails" +" documentation about persistence</a> to learn more." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:144 +msgid "Passphrase:" +msgstr "סיסמא:" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:154 +msgid "Verify Passphrase:" +msgstr "וודא סיסמא:" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:167 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:231 +msgid "Passphrase can't be empty" +msgstr "הסיסמא לא יכולה להיות ריקה" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:222 +msgid "Passphrases do not match" +msgstr "הסיסמאות לא תואמות" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:262 +#: ../lib/Tails/Persistence/Step/Configure.pm:189 +msgid "Failed" +msgstr "נכשל" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:269 +#: ../lib/Tails/Persistence/Step/Delete.pm:84 +msgid "Correcting attributes on Tails system partition." +msgstr "מתקן מאפיינים על מחיצת המערכת של Tails" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:272 +#: ../lib/Tails/Persistence/Step/Delete.pm:87 +msgid "The attributes of the Tails system partition will be corrected." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:280 +msgid "Mounting Tails persistence partition." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 +msgid "The Tails persistence partition will be mounted." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:304 +msgid "Creating..." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:307 +msgid "Creating the persistent volume..." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Configure.pm:60 +msgid "Persistence wizard - Persistent volume configuration" +msgstr "" + +#: ../lib/Tails/Persistence/Step/Configure.pm:63 +msgid "Specify the files that will be saved in the persistent volume" +msgstr "" + +#. TRANSLATORS: partition, size, device vendor, device model +#: ../lib/Tails/Persistence/Step/Configure.pm:67 +#, perl-format +msgid "" +"The selected files will be stored in the encrypted partition %s (%s), on the" +" %s %s device." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Configure.pm:73 +msgid "Save" +msgstr "" + +#: ../lib/Tails/Persistence/Step/Configure.pm:135 +msgid "Make custom directory persistent (absolute path):" +msgstr "" + +#: ../lib/Tails/Persistence/Step/Configure.pm:141 +msgid "Destination:" +msgstr "" + +#: ../lib/Tails/Persistence/Step/Configure.pm:204 +msgid "Saving..." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Configure.pm:207 +msgid "Saving persistence configuration..." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Delete.pm:41 +msgid "Persistence wizard - Persistent volume deletion" +msgstr "" + +#: ../lib/Tails/Persistence/Step/Delete.pm:44 +msgid "Your persistent data will be deleted." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Delete.pm:48 +#, perl-format +msgid "" +"The persistent volume %s (%s), on the %s %s device, will be deleted." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Delete.pm:54 +msgid "Delete" +msgstr "" + +#: ../lib/Tails/Persistence/Step/Delete.pm:99 +msgid "Deleting..." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Delete.pm:102 +msgid "Deleting the persistent volume..." +msgstr ""

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 06 Dec '12

06 Dec '12

commit 4dda79a90434f867b3b0ff6dfd628879d46a05f3 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 6 18:45:29 2012 +0000 Update translations for vidalia_help --- he/services.po | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/he/services.po b/he/services.po index 43bc0b5..f1ec047 100644 --- a/he/services.po +++ b/he/services.po @@ -12,7 +12,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: he\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #. type: Content of: <html><body><h1> #: en/services.html:16 @@ -244,5 +244,3 @@ msgid "" "client application if it's not a web service), and Tor does the rest for " "you. There is no need to specifically configure Tor for that." msgstr "" - -

1 0

[stem/master] Improve Controller.extend_circuit documentation
by atagar＠torproject.org 06 Dec '12

06 Dec '12

commit a71163021f1731302c7f922ce4e5b3191d2fb938 Author: Ravi Chandra Padmala <neenaoffline(a)gmail.com> Date: Thu Dec 6 20:05:18 2012 +0530 Improve Controller.extend_circuit documentation Realized it might not be that obvious how paths are specified, and added some sample code to the Controller.extend_circuit documentation. Fixed a typo/grammer. --- stem/control.py | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/stem/control.py b/stem/control.py index 3252793..6b19c74 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1382,12 +1382,24 @@ class Controller(BaseController): def extend_circuit(self, circuit = 0, path = None, purpose = "general"): """ - Either requests a new circuit or extend an existing one. + Either requests the creation of a new circuit or extends an existing one. When called with a circuit value of zero (the default) a new circuit is created, and when non-zero the circuit with that id is extended. If the path isn't provided, one is automatically selected. + A python interpreter session used to create circuits could look like this... + + :: + + >>> control.extend_circuit(0, ["718BCEA286B531757ACAFF93AE04910EA73DE617", "30BAB8EE7606CBD12F3CC269AE976E0153E7A58D", "2765D8A8C4BBA3F89585A9FFE0E8575615880BEB"]) + 19 + >>> control.extend_circuit(0) + 20 + >>> print control.get_info('circuit-status') + 20 EXTENDED $718BCEA286B531757ACAFF93AE04910EA73DE617=KsmoinOK,$649F2D0ACF418F7CFC6539AB2257EB2D5297BAFA=Eskimo BUILD_FLAGS=NEED_CAPACITY PURPOSE=GENERAL TIME_CREATED=2012-12-06T13:51:11.433755 + 19 BUILT $718BCEA286B531757ACAFF93AE04910EA73DE617=KsmoinOK,$30BAB8EE7606CBD12F3CC269AE976E0153E7A58D=Pascal1,$2765D8A8C4BBA3F89585A9FFE0E8575615880BEB=Anthracite PURPOSE=GENERAL TIME_CREATED=2012-12-06T13:50:56.969938 + :param int circuit: id of a circuit to be extended :param list,str path: one or more relays to make a circuit through, this is required if the circuit id is non-zero

1 0

[stem/master] Controller.extend_circuit now checks for failures properly
by atagar＠torproject.org 06 Dec '12

06 Dec '12

commit 7882d3cfeec98a478046a779e531a6013558c348 Author: Ravi Chandra Padmala <neenaoffline(a)gmail.com> Date: Thu Dec 6 19:39:16 2012 +0530 Controller.extend_circuit now checks for failures properly --- stem/control.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/stem/control.py b/stem/control.py index 4d3bc8b..3252793 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1418,7 +1418,7 @@ class Controller(BaseController): assert extended == "EXTENDED" except: raise stem.ProtocolError("EXTENDCIRCUIT response invalid:\n%s", str(response)) - elif response.code == ('512', '552'): + elif response.code in ('512', '552'): raise stem.InvalidRequest(response.code, response.message) else: raise stem.ProtocolError("EXTENDCIRCUIT returned unexpected response code: %s" % response.code)

1 0

[stem/master] Skip pointless extra read of network status documents
by atagar＠torproject.org 06 Dec '12

06 Dec '12

commit 51141d37b9a26a8a05cfa09cf85f3939ab79011a Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Dec 6 09:02:35 2012 -0800 Skip pointless extra read of network status documents When parsing a network status document we read to the end of the router status entries solely to determine where the end of the file is. This is a waste of time and memory. Instead, checking for the end of the section as we go along. --- stem/control.py | 2 + stem/descriptor/__init__.py | 14 +++++++++-- stem/descriptor/networkstatus.py | 4 +- stem/descriptor/router_status_entry.py | 36 ++++++++++++++++++++++++------- 4 files changed, 43 insertions(+), 13 deletions(-) diff --git a/stem/control.py b/stem/control.py index 6b19c74..0803ad4 100644 --- a/stem/control.py +++ b/stem/control.py @@ -36,7 +36,9 @@ providing its own for interacting at a higher level. |- map_address - maps one address to another such that connections to the original are replaced with the other |- get_version - convenience method to get tor version |- get_server_descriptor - querying the server descriptor for a relay + |- get_server_descriptors - provides all presently available server descriptors |- get_network_status - querying the router status entry for a relay + |- get_network_statuses - provides all preently available router status entries |- authenticate - convenience method to authenticate the controller +- protocolinfo - convenience method to get the protocol info diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 4c5841e..7291995 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -175,7 +175,7 @@ class Descriptor(object): def __str__(self): return self._raw_contents -def _read_until_keywords(keywords, descriptor_file, inclusive = False, ignore_first = False, skip = False, end_position = None): +def _read_until_keywords(keywords, descriptor_file, inclusive = False, ignore_first = False, skip = False, end_position = None, include_ending_keyword = False): """ Reads from the descriptor file until we get to one of the given keywords or reach the end of the file. @@ -187,11 +187,14 @@ def _read_until_keywords(keywords, descriptor_file, inclusive = False, ignore_fi given keywords :param bool skip: skips buffering content, returning None :param int end_position: end if we reach this point in the file + :param bool include_ending_keyword: provides the keyword we broke on if **True** - :returns: **list** with the lines until we find one of the keywords + :returns: **list** with the lines until we find one of the keywords, this is a two value tuple with the ending keyword if include_ending_keyword is **True** """ content = None if skip else [] + ending_keyword = None + if type(keywords) == str: keywords = (keywords,) if ignore_first: @@ -218,6 +221,8 @@ def _read_until_keywords(keywords, descriptor_file, inclusive = False, ignore_fi line_keyword = line_match.groups()[0] if line_keyword in keywords: + ending_keyword = line_keyword + if not inclusive: descriptor_file.seek(last_position) elif content is not None: @@ -227,7 +232,10 @@ def _read_until_keywords(keywords, descriptor_file, inclusive = False, ignore_fi elif content is not None: content.append(line) - return content + if include_ending_keyword: + return (content, ending_keyword) + else: + return content def _get_pseudo_pgp_block(remaining_contents): """ diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index ca6aca2..efe40e1 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -296,7 +296,7 @@ class NetworkStatusDocumentV2(NetworkStatusDocument): validate, entry_class = stem.descriptor.router_status_entry.RouterStatusEntryV2, entry_keyword = ROUTERS_START, - section_end_keywords = V2_FOOTER_START, + section_end_keywords = (V2_FOOTER_START,), extra_args = (self,), )) @@ -483,7 +483,7 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): validate, entry_class = router_type, entry_keyword = ROUTERS_START, - section_end_keywords = FOOTER_START, + section_end_keywords = (FOOTER_START,), extra_args = (self,), )) diff --git a/stem/descriptor/router_status_entry.py b/stem/descriptor/router_status_entry.py index 61f03e8..2d02330 100644 --- a/stem/descriptor/router_status_entry.py +++ b/stem/descriptor/router_status_entry.py @@ -50,20 +50,40 @@ def parse_file(document_file, validate, entry_class, entry_keyword = "r", start_ * **IOError** if the file can't be read """ - if start_position is None: + if start_position: + document_file.seek(start_position) + else: start_position = document_file.tell() - if end_position is None: - if section_end_keywords: - stem.descriptor._read_until_keywords(section_end_keywords, document_file, skip = True) - end_position = document_file.tell() + # check if we're starting at the end of the section (ie, there's no entries to read) + if section_end_keywords: + first_keyword = None + line_match = stem.descriptor.KEYWORD_LINE.match(document_file.readline()) + + if line_match: + first_keyword = line_match.groups()[0] + + document_file.seek(start_position) + + if first_keyword in section_end_keywords: + return - document_file.seek(start_position) - while not end_position or document_file.tell() < end_position: - desc_content = "".join(stem.descriptor._read_until_keywords(entry_keyword, document_file, ignore_first = True, end_position = end_position)) + while end_position is None or document_file.tell() < end_position: + desc_lines, ending_keyword = stem.descriptor._read_until_keywords( + (entry_keyword,) + section_end_keywords, + document_file, + ignore_first = True, + end_position = end_position, + include_ending_keyword = True + ) + + desc_content = "".join(desc_lines) if desc_content: yield entry_class(desc_content, validate, *extra_args) + + # check if we stopped at the end of the section + if ending_keyword in section_end_keywords: break else: break

1 0

r25936: {website} fix windows tor standalone packages (website/trunk/include)
by Erinn Clark 06 Dec '12

06 Dec '12

Author: erinn Date: 2012-12-06 16:24:23 +0000 (Thu, 06 Dec 2012) New Revision: 25936 Modified: website/trunk/include/versions.wmi Log: fix windows tor standalone packages Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-12-06 05:21:37 UTC (rev 25935) +++ website/trunk/include/versions.wmi 2012-12-06 16:24:23 UTC (rev 25936) @@ -67,8 +67,8 @@ <define-tag version-androidbundle-libevent whitespace=delete>libevent-1.4.12-stable</define-tag> <define-tag package-androidbundle-alpha whitespace=delete>dist/android/<version-androidbundle-tor>-orbot-<version-androidbundle-orbot>.apk</define-tag> -<define-tag package-win32-stable whitespace=delete>../dist/win32/tor-<version-win32-stable>-win32.exe</define-tag> -<define-tag package-win32-alpha whitespace=delete>../dist/win32/tor-<version-win32-alpha>-win32.exe</define-tag> +<define-tag package-win32-stable whitespace=delete>../dist/win32/tor-<version-win32-stable>-win32-1.exe</define-tag> +<define-tag package-win32-alpha whitespace=delete>../dist/win32/tor-<version-win32-alpha>-win32-1.exe</define-tag> <define-tag file-win32-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.21.exe</define-tag> <define-tag package-win32-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-win32-bundle-stable></define-tag>

1 0

[ooni-probe/master] Update report documentation with better markup and better descriptions
by art＠torproject.org 06 Dec '12

06 Dec '12

commit 4648dd50aa44066eec9de1526f08a2e517ea14fb Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Dec 6 15:13:54 2012 +0100 Update report documentation with better markup and better descriptions --- docs/source/reports.rst | 34 ++++++++++++++++++++++++---------- 1 files changed, 24 insertions(+), 10 deletions(-) diff --git a/docs/source/reports.rst b/docs/source/reports.rst index cf5e008..7a49dcb 100644 --- a/docs/source/reports.rst +++ b/docs/source/reports.rst @@ -2,32 +2,46 @@ Reports ======= The reports collected by ooniprobe are stored on -https://ooni.torproject.org/reports/`reportFormatVersion`/`CC`/ +https://ooni.torproject.org/reports/ ``reportFormatVersion`` / ``CC`` / -Where `CC` is the two letter country code as specified by -http://en.wikipedia.org/wiki/ISO_3166-2. +Where ``CC`` is the two letter country code as specified by `ISO 31666-2 +<http://en.wikipedia.org/wiki/ISO_3166-2>`_. -For example the reports for Italy (`CC` is `it`) of the `reportVersion` 0.1 may +For example the reports for Italy (``CC`` is ``it``) of the ``reportVersion`` 0.1 may be found in: -:: - https://ooni.torproject.org/reports/0.1/IT/ +https://ooni.torproject.org/reports/0.1/IT/ This directory shall contain the various reports for the test using the following convention: -`ISO8601`-AS`probeASNumber`.yamloo +``dateInISO8601Format`` _ ``probeASNumber`` .yamloo + +The date is expressed using `ISO 8601 <http://en.wikipedia.org/wiki/ISO_8601`_ +including seconds and with no ``:`` to delimit hours, minutes, days. + +Like so + + ``YEAR`` - ``MONTH`` - ``DAY`` T ``HOURS`` ``MINUTES`` ``SECONDS`` Z + +The time is **always** expressed in UTC. If a collision is detected then an int (starting with 1) will get appended to the test. -For example a report that was created on the first of January 2012 at Noon (UTC -time) sharp from MIT (AS3) will be stored here: +For example if two report that are created on the first of January 2012 at Noon +(UTC time) sharp from MIT (AS3) will be stored here: :: - https://ooni.torproject.org/reports/0.1/US/2012-01-01T120000Z-AS3.yamloo + https://ooni.torproject.org/reports/0.1/US/2012-01-01T120000Z_AS3.yamloo + https://ooni.torproject.org/reports/0.1/US/2012-01-01T120000Z_AS3.1.yamloo + + +Note: it is highly unlikely that reports get created with the same exact +timestamp from the same exact ASN. If this does happen it could be index of +some malicious report poisoning attack in progress. Report format version changelog

1 0