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

[tor/master] try a little harder with getrandom types to avoid warnings
by nickm＠torproject.org 09 Dec '15

09 Dec '15

commit 3a69fcb01f131e8a241aa0d806d5ed7aef6b9314 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 9 08:31:29 2015 -0500 try a little harder with getrandom types to avoid warnings --- src/common/crypto.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 34e94b5..4554933 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -2397,13 +2397,14 @@ crypto_strongest_rand_syscall(uint8_t *out, size_t out_len) * /dev/srandom followed by opening and reading from /dev/urandom. */ if (PREDICT_LIKELY(getrandom_works)) { - int ret; + long ret; + /* A flag of '0' here means to read from '/dev/urandom', and to + * block if insufficient entropy is available to service the + * request. + */ + const unsigned int flags = 0; do { - /* A flag of '0' here means to read from '/dev/urandom', and to - * block if insufficient entropy is available to service the - * request. - */ - ret = syscall(SYS_getrandom, out, out_len, 0); + ret = syscall(SYS_getrandom, out, out_len, flags); } while (ret == -1 && ((errno == EINTR) ||(errno == EAGAIN))); if (PREDICT_UNLIKELY(ret == -1)) { @@ -2416,7 +2417,7 @@ crypto_strongest_rand_syscall(uint8_t *out, size_t out_len) return -1; } - tor_assert(ret == (int)out_len); + tor_assert(ret == (long)out_len); return 0; }

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 09 Dec '15

09 Dec '15

