- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 30468: Add mk locale for desktop builds
by gk＠torproject.org 04 Jul '19

04 Jul '19

commit 7b1c46d3649c20c91d4e33529412301e96ce2a0f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jul 4 17:44:31 2019 +0200 Bug 30468: Add mk locale for desktop builds --- projects/firefox-locale-bundle/build | 2 ++ projects/firefox/build | 6 ++++-- rbm.conf | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/projects/firefox-locale-bundle/build b/projects/firefox-locale-bundle/build index 7000300..3a9e323 100644 --- a/projects/firefox-locale-bundle/build +++ b/projects/firefox-locale-bundle/build @@ -13,6 +13,8 @@ tmpdir=$(mktemp -d) [% FOREACH lang = c('var/locales') %] [% SET lang = tmpl(lang); + # mk is unavailable on mobile. + NEXT IF lang == 'mk'; SET hgurl = "https://hg.mozilla.org/l10n-central/" _ lang %] if test -d [% lang %] then diff --git a/projects/firefox/build b/projects/firefox/build index 3aa4a4d..e0870c1 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -164,8 +164,10 @@ rm -f js/src/configure [% IF c("var/android") %] # Building a multi-locale .apk - [% FOREACH lang = c('var/locales') %] - [% SET lang = tmpl(lang) %] + [% FOREACH lang = c('var/locales'); + SET lang = tmpl(lang); + # mk is unavailable on mobile. + NEXT IF lang == 'mk'; %] # Copy our torbrowser_strings.dtd at the right place cp /var/tmp/dist/tba-translation/[% lang %]/torbrowser_strings.dtd /var/tmp/dist/locales/[% lang %]/mobile/android/base/ ./mach build chrome-[% lang %]; diff --git a/rbm.conf b/rbm.conf index 62a19a6..1a1570b 100644 --- a/rbm.conf +++ b/rbm.conf @@ -82,6 +82,7 @@ var: - '[% c("var/locale_ja") %]' - ka - ko + - mk - nb-NO - nl - pl

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_31079_v2'
by gk＠torproject.org 04 Jul '19

04 Jul '19

commit 142841696c055fff8b16e143cfe35609a6f0b223 Merge: f16f873 e5ed8e3 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 4 20:05:10 2019 +0000 Merge remote-tracking branch 'boklm/bug_31079_v2' keyring/firefox.gpg | Bin 2995 -> 2817 bytes 1 file changed, 0 insertions(+), 0 deletions(-)

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_30468'
by gk＠torproject.org 04 Jul '19

04 Jul '19

commit f16f8734b4834eaccd4d2c9dc018084f766b60f9 Merge: b1ce9a7 7b1c46d Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 4 20:01:53 2019 +0000 Merge remote-tracking branch 'boklm/bug_30468' projects/firefox-locale-bundle/build | 2 ++ projects/firefox/build | 6 ++++-- rbm.conf | 1 + 3 files changed, 7 insertions(+), 2 deletions(-)

1 0

[tor-browser/tor-browser-60.8.0esr-9.0-1] Pick up Torbutton 2.2.1
by gk＠torproject.org 04 Jul '19

04 Jul '19

commit 86b5513abc35287d635855de7e2f1321358f9faf Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 4 19:59:27 2019 +0000 Pick up Torbutton 2.2.1 --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index fc5f85c225f7..cbf7172b5daa 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit fc5f85c225f7518b078ca20457468e38a78430ad +Subproject commit cbf7172b5daa49ab53542c7757a64ddbabb29dce

1 0

[tor-launcher/master] Translations update
by gk＠torproject.org 04 Jul '19

04 Jul '19

commit 123e2eb78f9b8922cd50a8fc68f0c15cb8354e0b Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 4 16:49:16 2019 +0000 Translations update --- src/chrome/locale/da/network-settings.dtd | 6 +++--- src/chrome/locale/da/torlauncher.properties | 8 ++++---- src/chrome/locale/fr/network-settings.dtd | 2 +- src/chrome/locale/th/torlauncher.properties | 10 +++++----- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/chrome/locale/da/network-settings.dtd b/src/chrome/locale/da/network-settings.dtd index cdc10bd..52f89be 100644 --- a/src/chrome/locale/da/network-settings.dtd +++ b/src/chrome/locale/da/network-settings.dtd @@ -29,7 +29,7 @@ <!ENTITY torsettings.useProxy.type "Proxytype:"> <!ENTITY torsettings.useProxy.type.placeholder "vælg en proxytype"> <!ENTITY torsettings.useProxy.address "Adresse:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP adresse eller værtsnavn"> +<!ENTITY torsettings.useProxy.address.placeholder "IP-adresse eller værtsnavn"> <!ENTITY torsettings.useProxy.port "Port:"> <!ENTITY torsettings.useProxy.username "Brugernavn:"> <!ENTITY torsettings.useProxy.password "Adgangskode:"> @@ -37,7 +37,7 @@ <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP/HTTPS"> <!ENTITY torsettings.firewall.checkbox "Computeren går gennem en firewall som kun tillader forbindelse til bestemte porte"> -<!ENTITY torsettings.firewall.allowedPorts "Tilladte Porte:"> +<!ENTITY torsettings.firewall.allowedPorts "Tilladte porte:"> <!ENTITY torsettings.useBridges.checkbox "Tor er censureret i mit land"> <!ENTITY torsettings.useBridges.default "Vælg en indbygget bro"> <!ENTITY torsettings.useBridges.default.placeholder "vælg en bro"> @@ -54,7 +54,7 @@ <!ENTITY torsettings.proxyHelpTitle "Hjælp til proxy"> <!ENTITY torsettings.proxyHelp1 "Der kan være brug for en lokal proxy når der oprettes forbindelse gennem et netværk i virksomhed, skole eller universitet. Hvis du er i tvivl om der er brug for en proxy, så kig i internetindstillingerne i en anden browser eller tjek dit systems netværksindstillinger."> -<!ENTITY torsettings.bridgeHelpTitle "Bro-relæ hjælp"> +<!ENTITY torsettings.bridgeHelpTitle "Hjælp til bro-relæ"> <!ENTITY torsettings.bridgeHelp1 "Broer er ulistede relæer som gør det sværrer at blokere forbindelser til Tor-netværket.  Hver type bro bruger en anderledes metode for at undgå censur.  Dem med obfs får din netværkstrafik til at ligne tilfældig støj og dem med meek får din netværkstrafik til at se ud som om den er forbundet til tjenesten i stedet for Tor."> <!ENTITY torsettings.bridgeHelp2 "Pga. den måde bestemte lande prøver at blokere Tor, vil bestemte broer virke i nogle lande men ikke andre.  Besøg torproject.org/about/contact.html#support hvis du er i tvivl om hvilke broer der virker i dit land."> diff --git a/src/chrome/locale/da/torlauncher.properties b/src/chrome/locale/da/torlauncher.properties index 3046997..fd93c6d 100644 --- a/src/chrome/locale/da/torlauncher.properties +++ b/src/chrome/locale/da/torlauncher.properties @@ -22,7 +22,7 @@ torlauncher.failed_to_get_settings=Kan ikke hente Tor-indstillingerne..\n\n%S torlauncher.failed_to_save_settings=Kan ikke gemme Tor-indstillingerne.\n\n%S torlauncher.ensure_tor_is_running=Kontroller venligst at Tor kører. -torlauncher.error_proxy_addr_missing=Du skal angive både IP adresse eller værts navn og en port, for at konfigurere Tor til at bruge en proxy som forbindelse til internettet. +torlauncher.error_proxy_addr_missing=Du skal angive både IP-adresse eller værtsnavn og en port, for at konfigurere Tor til at bruge en proxy som forbindelse til internettet. torlauncher.error_proxy_type_missing=Du skal vælge proxytypen: torlauncher.error_bridges_missing=Du skal angive en eller flere broer. torlauncher.error_default_bridges_type_missing=Du skal vælge en transporttype for de tildelte broer. @@ -47,10 +47,10 @@ torlauncher.quit=Afslut torlauncher.quit_win=Afslut torlauncher.done=Færdig -torlauncher.forAssistance=For hjælp, kontakt %S -torlauncher.forAssistance2=For hjælp, besøg %S +torlauncher.forAssistance=For at få hjælp, kontakt %S +torlauncher.forAssistance2=For at få hjælp, besøg %S -torlauncher.copiedNLogMessages=Kopieringen er gennemført. %S logbeskeder fra Tor er klar til at blive sat ind i et tekstdokument eller en e-mail. +torlauncher.copiedNLogMessages=Kopieringen er gennemført. %S logbeskeder er klar til at blive indsæt i en tekstredigering eller en e-mail. torlauncher.bootstrapStatus.starting=Starter torlauncher.bootstrapStatus.conn_pt=Opretter forbindelse til bro diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd index abbc13d..fd80e04 100644 --- a/src/chrome/locale/fr/network-settings.dtd +++ b/src/chrome/locale/fr/network-settings.dtd @@ -46,7 +46,7 @@ <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Obtenir un nouveau test"> <!ENTITY torsettings.useBridges.captchaSubmit "Envoyer"> <!ENTITY torsettings.useBridges.custom "Utiliser un pont que je connais"> -<!ENTITY torsettings.useBridges.label "Saisir des informations de pont provenant d’une source fiable"> +<!ENTITY torsettings.useBridges.label "Saisir des renseignements de pont provenant d’une source fiable"> <!ENTITY torsettings.useBridges.placeholder "type adresse:port (un par ligne)"> <!ENTITY torsettings.copyLog "Copier le journal Tor dans le presse-papiers"> diff --git a/src/chrome/locale/th/torlauncher.properties b/src/chrome/locale/th/torlauncher.properties index 3d587f1..5c97813 100644 --- a/src/chrome/locale/th/torlauncher.properties +++ b/src/chrome/locale/th/torlauncher.properties @@ -67,7 +67,7 @@ torlauncher.bootstrapStatus.loading_status=กำลังดึงข้อม torlauncher.bootstrapStatus.loading_keys=กำลังดึง ใบรับรองสิทธิ torlauncher.bootstrapStatus.requesting_descriptors=กำลังร้องขอข้อมูล relay torlauncher.bootstrapStatus.loading_descriptors=กำลังดึงข้อมูล relay -torlauncher.bootstrapStatus.enough_dirinfo=การโหลดข้อมูลrelay เสร็จสิ้น +torlauncher.bootstrapStatus.enough_dirinfo=การโหลดข้อมูลรีเลย์ เสร็จสิ้น torlauncher.bootstrapStatus.ap_conn_pt=กำลังสร้างวงจร: กำลังเชื่อมต่อกับสะพาน torlauncher.bootstrapStatus.ap_conn_done_pt=กำลังสร้างวงจร: เชื่อมต่อกับสะพานแล้ว torlauncher.bootstrapStatus.ap_conn_proxy=กำลังสร้างวงจร: กำลังเชื่อมต่อกับพร็อกซี @@ -84,11 +84,11 @@ torlauncher.bootstrapWarning.connectrefused=ถูกปฏิเสธการ torlauncher.bootstrapWarning.misc=เบ็ดเตล็ด torlauncher.bootstrapWarning.resourcelimit=ทรัพยากรไม่เพียงพอ torlauncher.bootstrapWarning.identity=ข้อมูลประจำตัวไม่ตรงกัน -torlauncher.bootstrapWarning.timeout=นานเกินไปในการเชื่อมต่อ -torlauncher.bootstrapWarning.noroute=หาเส้นทางไปหา host ไม่พบ +torlauncher.bootstrapWarning.timeout=หมดเวลาสำหรับการเชื่อมต่อ +torlauncher.bootstrapWarning.noroute=ไม่พบเส้นทางไปยัง host torlauncher.bootstrapWarning.ioerror=อ่าน/เขียน ผิดพลาด -torlauncher.bootstrapWarning.pt_missing=ที่เสียบสำหรับการขนส่งหายไป +torlauncher.bootstrapWarning.pt_missing=ที่เสียบสำหรับการโอนถ่ายข้อมูลหายไป torlauncher.nsresult.NS_ERROR_NET_RESET=การเชื่อมต่อกับเซิร์ฟเวอร์หายไป -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์ได้. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์ได้ torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=ไม่สามารถเชื่อมต่อกับพร็อกซี

1 0

[tor-launcher/master] Release preparations for 0.2.19.2
by gk＠torproject.org 04 Jul '19

04 Jul '19

commit a5ea1aced958a6c566c5f643ae015aebdafcb32a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 4 16:49:57 2019 +0000 Release preparations for 0.2.19.2 Version bump --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index d78b9a8..9df9f31 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.19.1</em:version> + <em:version>0.2.19.2</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL>

1 0

[tor-launcher/master] Bug 30468: Add mk locale
by gk＠torproject.org 04 Jul '19

04 Jul '19

commit 397253580d87f74447fe150f7336edcf4d816c79 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jul 2 10:38:24 2019 +0000 Bug 30468: Add mk locale --- src/chrome/content/network-settings.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 7bcd52e..b39a194 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -321,6 +321,7 @@ function populateLocaleList(aLangPackAddons) "ja" : "\u65e5\u672c\u8a9e", "ka" : "\u10E5\u10D0\u10E0\u10D7\u10E3\u10DA\u10D8", "ko" : "\ud55c\uad6d\uc5b4", + "mk" : "\u041c\u0430\u043a\u0435\u0434\u043e\u043d\u0441\u043a\u0438", "nl" : "Nederlands", "nb" : "Norsk bokmå\u0345l", "pl" : "Polski",

1 0

[torbutton/master] Release preparations for 2.2.1
by gk＠torproject.org 04 Jul '19

04 Jul '19

commit cbf7172b5daa49ab53542c7757a64ddbabb29dce Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 4 16:11:16 2019 +0000 Release preparations for 2.2.1 CHANGELOG update and version bump --- src/CHANGELOG | 6 ++++++ src/install.rdf | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index e1b56304..ce95f237 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,9 @@ +2.2.1 + * Bug 30577: Add Fundraising Banner + * Bug 31041: Stop syncing network.cookie.lifetimePolicy + * Bug 30468: Add mk locale + * Translations update + 2.2 * Bug 30469: Add ro translation * Translations update diff --git a/src/install.rdf b/src/install.rdf index 2d855202..79a4a6db 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>2.2</em:version> + <em:version>2.2.1</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[tor-browser-build/master] Bug 31058: Pick up correct tor-android-service commit
by gk＠torproject.org 04 Jul '19

04 Jul '19

commit b1ce9a7e79a9d75b1a6388a23bcff3afd64c06bf Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 4 16:44:21 2019 +0000 Bug 31058: Pick up correct tor-android-service commit --- projects/tor-android-service/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index e98f745..e269704 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -git_hash: 074285582eb6415431759738fcccc712d1e4bee3 +git_hash: f81e8f61fd83367aead34ae0ce3b397d2ed6a494 git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1

1 0

[torbutton/master] Translations update
by gk＠torproject.org 04 Jul '19

04 Jul '19

commit 016a6e44a67b5054c9d05b70d604ef4a62e56610 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 4 16:07:52 2019 +0000 Translations update --- src/chrome/locale/ka/aboutTor.dtd | 4 ++-- src/chrome/locale/mk/aboutTor.dtd | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/chrome/locale/ka/aboutTor.dtd b/src/chrome/locale/ka/aboutTor.dtd index 3cdf164e..c7b5bbff 100644 --- a/src/chrome/locale/ka/aboutTor.dtd +++ b/src/chrome/locale/ka/aboutTor.dtd @@ -31,5 +31,5 @@ <!ENTITY aboutTor.donationBanner.line2e "შეინარჩუნეთ Tor ძლიერი."> <!ENTITY aboutTor.donationBanner.buttonA "გაიღეთ თანხა"> -<!ENTITY aboutTor.donationBanner3.line1 "Automatic monthly donations keep Tor strong."> -<!ENTITY aboutTor.donationBanner3.line2 "Become a Defender of Privacy today."> +<!ENTITY aboutTor.donationBanner3.line1 "ყოველთვიური შემოწირულობები მეტად აძლიერებს Tor-ს."> +<!ENTITY aboutTor.donationBanner3.line2 "გახდით პირადულობის გუშაგი დღესვე!"> diff --git a/src/chrome/locale/mk/aboutTor.dtd b/src/chrome/locale/mk/aboutTor.dtd index 551ad217..bb87e67c 100644 --- a/src/chrome/locale/mk/aboutTor.dtd +++ b/src/chrome/locale/mk/aboutTor.dtd @@ -30,3 +30,6 @@ <!ENTITY aboutTor.newsletter.link_text "Пријавете се за Tor Вести."> <!ENTITY aboutTor.donationBanner.line2e "Чувај го Tor силен."> <!ENTITY aboutTor.donationBanner.buttonA "Донирај сега"> + +<!ENTITY aboutTor.donationBanner3.line1 "Automatic monthly donations keep Tor strong."> +<!ENTITY aboutTor.donationBanner3.line2 "Become a Defender of Privacy today.">

1 0