- tor-commits - lists.torproject.org

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 25 Jan '16

25 Jan '16

commit 7c77b1622e81980c703df2177d0405c04d56476d Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 25 09:45:37 2016 +0000 Update translations for tails-greeter_completed --- he/he.po | 51 ++++++++++++++++++--------------------------------- 1 file changed, 18 insertions(+), 33 deletions(-) diff --git a/he/he.po b/he/he.po index 9ecbed4..37d1d89 100644 --- a/he/he.po +++ b/he/he.po @@ -4,6 +4,7 @@ # # Translators: # aharon, 2012 +# Ion Israeli <bobiganush(a)yahoo.com>, 2016 # dave nicetry <ndvnis(a)gmail.com>, 2014 # GenghisKhan <genghiskhan(a)gmx.ca>, 2013 # Johnny Diralenzo, 2015 @@ -14,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-20 18:20+0200\n" -"PO-Revision-Date: 2015-10-09 11:44+0000\n" -"Last-Translator: Johnny Diralenzo\n" +"POT-Creation-Date: 2016-01-11 15:05+0100\n" +"PO-Revision-Date: 2016-01-25 09:19+0000\n" +"Last-Translator: Ion Israeli <bobiganush(a)yahoo.com>\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -97,73 +98,57 @@ msgid "Passwords do not match" msgstr "סיסמאות אינו תואמות" #: ../glade/optionswindow.glade.h:10 -msgid "Windows camouflage" -msgstr "הסוואת Windows" - -#: ../glade/optionswindow.glade.h:11 -msgid "" -"<a " -"href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Documentation</a>" -msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">תיעוד</a>" - -#: ../glade/optionswindow.glade.h:12 -msgid "" -"This option makes Tails look more like Microsoft Windows 8. This may be " -"useful in public places in order to avoid attracting suspicion." -msgstr "אפשרות זו תגרום ל-Tails להיראות יותר כמו חלונות 8 של מיקרוסופט. דבר זה עשוי לסייע במקומות ציבוריים על מנת להימנע ממשיכת תשומת לב מיותרת." - -#: ../glade/optionswindow.glade.h:13 -msgid "Activate Microsoft Windows 8 Camouflage" -msgstr "הפעל הסוואת Microsoft Windows 8" - -#: ../glade/optionswindow.glade.h:14 msgid "MAC address spoofing" msgstr "זיוף כתובות Mac" -#: ../glade/optionswindow.glade.h:15 +#: ../glade/optionswindow.glade.h:11 msgid "" "<a " "href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>" msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">תיעוד</a>" -#: ../glade/optionswindow.glade.h:16 +#: ../glade/optionswindow.glade.h:12 msgid "" "Spoofing MAC addresses hides the serial number of your network cards to the " "local networks. This can help you hide your geographical location." msgstr "טשטוש כתובות MAC מסווה את המספר הסידורי של כרטיס הרשת שלך מעיני הרשתות המקומיות אליהן הוא מתחבר. דבר זה עשוי לסייע בידך להסתיר את מיקומך הגיאוגרפי." -#: ../glade/optionswindow.glade.h:17 +#: ../glade/optionswindow.glade.h:13 msgid "" "It is generally safer to spoof MAC addresses, but it might also raise " "suspicion or cause network connection problems." msgstr "ככלל, מומלץ לטשטש את כתובת ה-MAC שלך, אך זה גם עלול לעורר חשד או לשבש את החיבור לאינטרנט." -#: ../glade/optionswindow.glade.h:18 +#: ../glade/optionswindow.glade.h:14 msgid "Spoof all MAC addresses" msgstr "זייף את כל כתובות ה-Mac" -#: ../glade/optionswindow.glade.h:19 +#: ../glade/optionswindow.glade.h:15 msgid "Network configuration" msgstr "תצורת רשת" -#: ../glade/optionswindow.glade.h:20 +#: ../glade/optionswindow.glade.h:16 msgid "" "<a " "href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>" msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">תיעוד</a>" -#: ../glade/optionswindow.glade.h:21 +#: ../glade/optionswindow.glade.h:17 msgid "" "This computer's Internet connection is clear of obstacles. You would like to" " connect directly to the Tor network." msgstr "חיבור האינטרנט של מחשב זה פנוי ממכשולים, מסננים וחסימות. ברצונך לנסות להתחבר לאינטרנט ישירות באמצעות רשת Tor." -#: ../glade/optionswindow.glade.h:22 +#: ../glade/optionswindow.glade.h:18 msgid "" "This computer's Internet connection is censored, filtered, or proxied. You " "need to configure bridge, firewall, or proxy settings." msgstr "חיבור האינטרנט של מחשב זה מצונזר, מסונן או מוגבל. עליך לטפל בהגדרות פרוקסי, חומת אש או גשר." +#: ../glade/optionswindow.glade.h:19 +msgid "Disable all networking" +msgstr "השבת את כל ההתחברויות לרשת" + #: ../glade/langpanel.glade.h:1 msgid " " msgstr " " @@ -203,7 +188,7 @@ msgid "" "%(stderr)s" msgstr "הפעלה חיה עקבית נכשלה עם השגיאה: %(returncode)s:\n%(stdout)s \n%(stderr)s" -#: ../tailsgreeter/langpanel.py:123 ../tailsgreeter/langpanel.py:150 -#: ../tailsgreeter/langpanel.py:183 +#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167 +#: ../tailsgreeter/langpanel.py:200 msgid "Other..." msgstr "אחר..."

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 25 Jan '16

25 Jan '16

commit d196a432bfa81e2ba439b03c8f33c83263a454c8 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 25 09:45:33 2016 +0000 Update translations for tails-greeter --- he/he.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/he/he.po b/he/he.po index 427b9e9..37d1d89 100644 --- a/he/he.po +++ b/he/he.po @@ -4,6 +4,7 @@ # # Translators: # aharon, 2012 +# Ion Israeli <bobiganush(a)yahoo.com>, 2016 # dave nicetry <ndvnis(a)gmail.com>, 2014 # GenghisKhan <genghiskhan(a)gmx.ca>, 2013 # Johnny Diralenzo, 2015 @@ -14,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-16 18:12+0100\n" -"PO-Revision-Date: 2015-12-21 09:22+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2016-01-11 15:05+0100\n" +"PO-Revision-Date: 2016-01-25 09:19+0000\n" +"Last-Translator: Ion Israeli <bobiganush(a)yahoo.com>\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -146,7 +147,7 @@ msgstr "חיבור האינטרנט של מחשב זה מצונזר, מסונן #: ../glade/optionswindow.glade.h:19 msgid "Disable all networking" -msgstr "" +msgstr "השבת את כל ההתחברויות לרשת" #: ../glade/langpanel.glade.h:1 msgid " "

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 25 Jan '16

25 Jan '16