commit 7a3dbf028ecf93b28cb79bff2e9170274cf5fde1 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 9 12:45:24 2015 +0000 Update translations for liveusb-creator_completed --- fa/fa.po | 139 +++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 75 insertions(+), 64 deletions(-) diff --git a/fa/fa.po b/fa/fa.po index cb59d73..aaa2527 100644 --- a/fa/fa.po +++ b/fa/fa.po @@ -6,6 +6,7 @@ # zmix <check_people_status(a)yahoo.com>, 2013 # Mohammad Hossein <desmati(a)gmail.com>, 2014 # Eric D Smallberg <esmallberg(a)ndi.org>, 2013 +# Farshad Gh <farshad73(a)gmail.com>, 2015 # Farshad Sadri <farshad.sadri(a)gmail.com>, 2015 # Gilberto, 2015 # zendegi <inactive+zendegi(a)transifex.com>, 2013 @@ -19,9 +20,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-10 16:01+0200\n" -"PO-Revision-Date: 2015-08-17 08:27+0000\n" -"Last-Translator: Farshad Sadri <farshad.sadri(a)gmail.com>\n" +"POT-Creation-Date: 2015-11-02 21:23+0100\n" +"PO-Revision-Date: 2015-12-09 12:42+0000\n" +"Last-Translator: Farshad Gh <farshad73(a)gmail.com>\n" "Language-Team: Persian (http://www.transifex.com/otf/torproject/language/fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,7 +38,7 @@ msgstr "\"تکثیر و نصب\"" msgid "\"Install from ISO\"" msgstr "\"نصب از ISO\"" -#: ../liveusb/dialog.py:150 ../liveusb/launcher_ui.py:149 +#: ../liveusb/dialog.py:157 ../liveusb/launcher_ui.py:153 #, python-format msgid "%(distribution)s Installer" msgstr "نصب کننده‌ی %(distribution)s" @@ -62,51 +63,61 @@ msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s" msgid "%s already bootable" msgstr "%s از پیش قابل راه‌اندازی" -#: ../liveusb/launcher_ui.py:156 -msgid "" -"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" -"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" -"p, li { white-space: pre-wrap; }\n" -"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" -"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Need help? Read the </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a><span style=\" font-size:11pt;\">.</span></p></body></html>" -msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n <html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n p, li { white-space: pre-wrap; }\n </style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n <p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-\nindent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">\nبه کمک نیاز دارید؟ </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">مستندات</span></a> را بخوانید<span style=\" font-size:11pt;\">.</span></p></body></html>" - -#: ../liveusb/launcher_ui.py:151 -msgid "" -"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" -"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" -"p, li { white-space: pre-wrap; }\n" -"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" -"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Copy the running Tails onto a USB stick or SD card. All data on the target drive will be lost.</span></p></body></html>" -msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\"> Tails ،در حال اجرای پیش رو را بر روی یک کارت SD یا حافظه ی USB کپی نمایید. تمامی داده های موجود بر روی درایو مورد نظر از بین خواهند رفت. </span></p></body></html>" - -#: ../liveusb/launcher_ui.py:153 +#: ../liveusb/launcher_ui.py:160 msgid "" "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" "p, li { white-space: pre-wrap; }\n" -"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" -"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Copy the running Tails onto an already installed Tails device. Other partitions found on the stick are preserved.</span></p></body></html>" -msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\"> Tails درحال اجرا را بر روی یک وسیله ی راه اندازی شده ی Tailss کپی نمایید. بخش های دیگری که بر روی حافظه قرار دارند دستنخورده باقی می مانند.</span></p></body></html>" +"</style></head><body style=\" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;\">\n" +"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Need help? Read the <a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a>.</p></body></html>" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">به کمک نیاز دارید؟ خواندن: <a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">مستندات</span></a>.</p></body></html>" #: ../liveusb/launcher_ui.py:155 msgid "" -"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" -"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" -"p, li { white-space: pre-wrap; }\n" -"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" -"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Upgrade an already installed Tails device from a new ISO image.</span></p></body></html>" -msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">یک وسیله ی نصب شده ی Tails را از یک تصویر ISO ی جدید به روز رسانی نمایید. </span></p></body></html>" +"<ul>\n" +"<li>Install Tails on another USB stick by copying the Tails system that you are currently using..</li>\n" +"\n" +"<li>The USB stick that you install on is formatted and all data is lost.</li>\n" +"\n" +"<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n" +"\n" +"</ul>" +msgstr "<ul>\n<li>تیلز را با کپی کردن همان سیستم تیلزی که شما در حال حاضر از آن استفاده می‌کنید، روی یک حافظه‌ی USB دیگر نصب کنید..</li>\n\n<li>حافظه‌ی USB که روی آن نصب می‌کنید، فرمت شده و تمامی اطلاعات آن از بین رفته است.</li>\n\n<li>فضای دائمی رمزگذاری شده از حافظه‌ی USB تیلز که شما در حال حاضر از آن استفاده می‌کنید، کپی نشده است.</li>\n\n</ul>" + +#: ../liveusb/launcher_ui.py:157 +msgid "" +"<ul>\n" +"<li>Upgrade another Tails USB stick to the same version of Tails that you are currently using.</li>\n" +"\n" +"<li>The encrypted persistent storage of the Tails USB stick that you upgrade is preserved.</li>\n" +"\n" +"<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n" +"\n" +"\n" +"</ul>" +msgstr "<ul>\n<li>یک حافظه‌ی USB دیگر تیلز را به همان ورژنی که شما استفاده می‌کنید ارتقاء دهید.</li>\n\n<li>فضای دائمی رمز گذاری شده از حافظه‌ی USB تیلز که شما ارتقا می‌دهید، محفوظ است.</li>\n\n<li>فضای دائمی رمز گذاری شده از حافظه‌ی USB تیلز که شما در حال حاضر از آن استفاده می‌کنید، کپی نشده است.</li>\n\n\n</ul>" + +#: ../liveusb/launcher_ui.py:159 +msgid "" +"<ul>\n" +"<li>Upgrade another Tails USB stick to the version of an ISO image.</li>\n" +"\n" +"<li>The encrypted persistent storage of the Tails USB stick that you upgrade is preserved.</li>\n" +"\n" +"<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n" +"\n" +"</ul>" +msgstr "<ul>\n<li>یک حافظه‌ی USB دیگر تیلز را به ورژن یک تصویر ISO ارتقاء دهید.</li>\n\n<li>فضای دائمی رمز گذاری شده از حافظه‌ی USB تیلز که شما ارتقا می‌دهید، محفوظ است.</li>\n\n<li>فضای دائمی رمز گذاری شده از حافظه‌ی USB تیلز که شما در حال حاضر از آن استفاده می‌کنید، کپی نشده است.</li>\n\n</ul>" -#: ../liveusb/dialog.py:154 +#: ../liveusb/dialog.py:161 msgid "Alt+B" msgstr "Alt+B" -#: ../liveusb/dialog.py:153 +#: ../liveusb/dialog.py:160 msgid "Browse" msgstr "مرور وب!" -#: ../liveusb/dialog.py:160 +#: ../liveusb/dialog.py:167 msgid "" "By allocating extra space on your USB stick for a persistent overlay, you " "will be able to store data and make permanent modifications to your live " @@ -128,20 +139,6 @@ msgstr "یافت نمی‌شود" msgid "Cannot find device %s" msgstr "وسیله ی %s یافت نشد" -#: ../liveusb/launcher_ui.py:150 -msgid "" -"Clone\n" -"&&\n" -"Install" -msgstr "کپی\\n&&\\نصب" - -#: ../liveusb/launcher_ui.py:152 -msgid "" -"Clone\n" -"&&\n" -"Upgrade" -msgstr "کپی\\n&&\\به روزرسانی" - #: ../liveusb/creator.py:417 #, python-format msgid "Creating %sMB persistent overlay" @@ -152,7 +149,7 @@ msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." msgstr "‫وسیله هنوز نصب نشده، نمی‌توان اندازه‌ی فضای خالی را تعیین کرد." -#: ../liveusb/dialog.py:157 +#: ../liveusb/dialog.py:164 #, python-format msgid "Download %(distribution)s" msgstr "دریافت %(distribution)s" @@ -212,13 +209,19 @@ msgstr "موفقیت در کنترل ISO MD5" msgid "ISO MD5 checksum verification failed" msgstr "عدم موفقیت در بازبینی کنترل ISO MD5" -#: ../liveusb/dialog.py:156 +#: ../liveusb/dialog.py:163 msgid "" "If you do not select an existing Live ISO, the selected release will be " "downloaded for you." msgstr "اگر یک Live ISO موجود را انتخاب نکنید، نسخه‌ی انتخاب‌شده برای‌تان دانلود خواهد شد" -#: ../liveusb/dialog.py:165 +#: ../liveusb/launcher_ui.py:154 +msgid "" +"Install\n" +"by cloning" +msgstr "نصب\nتوسط شبیه سازی" + +#: ../liveusb/dialog.py:172 msgid "Install Tails" msgstr "نصب تیلز" @@ -300,7 +303,7 @@ msgstr "در حال پاتیشن‌بندیِ %(device)s" msgid "Persistent Storage" msgstr "ذخيره سازي مداوم" -#: ../liveusb/dialog.py:161 +#: ../liveusb/dialog.py:168 msgid "Persistent Storage (0 MB)" msgstr "حافظه دائم (0 مگابایت)" @@ -354,7 +357,7 @@ msgstr "نوع منبع، عملیات بازبینی از کنترل ISO MD5 ر msgid "Synchronizing data on disk..." msgstr "هماهنگ سازی داده‌ها بر روی دیسک..." -#: ../liveusb/dialog.py:159 +#: ../liveusb/dialog.py:166 msgid "Target Device" msgstr "دستگاه هدف" @@ -378,14 +381,14 @@ msgid "" "A more detailed error log has been written to '%(filename)s'." msgstr "مشکلی در اجرای دستور زیر وجود دارد: `%(command)s`.\\n یک کارنامه‌ خطا با جزییات بیشتر روی '%(filename)s' نوشته شده است." -#: ../liveusb/dialog.py:151 +#: ../liveusb/dialog.py:158 msgid "" "This button allows you to browse for an existing Live system ISO that you " "have previously downloaded. If you do not select one, a release will be " "downloaded for you automatically." msgstr "این دکمه به شما اجازه می‌دهد تا به دنبال یک Live system ISO موجود که پیش‌تر دانلود کرده‌اید بگردید. اگر یکی از گزینه‌ها را انتخاب نکنید، یک نسخه به صورت خودکار برای‌تان دانلود خواهد شد." -#: ../liveusb/dialog.py:164 +#: ../liveusb/dialog.py:171 msgid "" "This button will begin the LiveUSB creation process. This entails " "optionally downloading a release (if an existing one wasn't selected), " @@ -393,19 +396,19 @@ msgid "" "installing the bootloader." msgstr "این دکمه فرآیند ساختن یواس‌بی زنده را شروع می‌کند. این شامل دانلود کردن یک انتشار از سیستم‌عامل «تیلز» (البته فقط در صورتی که هیچ گزینه‌ای موجود نباشد)، باز کردن فایل ایزو و ریختن آن روی دستگاه، ساختن یک لایه همیشگی و نهایتا نصب راه‌انداز یا بوت‌لودر آن می‌باشد." -#: ../liveusb/dialog.py:158 +#: ../liveusb/dialog.py:165 msgid "" "This is the USB stick that you want to install your Live system on. This " "device must be formatted with the FAT filesystem." msgstr "این حافظه جانبی USB است که شما می‌خواهید Live system خود را روی آن نصب کنید. این حافظه می‌بایست تحت سیستم FAT فُرمَت شود." -#: ../liveusb/dialog.py:163 +#: ../liveusb/dialog.py:170 msgid "" "This is the progress bar that will indicate how far along in the LiveUSB " "creation process you are" msgstr "این نوار پیشرفت نشان می‌دهد که شما در کجای فرآیند ساختن سیستم‌عامل زنده هستید" -#: ../liveusb/dialog.py:162 +#: ../liveusb/dialog.py:169 msgid "This is the status console, where all messages get written to." msgstr "اینجا کنسول وضعیت است. جایی که تمام پیغام‌ها در آن نوشته می‌شوند." @@ -534,11 +537,19 @@ msgstr "فایل سیستم پشتیبانی نشده: %s\nلطفا از وسی msgid "Updating properties of system partition %(system_partition)s" msgstr "در حال به روز رسانی اطلاعات پارتیشن سیستمی %(system_partition)s" -#: ../liveusb/launcher_ui.py:154 -msgid "Upgrade from ISO" -msgstr "به روزرسانی از ISO را انجام دهید" +#: ../liveusb/launcher_ui.py:156 +msgid "" +"Upgrade\n" +"by cloning" +msgstr "ارتقا\nتوسط شبیه سازی" + +#: ../liveusb/launcher_ui.py:158 +msgid "" +"Upgrade\n" +"from ISO" +msgstr "ارتقا\nاز ISO" -#: ../liveusb/dialog.py:152 +#: ../liveusb/dialog.py:159 msgid "Use existing Live system ISO" msgstr "استفاده از یک ایزوی زنده موجود" @@ -604,6 +615,6 @@ msgstr "بار دیگر می توانید برای ادامه دانلود سع msgid "You must run this application as root" msgstr "شما بايد اين برنامه را با دسترسي روت اجرا كنيد" -#: ../liveusb/dialog.py:155 +#: ../liveusb/dialog.py:162 msgid "or" msgstr "یا"

