- tor-commits - lists.torproject.org

[translation/torbutton-torbuttonproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
by translation＠torproject.org 17 Apr '20

17 Apr '20

commit feb875c8a9f5fda26ab8c97a12b1300e05cb135a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 17 18:21:30 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- fa/torbutton.properties | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/fa/torbutton.properties b/fa/torbutton.properties index f8d9e16678..510fc272b5 100644 --- a/fa/torbutton.properties +++ b/fa/torbutton.properties @@ -69,22 +69,22 @@ onionServices.errorPage.onionSite=سایت های پیازی # LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with # an error code, e.g., 0xF3. # Tor SOCKS error 0xF0: -onionServices.descNotFound.pageTitle=Problem Loading Onionsite +onionServices.descNotFound.pageTitle=اشکال در بارگیری سایت پیازی onionServices.descNotFound.header=Onionsite Not Found onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client. # Tor SOCKS error 0xF1: -onionServices.descInvalid.pageTitle=Problem Loading Onionsite +onionServices.descInvalid.pageTitle=اشکال در بارگیری سایت پیازی onionServices.descInvalid.header=Onionsite Cannot Be Reached onionServices.descInvalid=The onionsite is unreachable due an internal error. onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed. # Tor SOCKS error 0xF2: -onionServices.introFailed.pageTitle=Problem Loading Onionsite +onionServices.introFailed.pageTitle=اشکال در بارگیری سایت پیازی onionServices.introFailed.header=Onionsite Has Disconnected onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running. # Tor SOCKS error 0xF3: -onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite +onionServices.rendezvousFailed.pageTitle=اشکال در بارگیری سایت پیازی onionServices.rendezvousFailed.header=Unable to Connect to Onionsite onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later. onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection. @@ -94,12 +94,12 @@ onionServices.clientAuthMissing.header=Onionsite Requires Authentication onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided. onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing. # Tor SOCKS error 0xF5: -onionServices.clientAuthIncorrect.pageTitle=Authorization Failed +onionServices.clientAuthIncorrect.pageTitle=احراز هویت ناموفق onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator. onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked. # Tor SOCKS error 0xF6: -onionServices.badAddress.pageTitle=Problem Loading Onionsite +onionServices.badAddress.pageTitle=اشکال در بارگیری سایت پیازی onionServices.badAddress.header=Invalid Onionsite Address onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly. onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid. @@ -134,10 +134,10 @@ onionLocation.alwaysPrioritizeAccessKey=a onionLocation.notNow=نه در حال حاضر onionLocation.notNowAccessKey=n onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship. -onionLocation.tryThis=Try Onion Services +onionLocation.tryThis=سرویس های پیازی را امتحان کنید onionLocation.onionAvailable=.onion available onionLocation.learnMore=Learn more… onionLocation.always=همیشه -onionLocation.askEverytime=Ask every time +onionLocation.askEverytime=هر بار بپرس onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known. onionLocation.onionServicesTitle=◾️ سرویس های پیازی

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 17 Apr '20

17 Apr '20

commit 5be353184681a187ff191ff00425e2b770764356 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 17 18:15:18 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- fa/LC_MESSAGES/bridgedb.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fa/LC_MESSAGES/bridgedb.po b/fa/LC_MESSAGES/bridgedb.po index 3342ee886d..99cf2eb72c 100644 --- a/fa/LC_MESSAGES/bridgedb.po +++ b/fa/LC_MESSAGES/bridgedb.po @@ -25,7 +25,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-04-09 14:45-0700\n" -"PO-Revision-Date: 2020-04-17 17:39+0000\n" +"PO-Revision-Date: 2020-04-17 18:08+0000\n" "Last-Translator: Hamid reza Zaefarani\n" "Language-Team: Persian (http://www.transifex.com/otf/torproject/language/fa/)\n" "MIME-Version: 1.0\n" @@ -214,7 +214,7 @@ msgstr "شما از حد مجاز تجاوز نموده اید. لطفاً پش msgid "" "If these bridges are not what you need, reply to this email with one of\n" "the following commands in the message body:" -msgstr "" +msgstr "اگر این پل‌ها آن چیزی نیستند که شما نیاز دارید، با یکی از دستورات زیر در متن پیام، به این ایمیل پاسخ دهید:" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". @@ -398,14 +398,14 @@ msgid "" " Manual explains how you can add your bridges to Tor Browser. If you are\n" " using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n" " are using Android, %sclick here%s." -msgstr "" +msgstr "ابتدا، شما نیاز به %sبارگیری مرور‌گر تور%s دارید. دفترچه راهنما مرورگر Tor ما، توضیح می‌دهد که چگونه می‌توانید پل‌های خود را به مرورگر Tor اضافه کنید\nاگر شما از ویندوز، لینوکس یا مک استفاده می‌کنید، برای اطلاعات بیشتر %s اینجا کلیک کنید%s. اگر شما از اندروید استفاده می‌کتید،%sاینجا کلیک کنید%s." #: bridgedb/strings.py:166 msgid "" "Add these bridges to your Tor Browser by opening your browser\n" "preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n" "bridge\" field." -msgstr "" +msgstr "این پل‌ها را به مرورگر تور خود، با باز کردن تنظیمات مرورگر، کلیک بر روی \"Tor\"، و سپس اضافه کردن آنها به بخش \"ارائه یک پل\"، اضافه کنید." #: bridgedb/strings.py:173 msgid "(Request unobfuscated Tor bridges.)" @@ -413,8 +413,8 @@ msgstr "(درخواست پل‌های تور نا‌مبهم.)" #: bridgedb/strings.py:174 msgid "(Request IPv6 bridges.)" -msgstr "" +msgstr "(درخواست پل‌های IPv6.)" #: bridgedb/strings.py:175 msgid "(Request obfs4 obfuscated bridges.)" -msgstr "" +msgstr "(درخواست پل‌های مبهم obfs4.)"

1 0

[translation/torbutton-torbuttonproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
by translation＠torproject.org 17 Apr '20

17 Apr '20

commit 13106196095da23f64b440049e637cd3d56317e0 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 17 17:51:35 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- fa/torbutton.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fa/torbutton.properties b/fa/torbutton.properties index 0b23816088..f8d9e16678 100644 --- a/fa/torbutton.properties +++ b/fa/torbutton.properties @@ -9,7 +9,7 @@ torbutton.circuit_display.guard = محافظ torbutton.circuit_display.guard_note = گره [گارد] شما ممکن است تغییر نکند. torbutton.circuit_display.learn_more = اطلاعات بیشتر torbutton.circuit_display.click_to_copy = Click to Copy -torbutton.circuit_display.copied = Copied! +torbutton.circuit_display.copied = کپی‌شد! torbutton.content_sizer.margin_tooltip = مرورگر Tor اضافه می کند این حاشیه را به عرض و ارتفاع پنجره شما که کمتر مشخص شود، و در نتیجه باعث کاهش توانایی به ردیابی آنلاین شما شود. torbutton.panel.tooltip.disabled = برای فعال کردن Tor کليک کنيد torbutton.panel.tooltip.enabled = برای غيرفعال کردن Tor کليک کنيد @@ -89,7 +89,7 @@ onionServices.rendezvousFailed.header=Unable to Connect to Onionsite onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later. onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection. # Tor SOCKS error 0xF4: -onionServices.clientAuthMissing.pageTitle=Authorization Required +onionServices.clientAuthMissing.pageTitle=احراز هویت مورد‌نیاز است onionServices.clientAuthMissing.header=Onionsite Requires Authentication onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided. onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing. @@ -104,7 +104,7 @@ onionServices.badAddress.header=Invalid Onionsite Address onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly. onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid. # Tor SOCKS error 0xF7: -onionServices.introTimedOut.pageTitle=Problem Loading Onionsite +onionServices.introTimedOut.pageTitle=اشکال در بارگیری سایت پیازی onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection. onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 17 Apr '20

17 Apr '20

commit cdb20aa9de008d8c258dc53da88bf949c5dc44a0 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 17 17:48:53 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- fa.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fa.po b/fa.po index 0d68e12602..cf634c36ea 100644 --- a/fa.po +++ b/fa.po @@ -37,8 +37,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-03-21 09:59+0100\n" -"PO-Revision-Date: 2020-03-25 13:13+0000\n" -"Last-Translator: Paolo Spada <donpaolospada(a)protonmail.com>\n" +"PO-Revision-Date: 2020-04-17 17:36+0000\n" +"Last-Translator: Hamid reza Zaefarani\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"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 17 Apr '20

17 Apr '20

commit fd5195fbf779c0a79e3fb4648cd3525dc7a7ef10 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 17 17:47:19 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- fa.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/fa.po b/fa.po index 46177d2546..9517a4215c 100644 --- a/fa.po +++ b/fa.po @@ -27,7 +27,7 @@ # Mohammad Hadi K <mhkaramzadeh7(a)gmail.com>, 2018 # Mohammad Hossein <desmati(a)gmail.com>, 2014 # Mohsen Eghbal <Eghbalmohsen(a)gmail.com>, 2019 -# magnifico, 2019 +# Reza Ghasemi, 2019 # Samaneh M <asamana.haoma(a)gmail.com>, 2019 # Sina Eghbal <s.eghbal(a)gmail.com>, 2016 # b0b47d46632b78a09a40de799fda9a65, 2019 @@ -37,8 +37,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-03-21 09:59+0100\n" -"PO-Revision-Date: 2020-03-25 13:13+0000\n" -"Last-Translator: Paolo Spada <donpaolospada(a)protonmail.com>\n" +"PO-Revision-Date: 2020-04-17 17:36+0000\n" +"Last-Translator: Hamid reza Zaefarani\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" @@ -1467,21 +1467,21 @@ msgstr "اطلاعات بیشتر در مورد Tails را یاد بگیرید" #: ../config/chroot_local-includes/usr/share/applications/tails-persistence-delete.desktop.in.h:1 msgid "Delete persistent volume" -msgstr "" +msgstr "حذف حجم ذخیره سازی پایدار" #: ../config/chroot_local-includes/usr/share/applications/tails-persistence-delete.desktop.in.h:2 msgid "Delete the persistent volume and its content" -msgstr "" +msgstr "حذف حجم ذخیره سازی پایدار و محتویات آن" #: ../config/chroot_local-includes/usr/share/applications/tails-persistence-setup.desktop.in.h:1 msgid "Configure persistent volume" -msgstr "" +msgstr "پیکربندی حجم ذخیره سازی پایدار" #: ../config/chroot_local-includes/usr/share/applications/tails-persistence-setup.desktop.in.h:2 msgid "" "Configure which files and application configuration are saved between " "working sessions" -msgstr "" +msgstr "تنظیم کنید که کدام پرونده‌ها و پیکربندی برنامه‌ها بین جلسات کاری ذخیره می‌شوند" #: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:1 msgid "Tor Browser"

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 17 Apr '20

17 Apr '20

commit 606c56898cb99f72002a1fda4433f6d8d45bca09 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 17 17:45:15 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- fa/LC_MESSAGES/bridgedb.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fa/LC_MESSAGES/bridgedb.po b/fa/LC_MESSAGES/bridgedb.po index c3ae7967da..3342ee886d 100644 --- a/fa/LC_MESSAGES/bridgedb.po +++ b/fa/LC_MESSAGES/bridgedb.po @@ -25,8 +25,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-04-09 14:45-0700\n" -"PO-Revision-Date: 2020-04-15 19:46+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-04-17 17:39+0000\n" +"Last-Translator: Hamid reza Zaefarani\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" @@ -197,7 +197,7 @@ msgstr "%sد%sریافت پل‌ها" #: bridgedb/strings.py:33 msgid "[This is an automated email.]" -msgstr "" +msgstr "[این یک ایمیل خودکار می‌باشد.]" #: bridgedb/strings.py:35 msgid "Here are your bridges:" @@ -409,7 +409,7 @@ msgstr "" #: bridgedb/strings.py:173 msgid "(Request unobfuscated Tor bridges.)" -msgstr "" +msgstr "(درخواست پل‌های تور نا‌مبهم.)" #: bridgedb/strings.py:174 msgid "(Request IPv6 bridges.)"

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 17 Apr '20

17 Apr '20

commit dbe9c7eda88687a510f2ad5c1bd80a78542a872d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 17 16:45:16 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- ru/LC_MESSAGES/bridgedb.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ru/LC_MESSAGES/bridgedb.po b/ru/LC_MESSAGES/bridgedb.po index ad3770c402..b556f22a3d 100644 --- a/ru/LC_MESSAGES/bridgedb.po +++ b/ru/LC_MESSAGES/bridgedb.po @@ -33,8 +33,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-04-09 14:45-0700\n" -"PO-Revision-Date: 2020-04-15 19:46+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-04-17 16:33+0000\n" +"Last-Translator: diana azaryan <dianazryn(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -205,7 +205,7 @@ msgstr "%sП%sолучить адреса мостов" #: bridgedb/strings.py:33 msgid "[This is an automated email.]" -msgstr "" +msgstr "[Это автоматическое письмо.]" #: bridgedb/strings.py:35 msgid "Here are your bridges:" @@ -222,7 +222,7 @@ msgstr "Вы превысили допустимый лимит. Пожалуй msgid "" "If these bridges are not what you need, reply to this email with one of\n" "the following commands in the message body:" -msgstr "" +msgstr "Если эти мосты не то, что вам нужно, ответьте на это письмо\nс помощью одной из следующих команд в теле сообщения:" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".

1 0

[tor-browser-bundle-testsuite/master] Bug 33926: Add a LICENSE file ("3-clause BSD" license)
by gk＠torproject.org 17 Apr '20

17 Apr '20

commit 2357de09b5e66dddf749a4fec042940abcafabca Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 17 15:16:11 2020 +0200 Bug 33926: Add a LICENSE file ("3-clause BSD" license) --- LICENSE | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..a8acdf3 --- /dev/null +++ b/LICENSE @@ -0,0 +1,29 @@ +Copyright (c) 2020, The Tor Project, Inc. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + + * Neither the names of the copyright owners nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

1 0

[tor-browser-build/master] Bug 32038: Add a LICENSE file
by gk＠torproject.org 17 Apr '20

17 Apr '20

commit 49319fa1afea0f0f0e2ce16b7d61da95f39c79b2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 31 20:28:27 2020 +0200 Bug 32038: Add a LICENSE file --- LICENSE | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..ee29ae2 --- /dev/null +++ b/LICENSE @@ -0,0 +1,37 @@ +This file contains the license for the build recipes and tools used in +the Tor Browser development process, that are included in this repository. + +For the license of specific components included in Tor Browser, see +directory projects/tor-browser/Bundle-Data/Docs/Licenses. + +=============================================================================== + +Copyright (c) 2020, The Tor Project, Inc. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + + * Neither the names of the copyright owners nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

1 0

[tor-browser-build/master] Bug 32788: Specify version for test builds
by gk＠torproject.org 17 Apr '20

17 Apr '20

commit 3310abeac20111775407177fb95f4ede3d50251c Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 17 06:46:29 2020 +0000 Bug 32788: Specify version for test builds With our switch to including a date into our nightly build versioning (#25009) testing patches with test builds got harder. The firefox part has to be rebuilt every day now as it includes the version number, even if no code changes occurred. That slows down testing of patches significantly. We hardcode "testing" as the test build version number to fix that and use "20010101010101" for the build date. Thanks to boklm for help. --- projects/firefox/get-moz-build-date | 4 ++++ rbm.conf | 11 ++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/projects/firefox/get-moz-build-date b/projects/firefox/get-moz-build-date index e6989ff..a43f2f7 100755 --- a/projects/firefox/get-moz-build-date +++ b/projects/firefox/get-moz-build-date @@ -8,6 +8,10 @@ my ($year, $version) = @ARGV; my $date; if ($version =~ m/^tbb-nightly\.([^\.]+)\.([^\.]+)\.([^\.]+)$/) { $date = sprintf("%d%02d%02d010101", $1, $2, $3); +} elsif ($version eq 'testbuild') { + # There is no need for an increasing build date in test builds. Just hardcode + # it. + $date = 20010101010101; } else { my @v = split(/[\.ab]/, $version); push @v, '0' if @v < 4; diff --git a/rbm.conf b/rbm.conf index cd17da9..94f9fcc 100644 --- a/rbm.conf +++ b/rbm.conf @@ -151,7 +151,16 @@ targets: var: nightly: 1 channel: nightly - torbrowser_version: '[% ENV.TORBROWSER_NIGHTLY_VERSION ? ENV.TORBROWSER_NIGHTLY_VERSION : c("var_p/nightly_torbrowser_version") %]' + torbrowser_version: | + [% + IF ENV.TORBROWSER_NIGHTLY_VERSION; + GET ENV.TORBROWSER_NIGHTLY_VERSION; + ELSIF c("var/testbuild"); + GET "testbuild"; + ELSE; + GET c("var_p/nightly_torbrowser_version"); + END; + -%] # For nightly builds, we support updates for a limited set of locales mar_locales: - de

1 0