commit f626ba6e341075cf62235c9bd78d219048dcf208 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 25 09:45:28 2016 +0000 Update translations for tails-persistence-setup_completed --- he/he.po | 100 ++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 51 insertions(+), 49 deletions(-) diff --git a/he/he.po b/he/he.po index 09cbed8..f055e9f 100644 --- a/he/he.po +++ b/he/he.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Ion Israeli <bobiganush(a)yahoo.com>, 2016 # Johnny Diralenzo, 2015 # Kunda, 2013-2014 # yael gogol <yaelgogol(a)gmail.com>, 2012 @@ -10,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2015-08-05 19:02+0200\n" -"PO-Revision-Date: 2015-10-09 11:40+0000\n" -"Last-Translator: Johnny Diralenzo\n" +"POT-Creation-Date: 2015-12-16 17:55+0100\n" +"PO-Revision-Date: 2016-01-25 09:21+0000\n" +"Last-Translator: Ion Israeli <bobiganush(a)yahoo.com>\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,7 +23,7 @@ msgstr "" #: ../lib/Tails/Persistence/Configuration/Presets.pm:48 msgid "Personal Data" -msgstr "מידע אישי" +msgstr "נתונים אישיים" #: ../lib/Tails/Persistence/Configuration/Presets.pm:50 msgid "Keep files stored in the `Persistent' directory" @@ -53,69 +54,69 @@ 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 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:90 msgid "Secrets stored by GNOME Keyring" msgstr "סודות השמורים במחזיק המפתחות של GNOME" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:108 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:98 msgid "Network Connections" msgstr "חיבורי רשת" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:110 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:100 msgid "Configuration of network devices and connections" msgstr "הגדרות של חיבורים והתקני רשת" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:118 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:108 msgid "Browser bookmarks" msgstr "סימניות דפדפן" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:120 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:110 msgid "Bookmarks saved in the Tor Browser" msgstr "סימניות שמורות בדפדפן Tor" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:128 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:118 msgid "Printers" msgstr "מדפסות" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:130 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:120 msgid "Printers configuration" msgstr "תצורת מדפסות" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:138 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:128 msgid "Bitcoin client" msgstr "תוכנת לקוח ביטקוין" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:130 msgid "Electrum's bitcoin wallet and configuration" msgstr "ארנק הביטקוין של אלקטרום והגדרותיו" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:148 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:138 msgid "APT Packages" msgstr "חבילות APT" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:150 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 msgid "Packages downloaded by APT" msgstr "חבילות שהורדו ע\"י APT" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:158 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:148 msgid "APT Lists" msgstr "רשימות APT" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:160 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:150 msgid "Lists downloaded by APT" msgstr "רשימות שהורדו ע\"י APT" +#: ../lib/Tails/Persistence/Configuration/Presets.pm:158 +msgid "Icedove" +msgstr "Icedove" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:160 +msgid "Icedove profiles and locally stored email" +msgstr "פרופילי Icedove ודוא\"ל שמור מקומי" + #: ../lib/Tails/Persistence/Configuration/Presets.pm:168 msgid "Dotfiles" msgstr "Dotfiles" @@ -125,71 +126,71 @@ msgid "" "Symlink into $HOME every file or directory found in the `dotfiles' directory" msgstr "צור קיצור דרך מ $ HOMEלכל קובץ או תיקייה בתיקיית `dotfiles' " -#: ../lib/Tails/Persistence/Setup.pm:227 +#: ../lib/Tails/Persistence/Setup.pm:230 msgid "Setup Tails persistent volume" msgstr "התקנת התקן עיקש של Tails" -#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:451 +#: ../lib/Tails/Persistence/Setup.pm:311 ../lib/Tails/Persistence/Setup.pm:458 msgid "Error" msgstr "שגיאה" -#: ../lib/Tails/Persistence/Setup.pm:338 +#: ../lib/Tails/Persistence/Setup.pm:343 #, perl-format msgid "Device %s already has a persistent volume." msgstr "בהתקן %s כבר יש התקן עיקש" -#: ../lib/Tails/Persistence/Setup.pm:346 +#: ../lib/Tails/Persistence/Setup.pm:351 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "אין מספיק מקום מוקצה להתקן %s" -#: ../lib/Tails/Persistence/Setup.pm:354 ../lib/Tails/Persistence/Setup.pm:368 +#: ../lib/Tails/Persistence/Setup.pm:359 ../lib/Tails/Persistence/Setup.pm:373 #, perl-format msgid "Device %s has no persistent volume." msgstr "בהתקן %s אין התקן עיקש" -#: ../lib/Tails/Persistence/Setup.pm:360 +#: ../lib/Tails/Persistence/Setup.pm:365 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "לא ניתן למחוק התקן עיקש בזמן השימוש. עליך לאתחל את Tails ללא התקן עיקש" -#: ../lib/Tails/Persistence/Setup.pm:379 +#: ../lib/Tails/Persistence/Setup.pm:384 msgid "Persistence volume is not unlocked." msgstr "התקן עיקש נעול" -#: ../lib/Tails/Persistence/Setup.pm:384 +#: ../lib/Tails/Persistence/Setup.pm:389 msgid "Persistence volume is not mounted." msgstr "התקן עיקש לא מחובר" -#: ../lib/Tails/Persistence/Setup.pm:389 +#: ../lib/Tails/Persistence/Setup.pm:394 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "לא ניתן לקרוא מהתקן עיקש, האם יש בעיית הרשאות או בעלות?" -#: ../lib/Tails/Persistence/Setup.pm:394 +#: ../lib/Tails/Persistence/Setup.pm:399 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "לא ניתן לכתוב להתקן עיקש. האם חובר כהתקן לקריאה בלבד?" -#: ../lib/Tails/Persistence/Setup.pm:403 +#: ../lib/Tails/Persistence/Setup.pm:408 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "Tails פועל ממכשיר %s שלא מסוג-USB ולא מסוג-SDIO." -#: ../lib/Tails/Persistence/Setup.pm:409 +#: ../lib/Tails/Persistence/Setup.pm:414 #, perl-format msgid "Device %s is optical." msgstr "%s הוא אתקן אופטי." -#: ../lib/Tails/Persistence/Setup.pm:416 +#: ../lib/Tails/Persistence/Setup.pm:421 #, perl-format msgid "Device %s was not created using Tails Installer." msgstr "התקן %s לא נוצר באמצעות תוכנת ההתקנה של Tails." -#: ../lib/Tails/Persistence/Setup.pm:676 +#: ../lib/Tails/Persistence/Setup.pm:667 msgid "Persistence wizard - Finished" msgstr "אשף העיקשות - הסתיים" -#: ../lib/Tails/Persistence/Setup.pm:679 +#: ../lib/Tails/Persistence/Setup.pm:670 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" @@ -241,32 +242,33 @@ msgstr "הסיסמא לא יכולה להיות ריקה" msgid "Passphrases do not match" msgstr "הסיסמאות לא תואמות" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:262 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:274 #: ../lib/Tails/Persistence/Step/Configure.pm:129 +#: ../lib/Tails/Persistence/Step/Delete.pm:95 msgid "Failed" msgstr "נכשל" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:271 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 msgid "Mounting Tails persistence partition." msgstr "מחבר מחיצת Tails עיקשת" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:274 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:286 msgid "The Tails persistence partition will be mounted." msgstr "מחיצת Tails עיקשת תחובר." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:295 msgid "Correcting permissions of the persistent volume." msgstr "תיקון הרשאות של הכרך עיקש." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:286 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:298 msgid "The permissions of the persistent volume will be corrected." msgstr "ההרשאות של הכרך עיקש תתוקן." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:308 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:320 msgid "Creating..." msgstr "יוצר..." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:311 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:323 msgid "Creating the persistent volume..." msgstr "יוצר כרך עיקש..." @@ -316,10 +318,10 @@ msgstr "הכרך העיקש %s (%s), אשר ב %s %s התקן, ימחק." msgid "Delete" msgstr "מחיקה" -#: ../lib/Tails/Persistence/Step/Delete.pm:101 +#: ../lib/Tails/Persistence/Step/Delete.pm:111 msgid "Deleting..." msgstr "מוחק..." -#: ../lib/Tails/Persistence/Step/Delete.pm:104 +#: ../lib/Tails/Persistence/Step/Delete.pm:114 msgid "Deleting the persistent volume..." msgstr "מוחק את הכרך העיקש..."

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 25 Jan '16

25 Jan '16