1 0

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

09 Dec '15

commit 02403967f9590763f4498cb6bbf0cb66c27b682b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 9 12:45:20 2015 +0000 Update translations for liveusb-creator --- fa/fa.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/fa/fa.po b/fa/fa.po index 5023888..aaa2527 100644 --- a/fa/fa.po +++ b/fa/fa.po @@ -6,6 +6,7 @@ # zmix <check_people_status(a)yahoo.com>, 2013 # Mohammad Hossein <desmati(a)gmail.com>, 2014 # Eric D Smallberg <esmallberg(a)ndi.org>, 2013 +# Farshad Gh <farshad73(a)gmail.com>, 2015 # Farshad Sadri <farshad.sadri(a)gmail.com>, 2015 # Gilberto, 2015 # zendegi <inactive+zendegi(a)transifex.com>, 2013 @@ -20,8 +21,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-02 21:23+0100\n" -"PO-Revision-Date: 2015-11-28 22:15+0000\n" -"Last-Translator: Gilberto\n" +"PO-Revision-Date: 2015-12-09 12:42+0000\n" +"Last-Translator: Farshad Gh <farshad73(a)gmail.com>\n" "Language-Team: Persian (http://www.transifex.com/otf/torproject/language/fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -81,7 +82,7 @@ msgid "" "<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n" "\n" "</ul>" -msgstr "" +msgstr "<ul>\n<li>تیلز را با کپی کردن همان سیستم تیلزی که شما در حال حاضر از آن استفاده می‌کنید، روی یک حافظه‌ی USB دیگر نصب کنید..</li>\n\n<li>حافظه‌ی USB که روی آن نصب می‌کنید، فرمت شده و تمامی اطلاعات آن از بین رفته است.</li>\n\n<li>فضای دائمی رمزگذاری شده از حافظه‌ی USB تیلز که شما در حال حاضر از آن استفاده می‌کنید، کپی نشده است.</li>\n\n</ul>" #: ../liveusb/launcher_ui.py:157 msgid "" @@ -94,7 +95,7 @@ msgid "" "\n" "\n" "</ul>" -msgstr "" +msgstr "<ul>\n<li>یک حافظه‌ی USB دیگر تیلز را به همان ورژنی که شما استفاده می‌کنید ارتقاء دهید.</li>\n\n<li>فضای دائمی رمز گذاری شده از حافظه‌ی USB تیلز که شما ارتقا می‌دهید، محفوظ است.</li>\n\n<li>فضای دائمی رمز گذاری شده از حافظه‌ی USB تیلز که شما در حال حاضر از آن استفاده می‌کنید، کپی نشده است.</li>\n\n\n</ul>" #: ../liveusb/launcher_ui.py:159 msgid "" @@ -106,7 +107,7 @@ msgid "" "<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n" "\n" "</ul>" -msgstr "" +msgstr "<ul>\n<li>یک حافظه‌ی USB دیگر تیلز را به ورژن یک تصویر ISO ارتقاء دهید.</li>\n\n<li>فضای دائمی رمز گذاری شده از حافظه‌ی USB تیلز که شما ارتقا می‌دهید، محفوظ است.</li>\n\n<li>فضای دائمی رمز گذاری شده از حافظه‌ی USB تیلز که شما در حال حاضر از آن استفاده می‌کنید، کپی نشده است.</li>\n\n</ul>" #: ../liveusb/dialog.py:161 msgid "Alt+B"

