[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
commit 5bd87181faa909f32322a5ff09714e301af63654 Author: Translation commit botDate: Thu Nov 10 06:46:35 2016 + Update translations for torbutton-torbuttondtd --- ro/torbutton.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ro/torbutton.dtd b/ro/torbutton.dtd index 2c62c62..bf00200 100644 --- a/ro/torbutton.dtd +++ b/ro/torbutton.dtd @@ -2,7 +2,7 @@ - + @@ -12,7 +12,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd
commit f53524ca3f9f36d045328f486073355878d90232 Author: Translation commit botDate: Thu Nov 10 06:17:39 2016 + Update translations for tor-messenger-prefsdtd --- fr/prefs.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fr/prefs.dtd b/fr/prefs.dtd index 25e26bb..1e97d13 100644 --- a/fr/prefs.dtd +++ b/fr/prefs.dtd @@ -16,7 +16,7 @@ - - - + + + \ No newline at end of file ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-messenger-uiproperties_completed] Update translations for tor-messenger-uiproperties_completed
commit e7f02a0e05b60c01b1fcfcc62dd59b7d29beca7d Author: Translation commit botDate: Wed Nov 9 23:18:03 2016 + Update translations for tor-messenger-uiproperties_completed --- id/ui.properties | 27 +++ 1 file changed, 27 insertions(+) diff --git a/id/ui.properties b/id/ui.properties new file mode 100644 index 000..96d6f13 --- /dev/null +++ b/id/ui.properties @@ -0,0 +1,27 @@ +start.label=Mulai percakapan privat +end.label=Akhiri percakapan privat +refresh.label=Segarkan percakapan privat +auth.label=Verifikasi identitas kontak Anda +auth.cancel=Batal +auth.cancelAccessKey=C +auth.error=Terjadi kesalahan saat memverifikasi identitas kontak anda. +auth.success=Verifikasi identitas kontak anda telah berhasil. +auth.successThem=Kontak anda telah berhasi memverifikasi identitas anda. Anda juga mungkin ingin memverifikasi identitas mereka dengan menanyakan pertanyaan anda sendiri. +auth.fail=Gagal memverifikasi identitas kontak anda. +auth.waiting=Menunggu kontak... +reauth.label=Verifikasi ulang identitas kontak Anda +prefs.label=Preferensi OTR +alert.start=Mencoba memulai percakapan privat dengan %S. +alert.refresh=Mencoba untuk menyegarkan percakapan privat dengan %S. +alert.gone_insecure=Percakapan privat dengan %S telah berakhir. +finger.seen=%S menghubungi Anda dari komputer yang tidak dikenal. Anda harus memverifikasi identitas kontak ini. +finger.unseen=Identitas %S belum diverifikasi. Anda harus memverifikasi identitas kontak ini. +finger.verify=Verifikasi +verify.accessKey=V +state.not_private=Percakapan ini tidak privat. +state.unverified=Percakapan ini privat tetapi identitas %S belum diverifikasi. +state.private=Percakapan ini privat dan identitas %S telah diverifikasi. +state.finished=%S telah mengakhiri percakapan privat dengan Anda; Anda harus melakukan hal yang sama. +afterauth.private=Anda telah memverifikasi identitas %S. +afterauth.unverified=Identitas %S belum diverifikasi. +buddycontextmenu.label=Tambah sidik jari kontak ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-messenger-uiproperties] Update translations for tor-messenger-uiproperties
commit 2675bf363aab6f85211e9eb3008d6b49d1eff69d Author: Translation commit botDate: Wed Nov 9 23:17:59 2016 + Update translations for tor-messenger-uiproperties --- id/ui.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/id/ui.properties b/id/ui.properties index 8e3ba2b..96d6f13 100644 --- a/id/ui.properties +++ b/id/ui.properties @@ -4,10 +4,10 @@ refresh.label=Segarkan percakapan privat auth.label=Verifikasi identitas kontak Anda auth.cancel=Batal auth.cancelAccessKey=C -auth.error=An error occurred while verifying your contact's identity. +auth.error=Terjadi kesalahan saat memverifikasi identitas kontak anda. auth.success=Verifikasi identitas kontak anda telah berhasil. -auth.successThem=Your contact has successfully verified your identity. You may want to verify their identity as well by asking your own question. -auth.fail=Failed to verify your contact's identity. +auth.successThem=Kontak anda telah berhasi memverifikasi identitas anda. Anda juga mungkin ingin memverifikasi identitas mereka dengan menanyakan pertanyaan anda sendiri. +auth.fail=Gagal memverifikasi identitas kontak anda. auth.waiting=Menunggu kontak... reauth.label=Verifikasi ulang identitas kontak Anda prefs.label=Preferensi OTR ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd
commit 3c1c5f75e9128f2a02cb147ff8cc073634c53489 Author: Translation commit botDate: Wed Nov 9 23:17:42 2016 + Update translations for tor-messenger-prefsdtd --- id/prefs.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/id/prefs.dtd b/id/prefs.dtd index cd7fa35..ac30e0e 100644 --- a/id/prefs.dtd +++ b/id/prefs.dtd @@ -19,4 +19,4 @@ - \ No newline at end of file + \ No newline at end of file ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-messenger-prefsdtd_completed] Update translations for tor-messenger-prefsdtd_completed
commit 9874761011331f752ee46219ea6fe4aa0229b36a Author: Translation commit botDate: Wed Nov 9 23:17:46 2016 + Update translations for tor-messenger-prefsdtd_completed --- id/prefs.dtd | 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/id/prefs.dtd b/id/prefs.dtd index b2391ca..ac30e0e 100644 --- a/id/prefs.dtd +++ b/id/prefs.dtd @@ -1,4 +1,6 @@ + + @@ -10,4 +12,11 @@ - \ No newline at end of file + + + + + + + + \ No newline at end of file ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
commit 0bd8c6f8c409e7427907bf1e2729cb50f0f8e43e Author: Translation commit botDate: Wed Nov 9 23:16:33 2016 + Update translations for torbutton-torbuttondtd --- id/torbutton.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/id/torbutton.dtd b/id/torbutton.dtd index 370d58a..7b81797 100644 --- a/id/torbutton.dtd +++ b/id/torbutton.dtd @@ -32,7 +32,7 @@ - + @@ -48,7 +48,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-iuk] Update translations for tails-iuk
commit c3501c5f0046e81d9ef1ba7a6291e1a5218c0a0c Author: Translation commit botDate: Wed Nov 9 22:46:41 2016 + Update translations for tails-iuk --- id.po | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/id.po b/id.po index 3280208..ab691d9 100644 --- a/id.po +++ b/id.po @@ -4,17 +4,18 @@ # # Translators: # cholif yulian , 2015 +# Frengky Sinaga , 2016 # Mohamad Hasan Al Banna , 2015 # km242saya , 2014 # yogipriyo , 2014 -# zk , 2015 +# zk, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers \n" "POT-Creation-Date: 2016-05-25 16:55+0200\n" -"PO-Revision-Date: 2016-05-26 08:49+\n" -"Last-Translator: carolyn \n" +"PO-Revision-Date: 2016-11-09 22:17+\n" +"Last-Translator: Frengky Sinaga \n" "Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -184,11 +185,11 @@ msgid "" "Could not choose a download server.\n" "\n" "This should not happen. Please report a bug." -msgstr "" +msgstr "Tidak dapat memilih server unduh\n\nHal ini seharusnya tidak terjadi. Silakan laporkan bug." #: ../lib/Tails/IUK/Frontend.pm:591 msgid "Error while choosing a download server" -msgstr "" +msgstr "Kesalahan saat memilih server unduh" #: ../lib/Tails/IUK/Frontend.pm:608 msgid "" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-iuk_completed] Update translations for tails-iuk_completed
commit 8b933884094c7a0f56d4d80c40ad5e08e4ea3ecc Author: Translation commit botDate: Wed Nov 9 22:46:45 2016 + Update translations for tails-iuk_completed --- id.po | 102 +- 1 file changed, 57 insertions(+), 45 deletions(-) diff --git a/id.po b/id.po index cb16010..ab691d9 100644 --- a/id.po +++ b/id.po @@ -4,17 +4,18 @@ # # Translators: # cholif yulian , 2015 +# Frengky Sinaga , 2016 # Mohamad Hasan Al Banna , 2015 # km242saya , 2014 # yogipriyo , 2014 -# zk , 2015 +# zk, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers \n" -"POT-Creation-Date: 2016-03-07 17:51+0100\n" -"PO-Revision-Date: 2016-03-21 16:27+\n" -"Last-Translator: Mohamad Hasan Al Banna \n" +"POT-Creation-Date: 2016-05-25 16:55+0200\n" +"PO-Revision-Date: 2016-11-09 22:17+\n" +"Last-Translator: Frengky Sinaga \n" "Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,18 +23,18 @@ msgstr "" "Language: id\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../lib/Tails/IUK/Frontend.pm:146 ../lib/Tails/IUK/Frontend.pm:522 -#: ../lib/Tails/IUK/Frontend.pm:662 +#: ../lib/Tails/IUK/Frontend.pm:148 ../lib/Tails/IUK/Frontend.pm:524 +#: ../lib/Tails/IUK/Frontend.pm:697 msgid "" "For debugging information, execute the following command: sudo tails-" "debugging-info" msgstr "Untuk informasi pengawakutuan, eksekusi perintah berikut: sudo tails-debugging-info" -#: ../lib/Tails/IUK/Frontend.pm:215 +#: ../lib/Tails/IUK/Frontend.pm:217 msgid "Error while checking for upgrades" msgstr "Galat saat memeriksa pemutakhiran" -#: ../lib/Tails/IUK/Frontend.pm:218 +#: ../lib/Tails/IUK/Frontend.pm:220 msgid "" "Could not determine whether an upgrade is available from our website.\n" "\n" @@ -42,64 +43,64 @@ msgid "" "If the problem persists, go to file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" msgstr "Tidak dapat menentukan apakah pemutakhiran tersedia dari situs web kami.\n\nPeriksa koneksi jaringan Anda, dan mulai ulang Tails untuk mencoba memutakhirkannya lagi.\n\nJika masalah tetap ada, kunjungi file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" -#: ../lib/Tails/IUK/Frontend.pm:233 +#: ../lib/Tails/IUK/Frontend.pm:235 msgid "no automatic upgrade is available from our website for this version" msgstr "tidak ada pemutakhiran otomatis yang tersedia di situs kami untuk versi ini" -#: ../lib/Tails/IUK/Frontend.pm:239 +#: ../lib/Tails/IUK/Frontend.pm:241 msgid "your device was not created using Tails Installer" msgstr "perangkat Anda tidak dibuat menggunakan Pemasang Tails" -#: ../lib/Tails/IUK/Frontend.pm:244 +#: ../lib/Tails/IUK/Frontend.pm:246 msgid "Tails was started from a DVD or a read-only device" msgstr "Tails telah dijalankan dari DVD atau perangkat baca-saja" -#: ../lib/Tails/IUK/Frontend.pm:249 +#: ../lib/Tails/IUK/Frontend.pm:251 msgid "there is not enough free space on the Tails system partition" msgstr "tidak cukup ruang kosong pada partisi sistem Tails" -#: ../lib/Tails/IUK/Frontend.pm:254 +#: ../lib/Tails/IUK/Frontend.pm:256 msgid "not enough memory is available on this system" msgstr "memori yang tersedia tidak cukup pada sistem ini" -#: ../lib/Tails/IUK/Frontend.pm:260 +#: ../lib/Tails/IUK/Frontend.pm:262 #, perl-brace-format msgid "No explanation available for reason '%{reason}s'." msgstr "Tidak ada penjelasan yang tersedia untuk '%{reason}s'." -#: ../lib/Tails/IUK/Frontend.pm:280 +#: ../lib/Tails/IUK/Frontend.pm:282 msgid "The system is up-to-date" msgstr "Sistem paling mutakhir" -#: ../lib/Tails/IUK/Frontend.pm:285 +#: ../lib/Tails/IUK/Frontend.pm:287 msgid "This version of Tails is outdated, and may have security issues." msgstr "Versi Tails ini sudah usang, dan mungkin memiliki banyak masalah keamanan." -#: ../lib/Tails/IUK/Frontend.pm:317 +#: ../lib/Tails/IUK/Frontend.pm:319 #, 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 "Pemutakhiran berjenjang yang ada membutuhkan ruang kosong sebesar %{space_needed}s pada sistem partisi Tails, tetapi hanya tersedia %{free_space}s." -#: ../lib/Tails/IUK/Frontend.pm:333 +#: ../lib/Tails/IUK/Frontend.pm:335 #, perl-brace-format msgid "" "The available incremental upgrade requires %{memory_needed}s of free memory," " but only %{free_memory}s is available." msgstr "Pemutakhiran berjenjang yang ada membutuhkan memori bebas sebesar %{memory_needed}s, tetapi hanya tersedia
[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
commit e06ebecd2ecd070e88ae2f28be4eaaca87cd0c1e Author: Translation commit botDate: Wed Nov 9 22:46:38 2016 + Update translations for torbutton-torbuttondtd --- id/torbutton.dtd | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/id/torbutton.dtd b/id/torbutton.dtd index aa69305..370d58a 100644 --- a/id/torbutton.dtd +++ b/id/torbutton.dtd @@ -11,9 +11,9 @@ - - - + + + @@ -27,10 +27,10 @@ - + - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-launcher-properties] Update translations for tor-launcher-properties
commit cfc33a0d0cb5fb7ce127c24f9ed3bbcefbf77aa5 Author: Translation commit botDate: Wed Nov 9 22:45:56 2016 + Update translations for tor-launcher-properties --- id/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/id/torlauncher.properties b/id/torlauncher.properties index f18c2dd..00c65ec 100644 --- a/id/torlauncher.properties +++ b/id/torlauncher.properties @@ -3,7 +3,7 @@ torlauncher.error_title=Tor Launcher -torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. +torlauncher.tor_exited_during_startup=Tor keluar ketika startup. Hal ini mungkin karena suatu kesalahan pada berkas torrc anda, bug pada Tor atau program lain pada sistem anda, atau kerusakan pada perangkat keras. Hingga anda memperbaiki masalah tersebut dan mulai ulang Tor, Tor Browser tidak akan dijalankan. torlauncher.tor_exited=Tor keluar mendadak. Ini dapat terjadi karena bug dalam Tor, atau program lain di sistem Anda, atau kerusakan perangkat keras. Sampai anda memuat ulang Tor, Browser Tor tidak dapat mencapai situs web apapun. Jika masalah ini terus bertahan, mohon mengirimkan salinan dari log Tor Anda kepada tim pendukung. torlauncher.tor_exited2=Memuat ulang Tor tidak akan menutup tab browser Anda. torlauncher.tor_controlconn_failed=Tidak dapat tersambung pada port kontrol Tor. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
commit 8a0e57ff47dd5e8f2a81ccf510a382c74a06f545 Author: Translation commit botDate: Wed Nov 9 22:46:08 2016 + Update translations for tor-launcher-network-settings --- id/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/id/network-settings.dtd b/id/network-settings.dtd index ec6e8d4..c5815c6 100644 --- a/id/network-settings.dtd +++ b/id/network-settings.dtd @@ -65,7 +65,7 @@ - + https://bridges.torproject.org;> ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
commit 932c845d0f769c4a630ad2f279b00b7f9a048cea Author: Translation commit botDate: Wed Nov 9 22:46:11 2016 + Update translations for tor-launcher-network-settings_completed --- id/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/id/network-settings.dtd b/id/network-settings.dtd index 15c16e8..c5815c6 100644 --- a/id/network-settings.dtd +++ b/id/network-settings.dtd @@ -65,7 +65,7 @@ - + https://bridges.torproject.org;> ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
commit e6d2ee9462cdf7532f65584a11a8535f686f8d6d Author: Translation commit botDate: Wed Nov 9 22:45:59 2016 + Update translations for tor-launcher-properties_completed --- id/torlauncher.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/id/torlauncher.properties b/id/torlauncher.properties index 3605b08..00c65ec 100644 --- a/id/torlauncher.properties +++ b/id/torlauncher.properties @@ -3,6 +3,7 @@ torlauncher.error_title=Tor Launcher +torlauncher.tor_exited_during_startup=Tor keluar ketika startup. Hal ini mungkin karena suatu kesalahan pada berkas torrc anda, bug pada Tor atau program lain pada sistem anda, atau kerusakan pada perangkat keras. Hingga anda memperbaiki masalah tersebut dan mulai ulang Tor, Tor Browser tidak akan dijalankan. torlauncher.tor_exited=Tor keluar mendadak. Ini dapat terjadi karena bug dalam Tor, atau program lain di sistem Anda, atau kerusakan perangkat keras. Sampai anda memuat ulang Tor, Browser Tor tidak dapat mencapai situs web apapun. Jika masalah ini terus bertahan, mohon mengirimkan salinan dari log Tor Anda kepada tim pendukung. torlauncher.tor_exited2=Memuat ulang Tor tidak akan menutup tab browser Anda. torlauncher.tor_controlconn_failed=Tidak dapat tersambung pada port kontrol Tor. @@ -36,6 +37,7 @@ torlauncher.quit_win=Keluar torlauncher.done=Selesai. torlauncher.forAssistance=Untuk bantuan, hubungi $S +torlauncher.forAssistance2=Untuk bantuan, kunjungi %S torlauncher.copiedNLogMessages=Penyalinan selesai. %S log pesan Tor telah siap untuk ditempelkan ke dalam editor text atau pesan email. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
commit aa1e2450acc044b238c140a29db1371e57be48f4 Author: Translation commit botDate: Wed Nov 9 22:17:13 2016 + Update translations for torbutton-abouttorproperties --- id/abouttor.properties | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/id/abouttor.properties b/id/abouttor.properties index 2e88451..0a812a6 100644 --- a/id/abouttor.properties +++ b/id/abouttor.properties @@ -20,9 +20,9 @@ aboutTor.searchDC.privacy.link=https://disconnect.me/privasi # The following string is a link which replaces %2$S above. aboutTor.searchDC.search.link=https://cari.disconnect.me/ -aboutTor.donationBanner.donate=Donate Now! -aboutTor.donationBanner.heart=Tor is at the heart of Internet freedom -aboutTor.donationBanner.tagline1=Millions of People Depend on Tor for Online Security & Privacy -aboutTor.donationBanner.tagline2=A Network of People Protecting People -aboutTor.donationBanner.tagline3=Surveillance = Oppression -aboutTor.donationBanner.tagline4=Protecting Journalists, Activists & Whistleblowers Since 2006 +aboutTor.donationBanner.donate=Sumbang Sekarang! +aboutTor.donationBanner.heart=Tor merupakan jantung dari kebebasan Internet +aboutTor.donationBanner.tagline1=Jutaan Orang Bergantung pada Tor sebagai Keamanan & Privasi Online +aboutTor.donationBanner.tagline2=Jaringan dimana Orang Melindungi Orang +aboutTor.donationBanner.tagline3=Pengawasan=Penindasan +aboutTor.donationBanner.tagline4=Perlindungan Wartawan, Aktivis, dan Pelapor Sejak 2006 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-onioncircuits] Update translations for tails-onioncircuits
commit 33c18372d9b13105444cc7cd51f4147b3f981545 Author: Translation commit botDate: Wed Nov 9 22:17:31 2016 + Update translations for tails-onioncircuits --- id/onioncircuits.pot | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/id/onioncircuits.pot b/id/onioncircuits.pot index c5e3719..93da614 100644 --- a/id/onioncircuits.pot +++ b/id/onioncircuits.pot @@ -3,7 +3,8 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Al Kautsar , 2016 +# Nur Ad-Duja , 2016 +# Frengky Sinaga , 2016 # R. Gosal , 2016 # sony wiliyanto , 2016 msgid "" @@ -11,8 +12,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-31 14:42+0200\n" -"PO-Revision-Date: 2016-07-12 08:57+\n" -"Last-Translator: R. Gosal \n" +"PO-Revision-Date: 2016-11-09 22:16+\n" +"Last-Translator: Frengky Sinaga \n" "Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -38,7 +39,7 @@ msgstr "Status" #: ../onioncircuits:142 msgid "Click on a circuit for more detail about its Tor relays." -msgstr "" +msgstr "Tekan pada sirkuit untuk penjelasan selengkapnya tentang setiap relay Tor." #: ../onioncircuits:221 msgid "The connection to Tor was lost..." ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-onioncircuits_completed] Update translations for tails-onioncircuits_completed
commit 23cbf70da5c0e2e7ad42cb235db4f6d49d98cb45 Author: Translation commit botDate: Wed Nov 9 22:17:35 2016 + Update translations for tails-onioncircuits_completed --- id/onioncircuits.pot | 94 +--- 1 file changed, 45 insertions(+), 49 deletions(-) diff --git a/id/onioncircuits.pot b/id/onioncircuits.pot index fd590ef..93da614 100644 --- a/id/onioncircuits.pot +++ b/id/onioncircuits.pot @@ -3,15 +3,17 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Al Kautsar , 2016 +# Nur Ad-Duja , 2016 +# Frengky Sinaga , 2016 +# R. Gosal , 2016 # sony wiliyanto , 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-31 21:31+0200\n" -"PO-Revision-Date: 2016-05-27 01:34+\n" -"Last-Translator: sony wiliyanto \n" +"POT-Creation-Date: 2016-05-31 14:42+0200\n" +"PO-Revision-Date: 2016-11-09 22:16+\n" +"Last-Translator: Frengky Sinaga \n" "Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,74 +22,68 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #: ../onioncircuits:81 -msgid "" -"Cannot connect to the Tor daemon. Onion Circuits will try to reconnect..." -msgstr "Tidak dapat terhubung ke Tor daemon. Sirkuit Onion akan mencoba menghubungkan " +msgid "You are not connected to Tor yet..." +msgstr "Anda belum terhubung ke Tor..." -#: ../onioncircuits:94 +#: ../onioncircuits:95 msgid "Onion Circuits" msgstr "Sirkuit Onion" -#: ../onioncircuits:95 -msgid "Display Tor circuits and streams" -msgstr "Tampilan Sirkuit Tor dan sungai" - -#: ../onioncircuits:107 -msgid "OK" -msgstr "OK" - -#: ../onioncircuits:124 -msgid "Path" -msgstr "Path" - #: ../onioncircuits:125 +msgid "Circuit" +msgstr "Sirkuit" + +#: ../onioncircuits:126 msgid "Status" msgstr "Status" -#: ../onioncircuits:141 -msgid "Click on a path to get details" -msgstr "klik pada path untuk mendapatkan detail" +#: ../onioncircuits:142 +msgid "Click on a circuit for more detail about its Tor relays." +msgstr "Tekan pada sirkuit untuk penjelasan selengkapnya tentang setiap relay Tor." -#: ../onioncircuits:215 -msgid "" -"Lost connection to the Tor daemon. Onion Circuits will try to reconnect..." -msgstr "Kehilangan koneksi ke Tor daemon. Sirkuit Onion akan mencoba menghubungkan..." - -#: ../onioncircuits:232 -msgid "Connected to the Tor daemon! You can use now Onion Circuits." -msgstr "Terhubung ke Tor daemon! anda dapat menggunakan sirkuit Onion" +#: ../onioncircuits:221 +msgid "The connection to Tor was lost..." +msgstr "Koneksi ke Tor terputus..." -#: ../onioncircuits:314 -msgid "Building..." -msgstr "Membangun " +#: ../onioncircuits:317 +msgid "..." +msgstr "..." -#: ../onioncircuits:339 +#: ../onioncircuits:343 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: ../onioncircuits:564 +#: ../onioncircuits:554 +msgid "GeoIP database unavailable. No country information will be displayed." +msgstr "Database GeoIP tidak tersedia. Informasi negara tidak akan ditampilkan." + +#: ../onioncircuits:585 +#, c-format +msgid "%s (%s)" +msgstr "%s (%s)" + +#: ../onioncircuits:590 +#, c-format +msgid "%.2f Mb/s" +msgstr "%.2f Mb/detik" + +#: ../onioncircuits:592 ../onioncircuits:593 ../onioncircuits:594 +msgid "Unknown" +msgstr "Tidak diketahui" + +#: ../onioncircuits:607 msgid "Fingerprint:" msgstr "Sidik jari:" -#: ../onioncircuits:565 +#: ../onioncircuits:608 msgid "Published:" msgstr "Diterbitkan:" -#: ../onioncircuits:566 +#: ../onioncircuits:609 msgid "IP:" msgstr "IP:" -#: ../onioncircuits:566 -#, c-format -msgid "%s (%s)" -msgstr "%s (%s)" - -#: ../onioncircuits:567 +#: ../onioncircuits:610 msgid "Bandwidth:" msgstr "Bandwidth:" - -#: ../onioncircuits:567 -#, c-format -msgid "%.2f Mb/s" -msgstr "%.2f Mb/detik" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed
commit d2e64725f57f927a6919b899c0be2107f3bcbb74 Author: Translation commit botDate: Wed Nov 9 22:17:16 2016 + Update translations for torbutton-abouttorproperties_completed --- id/abouttor.properties | 7 +++ 1 file changed, 7 insertions(+) diff --git a/id/abouttor.properties b/id/abouttor.properties index 3fa07ec..0a812a6 100644 --- a/id/abouttor.properties +++ b/id/abouttor.properties @@ -19,3 +19,10 @@ aboutTor.searchDC.privacy=Cari secara aman dengan https://disconnect.me/privasi # The following string is a link which replaces %2$S above. aboutTor.searchDC.search.link=https://cari.disconnect.me/ + +aboutTor.donationBanner.donate=Sumbang Sekarang! +aboutTor.donationBanner.heart=Tor merupakan jantung dari kebebasan Internet +aboutTor.donationBanner.tagline1=Jutaan Orang Bergantung pada Tor sebagai Keamanan & Privasi Online +aboutTor.donationBanner.tagline2=Jaringan dimana Orang Melindungi Orang +aboutTor.donationBanner.tagline3=Pengawasan=Penindasan +aboutTor.donationBanner.tagline4=Perlindungan Wartawan, Aktivis, dan Pelapor Sejak 2006 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed
commit 4af46c92b52c20ab6cc41b7a709e6736250eb1c8 Author: Translation commit botDate: Wed Nov 9 22:16:22 2016 + Update translations for tails-misc_completed --- id.po | 241 -- 1 file changed, 41 insertions(+), 200 deletions(-) diff --git a/id.po b/id.po index ca06274..80d848a 100644 --- a/id.po +++ b/id.po @@ -3,21 +3,22 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Astryd Viandila Dahlan , 2015 +# Astryd Viandila Dahlan, 2015 # cholif yulian , 2015 # Dwi Cahyono , 2015 +# Frengky Sinaga , 2016 # Ibnu Daru Aji, 2014 # Mohamad Hasan Al Banna , 2015 # L1Nus , 2014 -# zk , 2015-2016 -# zk , 2015 +# zk, 2015-2016 +# zk, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-17 15:03+0100\n" -"PO-Revision-Date: 2016-03-21 16:27+\n" -"Last-Translator: zk \n" +"POT-Creation-Date: 2016-09-19 13:02+0200\n" +"PO-Revision-Date: 2016-11-09 22:14+\n" +"Last-Translator: Frengky Sinaga \n" "Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -66,215 +67,67 @@ msgid "Do you want to start Electrum anyway?" msgstr "Apakah Anda tetap ingin memulai Electrum?" #: config/chroot_local-includes/usr/local/bin/electrum:23 -#: config/chroot_local-includes/usr/local/bin/icedove:23 +#: config/chroot_local-includes/usr/local/bin/icedove:37 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41 msgid "_Launch" msgstr "_Luncurkan" #: config/chroot_local-includes/usr/local/bin/electrum:24 -#: config/chroot_local-includes/usr/local/bin/icedove:24 +#: config/chroot_local-includes/usr/local/bin/icedove:38 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42 msgid "_Exit" msgstr "_Keluar" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:136 -msgid "OpenPGP encryption applet" -msgstr "Applet enkripsi OpenPGP" - -#: config/chroot_local-includes/usr/local/bin/gpgApplet:139 -msgid "Exit" -msgstr "Keluar" - -#: config/chroot_local-includes/usr/local/bin/gpgApplet:141 -msgid "About" -msgstr "Tentang" - -#: config/chroot_local-includes/usr/local/bin/gpgApplet:192 -msgid "Encrypt Clipboard with _Passphrase" -msgstr "Enkripsikan Papan Klip dengan _Frasa Sandi" - -#: config/chroot_local-includes/usr/local/bin/gpgApplet:195 -msgid "Sign/Encrypt Clipboard with Public _Keys" -msgstr "Tandai/Enkripsi Papan Klip dengan _Kunci Publik" - -#: config/chroot_local-includes/usr/local/bin/gpgApplet:200 -msgid "_Decrypt/Verify Clipboard" -msgstr "_Dekrip/Verifikasi Papan Klip" - -#: config/chroot_local-includes/usr/local/bin/gpgApplet:204 -msgid "_Manage Keys" -msgstr "_Kelola Kunci" - -#: config/chroot_local-includes/usr/local/bin/gpgApplet:208 -msgid "_Open Text Editor" -msgstr "_Buka Penyunting Teks" - -#: config/chroot_local-includes/usr/local/bin/gpgApplet:252 -msgid "The clipboard does not contain valid input data." -msgstr "Papan klip ini tidak berisi data masukan yang valid." - -#: config/chroot_local-includes/usr/local/bin/gpgApplet:303 -#: config/chroot_local-includes/usr/local/bin/gpgApplet:305 -#: config/chroot_local-includes/usr/local/bin/gpgApplet:307 -msgid "Unknown Trust" -msgstr "Kepercayaan Tidak Dikenal" - -#: config/chroot_local-includes/usr/local/bin/gpgApplet:309 -msgid "Marginal Trust" -msgstr "Kepercayaan Marginal" - -#: config/chroot_local-includes/usr/local/bin/gpgApplet:311 -msgid "Full Trust" -msgstr "Kepercayaan Penuh" - -#: config/chroot_local-includes/usr/local/bin/gpgApplet:313 -msgid "Ultimate Trust" -msgstr "Kepercayaan Tertinggi" - -#: config/chroot_local-includes/usr/local/bin/gpgApplet:366 -msgid "Name" -msgstr "Nama" - -#: config/chroot_local-includes/usr/local/bin/gpgApplet:367 -msgid "Key ID" -msgstr "ID Kunci" - -#: config/chroot_local-includes/usr/local/bin/gpgApplet:368 -msgid "Status" -msgstr "Status" - -#: config/chroot_local-includes/usr/local/bin/gpgApplet:400 -msgid "Fingerprint:" -msgstr "Sidik jari:" - -#: config/chroot_local-includes/usr/local/bin/gpgApplet:403 -msgid "User ID:" -msgid_plural "User IDs:" -msgstr[0] "ID Pengguna:" - -#: config/chroot_local-includes/usr/local/bin/gpgApplet:433 -msgid "None (Don't sign)" -msgstr "Tidak ada (Jangan tandai)" - -#: config/chroot_local-includes/usr/local/bin/gpgApplet:496 -msgid "Select recipients:" -msgstr "Pilih penerima:" - -#: config/chroot_local-includes/usr/local/bin/gpgApplet:504 -msgid "Hide recipients" -msgstr "Sembunyikan penerima" - -#: config/chroot_local-includes/usr/local/bin/gpgApplet:507 -msgid "" -"Hide the user IDs of all
[tor-commits] [translation/tails-misc] Update translations for tails-misc
commit 2700408269392efe94eb0059bfcc5b6d22b16c00 Author: Translation commit botDate: Wed Nov 9 22:16:19 2016 + Update translations for tails-misc --- id.po | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/id.po b/id.po index e079637..80d848a 100644 --- a/id.po +++ b/id.po @@ -6,6 +6,7 @@ # Astryd Viandila Dahlan, 2015 # cholif yulian , 2015 # Dwi Cahyono , 2015 +# Frengky Sinaga , 2016 # Ibnu Daru Aji, 2014 # Mohamad Hasan Al Banna , 2015 # L1Nus , 2014 @@ -15,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-02 16:02+0200\n" -"PO-Revision-Date: 2016-09-03 08:57+\n" -"Last-Translator: carolyn \n" +"POT-Creation-Date: 2016-09-19 13:02+0200\n" +"PO-Revision-Date: 2016-11-09 22:14+\n" +"Last-Translator: Frengky Sinaga \n" "Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -93,7 +94,7 @@ msgid "" "If you already migrated your emails to Icedove, you should delete" " all your Claws Mail data to remove this warning." -msgstr "" +msgstr "Jika anda telah melakukan migrasi email ke Icedove anda harus menghapus semua data Mail Claw untuk menghilangkan peringatan ini." #: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-hel...@tails.boum.org/extension.js:71 msgid "Restart" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere] Update translations for https_everywhere
commit bcdc36b0f363630680b185e15a7ca22bc9733cdc Author: Translation commit botDate: Wed Nov 9 22:15:23 2016 + Update translations for https_everywhere --- id/https-everywhere.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/id/https-everywhere.dtd b/id/https-everywhere.dtd index 8c5a913..e7037a0 100644 --- a/id/https-everywhere.dtd +++ b/id/https-everywhere.dtd @@ -5,7 +5,7 @@ - + @@ -20,7 +20,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed
commit a6c2be1456d37ca37297e7e0e65f1ccafd31a8d4 Author: Translation commit botDate: Wed Nov 9 22:15:31 2016 + Update translations for https_everywhere_completed --- id/https-everywhere.dtd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/id/https-everywhere.dtd b/id/https-everywhere.dtd index bae2bef..e7037a0 100644 --- a/id/https-everywhere.dtd +++ b/id/https-everywhere.dtd @@ -5,6 +5,7 @@ + @@ -19,7 +20,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed
commit 15128fcc9856b052a85e7fa2d18675bcc3184846 Author: Translation commit botDate: Wed Nov 9 20:47:17 2016 + Update translations for torbutton-abouttorproperties_completed --- ru/abouttor.properties | 7 +++ 1 file changed, 7 insertions(+) diff --git a/ru/abouttor.properties b/ru/abouttor.properties index 07d591c..055faae 100644 --- a/ru/abouttor.properties +++ b/ru/abouttor.properties @@ -19,3 +19,10 @@ aboutTor.searchDC.privacy=ÐÑиÑе конÑиденÑиалÑн 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.donate=ÐожеÑÑвоваÑÑ ÑейÑаÑ! +aboutTor.donationBanner.heart=Tor ÑÑо ÑеÑдÑе ÑÐ²Ð¾Ð±Ð¾Ð´Ñ ÐнÑеÑнеÑа +aboutTor.donationBanner.tagline1=ÐÐ¸Ð»Ð»Ð¸Ð¾Ð½Ñ Ð»Ñдей завиÑÑÑ Ð¾Ñ Tor в онлайн-безопаÑноÑÑи и конÑиденÑиалÑноÑÑи +aboutTor.donationBanner.tagline2=СеÑÑ Ð»Ñдей, заÑиÑаÑÑÐ¸Ñ Ð»Ñдей +aboutTor.donationBanner.tagline3=ÐаблÑдение = УгнеÑение +aboutTor.donationBanner.tagline4=ÐаÑиÑа жÑÑналиÑÑов, акÑивиÑÑов и инÑоÑмаÑоÑов Ñ 2006 года ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
commit dafb15ea75e11998d486d2499dc5aa09aceca77c Author: Translation commit botDate: Wed Nov 9 20:46:42 2016 + Update translations for torbutton-torbuttondtd --- ru/torbutton.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ru/torbutton.dtd b/ru/torbutton.dtd index de02dd2..c5c989a 100644 --- a/ru/torbutton.dtd +++ b/ru/torbutton.dtd @@ -11,9 +11,9 @@ - - - + + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
commit 1f6ef1ee2becb04e2b30878fd55417d84e13b46c Author: Translation commit botDate: Wed Nov 9 20:47:13 2016 + Update translations for torbutton-abouttorproperties --- ru/abouttor.properties | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ru/abouttor.properties b/ru/abouttor.properties index 4d33808..055faae 100644 --- a/ru/abouttor.properties +++ b/ru/abouttor.properties @@ -20,9 +20,9 @@ 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.donate=Donate Now! -aboutTor.donationBanner.heart=Tor is at the heart of Internet freedom -aboutTor.donationBanner.tagline1=Millions of People Depend on Tor for Online Security & Privacy -aboutTor.donationBanner.tagline2=A Network of People Protecting People -aboutTor.donationBanner.tagline3=Surveillance = Oppression -aboutTor.donationBanner.tagline4=Protecting Journalists, Activists & Whistleblowers Since 2006 +aboutTor.donationBanner.donate=ÐожеÑÑвоваÑÑ ÑейÑаÑ! +aboutTor.donationBanner.heart=Tor ÑÑо ÑеÑдÑе ÑÐ²Ð¾Ð±Ð¾Ð´Ñ ÐнÑеÑнеÑа +aboutTor.donationBanner.tagline1=ÐÐ¸Ð»Ð»Ð¸Ð¾Ð½Ñ Ð»Ñдей завиÑÑÑ Ð¾Ñ Tor в онлайн-безопаÑноÑÑи и конÑиденÑиалÑноÑÑи +aboutTor.donationBanner.tagline2=СеÑÑ Ð»Ñдей, заÑиÑаÑÑÐ¸Ñ Ð»Ñдей +aboutTor.donationBanner.tagline3=ÐаблÑдение = УгнеÑение +aboutTor.donationBanner.tagline4=ÐаÑиÑа жÑÑналиÑÑов, акÑивиÑÑов и инÑоÑмаÑоÑов Ñ 2006 года ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-messenger-build/master] Use tor-browser 6.0.5
commit 2abdfc10e7fbac7c73cff33665985b4d89af6b25 Author: Arlo BreaultDate: Wed Nov 9 12:46:18 2016 -0800 Use tor-browser 6.0.5 --- projects/tor-browser/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 15e73ff..0ea0dcd 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 6.0.4 +version: 6.0.5 filename: 'tor-browser-[% c("version") %]-[% c("var/osname") %].[% c("var/extension") %]' input_files: ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator
commit 08feb150ffaf98284d85e8177cafa6f2101024a7 Author: Translation commit botDate: Wed Nov 9 20:45:29 2016 + Update translations for liveusb-creator --- ru/ru.po | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ru/ru.po b/ru/ru.po index a81f65b..3320130 100644 --- a/ru/ru.po +++ b/ru/ru.po @@ -4,6 +4,7 @@ # # Translators: # ÐнаÑолий ÐÑÑÑков , 2009 +# Andrey, 2016 # ÐнÑон ТолмаÑев , 2015 # Den Arefyev <>, 2012 # Denis Denis , 2014 @@ -24,8 +25,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: 2016-05-02 03:02+\n" -"Last-Translator: ÐндÑей ÐоÑÑÑиков \n" +"PO-Revision-Date: 2016-11-09 20:42+\n" +"Last-Translator: Andrey\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" @@ -295,7 +296,7 @@ msgstr "Раздел FAT16: Ð Ð°Ð·Ð¼ÐµÑ Ð¾Ð²ÐµÑÐ»ÐµÑ Ð²Ð¾Ð·Ð¼Ð¾Ð¶ÐµÐ½ не б #: ../liveusb/gui.py:565 msgid "Partition is FAT32; Restricting overlay size to 4G" -msgstr "Раздел оÑÑоÑмаÑиÑован в FAT32; Ð Ð°Ð·Ð¼ÐµÑ Ð¿Ð¾ÑÑоÑнного Ñ ÑанилиÑа огÑаниÑен 4G" +msgstr "Раздел оÑÑоÑмаÑиÑован в FAT32; Ð Ð°Ð·Ð¼ÐµÑ Ð¿Ð¾ÑÑоÑнного Ñ ÑанилиÑа огÑаниÑен 4 ÐÐ" #: ../liveusb/creator.py:236 ../liveusb/creator.py:866 #, python-format ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
commit 0042c73ca56d461aa0a94d39322051d94e10f586 Author: Translation commit botDate: Wed Nov 9 20:45:33 2016 + Update translations for liveusb-creator_completed --- ru/ru.po | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ru/ru.po b/ru/ru.po index a81f65b..3320130 100644 --- a/ru/ru.po +++ b/ru/ru.po @@ -4,6 +4,7 @@ # # Translators: # ÐнаÑолий ÐÑÑÑков , 2009 +# Andrey, 2016 # ÐнÑон ТолмаÑев , 2015 # Den Arefyev <>, 2012 # Denis Denis , 2014 @@ -24,8 +25,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: 2016-05-02 03:02+\n" -"Last-Translator: ÐндÑей ÐоÑÑÑиков \n" +"PO-Revision-Date: 2016-11-09 20:42+\n" +"Last-Translator: Andrey\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" @@ -295,7 +296,7 @@ msgstr "Раздел FAT16: Ð Ð°Ð·Ð¼ÐµÑ Ð¾Ð²ÐµÑÐ»ÐµÑ Ð²Ð¾Ð·Ð¼Ð¾Ð¶ÐµÐ½ не б #: ../liveusb/gui.py:565 msgid "Partition is FAT32; Restricting overlay size to 4G" -msgstr "Раздел оÑÑоÑмаÑиÑован в FAT32; Ð Ð°Ð·Ð¼ÐµÑ Ð¿Ð¾ÑÑоÑнного Ñ ÑанилиÑа огÑаниÑен 4G" +msgstr "Раздел оÑÑоÑмаÑиÑован в FAT32; Ð Ð°Ð·Ð¼ÐµÑ Ð¿Ð¾ÑÑоÑнного Ñ ÑанилиÑа огÑаниÑен 4 ÐÐ" #: ../liveusb/creator.py:236 ../liveusb/creator.py:866 #, python-format ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/maint-6.0] Revert "Upgrade Go to 1.6.3."
commit a10a5a000c5eaf294d7afc01ba4c6b9af9f67e50 Author: Georg KoppenDate: Wed Nov 9 20:38:09 2016 + Revert "Upgrade Go to 1.6.3." This reverts commit 3dee56db1330daa8df7e4d0c90d88bff17b80fec. --- .../linux/gitian-pluggable-transports.yml | 12 -- .../mac/gitian-pluggable-transports.yml| 27 + .../windows/gitian-pluggable-transports.yml| 28 +- gitian/fetch-inputs.sh | 5 ++-- gitian/verify-tags.sh | 2 +- gitian/versions| 9 ++- gitian/versions.alpha | 9 ++- gitian/versions.beta | 9 ++- gitian/versions.nightly| 9 ++- 9 files changed, 23 insertions(+), 87 deletions(-) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index a1cdc48..38ae561 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -46,7 +46,6 @@ files: - "zope.interface.zip" - "twisted.tar.bz2" - "parsley.tar.gz" -- "go14.tar.gz" - "go.tar.gz" - "dzip.sh" - "gmp-linux32-utils.zip" @@ -75,17 +74,6 @@ script: | # FTE only needs libgmp.so.10 and no libgmpxx anymore. cp $INSTDIR/gmp/lib/libgmp.so.10 $INSTDIR/Tor - # Building go 1.4.x - # This is needed to bootstrap the go that we actually use - # https://golang.org/doc/install/source#go14 - tar xvf go14.tar.gz --transform='s,^go\>,go1.4,' - cd go1.4/src - # Disable cgo to avoid conflicts with newer GCC. cgo is not needed for the bootstrap go. - # https://github.com/golang/go/issues/13114#issuecomment-186922245 - CGO_ENABLED=0 ./make.bash - cd ../.. - export GOROOT_BOOTSTRAP="$PWD/go1.4" - # Building go # http://golang.org/doc/install/source#environment export GOPATH="$HOME/go" diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 33b134e..fbf38c2 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -45,7 +45,6 @@ files: - "zope.interface.zip" - "twisted.tar.bz2" - "parsley.tar.gz" -- "go14.tar.gz" - "go.tar.gz" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" @@ -104,33 +103,19 @@ script: | export CXXFLAGS="-m64 -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5 -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1$FTE_EXTRA_CFLAGS" export LDFLAGS="-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5" - # Building go 1.4.x - # This is needed to bootstrap the go that we actually use - # https://golang.org/doc/install/source#go14 - tar xvf go14.tar.gz --transform='s,^go\>,go1.4,' - cd go1.4/src - # Disable cgo to avoid conflicts with newer GCC. cgo is not needed for the bootstrap go. - # https://github.com/golang/go/issues/13114#issuecomment-186922245 - # Disable CC etc. that are set up for cross builds. - CGO_ENABLED=0 CC= CFLAGS= LDFLAGS= ./make.bash - cd ../.. - export GOROOT_BOOTSTRAP="$PWD/go1.4" - # Building go - # Create a cc-for-target script that closes over CC, CFLAGS, and LDFLAGS. - # Go's CC_FOR_TARGET only allows a command name, not a command with arguments. - # https://github.com/golang/go/issues/15457 - CC_FOR_TARGET="$(pwd)/cc-for-target" - echo "#!/bin/sh" > "$CC_FOR_TARGET" - echo "exec $CC $CFLAGS $LDFLAGS \"\$@\"" >> "$CC_FOR_TARGET" - chmod +x "$CC_FOR_TARGET" # http://golang.org/doc/install/source#environment export GOPATH="$HOME/go" export GOOS=darwin export GOARCH=386 tar xvf go.tar.gz cd go/src - CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash + # http://golang.org/cmd/cgo/: + # "To enable cgo during cross compiling builds, set the CGO_ENABLED + # environment variable to 1 when building the Go tools with make.bash. Also, + # set CC_FOR_TARGET to the C cross compiler for the target. CC will be used + # for compiling for the host." + CGO_ENABLED=1 CC_FOR_TARGET="$CC $CFLAGS $LDFLAGS" CC= CFLAGS= LDFLAGS= ./make.bash cd ../.. export PATH="$PATH:$PWD/go/bin" diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 7e8a349..f073fd1 100644 ---
[tor-commits] [tor-browser-bundle/maint-6.0] Revert "Bug 20023: Upgrade Go to 1.7.3."
commit 8e93f0ddb6b018c6d5a28c2063554bb5174d9c45 Author: Georg KoppenDate: Wed Nov 9 20:37:53 2016 + Revert "Bug 20023: Upgrade Go to 1.7.3." This reverts commit 4a0bf1ed2578e3e742e00f95385f914a241904fd. --- gitian/descriptors/mac/gitian-pluggable-transports.yml | 12 +--- gitian/versions| 4 ++-- gitian/versions.alpha | 4 ++-- gitian/versions.beta | 4 ++-- gitian/versions.nightly| 4 ++-- 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 519a3ee..33b134e 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -48,7 +48,6 @@ files: - "go14.tar.gz" - "go.tar.gz" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" -- "MacOSX10.7.sdk.tar.gz" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "dzip.sh" - "gmp-mac64-utils.zip" @@ -83,8 +82,6 @@ script: | export PATH="/usr/sbin:/sbin:$PATH" sudo dpkg -i *.deb tar xaf multiarch-darwin*tar.xz - # The 10.7 SDK is needed for Go: https://bugs.torproject.org/20023#comment:6 - tar xaf MacOSX10.7.sdk.tar.gz export PATH="$PATH:$HOME/build/apple-osx/bin/" if [ "z$INCLUDE_FTE" = "z1" ]; then unzip -d $INSTDIR gmp-mac64-utils.zip @@ -102,6 +99,10 @@ script: | export CXX=$HOME/build/apple-osx/bin/i686-apple-darwin11-g++ # http://bugs.python.org/issue9437 export LDSHARED="$CC -pthread -shared" + # XXX Clean up these flags? + export CFLAGS="-m64 -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5 -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1$FTE_EXTRA_CFLAGS" + export CXXFLAGS="-m64 -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5 -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1$FTE_EXTRA_CFLAGS" + export LDFLAGS="-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5" # Building go 1.4.x # This is needed to bootstrap the go that we actually use @@ -121,7 +122,7 @@ script: | # https://github.com/golang/go/issues/15457 CC_FOR_TARGET="$(pwd)/cc-for-target" echo "#!/bin/sh" > "$CC_FOR_TARGET" - echo "exec $CC $CFLAGS $LDFLAGS -isysroot $HOME/build/MacOSX10.7.sdk -std=gnu99 \"\$@\"" >> "$CC_FOR_TARGET" + echo "exec $CC $CFLAGS $LDFLAGS \"\$@\"" >> "$CC_FOR_TARGET" chmod +x "$CC_FOR_TARGET" # http://golang.org/doc/install/source#environment export GOPATH="$HOME/go" @@ -129,9 +130,6 @@ script: | export GOARCH=386 tar xvf go.tar.gz cd go/src - # Remove a preprocessor directive that causes problems when building with the 10.7 SDK. - # https://github.com/golang/go/issues/17732 - sed -i -e '/^#cgo CFLAGS:/s/-D__MAC_OS_X_VERSION_MAX_ALLOWED=1060//' crypto/x509/root_cgo_darwin.go CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash cd ../.. export PATH="$PATH:$PWD/go/bin" diff --git a/gitian/versions b/gitian/versions index 2be65b4..387b7c5 100755 --- a/gitian/versions +++ b/gitian/versions @@ -62,7 +62,7 @@ SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 # We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 GO14_VER=1.4.3 -GO_VER=1.7.3 +GO_VER=1.6.3 NSIS_VER=2.51 ## File names for the source packages @@ -114,7 +114,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=79430a0027a09b0b3ad57e214c4c1acfdd7af290961dd08d322818895af1ef44 +GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 68be3f3..d6044ce 100755 --- a/gitian/versions.alpha +++
[tor-commits] [tor-browser-bundle/maint-6.0] Remove the Go update from Changelog
commit fe44fa5dc3e1eb5889f64114d0a8a03d144e7891 Author: Georg KoppenDate: Wed Nov 9 20:40:21 2016 + Remove the Go update from Changelog --- Bundle-Data/Docs/ChangeLog.txt | 4 1 file changed, 4 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index b2a0719..0758477 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -21,10 +21,6 @@ Tor Browser 6.0.6 -- November 15 * Bug 20342: Add tor-gencert.exe to expert bundle * OS X * Bug 20204: Windows don't drag on macOS Sierra anymore - * Bug 20250: Meek fails on macOS Sierra if built with Go < 1.7 - * Build system - * All platforms - * Bug 20023: Upgrade Go to 1.7.3 Tor Browser 6.0.5 -- September 16 * All Platforms ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
commit cf96c11d90186d2a5a6aff8d2dad0b780c28e385 Author: Translation commit botDate: Wed Nov 9 19:46:18 2016 + Update translations for abouttor-homepage_completed --- fr/aboutTor.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fr/aboutTor.dtd b/fr/aboutTor.dtd index 3e41d4f..0fc5b1e 100644 --- a/fr/aboutTor.dtd +++ b/fr/aboutTor.dtd @@ -15,7 +15,7 @@ - + @@ -31,11 +31,11 @@ - + https://www.torproject.org/download/download.html#warning;> - + https://www.torproject.org/docs/tor-doc-relay.html;> ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-abouttbupdatedtd] Update translations for torbutton-abouttbupdatedtd
commit c656fe45d5606fa5cf8bde00067f945ca4fe7fa1 Author: Translation commit botDate: Wed Nov 9 19:47:17 2016 + Update translations for torbutton-abouttbupdatedtd --- fr/abouttbupdate.dtd | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fr/abouttbupdate.dtd b/fr/abouttbupdate.dtd index bbc32e1..fc83797 100644 --- a/fr/abouttbupdate.dtd +++ b/fr/abouttbupdate.dtd @@ -1,6 +1,6 @@ - - - - + + + + - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage
commit 2f6257e28c28d1dfc6325d91e8c0948d9c671792 Author: Translation commit botDate: Wed Nov 9 19:46:14 2016 + Update translations for abouttor-homepage --- fr/aboutTor.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fr/aboutTor.dtd b/fr/aboutTor.dtd index 3e41d4f..0fc5b1e 100644 --- a/fr/aboutTor.dtd +++ b/fr/aboutTor.dtd @@ -15,7 +15,7 @@ - + @@ -31,11 +31,11 @@ - + https://www.torproject.org/download/download.html#warning;> - + https://www.torproject.org/docs/tor-doc-relay.html;> ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-aboutdialogdtd_completed] Update translations for torbutton-aboutdialogdtd_completed
commit 526af0a9dc0b11643e484b9ee9203ccacc1e76cf Author: Translation commit botDate: Wed Nov 9 19:47:01 2016 + Update translations for torbutton-aboutdialogdtd_completed --- fr/aboutdialog.dtd | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/fr/aboutdialog.dtd b/fr/aboutdialog.dtd index e3dbd27..f37379c 100644 --- a/fr/aboutdialog.dtd +++ b/fr/aboutdialog.dtd @@ -1,19 +1,19 @@ - + - + - + - + - + - - + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-messenger-build/master] Pull in fixup for updater on tor-browser-45.5.0esr-6.0-1
commit a6048ed04fe0be8bc0a78b364d5b4864d26547f8 Author: Arlo BreaultDate: Wed Nov 9 11:50:42 2016 -0800 Pull in fixup for updater on tor-browser-45.5.0esr-6.0-1 --- projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch| 2 +- projects/mozilla/0002-Trac-16475-Block-flash-too.patch | 2 +- .../0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch | 2 +- .../0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch | 2 +- projects/mozilla/0005-OSX-package-as-tar.bz2.patch | 2 +- projects/mozilla/0006-Updater-fixups-for-TM.patch | 2 +- projects/mozilla/config | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch b/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch index 1ce4cfc..f365561 100644 --- a/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch +++ b/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch @@ -1,4 +1,4 @@ -From d05e3b60489252ad72c367af074432ab30251b3b Mon Sep 17 00:00:00 2001 +From 428362e2eee5c06ec84c6d52ff0327d1cbb8beda Mon Sep 17 00:00:00 2001 From: Arlo Breault Date: Mon, 10 Oct 2016 10:52:52 -0700 Subject: [PATCH 1/6] Trac 19910: Prevents STARTTLS in XMPP diff --git a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch index d4cc5a8..19481d3 100644 --- a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch +++ b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch @@ -1,4 +1,4 @@ -From 8f56d8580b3fb8a8355bc477d2353184ebf8ff31 Mon Sep 17 00:00:00 2001 +From 05842dca95a626ccdad123be15353b00ff03a7f0 Mon Sep 17 00:00:00 2001 From: Arlo Breault Date: Thu, 6 Oct 2016 20:13:35 -0700 Subject: [PATCH 2/6] Trac 16475: Block flash too diff --git a/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch b/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch index 667d46a..4cd9013 100644 --- a/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch +++ b/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch @@ -1,4 +1,4 @@ -From 6dcf4662033b55c53401ed57e7d25d22ccf3e15b Mon Sep 17 00:00:00 2001 +From 401acfb1085f0ac9de8628a4f87d522fccbae8b1 Mon Sep 17 00:00:00 2001 From: Jonathan Kew Date: Sun, 9 Oct 2016 09:18:37 -0700 Subject: [PATCH 3/6] Trac 20206: Avoid the need to download the font Osaka diff --git a/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch b/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch index 06c97ca..0331884 100644 --- a/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch +++ b/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch @@ -1,4 +1,4 @@ -From ed613224bf375dd049edccdb6f1de8cfc5f9a149 Mon Sep 17 00:00:00 2001 +From 283d30517d1795fff99c0c193eeabe06043b591b Mon Sep 17 00:00:00 2001 From: Arlo Breault Date: Wed, 23 Mar 2016 19:52:07 -0700 Subject: [PATCH 4/6] Trac 18331: Update OS X toolchain to work with ESR 45 diff --git a/projects/mozilla/0005-OSX-package-as-tar.bz2.patch b/projects/mozilla/0005-OSX-package-as-tar.bz2.patch index 927e8cf..18652a0 100644 --- a/projects/mozilla/0005-OSX-package-as-tar.bz2.patch +++ b/projects/mozilla/0005-OSX-package-as-tar.bz2.patch @@ -1,4 +1,4 @@ -From 283a123b62870f7f8060d6e9164082f25b67927b Mon Sep 17 00:00:00 2001 +From 386cca851618f0d19f7ce07483c0b290e178ce46 Mon Sep 17 00:00:00 2001 From: Nicolas Vigier Date: Thu, 25 Jun 2015 12:18:43 +0200 Subject: [PATCH 5/6] OSX: package as tar.bz2 diff --git a/projects/mozilla/0006-Updater-fixups-for-TM.patch b/projects/mozilla/0006-Updater-fixups-for-TM.patch index a0d7f47..0dd6a00 100644 --- a/projects/mozilla/0006-Updater-fixups-for-TM.patch +++ b/projects/mozilla/0006-Updater-fixups-for-TM.patch @@ -1,4 +1,4 @@ -From 94a4585f80a62a42f06e5433ba122e36ec60c418 Mon Sep 17 00:00:00 2001 +From 8f449e5b031577a45b80a58c798ad89bcf1ce2a6 Mon Sep 17 00:00:00 2001 From: Arlo Breault Date: Sun, 9 Oct 2016 09:34:38 -0700 Subject: [PATCH 6/6] Updater fixups for TM diff --git a/projects/mozilla/config b/projects/mozilla/config index ca7d2b0..1c224be 100644 --- a/projects/mozilla/config +++ b/projects/mozilla/config @@ -2,7 +2,7 @@ version: '[% c("abbrev") %]' filename: 'mozilla-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.torproject.org/tor-browser.git -git_hash: e5dafab84b9b073bf1e510a8272c6ca35b4e396d +git_hash: f0382d95b8145b91bae099024bce64a34523 input_files: - filename:
[tor-commits] [translation/torbutton-abouttbupdatedtd_completed] Update translations for torbutton-abouttbupdatedtd_completed
commit d903bccae5109a97a78a5882016452e3bab406cd Author: Translation commit botDate: Wed Nov 9 19:47:21 2016 + Update translations for torbutton-abouttbupdatedtd_completed --- fr/abouttbupdate.dtd | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fr/abouttbupdate.dtd b/fr/abouttbupdate.dtd index bbc32e1..fc83797 100644 --- a/fr/abouttbupdate.dtd +++ b/fr/abouttbupdate.dtd @@ -1,6 +1,6 @@ - - - - + + + + - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
commit d5f63687189c9e4de3d6d64ce20dca25cc79303a Author: Translation commit botDate: Wed Nov 9 19:47:05 2016 + Update translations for torbutton-abouttorproperties --- fr/abouttor.properties | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/fr/abouttor.properties b/fr/abouttor.properties index b92043e..174b286 100644 --- a/fr/abouttor.properties +++ b/fr/abouttor.properties @@ -2,27 +2,27 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=Rechercher de manière sécurisée avec Startpage. +aboutTor.searchSP.privacy=Rechercher en toute sécurité avec Startpage. # The following string is a link which replaces %1$S above. -aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +aboutTor.searchSP.privacy.link=https://startpage.com/fra/protect-privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchSP.search.link=https://startpage.com/ -aboutTor.searchDDG.privacy=Rechercher de manière sécurisée avec DuckDuckGo. +aboutTor.searchDDG.privacy=Rechercher en toute sécurité avec DuckDuckGo. # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ -aboutTor.searchDC.privacy=Rechercher de manière sécurisée avec Disconnect.me. +aboutTor.searchDC.privacy=Rechercher en toute sécurité avec Disconnect.me. # The following string is a link which replaces %1$S above. 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.donate=Faire un don ! -aboutTor.donationBanner.heart=Tor is at the heart of Internet freedom -aboutTor.donationBanner.tagline1=La sécurité et la vie privée en ligne de millions de personnes dépendent de Tor. -aboutTor.donationBanner.tagline2=Un réseau de personnes qui en protègent d'autres -aboutTor.donationBanner.tagline3=Surveillance = Opression -aboutTor.donationBanner.tagline4=Protège les journalistes, les activistes et les lanceurs d'alertes depuis 2006 +aboutTor.donationBanner.donate=Faites un don maintenant ! +aboutTor.donationBanner.heart=Tor est au cÅur de la liberté sur Internet +aboutTor.donationBanner.tagline1=Des millions de personnes dépendent de Tor pour leur sécurité et la protection de leurs renseignements personnels en ligne +aboutTor.donationBanner.tagline2=Un réseau de personnes qui protège les gens +aboutTor.donationBanner.tagline3=Surveillance = Oppression +aboutTor.donationBanner.tagline4=Nous protégeons les journalistes, les activistes et les lanceurs d'alerte depuis 2006 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
commit af1fba65a63133780edb0db713cef089ec423df5 Author: Translation commit botDate: Wed Nov 9 19:46:35 2016 + Update translations for torbutton-torbuttondtd --- fr/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/torbutton.dtd b/fr/torbutton.dtd index 11c0b28..26c9eb1 100644 --- a/fr/torbutton.dtd +++ b/fr/torbutton.dtd @@ -30,7 +30,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed
commit 2f9926bd928c58fd723d140b469736f2a95496c0 Author: Translation commit botDate: Wed Nov 9 19:47:08 2016 + Update translations for torbutton-abouttorproperties_completed --- fr/abouttor.properties | 15 +++ 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/fr/abouttor.properties b/fr/abouttor.properties index ec59d81..174b286 100644 --- a/fr/abouttor.properties +++ b/fr/abouttor.properties @@ -2,20 +2,27 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=Rechercher de manière sécurisée avec Startpage. +aboutTor.searchSP.privacy=Rechercher en toute sécurité avec Startpage. # The following string is a link which replaces %1$S above. -aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +aboutTor.searchSP.privacy.link=https://startpage.com/fra/protect-privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchSP.search.link=https://startpage.com/ -aboutTor.searchDDG.privacy=Rechercher de manière sécurisée avec DuckDuckGo. +aboutTor.searchDDG.privacy=Rechercher en toute sécurité avec DuckDuckGo. # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ -aboutTor.searchDC.privacy=Rechercher de manière sécurisée avec Disconnect.me. +aboutTor.searchDC.privacy=Rechercher en toute sécurité avec Disconnect.me. # The following string is a link which replaces %1$S above. 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.donate=Faites un don maintenant ! +aboutTor.donationBanner.heart=Tor est au cÅur de la liberté sur Internet +aboutTor.donationBanner.tagline1=Des millions de personnes dépendent de Tor pour leur sécurité et la protection de leurs renseignements personnels en ligne +aboutTor.donationBanner.tagline2=Un réseau de personnes qui protège les gens +aboutTor.donationBanner.tagline3=Surveillance = Oppression +aboutTor.donationBanner.tagline4=Nous protégeons les journalistes, les activistes et les lanceurs d'alerte depuis 2006 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd
commit 7c49aac1739fef34b335f8c9adfcf5ef05de75d8 Author: Translation commit botDate: Wed Nov 9 19:46:58 2016 + Update translations for torbutton-aboutdialogdtd --- fr/aboutdialog.dtd | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/fr/aboutdialog.dtd b/fr/aboutdialog.dtd index e3dbd27..f37379c 100644 --- a/fr/aboutdialog.dtd +++ b/fr/aboutdialog.dtd @@ -1,19 +1,19 @@ - + - + - + - + - + - - + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-branddtd_completed] Update translations for torbutton-branddtd_completed
commit cca00880b5598ffb85372c6441f9a0bec6eb Author: Translation commit botDate: Wed Nov 9 19:16:37 2016 + Update translations for torbutton-branddtd_completed --- fr/brand.dtd | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fr/brand.dtd b/fr/brand.dtd index 416aa42..b3fe3f1 100644 --- a/fr/brand.dtd +++ b/fr/brand.dtd @@ -9,7 +9,7 @@ - - - - + + + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-messenger-build/master] Fix info plist
commit eee27317af799d0e937eb7f84273c900974f73e6 Author: Arlo BreaultDate: Wed Nov 9 11:15:34 2016 -0800 Fix info plist * Use TB script, slightly modified for TM. * The copyright_year var isn't entirely satisfying. --- projects/tor-messenger/build.osx | 6 ++ projects/tor-messenger/config| 2 ++ projects/tor-messenger/fix-info-plist.py | 33 rbm.conf | 1 + 4 files changed, 42 insertions(+) diff --git a/projects/tor-messenger/build.osx b/projects/tor-messenger/build.osx index 2c65e3f..06ad562 100755 --- a/projects/tor-messenger/build.osx +++ b/projects/tor-messenger/build.osx @@ -45,6 +45,12 @@ mv torbrowser/TorBrowser.app/Contents/Resources/TorBrowser/ $rootdir/TorMessenge mv torbrowser/TorBrowser.app/Contents/MacOS/Tor/ $rootdir/TorMessenger.app/Contents/MacOS/ +# Adjust the Info.plist file +INFO_PLIST=$rootdir/TorMessenger.app/Contents/Info.plist +mv $INFO_PLIST tmp.plist +python fix-info-plist.py [% c("var/tormessenger_version") %] [% c("var/copyright_year") %] < tmp.plist > $INFO_PLIST +rm -f tmp.plist + mkdir dmg mv TorMessenger.app dmg cd dmg diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config index ba60a99..4b75b12 100644 --- a/projects/tor-messenger/config +++ b/projects/tor-messenger/config @@ -36,6 +36,8 @@ input_files: enable: '[% c("var/windows") %]' - filename: pe_checksum_fix.py enable: '[% c("var/windows") %]' + - filename: fix-info-plist.py +enable: '[% c("var/osx") %]' - filename: cert_override.txt - filename: tor-messenger.ico enable: '[% c("var/windows") %]' diff --git a/projects/tor-messenger/fix-info-plist.py b/projects/tor-messenger/fix-info-plist.py new file mode 100755 index 000..b364c86 --- /dev/null +++ b/projects/tor-messenger/fix-info-plist.py @@ -0,0 +1,33 @@ +#!/usr/bin/env python + +# Sets these keys in a property list file: +# CFBundleGetInfoString +# CFBundleShortVersionString +# NSHumanReadableCopyright + +import getopt +import plistlib +import sys + +def usage(): +print >> sys.stderr, "usage: %s TORBROWSER_VERSION YEAR < Info.plist > FixedInfo.plist" % sys.argv[0] +sys.exit(2) + +_, args = getopt.gnu_getopt(sys.argv[1:], "") + +if len(args) != 2: +usage() + +TORBROWSER_VERSION = args[0] +YEAR = args[1] + +COPYRIGHT = "Tor Messenger %s Copyright %s The Tor Project" % (TORBROWSER_VERSION, YEAR) + +plist = plistlib.readPlist(sys.stdin) + +plist["CFBundleGetInfoString"] = "Tor Messenger %s" % TORBROWSER_VERSION +plist["CFBundleVersion"] = TORBROWSER_VERSION +plist["CFBundleShortVersionString"] = TORBROWSER_VERSION +plist["NSHumanReadableCopyright"] = COPYRIGHT + +plistlib.writePlist(plist, sys.stdout) diff --git a/rbm.conf b/rbm.conf index 04d6dc9..62c9b6b 100644 --- a/rbm.conf +++ b/rbm.conf @@ -7,6 +7,7 @@ pkg_type: build var: tormessenger_version: '0.3.0b1' + copyright_year: '2016' build_id: '[% sha256(c("var/build_id_txt")).substr(0, 6) %]' build_id_txt: | [% c("version") %] ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
commit 1d770ae55c75bd947626c9f626621308c5ed3a9b Author: Translation commit botDate: Wed Nov 9 19:17:12 2016 + Update translations for torbutton-abouttorproperties --- fr/abouttor.properties | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fr/abouttor.properties b/fr/abouttor.properties index 5842c54..b92043e 100644 --- a/fr/abouttor.properties +++ b/fr/abouttor.properties @@ -20,9 +20,9 @@ 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.donate=Donate Now! +aboutTor.donationBanner.donate=Faire un don ! aboutTor.donationBanner.heart=Tor is at the heart of Internet freedom -aboutTor.donationBanner.tagline1=Millions of People Depend on Tor for Online Security & Privacy -aboutTor.donationBanner.tagline2=A Network of People Protecting People -aboutTor.donationBanner.tagline3=Surveillance = Oppression -aboutTor.donationBanner.tagline4=Protecting Journalists, Activists & Whistleblowers Since 2006 +aboutTor.donationBanner.tagline1=La sécurité et la vie privée en ligne de millions de personnes dépendent de Tor. +aboutTor.donationBanner.tagline2=Un réseau de personnes qui en protègent d'autres +aboutTor.donationBanner.tagline3=Surveillance = Opression +aboutTor.donationBanner.tagline4=Protège les journalistes, les activistes et les lanceurs d'alertes depuis 2006 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
commit 338ad268e5e7c952456654b5fb46c279c65b090d Author: Translation commit botDate: Wed Nov 9 19:16:43 2016 + Update translations for torbutton-torbuttondtd --- fr/torbutton.dtd | 90 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/fr/torbutton.dtd b/fr/torbutton.dtd index 035203b..11c0b28 100644 --- a/fr/torbutton.dtd +++ b/fr/torbutton.dtd @@ -2,61 +2,61 @@ - + - + - + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - + + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - + + + + + - - - - - - + + + + + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
commit f558082c4df8fbdb27690a1074e8d5b1508aaf79 Author: Translation commit botDate: Wed Nov 9 19:16:23 2016 + Update translations for abouttor-homepage_completed --- fr/aboutTor.dtd | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/fr/aboutTor.dtd b/fr/aboutTor.dtd index ab91620..3e41d4f 100644 --- a/fr/aboutTor.dtd +++ b/fr/aboutTor.dtd @@ -4,20 +4,20 @@ - vim: set sw=2 sts=2 ts=8 et syntax=xml: --> - + - + - + - + - - + + - + @@ -30,20 +30,20 @@ - - - + + + https://www.torproject.org/download/download.html#warning;> - - - + + + https://www.torproject.org/docs/tor-doc-relay.html;> https://www.torproject.org/getinvolved/volunteer.html;> https://www.torproject.org/donate/donate.html;> - + https://www.torproject.org/about/overview.html;> ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-brandproperties_completed] Update translations for torbutton-brandproperties_completed
commit e7dd5cfb4413e2ba6c63118dfc1af8a21c2c9709 Author: Translation commit botDate: Wed Nov 9 19:16:30 2016 + Update translations for torbutton-brandproperties_completed --- fr/brand.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr/brand.properties b/fr/brand.properties index 375e8b1..f9fb5ac 100644 --- a/fr/brand.properties +++ b/fr/brand.properties @@ -10,7 +10,7 @@ vendorShortName=Projet Tor homePageSingleStartMain=Firefox Start, une page d'accueil rapide avec recherche intégrée homePageImport=Importez votre page d'accueil à partir de %S -homePageMigrationPageTitle=Sélection de la Page d'accueil -homePageMigrationDescription=S'il vous plaît sélectionnez la page d'accueil que vous souhaitez utiliser : +homePageMigrationPageTitle=Choix de la page d'accueil +homePageMigrationDescription=Veuillez choisir la page d'accueil que vous souhaitez utiliser : syncBrandShortName=Sync ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage
commit c5891793d579876cac0dec7969b5a8cb4fbec183 Author: Translation commit botDate: Wed Nov 9 19:16:19 2016 + Update translations for abouttor-homepage --- fr/aboutTor.dtd | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/fr/aboutTor.dtd b/fr/aboutTor.dtd index ab91620..3e41d4f 100644 --- a/fr/aboutTor.dtd +++ b/fr/aboutTor.dtd @@ -4,20 +4,20 @@ - vim: set sw=2 sts=2 ts=8 et syntax=xml: --> - + - + - + - + - - + + - + @@ -30,20 +30,20 @@ - - - + + + https://www.torproject.org/download/download.html#warning;> - - - + + + https://www.torproject.org/docs/tor-doc-relay.html;> https://www.torproject.org/getinvolved/volunteer.html;> https://www.torproject.org/donate/donate.html;> - + https://www.torproject.org/about/overview.html;> ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-branddtd] Update translations for torbutton-branddtd
commit 6f86d2727759650bf276382d5b0df4a02e0e31a0 Author: Translation commit botDate: Wed Nov 9 19:16:33 2016 + Update translations for torbutton-branddtd --- fr/brand.dtd | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fr/brand.dtd b/fr/brand.dtd index 416aa42..b3fe3f1 100644 --- a/fr/brand.dtd +++ b/fr/brand.dtd @@ -9,7 +9,7 @@ - - - - + + + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-brandproperties] Update translations for torbutton-brandproperties
commit c008d47360734138a3faabd358d47b8d0621004e Author: Translation commit botDate: Wed Nov 9 19:16:26 2016 + Update translations for torbutton-brandproperties --- fr/brand.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr/brand.properties b/fr/brand.properties index 375e8b1..f9fb5ac 100644 --- a/fr/brand.properties +++ b/fr/brand.properties @@ -10,7 +10,7 @@ vendorShortName=Projet Tor homePageSingleStartMain=Firefox Start, une page d'accueil rapide avec recherche intégrée homePageImport=Importez votre page d'accueil à partir de %S -homePageMigrationPageTitle=Sélection de la Page d'accueil -homePageMigrationDescription=S'il vous plaît sélectionnez la page d'accueil que vous souhaitez utiliser : +homePageMigrationPageTitle=Choix de la page d'accueil +homePageMigrationDescription=Veuillez choisir la page d'accueil que vous souhaitez utiliser : syncBrandShortName=Sync ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torcheck_completed] Update translations for torcheck_completed
commit 0c61de5a783e0cce7179c309056823f316eb063d Author: Translation commit botDate: Wed Nov 9 19:15:13 2016 + Update translations for torcheck_completed --- fr/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/torcheck.po b/fr/torcheck.po index b5fc9d8..d4a87f3 100644 --- a/fr/torcheck.po +++ b/fr/torcheck.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2016-03-21 16:27+\n" +"PO-Revision-Date: 2016-11-09 18:59+\n" "Last-Translator: Hervé \n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torcheck] Update translations for torcheck
commit d0d258102e9fb05f1f7a1f04f82b5e872f4d1cdb Author: Translation commit botDate: Wed Nov 9 19:15:09 2016 + Update translations for torcheck --- fr/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/torcheck.po b/fr/torcheck.po index b5fc9d8..d4a87f3 100644 --- a/fr/torcheck.po +++ b/fr/torcheck.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2016-03-21 16:27+\n" +"PO-Revision-Date: 2016-11-09 18:59+\n" "Last-Translator: Hervé \n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/maint-6.0] Use the tor browser build2 tag
commit 7268d7b63d3a6dc8c71fbb1d5ff8892d25884019 Author: Georg KoppenDate: Wed Nov 9 18:52:10 2016 + Use the tor browser build2 tag --- gitian/versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions b/gitian/versions index c08c7be..2be65b4 100755 --- a/gitian/versions +++ b/gitian/versions @@ -14,7 +14,7 @@ FIREFOX_VERSION=45.5.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build2 TOR_TAG=tor-0.2.8.9 TORLAUNCHER_TAG=0.2.9.4 TORBUTTON_TAG=1.9.5.8 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-45.5.0esr-6.0-1] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.
commit f0382d95b8145b91bae099024bce64a34523 Author: Kathy BradeDate: Wed Nov 9 12:02:00 2016 -0500 fixup! Bug #4234: Use the Firefox Update Process for Tor Browser. Modify the AddSymlink implementation to use absolute paths when creating symlinks. This fixes a compile error that was introduced due to the changes Mozilla made for https://bugzilla.mozilla.org/show_bug.cgi?id=1246972. --- toolkit/mozapps/update/updater/updater.cpp | 47 ++ 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/toolkit/mozapps/update/updater/updater.cpp b/toolkit/mozapps/update/updater/updater.cpp index 9e45698..d6d0f09 100644 --- a/toolkit/mozapps/update/updater/updater.cpp +++ b/toolkit/mozapps/update/updater/updater.cpp @@ -1986,9 +1986,7 @@ PatchIfFile::Finish(int status) class AddSymlink : public Action { public: - AddSymlink() : mLinkName(NULL) - , mTarget(NULL) - , mAdded(false) + AddSymlink() : mAdded(false) { } virtual int Parse(NS_tchar *line); @@ -1997,8 +1995,9 @@ public: virtual void Finish(int status); private: - const NS_tchar *mLinkName; - const NS_tchar *mTarget; + mozilla::UniquePtr mLinkPath; + mozilla::UniquePtr mRelPath; + mozilla::UniquePtr mTarget; bool mAdded; }; @@ -2007,26 +2006,36 @@ AddSymlink::Parse(NS_tchar *line) { // format "" "target" - mLinkName = get_valid_path(); - if (!mLinkName) + NS_tchar * validPath = get_valid_path(); + if (!validPath) return PARSE_ERROR; + mRelPath = mozilla::MakeUnique (MAXPATHLEN); + NS_tstrcpy(mRelPath.get(), validPath); + mLinkPath.reset(get_full_path(validPath)); + if (!mLinkPath) { + return PARSE_ERROR; + } + // consume whitespace between args NS_tchar *q = mstrtok(kQuote, ); if (!q) return PARSE_ERROR; - mTarget = get_valid_path(, false, true); - if (!mTarget) + validPath = get_valid_path(, false, true); + if (!validPath) return PARSE_ERROR; + mTarget = mozilla::MakeUnique (MAXPATHLEN); + NS_tstrcpy(mTarget.get(), validPath); + return OK; } int AddSymlink::Prepare() { - LOG(("PREPARE ADDSYMLINK " LOG_S " -> " LOG_S, mLinkName, mTarget)); + LOG(("PREPARE ADDSYMLINK " LOG_S " -> " LOG_S, mRelPath.get(), mTarget.get())); return OK; } @@ -2034,26 +2043,26 @@ AddSymlink::Prepare() int AddSymlink::Execute() { - LOG(("EXECUTE ADDSYMLINK " LOG_S " -> " LOG_S, mLinkName, mTarget)); + LOG(("EXECUTE ADDSYMLINK " LOG_S " -> " LOG_S, mRelPath.get(), mTarget.get())); // First make sure that we can actually get rid of any existing file or link. struct stat linkInfo; - int rv = lstat(mLinkName, ); + int rv = lstat(mLinkPath.get(), ); if ((0 == rv) && !S_ISLNK(linkInfo.st_mode)) { -rv = NS_taccess(mLinkName, F_OK); +rv = NS_taccess(mLinkPath.get(), F_OK); } if (rv == 0) { -rv = backup_create(mLinkName); +rv = backup_create(mLinkPath.get()); if (rv) return rv; } else { -rv = ensure_parent_dir(mLinkName); +rv = ensure_parent_dir(mLinkPath.get()); if (rv) return rv; } // Create the link. - rv = symlink(mTarget, mLinkName); + rv = symlink(mTarget.get(), mLinkPath.get()); if (!rv) { mAdded = true; } @@ -2064,12 +2073,12 @@ AddSymlink::Execute() void AddSymlink::Finish(int status) { - LOG(("FINISH ADDSYMLINK " LOG_S " -> " LOG_S, mLinkName, mTarget)); + LOG(("FINISH ADDSYMLINK " LOG_S " -> " LOG_S, mRelPath.get(), mTarget.get())); // When there is an update failure and a link has been added it is removed // here since there might not be a backup to replace it. if (status && mAdded) -NS_tremove(mLinkName); - backup_finish(mLinkName, status); +NS_tremove(mLinkPath.get()); + backup_finish(mLinkPath.get(), mRelPath.get(), status); } #endif ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-messenger-build/master] Switch to tor-browser-45.5.0esr-6.0-1 branch
commit 122f2ad3fc4b7c03edfe049c023ea84ea43ed9f0 Author: Arlo BreaultDate: Wed Nov 9 09:48:13 2016 -0800 Switch to tor-browser-45.5.0esr-6.0-1 branch --- ChangeLog | 2 +- projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch | 4 ++-- projects/mozilla/0002-Trac-16475-Block-flash-too.patch| 4 ++-- ...003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch | 8 ...004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch | 4 ++-- projects/mozilla/0005-OSX-package-as-tar.bz2.patch| 4 ++-- projects/mozilla/0006-Updater-fixups-for-TM.patch | 4 ++-- projects/mozilla/config | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 67f2523..9b7d4b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ Tor Messenger 0.3.0b1 -- * All Platforms - * Use the tor-browser-45.4.0esr-6.0-1 branch (41f1c54a) on tor-browser + * Use the tor-browser-45.5.0esr-6.0-1 branch (e5dafab8) on tor-browser * Use the THUNDERBIRD_45_4_0_RELEASE tag on comm-esr45 * Update ctypes-otr to 00e4e80a * Trac 16489: Only show "close" button on Windows diff --git a/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch b/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch index 9fca0b7..1ce4cfc 100644 --- a/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch +++ b/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch @@ -1,4 +1,4 @@ -From 1703b578adc3d9e57358e3ad2eee08922a9d93ec Mon Sep 17 00:00:00 2001 +From d05e3b60489252ad72c367af074432ab30251b3b Mon Sep 17 00:00:00 2001 From: Arlo Breault Date: Mon, 10 Oct 2016 10:52:52 -0700 Subject: [PATCH 1/6] Trac 19910: Prevents STARTTLS in XMPP @@ -116,5 +116,5 @@ index 568c700..1793001 100644 private: -- -2.10.1 +2.10.2 diff --git a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch index 8f08ce2..d4cc5a8 100644 --- a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch +++ b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch @@ -1,4 +1,4 @@ -From e9e251b1018bec2c9cdf9e4cac86e26fda087189 Mon Sep 17 00:00:00 2001 +From 8f56d8580b3fb8a8355bc477d2353184ebf8ff31 Mon Sep 17 00:00:00 2001 From: Arlo Breault Date: Thu, 6 Oct 2016 20:13:35 -0700 Subject: [PATCH 2/6] Trac 16475: Block flash too @@ -29,5 +29,5 @@ index 5345ce7..1569236 100644 } -- -2.10.1 +2.10.2 diff --git a/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch b/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch index d903ceb..667d46a 100644 --- a/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch +++ b/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch @@ -1,4 +1,4 @@ -From 2476fa68858572f0be003df27b78579a5bb68a7f Mon Sep 17 00:00:00 2001 +From 6dcf4662033b55c53401ed57e7d25d22ccf3e15b Mon Sep 17 00:00:00 2001 From: Jonathan Kew Date: Sun, 9 Oct 2016 09:18:37 -0700 Subject: [PATCH 3/6] Trac 20206: Avoid the need to download the font Osaka @@ -44,10 +44,10 @@ index eb7a788..5c63e69 100644 LOG_FONTLIST(("(fontlist-singleface) family name: %s, key: %s\n", NS_ConvertUTF16toUTF8(familyName).get(), diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js -index 7078c66..a7b091d 100644 +index e855cdb..2891c80 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js -@@ -3576,9 +3576,9 @@ pref("font.name.monospace.x-math", "Courier"); +@@ -3577,9 +3577,9 @@ pref("font.name.monospace.x-math", "Courier"); pref("font.name.cursive.x-math", "Apple Chancery"); pref("font.name.fantasy.x-math", "Papyrus"); @@ -61,5 +61,5 @@ index 7078c66..a7b091d 100644 // optimization hint for fonts with localized names to be read in at startup, otherwise read in at lookup miss // names are canonical family names (typically English names) -- -2.10.1 +2.10.2 diff --git a/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch b/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch index 81a82c3..06c97ca 100644 --- a/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch +++ b/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch @@ -1,4 +1,4 @@ -From 504315cc3326902da82e4b1e1980327053a97500 Mon Sep 17 00:00:00 2001 +From ed613224bf375dd049edccdb6f1de8cfc5f9a149 Mon Sep 17 00:00:00 2001 From: Arlo Breault Date: Wed, 23 Mar 2016 19:52:07 -0700 Subject: [PATCH 4/6] Trac 18331: Update OS X toolchain to work with ESR 45 @@ -119,5 +119,5 @@ index 0e4d118..e0ad0d3 100644 /*
[tor-commits] [tor-messenger-build/master] Set torbrowser.version pref
commit b682f39bf21c219310516fb6c86e4efb2eec00d6 Author: Arlo BreaultDate: Wed Nov 9 09:55:56 2016 -0800 Set torbrowser.version pref --- .../instantbird/0001-Set-Tor-Messenger-preferences.patch | 14 +- .../0002-Trac-16489-Prevent-account-autologin.patch| 2 +- ...c-17896-Support-Special-Characters-input-prompt-o.patch | 2 +- ...c-17494-Better-error-reporting-for-failed-outgoin.patch | 2 +- .../instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch | 2 +- ...-1218193-Fix-tab-strip-background-colour-on-OS-X..patch | 2 +- ...-1246431-XMPP-createConversation-should-handle-in.patch | 2 +- ...-1298574-Set-_userVCard-own-property-when-downloa.patch | 2 +- projects/instantbird/0009-XMPP-in-band-registration.patch | 2 +- projects/instantbird/0010-Remove-search-from-UI.patch | 2 +- projects/instantbird/0011-Add-Tor-Messenger-branding.patch | 2 +- projects/instantbird/0012-Account-picture.patch| 2 +- projects/instantbird/0013-Modify-protocol-defaults.patch | 2 +- projects/instantbird/0014-Modify-IRC-defaults.patch| 2 +- projects/instantbird/0015-Modify-themes.patch | 2 +- projects/instantbird/0016-Modify-XMPP-defaults.patch | 2 +- projects/instantbird/0017-Remove-logging-UI.patch | 2 +- projects/instantbird/0018-Cert-override.patch | 2 +- .../instantbird/0019-Display-all-traffic-over-Tor.patch| 2 +- projects/instantbird/0020-Trac-17480-Content-sink.patch| 2 +- .../instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch | 2 +- ...-1313137-msg-is-not-defined-error-in-irc.js-chang.patch | 2 +- ...-954368-Contact-list-entries-should-adapt-their-h.patch | 2 +- ...024-Bug-1187281-Only-show-close-button-on-Windows.patch | 2 +- ...-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch | 2 +- 25 files changed, 33 insertions(+), 29 deletions(-) diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch index a79e25e..605dac6 100644 --- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch +++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch @@ -1,14 +1,14 @@ -From 1d67d081f0a1c5c354152c5c54387403a7334946 Mon Sep 17 00:00:00 2001 +From a389b023c2017828d58195917fe70c3babfcb6ae Mon Sep 17 00:00:00 2001 From: Sukhbir Singh Date: Mon, 10 Oct 2016 19:48:41 -0700 Subject: [PATCH 01/25] Set Tor Messenger preferences --- - im/app/profile/all-instantbird.js | 399 -- - 1 file changed, 378 insertions(+), 21 deletions(-) + im/app/profile/all-instantbird.js | 403 -- + 1 file changed, 382 insertions(+), 21 deletions(-) diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.js -index b7a3970..2d9a217 100644 +index b7a3970..ce25d3a 100644 --- a/im/app/profile/all-instantbird.js +++ b/im/app/profile/all-instantbird.js @@ -1,3 +1,46 @@ @@ -156,7 +156,7 @@ index b7a3970..2d9a217 100644 // We have an Error Console menu item by default so let's display chrome errors pref("javascript.options.showInConsole", true); -@@ -300,14 +340,331 @@ pref("browser.tabs.tabClipWidth", 140); +@@ -300,14 +340,335 @@ pref("browser.tabs.tabClipWidth", 140); // 3 at the end of the tabstrip pref("browser.tabs.closeButtons", 1); @@ -491,6 +491,10 @@ index b7a3970..2d9a217 100644 +// `about:downloads` is only shown if the following preference is set to `true` +// in case the download panel got removed from the toolbar. +pref("browser.download.panel.shown", true); ++ ++#ifdef TOR_BROWSER_VERSION ++#expand pref("torbrowser.version", __TOR_BROWSER_VERSION__); ++#endif -- 2.10.2 diff --git a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch index 034cc47..dfafdf3 100644 --- a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch +++ b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch @@ -1,4 +1,4 @@ -From f1e661a5b83c86b1f2d04a434f59c938d3ae1eef Mon Sep 17 00:00:00 2001 +From 0560300c21e64eef9fe43ce6beee0abb76417603 Mon Sep 17 00:00:00 2001 From: Arlo Breault Date: Mon, 16 Nov 2015 20:37:53 -0800 Subject: [PATCH 02/25] Trac 16489: Prevent account autologin diff --git a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch index 90fd28b..65579d9 100644 --- a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch +++ b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch @@ -1,4 +1,4 @@ -From ffc41b64d3a203ada0549a57044329afb31e88dd Mon Sep 17 00:00:00 2001 +From 5bcf95f441ca97cbd5bc1f352d014a655ab52cf5 Mon Sep 17
[tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
commit e718655023fc9f7e1a34049a78043d24c4e5fe2e Author: Translation commit botDate: Wed Nov 9 17:47:04 2016 + Update translations for torbutton-abouttorproperties --- zh_CN/abouttor.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/abouttor.properties b/zh_CN/abouttor.properties index 1a947ff..421ac52 100644 --- a/zh_CN/abouttor.properties +++ b/zh_CN/abouttor.properties @@ -25,4 +25,4 @@ aboutTor.donationBanner.heart=Tor æ¯äºèç½èªç±çæ ¸å¿ aboutTor.donationBanner.tagline1=æ°ç¾ä¸äººä¾é Tor å®å ¨ãç§å¯å°ä¸ç½ aboutTor.donationBanner.tagline2=A Network of People Protecting People aboutTor.donationBanner.tagline3=çè§å³åè¿« -aboutTor.donationBanner.tagline4=Protecting Journalists, Activists & Whistleblowers Since 2006 +aboutTor.donationBanner.tagline4=为记è ãåå¯è åæ´»å¨äººå£«æä¾ä¿æ¤ï¼ä¸æ³¨å¿åå®å ¨ 10 å¹´ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-messenger-build/master] Remove old Yahoo! Messenger support
commit 690e6e65acebe80384883c7065c7b6fbcc5b65a9 Author: Arlo BreaultDate: Wed Nov 9 09:07:00 2016 -0800 Remove old Yahoo! Messenger support * Bugzilla 1316000 * https://web.archive.org/web/20160730080614/https://help.yahoo.com/kb/yahoo-messenger-for-web/SLN26860.html --- ChangeLog |1 + .../0001-Set-Tor-Messenger-preferences.patch |2 +- ...0002-Trac-16489-Prevent-account-autologin.patch |2 +- ...Support-Special-Characters-input-prompt-o.patch |2 +- ...Better-error-reporting-for-failed-outgoin.patch |2 +- .../0005-Trac-13312-OTR-over-Twitter-DMs.patch |2 +- ...-Fix-tab-strip-background-colour-on-OS-X..patch |2 +- ...-XMPP-createConversation-should-handle-in.patch |2 +- ...-Set-_userVCard-own-property-when-downloa.patch |2 +- .../0009-XMPP-in-band-registration.patch |2 +- .../instantbird/0010-Remove-search-from-UI.patch |2 +- .../0011-Add-Tor-Messenger-branding.patch |2 +- projects/instantbird/0012-Account-picture.patch|2 +- .../0013-Modify-protocol-defaults.patch|2 +- .../instantbird/0014-Modify-IRC-defaults.patch |2 +- projects/instantbird/0015-Modify-themes.patch |2 +- .../instantbird/0016-Modify-XMPP-defaults.patch|2 +- projects/instantbird/0017-Remove-logging-UI.patch |2 +- projects/instantbird/0018-Cert-override.patch |2 +- .../0019-Display-all-traffic-over-Tor.patch|2 +- .../instantbird/0020-Trac-17480-Content-sink.patch |2 +- .../0021-SASL-ECDSA-NIST256P-CHALLENGE.patch |2 +- ...-msg-is-not-defined-error-in-irc.js-chang.patch |2 +- ...Contact-list-entries-should-adapt-their-h.patch |2 +- ...1187281-Only-show-close-button-on-Windows.patch |2 +- ...-Remove-old-Yahoo-Messenger-support.-r-al.patch | 2398 projects/instantbird/config|1 + 27 files changed, 2424 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 765e033..67f2523 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ Tor Messenger 0.3.0b1 -- * Trac 20608: Use Instantbird app version * Bugzilla 1246431: Properly handle incoming xmpp server messages * Bugzilla 1313137: Fix irc "msg is not defined" error + * Bugzilla 1316000: Remove old Yahoo! Messenger support * Mac * Trac 20204: Windows don't drag on macOS Sierra * Trac 20206: Avoid prompting to download font "Osaka" on macOS Sierra diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch index 44e2669..a79e25e 100644 --- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch +++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch @@ -1,7 +1,7 @@ From 1d67d081f0a1c5c354152c5c54387403a7334946 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh Date: Mon, 10 Oct 2016 19:48:41 -0700 -Subject: [PATCH 01/24] Set Tor Messenger preferences +Subject: [PATCH 01/25] Set Tor Messenger preferences --- im/app/profile/all-instantbird.js | 399 -- diff --git a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch index 3b908e3..034cc47 100644 --- a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch +++ b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch @@ -1,7 +1,7 @@ From f1e661a5b83c86b1f2d04a434f59c938d3ae1eef Mon Sep 17 00:00:00 2001 From: Arlo Breault Date: Mon, 16 Nov 2015 20:37:53 -0800 -Subject: [PATCH 02/24] Trac 16489: Prevent account autologin +Subject: [PATCH 02/25] Trac 16489: Prevent account autologin --- chat/components/src/imAccounts.js | 2 +- diff --git a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch index 454ce61..90fd28b 100644 --- a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch +++ b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch @@ -1,7 +1,7 @@ From ffc41b64d3a203ada0549a57044329afb31e88dd Mon Sep 17 00:00:00 2001 From: aleth Date: Sat, 30 Jan 2016 20:56:38 +0100 -Subject: [PATCH 03/24] Trac 17896: Support "Special Characters" input prompt +Subject: [PATCH 03/25] Trac 17896: Support "Special Characters" input prompt on OS X * Bug 1151784 - Add Edit menu to the conversation window on OS X. r=nhnt11,florian diff --git a/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch b/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch index d7bcf52..a03c275 100644 ---
[tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
commit 38d983d56e9beeff59c738bba88c8c1f78d4ac9b Author: Translation commit botDate: Wed Nov 9 16:47:06 2016 + Update translations for torbutton-abouttorproperties --- zh_CN/abouttor.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/abouttor.properties b/zh_CN/abouttor.properties index 4d017c3..1a947ff 100644 --- a/zh_CN/abouttor.properties +++ b/zh_CN/abouttor.properties @@ -24,5 +24,5 @@ aboutTor.donationBanner.donate=ç«å³æå©ï¼ aboutTor.donationBanner.heart=Tor æ¯äºèç½èªç±çæ ¸å¿ aboutTor.donationBanner.tagline1=æ°ç¾ä¸äººä¾é Tor å®å ¨ãç§å¯å°ä¸ç½ aboutTor.donationBanner.tagline2=A Network of People Protecting People -aboutTor.donationBanner.tagline3=Surveillance = Oppression +aboutTor.donationBanner.tagline3=çè§å³åè¿« aboutTor.donationBanner.tagline4=Protecting Journalists, Activists & Whistleblowers Since 2006 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-messenger-build/master] Remove unnecessary tor-launcher patch after ec41e467
commit 487c740b8f621a5bc0bf1462e957092f4730872b Author: Arlo BreaultDate: Wed Nov 9 08:40:19 2016 -0800 Remove unnecessary tor-launcher patch after ec41e467 --- projects/tor-launcher/build | 1 - projects/tor-launcher/config| 1 - projects/tor-launcher/min-version.patch | 13 - 3 files changed, 15 deletions(-) diff --git a/projects/tor-launcher/build b/projects/tor-launcher/build index ea1e533..5b11d89 100644 --- a/projects/tor-launcher/build +++ b/projects/tor-launcher/build @@ -14,6 +14,5 @@ cp ../default48.png src/chrome/skin/default48.png [% END -%] patch -p1 < ../logo.patch patch -p1 < ../locale-disable.patch -patch -p1 < ../min-version.patch make package mv pkg/*.xpi [% dest_dir _ '/' _ c('filename') %] diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 3a4a129..f4dc4ee 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -11,7 +11,6 @@ input_files: - filename: default48.png - filename: logo.patch - filename: locale-disable.patch - - filename: min-version.patch - filename: controlport.patch content: '[% INCLUDE controlport.patch.tmpl -%]' refresh_input: 1 diff --git a/projects/tor-launcher/min-version.patch b/projects/tor-launcher/min-version.patch deleted file mode 100644 index ac58d39..000 --- a/projects/tor-launcher/min-version.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/install.rdf b/src/install.rdf -index 2eea493..4ce8ac8 100644 a/src/install.rdf -+++ b/src/install.rdf -@@ -34,7 +34,7 @@ - - - {33cb9019-c295-46dd-be21-8c4936574bee} --1.4 -+0 - *.*.* - - ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
commit 933f1c67bfe8087ca4aa6d30e55c287dfc0c9236 Author: Translation commit botDate: Wed Nov 9 15:46:45 2016 + Update translations for torbutton-torbuttondtd --- de/torbutton.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/de/torbutton.dtd b/de/torbutton.dtd index 56253fe..4cc42e9 100644 --- a/de/torbutton.dtd +++ b/de/torbutton.dtd @@ -11,8 +11,8 @@ - - + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbirdy] Update translations for torbirdy
commit 6ba75a235e6f1f1772daa803b41c7b180c03a041 Author: Translation commit botDate: Wed Nov 9 15:45:49 2016 + Update translations for torbirdy --- de/torbirdy.dtd | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/de/torbirdy.dtd b/de/torbirdy.dtd index f895a4b..0fc6349 100644 --- a/de/torbirdy.dtd +++ b/de/torbirdy.dtd @@ -12,7 +12,7 @@ - + @@ -32,17 +32,17 @@ - + - + - + - + - + - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbirdy_completed] Update translations for torbirdy_completed
commit 05090261aef828f17fe0dc69c8ae4134ebb5c1ee Author: Translation commit botDate: Wed Nov 9 15:45:54 2016 + Update translations for torbirdy_completed --- de/torbirdy.dtd | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/de/torbirdy.dtd b/de/torbirdy.dtd index f895a4b..0fc6349 100644 --- a/de/torbirdy.dtd +++ b/de/torbirdy.dtd @@ -12,7 +12,7 @@ - + @@ -32,17 +32,17 @@ - + - + - + - + - + - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torbutton/master] Bug 20264: Change security slider to 3 options (H, M, L)
commit 6c423a9aa505882bbb7685f3175dc131baad8809 Author: Arthur EdelsteinDate: Wed Oct 19 11:55:21 2016 -0700 Bug 20264: Change security slider to 3 options (H,M,L) --- src/chrome/content/preferences.js | 13 --- src/chrome/content/preferences.xul | 47 ++ src/chrome/locale/en/torbutton.dtd | 3 +-- src/modules/security-prefs.js | 19 ++- 4 files changed, 31 insertions(+), 51 deletions(-) diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index 7856ef1..3bb6c0c 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -7,11 +7,16 @@ let { getBoolPref, getIntPref, setBoolPref, setIntPref } = // Description elements have the follow names. const descNames = - [, "desc_high", "desc_medium_high", "desc_medium_low", "desc_low"]; + [, "desc_high", "desc_medium", "desc_low"]; // A single `state` object that reflects the user settings in this UI. let state = { slider : 0, custom : false}; +// Utility functions to convert between the legacy 4-value pref index +// and the 3-valued security slider. +let sliderPositionToPrefSetting = pos => [, 1, 2, 4][pos]; +let prefSettingToSliderPosition = pref => [, 1, 2, 2, 3][pref]; + // Set the desired slider value and update UI. function torbutton_set_slider(sliderPosition) { state.slider = sliderPosition; @@ -33,12 +38,14 @@ function torbutton_set_custom(customValue) { // Read prefs 'extensions.torbutton.security_slider' and // 'extensions.torbutton.security_custom', and initialize the UI. function torbutton_init_security_ui() { - torbutton_set_slider(getIntPref("extensions.torbutton.security_slider")); + torbutton_set_slider(prefSettingToSliderPosition( +getIntPref("extensions.torbutton.security_slider"))); torbutton_set_custom(getBoolPref("extensions.torbutton.security_custom")); }; // Write the two prefs from the current settings. function torbutton_save_security_settings() { - setIntPref("extensions.torbutton.security_slider", state.slider); + setIntPref("extensions.torbutton.security_slider", + sliderPositionToPrefSetting(state.slider)); setBoolPref("extensions.torbutton.security_custom", state.custom); }; diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index 53abd7f..c6432e0 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -28,7 +28,7 @@ - @@ -41,22 +41,15 @@ - - _med_high; - - - - - _med_low; + tooltip="medium_preview"> + _medium; _low; @@ -101,7 +94,7 @@ _webfonts_desc; - + _gen_desc; @@ -127,24 +120,6 @@ _font_rend_desc; - - - _gen_desc; - - - _some_jit_desc; _jit_slower_desc; - - - _html5_desc; - - - _mathml_desc; - - @@ -185,7 +160,7 @@ _svg_desc; _webfonts_desc; - + _gen_desc; @@ -195,14 +170,6 @@ _mathml_desc; _font_rend_desc; - - _gen_desc; - - - _some_jit_desc; _jit_slower_desc; - _html5_desc; - _mathml_desc; - _low_desc; diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 0c10406..97a994f 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -37,7 +37,6 @@ - @@ -47,7 +46,7 @@ - + diff --git a/src/modules/security-prefs.js b/src/modules/security-prefs.js index fa30aba..e6a888c 100644 --- a/src/modules/security-prefs.js +++ b/src/modules/security-prefs.js @@ -15,18 +15,19 @@ let log = (level, msg) => logger.log(level, msg); // __kSecuritySettings__. // A table of all prefs bound to the security slider, and the value -// for each security setting. +// for each security setting. Note that 2-m and 3-m are identical, +// corresponding to the old 2-medium-high setting. const kSecuritySettings = { - // Preference name :[0, 1-high 2-mh 3-ml 4-low] + // Preference name :[0, 1-high 2-m3-m4-low]
[tor-commits] [translation/tails-greeter_completed] Update translations for tails-greeter_completed
commit f984b9147ea448c7d19e59c1bc95cfac99674c7a Author: Translation commit botDate: Wed Nov 9 12:45:45 2016 + Update translations for tails-greeter_completed --- az/az.po | 57 + 1 file changed, 21 insertions(+), 36 deletions(-) diff --git a/az/az.po b/az/az.po index 96bcf97..09cb7ec 100644 --- a/az/az.po +++ b/az/az.po @@ -3,17 +3,18 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# E , 2014 +# D, 2014 # emin25 , 2013 # Fredi , 2013 +# Nikafn , 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-15 16:05+0200\n" -"PO-Revision-Date: 2014-12-30 12:01+\n" -"Last-Translator: E \n" -"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/torproject/language/az/)\n" +"POT-Creation-Date: 2016-09-02 14:43+0200\n" +"PO-Revision-Date: 2016-11-09 12:37+\n" +"Last-Translator: Nikafn \n" +"Language-Team: Azerbaijani (http://www.transifex.com/otf/torproject/language/az/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -93,78 +94,62 @@ msgid "Passwords do not match" msgstr "ÅifrÉlÉr eyni deyil" #: ../glade/optionswindow.glade.h:10 -msgid "Windows camouflage" -msgstr "Windows kamuflyaj" - -#: ../glade/optionswindow.glade.h:11 -msgid "" -"Documentation" -msgstr "SÉnÉdlÉÅmÉ" - -#: ../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 "Bu seçim Tails-i daha çox Microsoft Windows 8-É bÉnzÉdir. Ä°ctimai yerlÉrdÉ cÉlbedici ÅübhÉlÉrdÉn qaçınmaq üçün bu yararlı ola bilÉr." - -#: ../glade/optionswindow.glade.h:13 -msgid "Activate Microsoft Windows 8 Camouflage" -msgstr "Microsoft Windows 8 Kamuflyajını AktivlÉÅdir" - -#: ../glade/optionswindow.glade.h:14 msgid "MAC address spoofing" msgstr "MAC ünvan aldadıcı" -#: ../glade/optionswindow.glade.h:15 +#: ../glade/optionswindow.glade.h:11 msgid "" "Documentation" msgstr "SÉnÉdlÉÅmÉ" -#: ../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 ünvanların aldadılması yerli ÅÉbÉkÉyÉ olan ÅÉbÉkÉ kartlarının seriya nömrÉsini gizlÉdir. Bu sÉnÉ coÄrafi mÉkanını gizlÉmÉyÉ ÅÉrait yarada bilÉr." -#: ../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 ünvan aldadıcısını istifadÉ etmÉk ümumiyyÉtlÉ daha tÉhlükÉsizdir, amma bu ÉlavÉ olaraq ÅübhÉ yarada vÉ ya ÅÉbÉkÉ ÉlaqÉ problemlÉrinÉ sÉbÉb ola bilÉr." -#: ../glade/optionswindow.glade.h:18 +#: ../glade/optionswindow.glade.h:14 msgid "Spoof all MAC addresses" msgstr "Bütün MAC ünvanlarını aldat" -#: ../glade/optionswindow.glade.h:19 +#: ../glade/optionswindow.glade.h:15 msgid "Network configuration" msgstr "ÅÉbÉkÉ konfiqurasiyası" -#: ../glade/optionswindow.glade.h:20 +#: ../glade/optionswindow.glade.h:16 msgid "" "Documentation" msgstr "SÉnÉdlÉÅmÉ" -#: ../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 "Bu kompüterin internet ÉlaqÉsi maneÉlÉrdÉn tÉmizlÉnmiÅdir. SÉn bir baÅa Tor ÅÉbÉkÉsinÉ qoÅulmaq istÉyirsÉn." -#: ../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 "Bu kompüterin internet ÉlaqÉsi senzuradan keçirilmiÅ, filterlÉnmiÅ vÉ ya proksilÉnmiÅdir. SÉn körpü, tÉhlükÉsizlik divarı vÉ ya proksi parametrlÉrini konfiqurasiya etmÉlisÉn." +#: ../glade/optionswindow.glade.h:19 +msgid "Disable all networking" +msgstr "Bütün ÅÉbÉkÉni söndür" + #: ../glade/langpanel.glade.h:1 msgid " " msgstr " " -#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43 +#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45 msgid "Language" msgstr "Dil" @@ -199,7 +184,7 @@ msgid "" "%(stderr)s" msgstr "canlı-davamlılıq %(returncode)s geri ÅifrÉ ilÉ alınmadı:\n%(stdout)s\n%(stderr)s" -#: ../tailsgreeter/langpanel.py:123 ../tailsgreeter/langpanel.py:150 -#: ../tailsgreeter/langpanel.py:183
[tor-commits] [translation/tails-greeter] Update translations for tails-greeter
commit 2720af1743b7bbd90625d2b95d02c6ec11ce7fac Author: Translation commit botDate: Wed Nov 9 12:45:41 2016 + Update translations for tails-greeter --- az/az.po | 15 --- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/az/az.po b/az/az.po index 0fac256..09cb7ec 100644 --- a/az/az.po +++ b/az/az.po @@ -6,13 +6,14 @@ # D, 2014 # emin25 , 2013 # Fredi , 2013 +# Nikafn , 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-29 14:32+0100\n" -"PO-Revision-Date: 2016-03-21 16:27+\n" -"Last-Translator: carolyn \n" +"POT-Creation-Date: 2016-09-02 14:43+0200\n" +"PO-Revision-Date: 2016-11-09 12:37+\n" +"Last-Translator: Nikafn \n" "Language-Team: Azerbaijani (http://www.transifex.com/otf/torproject/language/az/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -142,13 +143,13 @@ msgstr "Bu kompüterin internet ÉlaqÉsi senzuradan keçirilmiÅ, filterlÉnmi #: ../glade/optionswindow.glade.h:19 msgid "Disable all networking" -msgstr "" +msgstr "Bütün ÅÉbÉkÉni söndür" #: ../glade/langpanel.glade.h:1 msgid " " msgstr " " -#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43 +#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45 msgid "Language" msgstr "Dil" @@ -183,7 +184,7 @@ msgid "" "%(stderr)s" msgstr "canlı-davamlılıq %(returncode)s geri ÅifrÉ ilÉ alınmadı:\n%(stdout)s\n%(stderr)s" -#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167 -#: ../tailsgreeter/langpanel.py:200 +#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169 +#: ../tailsgreeter/langpanel.py:202 msgid "Other..." msgstr "DigÉr..." ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator
commit b877bd8df1e79605366e809ed5e9fdaae72e841a Author: Translation commit botDate: Wed Nov 9 12:45:30 2016 + Update translations for liveusb-creator --- az/az.po | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/az/az.po b/az/az.po index 8d28a39..258a4d7 100644 --- a/az/az.po +++ b/az/az.po @@ -4,14 +4,15 @@ # # Translators: # D, 2014 -# Emin Mastizada , 2016 +# Emin Mastizada , 2016 +# Nikafn , 2016 msgid "" 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: 2016-03-21 16:31+\n" -"Last-Translator: Emin Mastizada \n" +"PO-Revision-Date: 2016-11-09 12:41+\n" +"Last-Translator: Nikafn \n" "Language-Team: Azerbaijani (http://www.transifex.com/otf/torproject/language/az/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -59,7 +60,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "\n" "Need help? Read the documentation." -msgstr "" +msgstr "http://www.w3.org/TR/REC-html40/strict.dtd\;>\n\np, li { white-space: pre-wrap; }\n\nYardım lazımdır? Ætraflı oxu." #: ../liveusb/launcher_ui.py:155 msgid "" @@ -71,7 +72,7 @@ msgid "" "The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.\n" "\n" "" -msgstr "" +msgstr "\nTails-i digÉr USB-yÉ quraÅdırmaq üçün istifadÉ etdiyin Tails sistemini köçürün..\n\nYüklÉdiyiniz flÉÅ kart format olunub vÉ bütün mÉlumatlar silinib.\n\nHazırda istifadÉ etdiyiniz Tail USB kartın ÅifrÉlÉnmiÅ saxlancı kopyalanmayıb.\n\n" #: ../liveusb/launcher_ui.py:157 msgid "" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-45.4.0esr-6.5-1] fixup! TB3: Tor Browser's official .mozconfigs.
commit db846f717b90c587b1934c65dd973e0ba0f14acd Author: Nicolas VigierDate: Tue Nov 8 17:20:36 2016 +0100 fixup! TB3: Tor Browser's official .mozconfigs. Bug 20439: make the build PIE on OSX --- .mozconfig-mac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mozconfig-mac b/.mozconfig-mac index 96f036a..cda309a 100644 --- a/.mozconfig-mac +++ b/.mozconfig-mac @@ -10,7 +10,7 @@ export CC="$topsrcdir/clang/bin/clang $FLAGS" export CXX="$topsrcdir/clang/bin/clang++ $FLAGS" export CPP="$topsrcdir/clang/bin/clang $FLAGS -E" export LLVMCONFIG=$topsrcdir/clang/bin/llvm-config -export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-dead_strip" +export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-dead_strip -Wl,-pie" export TOOLCHAIN_PREFIX=$CROSS_CCTOOLS_PATH/bin/x86_64-apple-darwin10- #TODO: bug 1184202 - would be nice if these could be detected with TOOLCHAIN_PREFIX automatically export AR=${TOOLCHAIN_PREFIX}ar ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/master] Bug 20439: make the build PIE on OSX
commit 565f2cc6e5c8e496bc50f03defa98947e24c93c4 Author: Nicolas VigierDate: Tue Nov 8 17:32:00 2016 +0100 Bug 20439: make the build PIE on OSX --- gitian/descriptors/mac/gitian-firefox.yml | 17 + 1 file changed, 17 insertions(+) diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index 7461031..aae6139 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -40,6 +40,23 @@ script: | tar xaf ../MacOSX10.7.sdk.tar.gz tar xaf ../cctools.tar.gz unzip ../clang-linux64-wheezy-utils.zip + # Bug 20439: build with PIE + # If we add -fPIE to the FLAGS, the build fails in js/src/ctypes/libffi + # with libtool giving an error: + # libtool: compile: unable to infer tagged configuration + # To avoid this error, we add -fPIE using wrappers on clang and clang++ + mv clang/bin/clang clang/bin/clang.real + mv clang/bin/clang++ clang/bin/clang++.real + cat > clang/bin/clang << EOF + #!/bin/sh + exec $(pwd)/clang/bin/clang.real -fPIE "\$@" + EOF + cat > clang/bin/clang++ << EOF + #!/bin/sh + exec $(pwd)/clang/bin/clang++.real -fPIE "\$@" + EOF + chmod +x clang/bin/clang clang/bin/clang++ + # TB_COMMIT_DATE=$(git show -s --format='%ci') COPYRIGHT_YEAR=${TB_COMMIT_DATE%%-*} mv .mozconfig-mac .mozconfig ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/hardened-builds] Bug 20186: extract mar tools when creating update responses
commit 3b26471de9544deaf9b34ed5e351a2f7ef9b5f3c Author: Nicolas VigierDate: Tue Nov 8 22:54:47 2016 +0100 Bug 20186: extract mar tools when creating update responses After #19528, we are using mar tools when creating update responses. --- tools/update-responses/update_responses | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 9d9cce2..1064a01 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -580,6 +580,7 @@ my %actions = ( unless $config->{channels}{$channel}; $htdocsfiles{$channel} = { '.' => 1, '..' => 1 }; } +extract_martools; write_responses($config, @channels); write_htaccess($config, @channels); write_downloads_json($config, @channels); ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/master] Bug 20186: extract mar tools when creating update responses
commit 03c0e4bb0fd295e16a72d755a52e74c7e73ce965 Author: Nicolas VigierDate: Tue Nov 8 22:54:47 2016 +0100 Bug 20186: extract mar tools when creating update responses After #19528, we are using mar tools when creating update responses. --- tools/update-responses/update_responses | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 5f8eb36..fd59132 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -590,6 +590,7 @@ my %actions = ( unless $config->{channels}{$channel}; $htdocsfiles{$channel} = { '.' => 1, '..' => 1 }; } +extract_martools; write_responses($config, @channels); write_htaccess($config, @channels); write_downloads_json($config, @channels); ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/hardened-builds] Bug 20612: fix path to application.ini
commit 7b0f893e548f7dc0090d22ccfa58e06940adc61c Author: Nicolas VigierDate: Tue Nov 8 23:10:23 2016 +0100 Bug 20612: fix path to application.ini --- tools/update-responses/update_responses | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index bef5615..9d9cce2 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -255,7 +255,7 @@ sub get_buildinfos { $appfile = "$tmpdir/Contents/Resources/application.ini" if -f "$tmpdir/Contents/Resources/application.ini"; exit_error "Could not find application.ini" unless $appfile; -foreach my $line (read_file("$tmpdir/application.ini")) { +foreach my $line (read_file($appfile)) { if ($line =~ m/^BuildID=(.*)$/) { $config->{versions}{$version}{buildID} = $1; return; ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/master] Bug 20612: fix path to application.ini
commit 418f5d66e9d064530b1a4d7ce5a96b03980ea14f Author: Nicolas VigierDate: Tue Nov 8 23:10:23 2016 +0100 Bug 20612: fix path to application.ini --- tools/update-responses/update_responses | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index a89a18a..5f8eb36 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -265,7 +265,7 @@ sub get_buildinfos { $appfile = "$tmpdir/Contents/Resources/application.ini" if -f "$tmpdir/Contents/Resources/application.ini"; exit_error "Could not find application.ini" unless $appfile; -foreach my $line (read_file("$tmpdir/application.ini")) { +foreach my $line (read_file($appfile)) { if ($line =~ m/^BuildID=(.*)$/) { $config->{versions}{$version}{buildID} = $1; return; ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/maint-6.0] Update tor signing key
commit 84c39a83d62b1b62ca03200099bd61dd46c38b42 Author: Georg KoppenDate: Wed Nov 9 11:10:02 2016 + Update tor signing key --- gitian/gpg/tor.gpg | Bin 14432 -> 21817 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/tor.gpg b/gitian/gpg/tor.gpg index 319a9a6..51eeb40 100644 Binary files a/gitian/gpg/tor.gpg and b/gitian/gpg/tor.gpg differ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/maint-6.0] Add bug number for Go update
commit f2de25fe6365b0d4f0fbbfdf78bd1f5593756ee7 Author: Georg KoppenDate: Wed Nov 9 10:46:38 2016 + Add bug number for Go update --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index f2eddea..b2a0719 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -24,7 +24,7 @@ Tor Browser 6.0.6 -- November 15 * Bug 20250: Meek fails on macOS Sierra if built with Go < 1.7 * Build system * All platforms - * Upgrade Go to 1.7.3 + * Bug 20023: Upgrade Go to 1.7.3 Tor Browser 6.0.5 -- September 16 * All Platforms ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/maint-6.0] Release preparations for 6.0.6
commit 75de6487f7aa4ce7b3feb90e39933ddd424c7d1f Author: Georg KoppenDate: Wed Nov 9 10:44:59 2016 + Release preparations for 6.0.6 Changelog update, versions bumps, and config.yml update --- Bundle-Data/Docs/ChangeLog.txt| 28 gitian/versions | 10 +- tools/update-responses/config.yml | 10 +- 3 files changed, 38 insertions(+), 10 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index ecb6572..f2eddea 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,31 @@ +Tor Browser 6.0.6 -- November 15 + * All Platforms + * Update Firefox to 45.5.0esr + * Update Tor to 0.2.8.9 + * Update OpenSSL to 1.0.1u + * Update Torbutton to 1.9.5.8 + * Bug 20414: Add donation banner on about:tor for 2016 campaign + * Translation updates + * Update Tor Launcher to 0.2.9.4 + * Bug 20429: Do not open progress window if tor doesn't get started + * Bug 19646: Wrong location for meek browser profile on OS X + * Update HTTPS-Everywhere to 5.2.7 + * Update meek to 0.25 + * Bug 19646: Wrong location for meek browser profile on OS X + * Bug 20030: Shut down meek-http-helper cleanly if built with Go > 1.5.4 + * Bug 19838: Add dgoulet's bridge and add another one commented out + * Bug 20296: Rotate ports again for default obfs4 bridges + * Bug 19735: Switch default search engine to DuckDuckGo + * Bug 20118: Don't unpack HTTPS Everywhere anymore + * Windows + * Bug 20342: Add tor-gencert.exe to expert bundle + * OS X + * Bug 20204: Windows don't drag on macOS Sierra anymore + * Bug 20250: Meek fails on macOS Sierra if built with Go < 1.7 + * Build system + * All platforms + * Upgrade Go to 1.7.3 + Tor Browser 6.0.5 -- September 16 * All Platforms * Update Firefox to 45.4.0esr diff --git a/gitian/versions b/gitian/versions index 92d7125..c08c7be 100755 --- a/gitian/versions +++ b/gitian/versions @@ -10,15 +10,15 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=1 -FIREFOX_VERSION=45.4.0esr +FIREFOX_VERSION=45.5.0esr TORBROWSER_UPDATE_CHANNEL=release TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build1 -TOR_TAG=tor-0.2.8.7 -TORLAUNCHER_TAG=0.2.9.3 -TORBUTTON_TAG=1.9.5.7 -HTTPSE_TAG=5.2.4 +TOR_TAG=tor-0.2.8.9 +TORLAUNCHER_TAG=0.2.9.4 +TORBUTTON_TAG=1.9.5.8 +HTTPSE_TAG=5.2.7 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index d81d102..4d21f0e 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -16,13 +16,13 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 6.5a2 -release: 6.0.5 +release: 6.0.6 versions: -6.0.5: -platformVersion: 45.4.0 -detailsURL: https://blog.torproject.org/blog/tor-browser-605-released +6.0.6: +platformVersion: 45.5.0 +detailsURL: https://blog.torproject.org/blog/tor-browser-606-released incremental_from: - - 6.0.4 + - 6.0.5 migrate_archs: osx32: osx64 osx32: ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torbutton/maint-1.9.5] Release preparations for 1.9.5.8
commit d1dffb97cc79a1a25b70a81c51135a3672f39aed Author: Georg KoppenDate: Wed Nov 9 10:38:33 2016 + Release preparations for 1.9.5.8 Version bump and changelog update --- src/CHANGELOG | 4 src/install.rdf | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 93eddba..0965a4a 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,7 @@ +1.9.5.8 + * Bug 20414: Add donation banner on about:tor for 2016 campaign + * Translation updates + 1.9.5.7 * Bug 18589: Clear site security settings during New Identity * Bug 19906: "Maximizing Tor Browser" Notification can exist multiple times diff --git a/src/install.rdf b/src/install.rdf index 0d1f843..840997a 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ Torbutton Mike Perry torbut...@torproject.org -1.9.5.7 +1.9.5.8 https://www.torproject.org/projects/torbrowser.html.en chrome://torbutton/content/preferences.xul chrome://torbutton/skin/tor.png ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torbutton/maint-1.9.5] Activate donation banner for tr locale
commit 6af7c834e9f79af974625d0f925d064a098bbee8 Author: Georg KoppenDate: Wed Nov 9 10:35:36 2016 + Activate donation banner for tr locale --- src/chrome/content/aboutTor/donation_banner.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/chrome/content/aboutTor/donation_banner.js b/src/chrome/content/aboutTor/donation_banner.js index 1087815..7ff3a98 100644 --- a/src/chrome/content/aboutTor/donation_banner.js +++ b/src/chrome/content/aboutTor/donation_banner.js @@ -8,6 +8,7 @@ let kBannerLocales = [ "fa", "it", "nl", + "tr", "vi", "zh", ]; ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torbutton/maint-1.9.5] Update Translations
commit 94e5cfa96ed3ce4a3172efcbda8638e280de637e Author: Georg KoppenDate: Wed Nov 9 10:34:02 2016 + Update Translations --- src/chrome/locale/ar/aboutTor.properties| 7 +++ src/chrome/locale/de/aboutTor.properties| 7 +++ src/chrome/locale/es/aboutTor.properties| 7 +++ src/chrome/locale/eu/aboutTor.properties| 7 +++ src/chrome/locale/fa/aboutTor.properties| 7 +++ src/chrome/locale/fr/aboutTor.properties| 7 +++ src/chrome/locale/it/aboutTor.properties| 7 +++ src/chrome/locale/ja/aboutTor.properties| 7 +++ src/chrome/locale/ko/aboutTor.properties| 7 +++ src/chrome/locale/nl/aboutTor.properties| 7 +++ src/chrome/locale/pl/aboutTor.properties| 7 +++ src/chrome/locale/pt/aboutTor.properties| 7 +++ src/chrome/locale/ru/aboutTor.properties| 7 +++ src/chrome/locale/sv/aboutTor.properties| 7 +++ src/chrome/locale/tr/aboutTor.properties| 7 +++ src/chrome/locale/vi/aboutTor.properties| 7 +++ src/chrome/locale/zh-CN/aboutTor.properties | 7 +++ 17 files changed, 119 insertions(+) diff --git a/src/chrome/locale/ar/aboutTor.properties b/src/chrome/locale/ar/aboutTor.properties index d607324..76192f4 100644 --- a/src/chrome/locale/ar/aboutTor.properties +++ b/src/chrome/locale/ar/aboutTor.properties @@ -19,3 +19,10 @@ aboutTor.searchDC.privacy=Search securely with 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.donate=Donate Now! +aboutTor.donationBanner.heart=Tor is at the heart of Internet freedom +aboutTor.donationBanner.tagline1=Millions of People Depend on Tor for Online Security & Privacy +aboutTor.donationBanner.tagline2=A Network of People Protecting People +aboutTor.donationBanner.tagline3=Surveillance = Oppression +aboutTor.donationBanner.tagline4=Protecting Journalists, Activists & Whistleblowers Since 2006 diff --git a/src/chrome/locale/de/aboutTor.properties b/src/chrome/locale/de/aboutTor.properties index b7fc4bf..cb7a1fe 100644 --- a/src/chrome/locale/de/aboutTor.properties +++ b/src/chrome/locale/de/aboutTor.properties @@ -19,3 +19,10 @@ aboutTor.searchDC.privacy=Sicheres Suchen mit 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.donate=Jetzt spenden! +aboutTor.donationBanner.heart=Tor ist am Herz der Internetfreiheit +aboutTor.donationBanner.tagline1=Millionen von Menschen verlassen sich auf Tor für Online-Sicherheit & Datenschutz +aboutTor.donationBanner.tagline2=Ein Netzwerk von Menschen, die Menschen schützen +aboutTor.donationBanner.tagline3=Ãberwachung = Unterdrückung +aboutTor.donationBanner.tagline4=Schutz von Journalisten, Aktivisten und Hinweisgebern seit 2006 diff --git a/src/chrome/locale/es/aboutTor.properties b/src/chrome/locale/es/aboutTor.properties index fb92251..fe998a0 100644 --- a/src/chrome/locale/es/aboutTor.properties +++ b/src/chrome/locale/es/aboutTor.properties @@ -19,3 +19,10 @@ aboutTor.searchDC.privacy=Busque de forma segura con 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.donate=¡Done ahora! +aboutTor.donationBanner.heart=Tor está en el corazón de la libertad en Internet +aboutTor.donationBanner.tagline1=Millones de personas dependen de Tor para la seguridad y la privacidad en lÃnea +aboutTor.donationBanner.tagline2=Una red de personas protegiendo a personas +aboutTor.donationBanner.tagline3=Vigilancia = Opresión +aboutTor.donationBanner.tagline4=Protegiendo a periodistas, activistas e informantes desde 2006 diff --git a/src/chrome/locale/eu/aboutTor.properties b/src/chrome/locale/eu/aboutTor.properties index 30a7858..81d4c44 100644 --- a/src/chrome/locale/eu/aboutTor.properties +++ b/src/chrome/locale/eu/aboutTor.properties @@ -19,3 +19,10 @@ aboutTor.searchDC.privacy=Bilatumodu seguruan ondokoarekin: < 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.donate=Donate Now! +aboutTor.donationBanner.heart=Tor is at the heart of Internet freedom +aboutTor.donationBanner.tagline1=Millions of People Depend on Tor for Online Security & Privacy +aboutTor.donationBanner.tagline2=A Network of People Protecting People +aboutTor.donationBanner.tagline3=Surveillance = Oppression +aboutTor.donationBanner.tagline4=Protecting Journalists, Activists & Whistleblowers Since 2006 diff --git a/src/chrome/locale/fa/aboutTor.properties b/src/chrome/locale/fa/aboutTor.properties index 54e04d9..a591490 100644 ---