commit 1e3915c1a72030b45e41239333722926307c28b4 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 25 09:45:24 2016 +0000 Update translations for tails-persistence-setup --- he/he.po | 62 ++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/he/he.po b/he/he.po index c744c74..f055e9f 100644 --- a/he/he.po +++ b/he/he.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Ion Israeli <bobiganush(a)yahoo.com>, 2016 # Johnny Diralenzo, 2015 # Kunda, 2013-2014 # yael gogol <yaelgogol(a)gmail.com>, 2012 @@ -10,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2015-12-14 21:35+0100\n" -"PO-Revision-Date: 2015-12-15 09:27+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2015-12-16 17:55+0100\n" +"PO-Revision-Date: 2016-01-25 09:21+0000\n" +"Last-Translator: Ion Israeli <bobiganush(a)yahoo.com>\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,7 +23,7 @@ msgstr "" #: ../lib/Tails/Persistence/Configuration/Presets.pm:48 msgid "Personal Data" -msgstr "מידע אישי" +msgstr "נתונים אישיים" #: ../lib/Tails/Persistence/Configuration/Presets.pm:50 msgid "Keep files stored in the `Persistent' directory" @@ -110,11 +111,11 @@ msgstr "רשימות שהורדו ע\"י APT" #: ../lib/Tails/Persistence/Configuration/Presets.pm:158 msgid "Icedove" -msgstr "" +msgstr "Icedove" #: ../lib/Tails/Persistence/Configuration/Presets.pm:160 msgid "Icedove profiles and locally stored email" -msgstr "" +msgstr "פרופילי Icedove ודוא\"ל שמור מקומי" #: ../lib/Tails/Persistence/Configuration/Presets.pm:168 msgid "Dotfiles" @@ -125,71 +126,71 @@ msgid "" "Symlink into $HOME every file or directory found in the `dotfiles' directory" msgstr "צור קיצור דרך מ $ HOMEלכל קובץ או תיקייה בתיקיית `dotfiles' " -#: ../lib/Tails/Persistence/Setup.pm:227 +#: ../lib/Tails/Persistence/Setup.pm:230 msgid "Setup Tails persistent volume" msgstr "התקנת התקן עיקש של Tails" -#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:451 +#: ../lib/Tails/Persistence/Setup.pm:311 ../lib/Tails/Persistence/Setup.pm:458 msgid "Error" msgstr "שגיאה" -#: ../lib/Tails/Persistence/Setup.pm:338 +#: ../lib/Tails/Persistence/Setup.pm:343 #, perl-format msgid "Device %s already has a persistent volume." msgstr "בהתקן %s כבר יש התקן עיקש" -#: ../lib/Tails/Persistence/Setup.pm:346 +#: ../lib/Tails/Persistence/Setup.pm:351 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "אין מספיק מקום מוקצה להתקן %s" -#: ../lib/Tails/Persistence/Setup.pm:354 ../lib/Tails/Persistence/Setup.pm:368 +#: ../lib/Tails/Persistence/Setup.pm:359 ../lib/Tails/Persistence/Setup.pm:373 #, perl-format msgid "Device %s has no persistent volume." msgstr "בהתקן %s אין התקן עיקש" -#: ../lib/Tails/Persistence/Setup.pm:360 +#: ../lib/Tails/Persistence/Setup.pm:365 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "לא ניתן למחוק התקן עיקש בזמן השימוש. עליך לאתחל את Tails ללא התקן עיקש" -#: ../lib/Tails/Persistence/Setup.pm:379 +#: ../lib/Tails/Persistence/Setup.pm:384 msgid "Persistence volume is not unlocked." msgstr "התקן עיקש נעול" -#: ../lib/Tails/Persistence/Setup.pm:384 +#: ../lib/Tails/Persistence/Setup.pm:389 msgid "Persistence volume is not mounted." msgstr "התקן עיקש לא מחובר" -#: ../lib/Tails/Persistence/Setup.pm:389 +#: ../lib/Tails/Persistence/Setup.pm:394 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "לא ניתן לקרוא מהתקן עיקש, האם יש בעיית הרשאות או בעלות?" -#: ../lib/Tails/Persistence/Setup.pm:394 +#: ../lib/Tails/Persistence/Setup.pm:399 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "לא ניתן לכתוב להתקן עיקש. האם חובר כהתקן לקריאה בלבד?" -#: ../lib/Tails/Persistence/Setup.pm:403 +#: ../lib/Tails/Persistence/Setup.pm:408 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "Tails פועל ממכשיר %s שלא מסוג-USB ולא מסוג-SDIO." -#: ../lib/Tails/Persistence/Setup.pm:409 +#: ../lib/Tails/Persistence/Setup.pm:414 #, perl-format msgid "Device %s is optical." msgstr "%s הוא אתקן אופטי." -#: ../lib/Tails/Persistence/Setup.pm:416 +#: ../lib/Tails/Persistence/Setup.pm:421 #, perl-format msgid "Device %s was not created using Tails Installer." msgstr "התקן %s לא נוצר באמצעות תוכנת ההתקנה של Tails." -#: ../lib/Tails/Persistence/Setup.pm:676 +#: ../lib/Tails/Persistence/Setup.pm:667 msgid "Persistence wizard - Finished" msgstr "אשף העיקשות - הסתיים" -#: ../lib/Tails/Persistence/Setup.pm:679 +#: ../lib/Tails/Persistence/Setup.pm:670 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" @@ -241,32 +242,33 @@ msgstr "הסיסמא לא יכולה להיות ריקה" msgid "Passphrases do not match" msgstr "הסיסמאות לא תואמות" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:262 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:274 #: ../lib/Tails/Persistence/Step/Configure.pm:129 +#: ../lib/Tails/Persistence/Step/Delete.pm:95 msgid "Failed" msgstr "נכשל" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:271 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 msgid "Mounting Tails persistence partition." msgstr "מחבר מחיצת Tails עיקשת" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:274 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:286 msgid "The Tails persistence partition will be mounted." msgstr "מחיצת Tails עיקשת תחובר." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:295 msgid "Correcting permissions of the persistent volume." msgstr "תיקון הרשאות של הכרך עיקש." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:286 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:298 msgid "The permissions of the persistent volume will be corrected." msgstr "ההרשאות של הכרך עיקש תתוקן." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:308 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:320 msgid "Creating..." msgstr "יוצר..." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:311 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:323 msgid "Creating the persistent volume..." msgstr "יוצר כרך עיקש..." @@ -316,10 +318,10 @@ msgstr "הכרך העיקש %s (%s), אשר ב %s %s התקן, ימחק." msgid "Delete" msgstr "מחיקה" -#: ../lib/Tails/Persistence/Step/Delete.pm:101 +#: ../lib/Tails/Persistence/Step/Delete.pm:111 msgid "Deleting..." msgstr "מוחק..." -#: ../lib/Tails/Persistence/Step/Delete.pm:104 +#: ../lib/Tails/Persistence/Step/Delete.pm:114 msgid "Deleting the persistent volume..." msgstr "מוחק את הכרך העיקש..."

1 0

[translation/tails-iuk_completed] Update translations for tails-iuk_completed
by translation＠torproject.org 25 Jan '16

25 Jan '16