1 0

[webwml/master] Try and show the donate-options footer again
by sebastian＠torproject.org 09 Dec '15

09 Dec '15

commit 4b9812e9e5866d95407da790f32be05c69ff0bed Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Dec 9 13:27:34 2015 +0100 Try and show the donate-options footer again --- donate/en/donate-options.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/donate/en/donate-options.wml b/donate/en/donate-options.wml index 942bf21..6ba2e3b 100644 --- a/donate/en/donate-options.wml +++ b/donate/en/donate-options.wml @@ -35,7 +35,7 @@ } </style> -<div id="content" class="container"> +<div id="content" class="container" style="padding-bottom: 85px"> <div id="maincol"> <h1>Ways to Donate to Tor</h1> <p>The Tor Project offers the following donation methods:</p>

1 0

[torbutton/maint-1.9.3] Bug 17770: Fix alignments on donation banner
by gk＠torproject.org 09 Dec '15

09 Dec '15

commit b2be87834a9f7bde1e1366d6f395d5c068b53ed4 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Dec 7 17:07:39 2015 -0800 Bug 17770: Fix alignments on donation banner --- src/chrome/content/aboutTor/aboutTor.xhtml | 2 +- src/chrome/skin/aboutTor.css | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index dbfca72..d9e7704 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -217,7 +217,7 @@ function setupDonationBanner() { return; } // Now we can show the banner. - document.getElementById("donation-banner").style.display = "inline"; + document.getElementById("donation-banner").style.display = "block"; } ]]> </script> diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 038d470..5f43f8c 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -351,12 +351,21 @@ body .top div.hideIfTorIsUpToDate h1.hideIfTorOff { display: none; } +#donation-banner > a { + display: block; +} + #donation-banner-inner { margin: 0px auto; position: relative; text-align: left; width: 700px; z-index: -1; + display: block; +} + +#donation-banner-image { + display: block; } #donation-banner-text { @@ -369,6 +378,7 @@ body .top div.hideIfTorIsUpToDate h1.hideIfTorOff { #donation-banner-quote { color: darkgreen; + font-family: serif; font-size: 18px; text-align: start; white-space: normal; @@ -407,11 +417,11 @@ body .top div.hideIfTorIsUpToDate h1.hideIfTorOff { color: white; font-family: sans-serif; font-size: 20px; - left: 600px; + left: 490px; padding: 10px; position: absolute; text-align: center; - top: 153px; + top: 144px; vertical-align: middle; width: 110px; }