commit a165d3d3164fd78fee0416f57614654de51a9042 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 25 09:16:02 2016 +0000 Update translations for tails-iuk_completed --- he.po | 95 ++++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 49 insertions(+), 46 deletions(-) diff --git a/he.po b/he.po index b9431c0..ae5be0a 100644 --- a/he.po +++ b/he.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Bobi Ganush <bobiganush(a)yahoo.com>, 2016 # dave nicetry <ndvnis(a)gmail.com>, 2014 # GenghisKhan <genghiskhan(a)gmx.ca>, 2014 # GenghisKhan <genghiskhan(a)gmx.ca>, 2014 @@ -14,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2015-08-05 20:06+0200\n" -"PO-Revision-Date: 2015-09-24 05:15+0000\n" -"Last-Translator: Johnny Diralenzo\n" +"POT-Creation-Date: 2015-12-16 18:20+0100\n" +"PO-Revision-Date: 2016-01-25 09:15+0000\n" +"Last-Translator: Bobi Ganush <bobiganush(a)yahoo.com>\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,16 +25,18 @@ msgstr "" "Language: he\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../lib/Tails/IUK/Frontend.pm:146 ../lib/Tails/IUK/Frontend.pm:523 -#: ../lib/Tails/IUK/Frontend.pm:667 -msgid "For debugging information, see /home/amnesia/.xsession-errors" -msgstr "למידע על ניפוי שגיאות-debugging, ראה /home/amnesia/.xsession-errors" +#: ../lib/Tails/IUK/Frontend.pm:146 ../lib/Tails/IUK/Frontend.pm:522 +#: ../lib/Tails/IUK/Frontend.pm:662 +msgid "" +"For debugging information, execute the following command: sudo tails-" +"debugging-info" +msgstr "למידע על ניפוי באגים, בצע את הפקודה הבאה: sudo tails-debugging-info" -#: ../lib/Tails/IUK/Frontend.pm:216 +#: ../lib/Tails/IUK/Frontend.pm:215 msgid "Error while checking for upgrades" msgstr "שגיאה במהלך בדיקת שדרוגים" -#: ../lib/Tails/IUK/Frontend.pm:219 +#: ../lib/Tails/IUK/Frontend.pm:218 msgid "" "Could not determine whether an upgrade is available from our website.\n" "\n" @@ -42,64 +45,64 @@ msgid "" "If the problem persists, go to file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" msgstr "לא ניתן לקבוע אם שדרוג הינו זמין מהאתר האינטרנט שלנו.\n\nבדקו את חיבור הרשת שלכם, ותפעילו מחדש את Tails כדי לנסות ולשדרג שוב.\n\nאם הבעיה נמשכת, המשיכו אל file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" -#: ../lib/Tails/IUK/Frontend.pm:234 +#: ../lib/Tails/IUK/Frontend.pm:233 msgid "no automatic upgrade is available from our website for this version" msgstr "אין עדכון זמין מהאתר שלנו עבור הגרסא הזאת" -#: ../lib/Tails/IUK/Frontend.pm:240 +#: ../lib/Tails/IUK/Frontend.pm:239 msgid "your device was not created using Tails Installer" msgstr "ההתקן שלך לא נוצר ע\"י Tails Installer" -#: ../lib/Tails/IUK/Frontend.pm:245 +#: ../lib/Tails/IUK/Frontend.pm:244 msgid "Tails was started from a DVD or a read-only device" msgstr "Tails הופעל מתוך DVD או מכשיר לקריאה בלבד" -#: ../lib/Tails/IUK/Frontend.pm:250 +#: ../lib/Tails/IUK/Frontend.pm:249 msgid "there is not enough free space on the Tails system partition" msgstr "אין מספיק מקום זמין עבור מחיצת המערכת של Tails" -#: ../lib/Tails/IUK/Frontend.pm:255 +#: ../lib/Tails/IUK/Frontend.pm:254 msgid "not enough memory is available on this system" msgstr "אין מספיק מקום זמין על המערכת הזאת" -#: ../lib/Tails/IUK/Frontend.pm:261 +#: ../lib/Tails/IUK/Frontend.pm:260 #, perl-brace-format msgid "No explanation available for reason '%{reason}s'." msgstr "אין הסבר זמין מהסיבה '%{reason}s'." -#: ../lib/Tails/IUK/Frontend.pm:281 +#: ../lib/Tails/IUK/Frontend.pm:280 msgid "The system is up-to-date" msgstr "המערכת הינה מעדכנת" -#: ../lib/Tails/IUK/Frontend.pm:286 +#: ../lib/Tails/IUK/Frontend.pm:285 msgid "This version of Tails is outdated, and may have security issues." msgstr "גרסא זו של Tails הינה מיושנת, ועלולה לטמון בתוכה בעיות אבטחה." -#: ../lib/Tails/IUK/Frontend.pm:318 +#: ../lib/Tails/IUK/Frontend.pm:317 #, perl-brace-format msgid "" "The available incremental upgrade requires %{space_needed}s of free space on" " Tails system partition, but only %{free_space}s is available." msgstr "השדרוג המוספי הזמין מצריך %{space_needed}s של נפח פנוי על מחיצת המערכת של Tails, אך בפועל ישנם רק %{free_space}s פנויים." -#: ../lib/Tails/IUK/Frontend.pm:334 +#: ../lib/Tails/IUK/Frontend.pm:333 #, perl-brace-format msgid "" "The available incremental upgrade requires %{memory_needed}s of free memory," " but only %{free_memory}s is available." msgstr "השדרוג המוספי הזמין מצריך %{space_needed}s של זכרון עבודה RAM פנוי, אך בפועל ישנם רק %{free_space}s פנויים." -#: ../lib/Tails/IUK/Frontend.pm:356 +#: ../lib/Tails/IUK/Frontend.pm:355 msgid "" "An incremental upgrade is available, but no full upgrade is.\n" "This should not happen. Please report a bug." msgstr "זמין שדרוג מצטבר, אך לא שדרוג מלא.\nזה לא אמור לקרות. אנא דווח באג." -#: ../lib/Tails/IUK/Frontend.pm:360 +#: ../lib/Tails/IUK/Frontend.pm:359 msgid "Error while detecting available upgrades" msgstr "שגיאה במהלך איתור שדרוגים זמינים" -#: ../lib/Tails/IUK/Frontend.pm:370 +#: ../lib/Tails/IUK/Frontend.pm:369 #, perl-brace-format msgid "" "You should upgrade to %{name}s %{version}s.\n" @@ -115,19 +118,19 @@ msgid "" "Do you want to upgrade now?" msgstr "עליך לשדרג ל%{name}s %{version}s.\nלמידע נוסף על גרסה חדשה זו:\n%{details_url}s\nמומלץ לסגור את כל היישומים הפתוחים במהלך השדרוג.\nתהליך ההורדה והשדרוג עשוי לארוך זמן רב, בין מספר דקות לשעות.\nכרטיסי הרשת יכובו לאחר הורדת השדרוג.\n\nגודל ההורדה: %{size}s\n\nהאם ברצונך לשדרג עכשיו?" -#: ../lib/Tails/IUK/Frontend.pm:385 +#: ../lib/Tails/IUK/Frontend.pm:384 msgid "Upgrade available" msgstr "שדרוג זמין" -#: ../lib/Tails/IUK/Frontend.pm:386 +#: ../lib/Tails/IUK/Frontend.pm:385 msgid "Upgrade now" msgstr "שדרג עכשיו" -#: ../lib/Tails/IUK/Frontend.pm:387 +#: ../lib/Tails/IUK/Frontend.pm:386 msgid "Upgrade later" msgstr "שדרג מאוחר יותר" -#: ../lib/Tails/IUK/Frontend.pm:395 +#: ../lib/Tails/IUK/Frontend.pm:394 #, perl-brace-format msgid "" "You should do a manual upgrade to %{name}s %{version}s.\n" @@ -139,20 +142,20 @@ msgid "" "To learn how to do a manual upgrade, go to https://tails.boum.org/doc/first_steps/upgrade/#manual" msgstr "עליך לבצע שדרוג ידני ל%{name}s %{version}s.\n\nלמידע נוסף על גרסה חדשה זו:\n%{details_url}s\n\nאין באפשרותנו לשדרגך אוטומטית לגרסה זו:\n%{explanation}s.\n\nעל מנת ללמוד כיצד לבצע בעצמך שדרוג ידני, קרא כאן:\nhttps://tails.boum.org/doc/first_steps/upgrade/#manual" -#: ../lib/Tails/IUK/Frontend.pm:411 +#: ../lib/Tails/IUK/Frontend.pm:410 msgid "New version available" msgstr "גרסא חדשה זמינה" -#: ../lib/Tails/IUK/Frontend.pm:468 +#: ../lib/Tails/IUK/Frontend.pm:467 msgid "Downloading upgrade" msgstr "מוריד כעת שדרוגים" -#: ../lib/Tails/IUK/Frontend.pm:471 +#: ../lib/Tails/IUK/Frontend.pm:470 #, perl-brace-format msgid "Downloading the upgrade to %{name}s %{version}s..." msgstr "הורדת שדרוג ל- %{name}s %{version}s..." -#: ../lib/Tails/IUK/Frontend.pm:512 +#: ../lib/Tails/IUK/Frontend.pm:511 msgid "" "The upgrade could not be downloaded.\\n\\nCheck your network " "connection, and restart Tails to try upgrading again.\\n\\nIf the problem " @@ -160,26 +163,26 @@ msgid "" "file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" msgstr "לא ניתן היה להוריד את השדרוג.\\n\\nבדקו את חיבור הרשת שלכם, ותפעילו מחדש את Tails כדי לנסות ולשדרג שוב.\\n\\nאם הבעיה נמשכת, תבדקו ב- file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" -#: ../lib/Tails/IUK/Frontend.pm:528 ../lib/Tails/IUK/Frontend.pm:547 +#: ../lib/Tails/IUK/Frontend.pm:527 ../lib/Tails/IUK/Frontend.pm:546 msgid "Error while downloading the upgrade" msgstr "שגיאה במהלך הורדת השדרוג" -#: ../lib/Tails/IUK/Frontend.pm:540 +#: ../lib/Tails/IUK/Frontend.pm:539 #, perl-brace-format msgid "" "Output file '%{output_file}s' does not exist, but tails-iuk-get-target-file " "did not complain. Please report a bug." msgstr "קובץ פלט '%{output_file}s' לא קיים, אבל tails-iuk-get-target-file לא התלונן. אנא דווחו על באג זה." -#: ../lib/Tails/IUK/Frontend.pm:559 +#: ../lib/Tails/IUK/Frontend.pm:558 msgid "Error while creating temporary downloading directory" msgstr "שגיאה בעת יצירת תיקיה זמנית להורדה " -#: ../lib/Tails/IUK/Frontend.pm:562 +#: ../lib/Tails/IUK/Frontend.pm:561 msgid "Failed to create temporary download directory" msgstr "נכשל ביצירת תיקיה זמנית להורדה" -#: ../lib/Tails/IUK/Frontend.pm:574 +#: ../lib/Tails/IUK/Frontend.pm:573 msgid "" "Your Tails device was successfully upgraded.\n" "\n" @@ -189,46 +192,46 @@ msgid "" "Do you want to restart now?" msgstr "מכשיר ה-Tails שלכם שודרג בהצלחה.\n\nתכונות אבטחה מסוימות הושבתו באופן זמני.\nצריך בהקדם האפשרי להפעיל מחדש את Tails בגרסה החדשה.\n\nהאם ברצונכם לאתחל כעת מחדש?" -#: ../lib/Tails/IUK/Frontend.pm:579 +#: ../lib/Tails/IUK/Frontend.pm:578 msgid "Restart Tails" msgstr "אתחל את Tails" -#: ../lib/Tails/IUK/Frontend.pm:580 +#: ../lib/Tails/IUK/Frontend.pm:579 msgid "Restart now" msgstr "אתחל כעת" -#: ../lib/Tails/IUK/Frontend.pm:581 +#: ../lib/Tails/IUK/Frontend.pm:580 msgid "Restart later" msgstr "אתחל מאווחר יותר" -#: ../lib/Tails/IUK/Frontend.pm:592 +#: ../lib/Tails/IUK/Frontend.pm:591 msgid "Error while restarting the system" msgstr "שגיאה במהלך אתחול המערכת" -#: ../lib/Tails/IUK/Frontend.pm:595 +#: ../lib/Tails/IUK/Frontend.pm:594 msgid "Failed to restart the system" msgstr "נכשל לאתחל את המערכת" -#: ../lib/Tails/IUK/Frontend.pm:610 +#: ../lib/Tails/IUK/Frontend.pm:609 msgid "Error while shutting down the network" msgstr "שגיאה במהלך כיבוי המערכת" -#: ../lib/Tails/IUK/Frontend.pm:613 +#: ../lib/Tails/IUK/Frontend.pm:612 msgid "Failed to shutdown network" msgstr "נכשל לכבות את הרשת" -#: ../lib/Tails/IUK/Frontend.pm:623 +#: ../lib/Tails/IUK/Frontend.pm:622 msgid "Upgrading the system" msgstr "משדרג כעת את המערכת" -#: ../lib/Tails/IUK/Frontend.pm:625 +#: ../lib/Tails/IUK/Frontend.pm:624 msgid "" "Your Tails device is being upgraded...\n" "\n" "For security reasons, the networking is now disabled." msgstr "מכשיר ה-Tails שלכם תוך כדי שידרוג...\n\nמסיבות ביטחוניות, הרשת מושבת כעת." -#: ../lib/Tails/IUK/Frontend.pm:662 +#: ../lib/Tails/IUK/Frontend.pm:657 msgid "" "An error occured while installing the upgrade.\\n\\nYour Tails device" " needs to be repaired and might be unable to restart.\\n\\nPlease follow the" @@ -236,6 +239,6 @@ msgid "" "file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" msgstr "ארעה שגיאה בעת התקנת השדרוג.\\n\\nמכשיר ה-Tails שלכם זקוק לתיקון, וייתכן שלא תוכלנה לאתחל מכשיר זה מחדש.\\n\\nנא לבצע את ההוראות ב- file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" -#: ../lib/Tails/IUK/Frontend.pm:672 +#: ../lib/Tails/IUK/Frontend.pm:667 msgid "Error while installing the upgrade" msgstr "שגיאה במהלך התקנת השדרוג"

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 25 Jan '16

25 Jan '16

commit b3c34613a19197c75e8aa57ea7ebc1e66bdffadc Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 25 09:15:58 2016 +0000 Update translations for tails-iuk --- he.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/he.po b/he.po index c813f48..ae5be0a 100644 --- a/he.po +++ b/he.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Bobi Ganush <bobiganush(a)yahoo.com>, 2016 # dave nicetry <ndvnis(a)gmail.com>, 2014 # GenghisKhan <genghiskhan(a)gmx.ca>, 2014 # GenghisKhan <genghiskhan(a)gmx.ca>, 2014 @@ -15,8 +16,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2015-12-16 18:20+0100\n" -"PO-Revision-Date: 2015-12-17 09:10+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-01-25 09:15+0000\n" +"Last-Translator: Bobi Ganush <bobiganush(a)yahoo.com>\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,7 +30,7 @@ msgstr "" msgid "" "For debugging information, execute the following command: sudo tails-" "debugging-info" -msgstr "" +msgstr "למידע על ניפוי באגים, בצע את הפקודה הבאה: sudo tails-debugging-info" #: ../lib/Tails/IUK/Frontend.pm:215 msgid "Error while checking for upgrades"

1 0

[translation/tor-launcher-progress_completed] Update translations for tor-launcher-progress_completed
by translation＠torproject.org 25 Jan '16

25 Jan '16

commit 20fa8a6adf142e1d0a5d8508491c7d1b8fb5c693 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 25 09:15:39 2016 +0000 Update translations for tor-launcher-progress_completed --- hu/progress.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hu/progress.dtd b/hu/progress.dtd index b19344f..e4565a2 100644 --- a/hu/progress.dtd +++ b/hu/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor állapot"> <!ENTITY torprogress.openSettings "Beállítások megnyitása"> <!ENTITY torprogress.heading "Kapcsolódás a Tor hálózathoz"> -<!ENTITY torprogress.pleaseWait "Kérlek várj amíg a kapcsolat létrejön a Tor hálózattal."> +<!ENTITY torprogress.pleaseWait "Kérlek várj, amíg létrehozunk egy kapcsolatot a Tor hálózathoz.  Ez eltarthat néhány percig.">

1 0

[translation/tor-launcher-progress] Update translations for tor-launcher-progress
by translation＠torproject.org 25 Jan '16

25 Jan '16

commit 4e2b3b5f3fffb09d7a5c9e0bb977ee2bf728035a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 25 09:15:35 2016 +0000 Update translations for tor-launcher-progress --- hu/progress.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hu/progress.dtd b/hu/progress.dtd index bdcab7a..e4565a2 100644 --- a/hu/progress.dtd +++ b/hu/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor állapot"> <!ENTITY torprogress.openSettings "Beállítások megnyitása"> <!ENTITY torprogress.heading "Kapcsolódás a Tor hálózathoz"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Kérlek várj, amíg létrehozunk egy kapcsolatot a Tor hálózathoz.  Ez eltarthat néhány percig.">

1 0

[tor-browser-bundle/hardened-builds] Revert "Bug 15578: drop our Python build"
by gk＠torproject.org 25 Jan '16

25 Jan '16