1 0

[translation/torbutton-abouttbupdatedtd_completed] Update translations for torbutton-abouttbupdatedtd_completed
by translation＠torproject.org 09 Dec '15

09 Dec '15

commit 5cfb5f1cdb11a6ffe8ab6b0b39a2e241f4bb9c92 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 9 10:16:56 2015 +0000 Update translations for torbutton-abouttbupdatedtd_completed --- en_GB/abouttbupdate.dtd | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/en_GB/abouttbupdate.dtd b/en_GB/abouttbupdate.dtd new file mode 100644 index 0000000..37567bd --- /dev/null +++ b/en_GB/abouttbupdate.dtd @@ -0,0 +1,6 @@ +<!ENTITY aboutTBUpdate.title "Tor Browser Update"> +<!ENTITY aboutTBUpdate.updated "Tor Browser has been updated."> +<!ENTITY aboutTBUpdate.linkPrefix "For the most up-to-date information about this release, "> +<!ENTITY aboutTBUpdate.linkLabel "visit our website"> +<!ENTITY aboutTBUpdate.linkSuffix "."> +<!ENTITY aboutTBUpdate.changeLogHeading "Changelog:">

1 0

[translation/tails-openpgp-applet_completed] Update translations for tails-openpgp-applet_completed
by translation＠torproject.org 09 Dec '15

09 Dec '15

commit fa52ab85b447bae6bac470da21a2929dc2bdb2ff Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 9 10:16:50 2015 +0000 Update translations for tails-openpgp-applet_completed --- en_GB/openpgp-applet.pot | 178 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 178 insertions(+) diff --git a/en_GB/openpgp-applet.pot b/en_GB/openpgp-applet.pot new file mode 100644 index 0000000..f364796 --- /dev/null +++ b/en_GB/openpgp-applet.pot @@ -0,0 +1,178 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Tails developers +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Andi Chandler <andi(a)gowling.com>, 2015 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: tails(a)boum.org\n" +"POT-Creation-Date: 2015-08-10 15:55+0200\n" +"PO-Revision-Date: 2015-12-09 09:59+0000\n" +"Last-Translator: Andi Chandler <andi(a)gowling.com>\n" +"Language-Team: English (United Kingdom) (http://www.transifex.com/otf/torproject/language/en_GB/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: en_GB\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: bin/openpgp-applet:163 +msgid "You are about to exit OpenPGP Applet. Are you sure?" +msgstr "You are about to exit OpenPGP Applet. Are you sure?" + +#: bin/openpgp-applet:175 +msgid "OpenPGP encryption applet" +msgstr "OpenPGP encryption applet" + +#: bin/openpgp-applet:178 +msgid "Exit" +msgstr "Exit" + +#: bin/openpgp-applet:180 +msgid "About" +msgstr "About" + +#: bin/openpgp-applet:235 +msgid "Encrypt Clipboard with _Passphrase" +msgstr "Encrypt Clipboard with _Passphrase" + +#: bin/openpgp-applet:238 +msgid "Sign/Encrypt Clipboard with Public _Keys" +msgstr "Sign/Encrypt Clipboard with Public _Keys" + +#: bin/openpgp-applet:243 +msgid "_Decrypt/Verify Clipboard" +msgstr "_Decrypt/Verify Clipboard" + +#: bin/openpgp-applet:247 +msgid "_Manage Keys" +msgstr "_Manage Keys" + +#: bin/openpgp-applet:251 +msgid "_Open Text Editor" +msgstr "_Open Text Editor" + +#: bin/openpgp-applet:295 +msgid "The clipboard does not contain valid input data." +msgstr "The clipboard does not contain valid input data." + +#: bin/openpgp-applet:347 bin/openpgp-applet:349 bin/openpgp-applet:351 +msgid "Unknown Trust" +msgstr "Unknown Trust" + +#: bin/openpgp-applet:353 +msgid "Marginal Trust" +msgstr "Marginal Trust" + +#: bin/openpgp-applet:355 +msgid "Full Trust" +msgstr "Full Trust" + +#: bin/openpgp-applet:357 +msgid "Ultimate Trust" +msgstr "Ultimate Trust" + +#: bin/openpgp-applet:410 +msgid "Name" +msgstr "Name" + +#: bin/openpgp-applet:411 +msgid "Key ID" +msgstr "Key ID" + +#: bin/openpgp-applet:412 +msgid "Status" +msgstr "Status" + +#: bin/openpgp-applet:444 +msgid "Fingerprint:" +msgstr "Fingerprint:" + +#: bin/openpgp-applet:447 +msgid "User ID:" +msgid_plural "User IDs:" +msgstr[0] "User ID:" +msgstr[1] "User IDs:" + +#: bin/openpgp-applet:476 +msgid "None (Don't sign)" +msgstr "None (Don't sign)" + +#: bin/openpgp-applet:539 +msgid "Select recipients:" +msgstr "Select recipients:" + +#: bin/openpgp-applet:547 +msgid "Hide recipients" +msgstr "Hide recipients" + +#: bin/openpgp-applet:550 +msgid "" +"Hide the user IDs of all recipients of an encrypted message. Otherwise " +"anyone that sees the encrypted message can see who the recipients are." +msgstr "Hide the user IDs of all recipients of an encrypted message. Otherwise anyone that sees the encrypted message can see who the recipients are." + +#: bin/openpgp-applet:556 +msgid "Sign message as:" +msgstr "Sign message as:" + +#: bin/openpgp-applet:560 +msgid "Choose keys" +msgstr "Choose keys" + +#: bin/openpgp-applet:600 +msgid "Do you trust these keys?" +msgstr "Do you trust these keys?" + +#: bin/openpgp-applet:603 +msgid "The following selected key is not fully trusted:" +msgid_plural "The following selected keys are not fully trusted:" +msgstr[0] "The following selected key is not fully trusted:" +msgstr[1] "The following selected keys are not fully trusted:" + +#: bin/openpgp-applet:621 +msgid "Do you trust this key enough to use it anyway?" +msgid_plural "Do you trust these keys enough to use them anyway?" +msgstr[0] "Do you trust this key enough to use it anyway?" +msgstr[1] "Do you trust these keys enough to use them anyway?" + +#: bin/openpgp-applet:634 +msgid "No keys selected" +msgstr "No keys selected" + +#: bin/openpgp-applet:636 +msgid "" +"You must select a private key to sign the message, or some public keys to " +"encrypt the message, or both." +msgstr "You must select a private key to sign the message, or some public keys to encrypt the message, or both." + +#: bin/openpgp-applet:664 +msgid "No keys available" +msgstr "No keys available" + +#: bin/openpgp-applet:666 +msgid "" +"You need a private key to sign messages or a public key to encrypt messages." +msgstr "You need a private key to sign messages or a public key to encrypt messages." + +#: bin/openpgp-applet:794 +msgid "GnuPG error" +msgstr "GnuPG error" + +#: bin/openpgp-applet:815 +msgid "Therefore the operation cannot be performed." +msgstr "Therefore the operation cannot be performed." + +#: bin/openpgp-applet:865 +msgid "GnuPG results" +msgstr "GnuPG results" + +#: bin/openpgp-applet:871 +msgid "Output of GnuPG:" +msgstr "Output of GnuPG:" + +#: bin/openpgp-applet:896 +msgid "Other messages provided by GnuPG:" +msgstr "Other messages provided by GnuPG:"

1 0

[translation/tails-openpgp-applet] Update translations for tails-openpgp-applet
by translation＠torproject.org 09 Dec '15

09 Dec '15

commit 6f0aa7388b43239c98169d49bfadfa73f31dbdfa Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 9 10:16:45 2015 +0000 Update translations for tails-openpgp-applet --- en_GB/openpgp-applet.pot | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/en_GB/openpgp-applet.pot b/en_GB/openpgp-applet.pot index 4fe5578..f364796 100644 --- a/en_GB/openpgp-applet.pot +++ b/en_GB/openpgp-applet.pot @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Andi Chandler <andi(a)gowling.com>, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2015-08-10 15:55+0200\n" -"PO-Revision-Date: 2015-11-23 02:23+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2015-12-09 09:59+0000\n" +"Last-Translator: Andi Chandler <andi(a)gowling.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/otf/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +20,7 @@ msgstr "" #: bin/openpgp-applet:163 msgid "You are about to exit OpenPGP Applet. Are you sure?" -msgstr "" +msgstr "You are about to exit OpenPGP Applet. Are you sure?" #: bin/openpgp-applet:175 msgid "OpenPGP encryption applet" @@ -92,8 +93,8 @@ msgstr "Fingerprint:" #: bin/openpgp-applet:447 msgid "User ID:" msgid_plural "User IDs:" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "User ID:" +msgstr[1] "User IDs:" #: bin/openpgp-applet:476 msgid "None (Don't sign)" @@ -128,14 +129,14 @@ msgstr "Do you trust these keys?" #: bin/openpgp-applet:603 msgid "The following selected key is not fully trusted:" msgid_plural "The following selected keys are not fully trusted:" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "The following selected key is not fully trusted:" +msgstr[1] "The following selected keys are not fully trusted:" #: bin/openpgp-applet:621 msgid "Do you trust this key enough to use it anyway?" msgid_plural "Do you trust these keys enough to use them anyway?" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Do you trust this key enough to use it anyway?" +msgstr[1] "Do you trust these keys enough to use them anyway?" #: bin/openpgp-applet:634 msgid "No keys selected"

1 0

[translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed
by translation＠torproject.org 09 Dec '15

09 Dec '15

commit 072b558fbcb92cef3f476031293f7d3726aba2d5 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 9 10:16:08 2015 +0000 Update translations for torbutton-abouttorproperties_completed --- en_GB/abouttor.properties | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/en_GB/abouttor.properties b/en_GB/abouttor.properties index d607324..10f09a1 100644 --- a/en_GB/abouttor.properties +++ b/en_GB/abouttor.properties @@ -19,3 +19,15 @@ aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S" aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above. aboutTor.searchDC.search.link=https://search.disconnect.me/ + +aboutTor.donationBanner.lp.who=— Laura Poitras +aboutTor.donationBanner.lp.quote=Edward Snowden would not have been able to contact me without Tor and other free software encryption projects. Tor is an essential tool, and it needs our support. +aboutTor.donationBanner.lp.speciality=Oscar-Winning Documentary Filmmaker, <i>CitizenFour</i> + +aboutTor.donationBanner.cd.who=— Cory Doctorow +aboutTor.donationBanner.cd.quote=Privacy and anonymity matter to all of us. +aboutTor.donationBanner.cd.speciality= Novelist, technology activist, co-editor of Boing Boing + +aboutTor.donationBanner.rd.who=— Roger Dingledine +aboutTor.donationBanner.rd.quote=Please help the strongest privacy tool in the world become more sustainable! +aboutTor.donationBanner.rd.speciality=Founder, Acting Executive Director of the Tor Project

1 0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 09 Dec '15

09 Dec '15

commit b6680aecdda0de0f745e869547c85fcf6323eab1 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 9 10:15:44 2015 +0000 Update translations for abouttor-homepage_completed --- en_GB/aboutTor.dtd | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/en_GB/aboutTor.dtd b/en_GB/aboutTor.dtd index b923233..17af371 100644 --- a/en_GB/aboutTor.dtd +++ b/en_GB/aboutTor.dtd @@ -6,14 +6,14 @@ <!ENTITY aboutTor.title "About Tor"> -<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date."> +<!ENTITY aboutTor.outOfDateTorOn.label "WARNING: this browser is out of date."> <!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date."> <!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Check for Tor Browser Update."> <!ENTITY aboutTor.check.label "Test Tor Network Settings"> -<!ENTITY aboutTor.success.label "Congratulations!"> -<!ENTITY aboutTor.success2.label "This browser is configured to use Tor."> +<!ENTITY aboutTor.success.label "Welcome to Tor Browser"> +<!ENTITY aboutTor.success2.label "Connected to the Tor network."> <!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously."> <!ENTITY aboutTor.failure.label "Something Went Wrong!"> <!ENTITY aboutTor.failure2.label "Tor is not working in this browser."> @@ -47,3 +47,6 @@ <!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy."> <!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project »"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> + +<!ENTITY aboutTor.donate.donate "Donate"> +<!ENTITY aboutTor.donate.supportTor "Please support Tor!">

1 0