commit 92d04ecc79e97a3306e12807af289c434be5da00 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 25 08:05:35 2016 +0000 Revert "Bug 15578: drop our Python build" This reverts commit 2d57f0452aaa35d1a7e96c9d84af23dd6b785cb2. --- gitian/descriptors/linux/gitian-bundle.yml | 7 ++++++- gitian/descriptors/linux/gitian-firefox.yml | 7 ++++++- gitian/descriptors/linux/gitian-utils.yml | 25 +++++++++++++++++++++++++ gitian/fetch-inputs.sh | 7 +++++-- gitian/mkbundle-linux.sh | 6 ++++++ gitian/verify-tags.sh | 5 +++-- gitian/versions | 5 +++++ gitian/versions.alpha | 5 +++++ gitian/versions.beta | 5 +++++ gitian/versions.nightly | 5 +++++ 10 files changed, 71 insertions(+), 6 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index d2baacf..8f282e0 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -13,7 +13,6 @@ packages: - "libxslt1.1" - "libxml2-utils" - "sqlite3" -- "python-lxml" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-launcher.git" @@ -33,6 +32,8 @@ files: - "tor-browser-linux64-gbuilt.zip" - "tor-linux64-gbuilt.zip" - "pluggable-transports-linux64-gbuilt.zip" +- "python-linux64-utils.zip" +- "lxml-linux64-utils.zip" - "mar-tools-linux64.zip" - "torrc-defaults-appendix-linux" - "bridge_prefs.js" @@ -76,6 +77,10 @@ script: | mkdir -p ${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/profile.meek-http-helper/extensions mkdir -p ${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/Caches mkdir -p ${TB_STAGE_DIR}/Browser/TorBrowser/Docs/sources/ + # Preparing Python for HTTPS-Everywhere. + unzip -d $INSTDIR python-linux$GBUILD_BITS-utils.zip + export PATH=$INSTDIR/python/bin:$PATH + unzip -d $INSTDIR/python/lib/python2.7 lxml-linux$GBUILD_BITS-utils.zip # # Extract the MAR tools. unzip -d ~/build ~/build/mar-tools-linux${GBUILD_BITS}.zip diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index c49636a..a0fc8e3 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -16,7 +16,6 @@ packages: - "libgstreamer-plugins-base0.10-dev" - "libxt-dev" - "hardening-wrapper" -- "python-dev" # To pass configure since ESR 31. - "libpulse-dev" # We built GCC but not the libmpc2, thus we need to install it. @@ -30,6 +29,7 @@ remotes: files: - "binutils-linux64-utils.zip" - "gcc-linux64-utils.zip" +- "python-linux64-utils.zip" - "re-dzip.sh" - "dzip.sh" - "versions" @@ -47,6 +47,11 @@ script: | export DEB_BUILD_HARDENING_FORMAT=1 export DEB_BUILD_HARDENING_PIE=1 # + # Preparing Python for Tor Browser + unzip -d $INSTDIR python-linux$GBUILD_BITS-utils.zip + # TODO: We might want to have a smarter solution than hard-coding the version. + ln -sf $INSTDIR/python/bin/python2.7 $INSTDIR/python/bin/python + export PATH=$INSTDIR/python/bin:$PATH # Preparing Binutils and GCC for Tor Browser unzip -d $INSTDIR binutils-linux$GBUILD_BITS-utils.zip # Make sure gold is used with the hardening wrapper for full RELRO, see diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index 673dc5a..c581248 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -32,6 +32,8 @@ files: - "binutils.tar.bz2" - "gcc.tar.bz2" - "openssl.tar.gz" +- "python.tar.bz2" +- "lxml.tar.gz" - "gmp.tar.bz2" - "versions" - "dzip.sh" @@ -112,7 +114,29 @@ script: | make install cd .. + # Building Python + # Fx 24 ESR and HTTPS Everywhere >= 3.5 do not work with Python < 2.7 anymore. + # But 10.04 does only ship with Python 2.6. Thus, we compile 2.7 ourselves... + tar xjf python.tar.bz2 + cd Python-* + ./configure + make $MAKEOPTS altinstall prefix=$INSTDIR/python exec-prefix=$INSTDIR/python + cd .. + + # Building lxml + export LD_PRELOAD="" + tar xzf lxml.tar.gz + cd lxml-* + # Make sure we use our freshly built python binary here. Otherwise bad things + # may happen when we do so in the bundle step assembling the HTTPS-Everywhere + # rules. + $INSTDIR/python/bin/python2.7 setup.py build + cd build/lib* + export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 + ~/build/dzip.sh lxml-$LXML_VER-linux$GBUILD_BITS-utils.zip lxml export LD_PRELOAD="" + cp *utils.zip $OUTDIR + cd ../../../ # Building GMP tar xjf gmp.tar.bz2 @@ -134,5 +158,6 @@ script: | ~/build/dzip.sh gcc-$GCC_VER-linux$GBUILD_BITS-utils.zip gcc ~/build/dzip.sh openssl-$OPENSSL_VER-linux$GBUILD_BITS-utils.zip openssl ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-linux$GBUILD_BITS-utils.zip libevent + ~/build/dzip.sh python-$PYTHON_VER-linux$GBUILD_BITS-utils.zip python ~/build/dzip.sh gmp-$GMP_VER-linux$GBUILD_BITS-utils.zip gmp cp *utils.zip $OUTDIR/ diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 9d6f2f3..206023b 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -112,11 +112,12 @@ update_git() { ############################################################################## # Get+verify sigs that exist -for i in OPENSSL BINUTILS GCC PYCRYPTO PYTHON_MSI GMP +for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO PYTHON_MSI GMP LXML do PACKAGE="${i}_PACKAGE" URL="${i}_URL" - if [ "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o "${i}" == "OPENSSL" ]; then + if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o \ + "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig" @@ -225,6 +226,7 @@ ln -sf "$NOSCRIPT_PACKAGE" noscript(a)noscript.net.xpi ln -sf "$OPENSSL_PACKAGE" openssl.tar.gz ln -sf "$BINUTILS_PACKAGE" binutils.tar.bz2 ln -sf "$GCC_PACKAGE" gcc.tar.bz2 +ln -sf "$PYTHON_PACKAGE" python.tar.bz2 ln -sf "$PYTHON_MSI_PACKAGE" python.msi ln -sf "$PYCRYPTO_PACKAGE" pycrypto.tar.gz ln -sf "$ARGPARSE_PACKAGE" argparse.tar.gz @@ -234,6 +236,7 @@ ln -sf "$TWISTED_PACKAGE" twisted.tar.bz2 ln -sf "$PY2EXE_PACKAGE" py2exe.exe ln -sf "$SETUPTOOLS_PACKAGE" setuptools.tar.gz ln -sf "$GMP_PACKAGE" gmp.tar.bz2 +ln -sf "$LXML_PACKAGE" lxml.tar.gz ln -sf "$PARSLEY_PACKAGE" parsley.tar.gz ln -sf "$GO_PACKAGE" go.tar.gz diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index a1674dd..5fa3966 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -104,6 +104,8 @@ if [ ! -f inputs/binutils-$BINUTILS_VER-linux64-utils.zip -o \ ! -f inputs/gcc-$GCC_VER-linux64-utils.zip -o \ ! -f inputs/openssl-$OPENSSL_VER-linux64-utils.zip -o \ ! -f inputs/libevent-${LIBEVENT_TAG_ORIG#release-}-linux64-utils.zip -o \ + ! -f inputs/python-$PYTHON_VER-linux64-utils.zip -o \ + ! -f inputs/lxml-$LXML_VER-linux64-utils.zip -o \ ! -f inputs/gmp-$GMP_VER-linux64-utils.zip ]; then echo @@ -123,6 +125,8 @@ then ln -sf gcc-$GCC_VER-linux64-utils.zip gcc-linux64-utils.zip ln -sf openssl-$OPENSSL_VER-linux64-utils.zip openssl-linux64-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-linux64-utils.zip libevent-linux64-utils.zip + ln -sf python-$PYTHON_VER-linux64-utils.zip python-linux64-utils.zip + ln -sf lxml-$LXML_VER-linux64-utils.zip lxml-linux64-utils.zip ln -sf gmp-$GMP_VER-linux64-utils.zip gmp-linux64-utils.zip cd .. #cp -a result/utils-linux-res.yml inputs/ @@ -137,6 +141,8 @@ else ln -sf gcc-$GCC_VER-linux64-utils.zip gcc-linux64-utils.zip ln -sf openssl-$OPENSSL_VER-linux64-utils.zip openssl-linux64-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-linux64-utils.zip libevent-linux64-utils.zip + ln -sf python-$PYTHON_VER-linux64-utils.zip python-linux64-utils.zip + ln -sf lxml-$LXML_VER-linux64-utils.zip lxml-linux64-utils.zip ln -sf gmp-$GMP_VER-linux64-utils.zip gmp-linux64-utils.zip cd .. fi diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index fc62344..82a810a 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -121,11 +121,12 @@ noto-fonts $NOTOFONTS_TAG EOF # Verify signatures on signed packages -for i in OPENSSL BINUTILS GCC PYCRYPTO PYTHON_MSI GMP +for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO PYTHON_MSI GMP LXML do PACKAGE="${i}_PACKAGE" URL="${i}_URL" - if [ "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o "${i}" == "OPENSSL" ]; then + if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o \ + "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig" diff --git a/gitian/versions b/gitian/versions index 522b37f..8e35391 100755 --- a/gitian/versions +++ b/gitian/versions @@ -55,6 +55,7 @@ TWISTED_VER=13.2.0 M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 +LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 NOTOCJKFONT_VER=1.004 @@ -70,6 +71,7 @@ OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 +PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz @@ -79,6 +81,7 @@ TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz +LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf @@ -116,6 +119,7 @@ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/${NOSCRIP… +PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI… PYCRYPTO_URL=https://pypi.python.org/packages/source/p/pycrypto/${PYCRYPTO_… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} @@ -126,6 +130,7 @@ TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_… PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… +LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 6943f2a..6c6d566 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -56,6 +56,7 @@ ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.2.0 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 +LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 NOTOCJKFONT_VER=1.004 @@ -71,6 +72,7 @@ OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 +PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz @@ -79,6 +81,7 @@ ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz +LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf @@ -115,6 +118,7 @@ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/${NOSCRIP… +PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI… PYCRYPTO_URL=https://pypi.python.org/packages/source/p/pycrypto/${PYCRYPTO_… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} @@ -124,6 +128,7 @@ TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… +LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… diff --git a/gitian/versions.beta b/gitian/versions.beta index 1bde7e5..43c5fde 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -48,6 +48,7 @@ TWISTED_VER=13.2.0 M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 +LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 NOTOCJKFONT_VER=1.004 @@ -63,6 +64,7 @@ MINGW_PACKAGE=mingw-w64-svn-snapshot.zip MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 +PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz @@ -72,6 +74,7 @@ TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz +LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf @@ -108,6 +111,7 @@ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NO… +PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI… PYCRYPTO_URL=https://pypi.python.org/packages/source/p/pycrypto/${PYCRYPTO_… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} @@ -118,6 +122,7 @@ TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_… PY2EXE_URL=http://softlayer-dal.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… +LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 9325e9d..d209c6a 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -59,6 +59,7 @@ ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.2.0 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 +LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 NOTOCJKFONT_VER=1.004 @@ -74,6 +75,7 @@ OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 +PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz @@ -82,6 +84,7 @@ ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz +LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf @@ -118,6 +121,7 @@ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/${NOSCRIP… +PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI… PYCRYPTO_URL=https://pypi.python.org/packages/source/p/pycrypto/${PYCRYPTO_… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} @@ -127,6 +131,7 @@ TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… +LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a…

1 0

[tor-browser-bundle/hardened-builds] Revert "Bug 15578: Switch Linux descriptors over to Wheezy"
by gk＠torproject.org 25 Jan '16

25 Jan '16

commit a125e1c1bfc3babae9636750b4722b4ab7010ca3 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 25 08:05:41 2016 +0000 Revert "Bug 15578: Switch Linux descriptors over to Wheezy" This reverts commit 763784f552779b6dd4e58a76f441a8602b9018ba. --- gitian/Makefile | 2 +- gitian/README.build | 2 +- gitian/check-prerequisites.sh | 41 ++++++++++---------- gitian/descriptors/linux/gitian-bundle.yml | 6 ++- gitian/descriptors/linux/gitian-firefox.yml | 9 +++-- .../linux/gitian-pluggable-transports.yml | 7 ++-- gitian/descriptors/linux/gitian-tor.yml | 7 ++-- gitian/descriptors/linux/gitian-utils.yml | 38 +++++------------- gitian/make-vms.sh | 29 ++++++-------- 9 files changed, 57 insertions(+), 84 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index 36b5ec3..5718d76 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -119,7 +119,7 @@ clean-bundle: vmclean: rm -rf ../../gitian-builder/*.qcow2 rm -rf ../../gitian-builder/base-* - rm -rf ../../gitian-builder/target-{lucid,wheezy,precise}* + rm -rf ../../gitian-builder/target-{lucid,precise}* distclean: vmclean rm -rf ../../gitian-builder/inputs/* diff --git a/gitian/README.build b/gitian/README.build index 4d01d6a..f289791 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -177,7 +177,7 @@ Known Issues and Quirks: where 'make vmclean' causes the rebuild of two VMs in a row.. This might trigger weird bugs in python-vm-builder.. To rebuild only one set of VMs, use either 'rm ../../gitian-builder/*precise*' (to remove the Windows/Mac - VMs) or 'rm ../../gitian-builder/*wheezy*' (to remove the Linux VMs). + VMs) or 'rm ../../gitian-builder/*lucid*' (to remove the Linux VMs). You probably want to make sure you have no stray qemu processes before rebuilding the VMs or starting a new build, too. 'killall qemu-kvm' is diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index a5f8393..cc16d0e 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -17,7 +17,7 @@ then VERSION=`cat /etc/issue | grep -Eo '[0-9]{2}' | head -1` if [ "$VERSION" -ge "14" ]; then - dpkg -s ruby apache2 git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion torsocks tor 2>/dev/null >/dev/null + dpkg -s ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion torsocks tor 2>/dev/null >/dev/null if [ $? -ne 0 ]; then @@ -25,7 +25,7 @@ then echo echo "Please run:" echo " sudo apt-get install torsocks tor" - echo " sudo torsocks apt-get install ruby apache2 git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion" + echo " sudo torsocks apt-get install ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion" exit 1 fi else @@ -45,29 +45,28 @@ then echo " sudo torsocks apt-get install ruby git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot zip unzip python-cheetah debootstrap parted kpartx rsync" exit 1 fi + + # python-vm-builder is special as we don't have a Debian package for it. + vmbuilder --help 2>/dev/null >/dev/null + if [ $? -ne 0 ]; + then + echo "The VM tool python-vm-builder is missing." + echo + echo "Please run" + echo 'torsocks wget -U "" http://archive.ubuntu.com/ubuntu/pool/universe/v/vm-builder/vm-builder_0.12…' + echo 'echo "ec12e0070a007989561bfee5862c89a32c301992dd2771c4d5078ef1b3014f03 vm-builder_0.12.4+bzr489.orig.tar.gz" | sha256sum -c' + echo "# (verification -- must return OK)" + echo "tar -zxvf vm-builder_0.12.4+bzr489.orig.tar.gz" + echo "cd vm-builder-0.12.4+bzr489" + echo "sudo python setup.py install" + echo "cd .." + exit 1 + fi else echo "We need Debian or Ubuntu which seem to be missing. Aborting." exit 1 fi -# vmbuilder is special as we don't have a package for it yet. -# XXX: Make sure an already installed vmbuilder is recent enough. -vmbuilder --help 2>/dev/null >/dev/null -if [ $? -ne 0 ]; -then - echo "The VM tool python-vm-builder is missing." - echo - echo "Please run" - echo 'torsocks wget -U "" https://bugs.launchpad.net/ubuntu/+archive/primary/+files/vm-builder_0.12.4…' - echo 'echo "76cbf8c52c391160b2641e7120dbade5afded713afaa6032f733a261f13e6a8e vm-builder_0.12.4+bzr494.orig.tar.gz" | sha256sum -c' - echo "# (verification -- must return OK)" - echo "tar -zxvf vm-builder_0.12.4+bzr494.orig.tar.gz" - echo "cd vm-builder-0.12.4+bzr494" - echo "sudo python setup.py install" - echo "cd .." - exit 1 -fi - update_responses_pkg="libyaml-perl libfile-slurp-perl libxml-writer-perl libio-captureoutput-perl libfile-which-perl libparallel-forkmanager-perl libxml-libxml-perl libwww-perl libjson-perl" missing_pkg='' for pkg in $update_responses_pkg @@ -81,7 +80,7 @@ if [ -n "$missing_pkg" ] then echo "You are missing one or more dependencies for the update_responses script" echo "Please run" - echo " sudo torsocks apt-get install $missing_pkg" + echo " sudo apt-get install $missing_pkg" exit 1 fi diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 8f282e0..48c68eb 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -1,8 +1,7 @@ --- name: "bundle-linux" -distro: "debian" suites: -- "wheezy" +- "lucid" architectures: - "amd64" packages: @@ -107,6 +106,9 @@ script: | cd ../../../ # cd https-everywhere + # Workaround for git not knowing `git submodule -f` in the version shipped in + # 10.04. + sed 's/recursive -f/recursive/' -i makexpi.sh # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 # The solution there does not work for us as doing something like diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index a0fc8e3..3c6c1f1 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -1,8 +1,7 @@ --- name: "torbrowser-linux" -distro: "debian" suites: -- "wheezy" +- "lucid" architectures: - "amd64" packages: @@ -11,10 +10,9 @@ packages: - "autoconf2.13" - "libgtk2.0-dev" - "libdbus-glib-1-dev" -- "yasm" +- "yasm-1" - "libasound2-dev" - "libgstreamer-plugins-base0.10-dev" -- "libxt-dev" - "hardening-wrapper" # To pass configure since ESR 31. - "libpulse-dev" @@ -47,6 +45,9 @@ script: | export DEB_BUILD_HARDENING_FORMAT=1 export DEB_BUILD_HARDENING_PIE=1 # + mkdir -p $INSTDIR/build/bin/ + ln -s /usr/bin/yasm-1 $INSTDIR/build/bin/yasm + export PATH=$PATH:$INSTDIR/build/bin # Preparing Python for Tor Browser unzip -d $INSTDIR python-linux$GBUILD_BITS-utils.zip # TODO: We might want to have a smarter solution than hard-coding the version. diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index a886572..25b5a1b 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -1,8 +1,7 @@ --- name: "pluggable-transports-linux" -distro: "debian" suites: -- "wheezy" +- "lucid" architectures: - "amd64" packages: @@ -55,6 +54,7 @@ script: | INSTDIR="$HOME/install" PTDIR="$INSTDIR/Tor/PluggableTransports" mkdir -p $PTDIR + export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME export TZ=UTC export LC_ALL=C @@ -248,8 +248,7 @@ script: | cp -a obfs4proxy $PTDIR cd ../.. - # Grabbing the results and making sure timestamps don't spoil them - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 + # Grabbing the results cd $INSTDIR ~/build/dzip.sh pluggable-transports-linux$GBUILD_BITS-gbuilt.zip Tor/ Docs/ cp pluggable-transports-linux$GBUILD_BITS-gbuilt.zip $OUTDIR/ diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index f8f83e9..630c2e0 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -1,8 +1,7 @@ --- name: "tor-linux" -distro: "debian" suites: -- "wheezy" +- "lucid" architectures: - "amd64" packages: @@ -28,6 +27,7 @@ files: script: | INSTDIR="$HOME/install" source versions + export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME export TZ=UTC export LC_ALL=C @@ -90,8 +90,7 @@ script: | objcopy --add-gnu-debuglink=./Debug/Tor/$LIB $INSTDIR/Tor/$LIB done - # Grabbing the results and making sure timestamps don't spoil them - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 + # Grabbing the results ~/build/dzip.sh tor-linux$GBUILD_BITS-gbuilt.zip Data/ Tor/ ~/build/dzip.sh tor-linux$GBUILD_BITS-debug.zip Debug/ cp tor-linux$GBUILD_BITS-gbuilt.zip $OUTDIR/ diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index c581248..a742c4e 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -1,8 +1,7 @@ --- name: "utils-linux" -distro: "debian" suites: -- "wheezy" +- "lucid" architectures: - "amd64" packages: @@ -22,8 +21,6 @@ packages: - "libxslt-dev" # Needed for passing the Python related part of configure in ESR 31. - "libssl-dev" -# Needed for binutils (64bit) as we are building with PIE enabled. -- "libstdc++6-4.7-pic" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://github.com/libevent/libevent.git" @@ -43,7 +40,6 @@ script: | source versions export TZ=UTC export LC_ALL=C - export FAKETIME=$REFERENCE_DATETIME umask 0022 # Config options for hardening-wrapper @@ -55,14 +51,6 @@ script: | # Building Binutils tar xjf binutils.tar.bz2 - # The libstdc++ shipped by default is non-PIC which breaks the binutils build - # if we build with DEB_BUILD_HARDENING_PIE=1. We need to install a PIC one AND - # make sure it gets used before the non-PIC one would. - if [ $GBUILD_BITS == "64" ]; - then - ln -s /usr/lib/gcc/x86_64-linux-gnu/4.7/libstdc++_pic.a libstdc++.a - export LDFLAGS="-L/home/debian -lstdc++" - fi cd binutils* # We want to use gold as the linker in our toolchain mainly as it is way # faster when linking Tor Browser code (especially libxul). But apart from @@ -74,15 +62,6 @@ script: | cd .. export PATH=$INSTDIR/binutils/bin:$PATH - export LDFLAGS="" - # We need to disable `-Werror=format-security` as GCC does not build with it - # anymore. It seems it got audited for those problems already: - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=48817. - export DEB_BUILD_HARDENING_FORMAT=0 - # libfaketime gets into our way when building GCC 4.9.x. See: - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61314 for details. Thus, we - # avoid it for the toolchain and cross our fingers. - # TODO: Test a newer libfaketime than 0.8. # Building GCC tar xjf gcc.tar.bz2 cd gcc-* @@ -92,7 +71,13 @@ script: | make install cd .. - export DEB_BUILD_HARDENING_FORMAT=1 + # libfaketime gets into our way when building GCC 4.9.x. See: + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61314 for details. Thus, we + # avoid it for the toolchain and cross our fingers. + # TODO: Test a newer libfaketime than 0.8. + export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 + export FAKETIME=$REFERENCE_DATETIME + # Building Libevent cd libevent ./autogen.sh @@ -103,7 +88,6 @@ script: | cd .. # Building OpenSSL - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 tar xzf openssl.tar.gz cd openssl-* find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" @@ -124,7 +108,6 @@ script: | cd .. # Building lxml - export LD_PRELOAD="" tar xzf lxml.tar.gz cd lxml-* # Make sure we use our freshly built python binary here. Otherwise bad things @@ -132,9 +115,7 @@ script: | # rules. $INSTDIR/python/bin/python2.7 setup.py build cd build/lib* - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 ~/build/dzip.sh lxml-$LXML_VER-linux$GBUILD_BITS-utils.zip lxml - export LD_PRELOAD="" cp *utils.zip $OUTDIR cd ../../../ @@ -151,8 +132,7 @@ script: | make install cd .. - # Grabbing the remaining results and making sure timestamps don't spoil them - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 + # Grabbing the remaining results cd $INSTDIR ~/build/dzip.sh binutils-$BINUTILS_VER-linux$GBUILD_BITS-utils.zip binutils ~/build/dzip.sh gcc-$GCC_VER-linux$GBUILD_BITS-utils.zip gcc diff --git a/gitian/make-vms.sh b/gitian/make-vms.sh index 469a9ca..a3b43b5 100755 --- a/gitian/make-vms.sh +++ b/gitian/make-vms.sh @@ -33,14 +33,7 @@ build_and_test_vm() { export LXC_ARCH=$arch ./bin/make-base-vm --suite $dist --lxc --arch $arch else - if [ "$dist" = "wheezy" ]; - then - export DISTRO=debian - ./bin/make-base-vm --distro debian --suite $dist --arch $arch - else - export DISTRO=ubuntu - ./bin/make-base-vm --suite $dist --arch $arch - fi + ./bin/make-base-vm --suite $dist --arch $arch fi make-clean-vm --suite $dist --arch $arch @@ -63,21 +56,21 @@ build_and_test_vm() { return 0 } -while ! build_and_test_vm wheezy i386 32 +while ! build_and_test_vm lucid i386 32 do - stop-target 32 wheezy - rm ./base-wheezy-i386* + stop-target 32 lucid + rm ./base-lucid-i386* echo - echo "Wheezy i386 VM build failed... Trying again" + echo "Lucid i386 VM build failed... Trying again" echo done -while ! build_and_test_vm wheezy amd64 64 +while ! build_and_test_vm lucid amd64 64 do - stop-target 64 wheezy - rm ./base-wheezy-amd64* + stop-target 64 lucid + rm ./base-lucid-amd64* echo - echo "Wheezy amd64 VM build failed... Trying again" + echo "Lucid amd64 VM build failed... Trying again" echo done @@ -86,7 +79,7 @@ do stop-target 32 precise rm ./base-precise-i386* echo - echo "Precise amd64 VM build failed... Trying again" + echo "Lucid amd64 VM build failed... Trying again" echo done @@ -95,7 +88,7 @@ do stop-target 64 precise rm ./base-precise-amd64* echo - echo "Precise amd64 VM build failed... Trying again" + echo "Lucid amd64 VM build failed... Trying again" echo done

1 0