- tbb-commits - lists.torproject.org

[tor-browser-bundle/maint-6.0] Rotate ports third time for default obfs4 bridges
by gk＠torproject.org 08 Dec '16

08 Dec '16

commit 617d635074ddbd51cdf0ca287cc1faf6b3475965 Author: Lynn Tsai <lynntsai(a)gmail.com> Date: Tue Nov 29 22:46:59 2016 -0800 Rotate ports third time for default obfs4 bridges LeifEricson (blocked): Port 50001 --> 50002 Greenbelt (unblocked): Port 7013 --> 12166 Mosaddegh (blocked): Port 9332 --> 15937 MaBishomarim (blocked): Port 7920 --> 16488 JonbesheSabz (blocked): Port 4148 --> 4304 Azadi (unblocked): Port 6041 --> 16815 --- Bundle-Data/PTConfigs/bridge_prefs.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 664e607..6831555 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -15,24 +15,24 @@ pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.163:8080 A1 pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH"); -pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 154.35.22.10:9332 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 154.35.22.10:15937 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 198.245.60.50:443 752CF7825B3B9EA6A98C83AC41F7099D67007EA5 cert=xpmQtKUqQ/6v5X7ijgYE/f03+l2/EuQ1dexjyUhh16wQlu/cpXUGalmhDIlhuiQPNEKmKw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=1"); -pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 83.212.101.3:50001 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 83.212.101.3:50002 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=2"); -pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 154.35.22.11:7920 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 154.35.22.11:16488 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 154.35.22.12:80 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 154.35.22.13:443 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 154.35.22.10:80 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 154.35.22.10:443 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 154.35.22.11:443 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 154.35.22.11:80 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 154.35.22.9:7013 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 154.35.22.9:12166 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 154.35.22.9:80 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 154.35.22.9:443 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 154.35.22.12:4148 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.18", "obfs4 154.35.22.13:6041 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 154.35.22.12:4304 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.18", "obfs4 154.35.22.13:16815 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0");

1 0

[tor-browser-bundle/master] Rotate ports third time for default obfs4 bridges
by gk＠torproject.org 08 Dec '16

08 Dec '16

commit 2d3fb691b40323a0960e1c2758c00713f212e5fb Author: Lynn Tsai <lynntsai(a)gmail.com> Date: Tue Nov 29 22:46:59 2016 -0800 Rotate ports third time for default obfs4 bridges LeifEricson (blocked): Port 50001 --> 50002 Greenbelt (unblocked): Port 7013 --> 12166 Mosaddegh (blocked): Port 9332 --> 15937 MaBishomarim (blocked): Port 7920 --> 16488 JonbesheSabz (blocked): Port 4148 --> 4304 Azadi (unblocked): Port 6041 --> 16815 --- Bundle-Data/PTConfigs/bridge_prefs.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 664e607..6831555 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -15,24 +15,24 @@ pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.163:8080 A1 pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH"); -pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 154.35.22.10:9332 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 154.35.22.10:15937 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 198.245.60.50:443 752CF7825B3B9EA6A98C83AC41F7099D67007EA5 cert=xpmQtKUqQ/6v5X7ijgYE/f03+l2/EuQ1dexjyUhh16wQlu/cpXUGalmhDIlhuiQPNEKmKw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=1"); -pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 83.212.101.3:50001 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 83.212.101.3:50002 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=2"); -pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 154.35.22.11:7920 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 154.35.22.11:16488 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 154.35.22.12:80 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 154.35.22.13:443 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 154.35.22.10:80 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 154.35.22.10:443 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 154.35.22.11:443 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 154.35.22.11:80 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 154.35.22.9:7013 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 154.35.22.9:12166 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 154.35.22.9:80 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 154.35.22.9:443 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 154.35.22.12:4148 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.18", "obfs4 154.35.22.13:6041 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 154.35.22.12:4304 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.18", "obfs4 154.35.22.13:16815 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0");

1 0

[tor-browser-bundle/hardened-builds] Bug 20147: (re-)dzip.sh: various improvements
by gk＠torproject.org 07 Dec '16

07 Dec '16

commit c74da40d46b10c7a757f8835f8177602ed77f8e4 Author: Rusty Bird <rustybird(a)openmailbox.org> Date: Wed Sep 21 12:05:39 2016 +0000 Bug 20147: (re-)dzip.sh: various improvements - Don't ignore errors - Quote $@ and $1 - Work with absolute filenames and filenames starting with a dash - Pass many files per chmod invocation (much faster) - Pass $UNZIPOPTS, like $ZIPOPTS - Reuse dzip.sh in re-dzip.sh The (re)generated zip files are identical. --- gitian/build-helpers/dzip.sh | 17 ++++++++--------- gitian/build-helpers/re-dzip.sh | 23 ++++++++++------------- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/gitian/build-helpers/dzip.sh b/gitian/build-helpers/dzip.sh index 5772c8b..64fcdca 100755 --- a/gitian/build-helpers/dzip.sh +++ b/gitian/build-helpers/dzip.sh @@ -1,14 +1,13 @@ -#!/bin/sh +#!/bin/sh -e # Crappy deterministic zip wrapper export LC_ALL=C -ZIPFILE=$1 +ZIPFILE=${1:?} shift -[ -n "$REFERENCE_DATETIME" ] && \ - find $@ -exec touch --date="$REFERENCE_DATETIME" {} \; - -find $@ -executable -exec chmod 700 {} \; -find $@ ! -executable -exec chmod 600 {} \; - -find $@ | sort | zip $ZIPOPTS -X -@ "$ZIPFILE" +if [ -n "$REFERENCE_DATETIME" ]; then + find "$@" -exec touch --date="$REFERENCE_DATETIME" -- {} + +fi +find "$@" -executable -exec chmod 700 {} + +find "$@" ! -executable -exec chmod 600 {} + +find "$@" | sort | zip $ZIPOPTS -X -@ "$ZIPFILE" diff --git a/gitian/build-helpers/re-dzip.sh b/gitian/build-helpers/re-dzip.sh index 27828e9..58942c4 100755 --- a/gitian/build-helpers/re-dzip.sh +++ b/gitian/build-helpers/re-dzip.sh @@ -1,17 +1,14 @@ -#!/bin/sh +#!/bin/sh -e # Crappy deterministic zip repackager export LC_ALL=C -ZIPFILE=`basename $1` +ZIPFILE_BASENAME=$(basename -- "${1:?}") +TEMPDIR=tmp-re-dzip-$$ +RE_DZIP=$(readlink -f -- "$(which -- "$0")") +PATH=$PATH:$(dirname "$RE_DZIP") -mkdir tmp_dzip -cd tmp_dzip -unzip ../$1 -[ -n "$REFERENCE_DATETIME" ] && \ - find . -exec touch --date="$REFERENCE_DATETIME" {} \; -find . -executable -exec chmod 700 {} \; -find . ! -executable -exec chmod 600 {} \; -find . | sort | zip $ZIPOPTS -X -@ $ZIPFILE -mv $ZIPFILE ../$1 -cd .. -rm -rf tmp_dzip +mkdir "$TEMPDIR" +unzip $UNZIPOPTS -d "$TEMPDIR" -- "$1" +(cd "$TEMPDIR"; dzip.sh ./"$ZIPFILE_BASENAME" .) +mv -- "$TEMPDIR"/"$ZIPFILE_BASENAME" "$1" +rm -rf "$TEMPDIR"

1 0

[tor-browser-bundle/master] Bug 20147: (re-)dzip.sh: various improvements
by gk＠torproject.org 07 Dec '16

07 Dec '16

commit a38d827c12ce75d13e18f19fc8f5bac8aca28c55 Author: Rusty Bird <rustybird(a)openmailbox.org> Date: Wed Sep 21 12:05:39 2016 +0000 Bug 20147: (re-)dzip.sh: various improvements - Don't ignore errors - Quote $@ and $1 - Work with absolute filenames and filenames starting with a dash - Pass many files per chmod invocation (much faster) - Pass $UNZIPOPTS, like $ZIPOPTS - Reuse dzip.sh in re-dzip.sh The (re)generated zip files are identical. --- gitian/build-helpers/dzip.sh | 17 ++++++++--------- gitian/build-helpers/re-dzip.sh | 23 ++++++++++------------- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/gitian/build-helpers/dzip.sh b/gitian/build-helpers/dzip.sh index 5772c8b..64fcdca 100755 --- a/gitian/build-helpers/dzip.sh +++ b/gitian/build-helpers/dzip.sh @@ -1,14 +1,13 @@ -#!/bin/sh +#!/bin/sh -e # Crappy deterministic zip wrapper export LC_ALL=C -ZIPFILE=$1 +ZIPFILE=${1:?} shift -[ -n "$REFERENCE_DATETIME" ] && \ - find $@ -exec touch --date="$REFERENCE_DATETIME" {} \; - -find $@ -executable -exec chmod 700 {} \; -find $@ ! -executable -exec chmod 600 {} \; - -find $@ | sort | zip $ZIPOPTS -X -@ "$ZIPFILE" +if [ -n "$REFERENCE_DATETIME" ]; then + find "$@" -exec touch --date="$REFERENCE_DATETIME" -- {} + +fi +find "$@" -executable -exec chmod 700 {} + +find "$@" ! -executable -exec chmod 600 {} + +find "$@" | sort | zip $ZIPOPTS -X -@ "$ZIPFILE" diff --git a/gitian/build-helpers/re-dzip.sh b/gitian/build-helpers/re-dzip.sh index 27828e9..58942c4 100755 --- a/gitian/build-helpers/re-dzip.sh +++ b/gitian/build-helpers/re-dzip.sh @@ -1,17 +1,14 @@ -#!/bin/sh +#!/bin/sh -e # Crappy deterministic zip repackager export LC_ALL=C -ZIPFILE=`basename $1` +ZIPFILE_BASENAME=$(basename -- "${1:?}") +TEMPDIR=tmp-re-dzip-$$ +RE_DZIP=$(readlink -f -- "$(which -- "$0")") +PATH=$PATH:$(dirname "$RE_DZIP") -mkdir tmp_dzip -cd tmp_dzip -unzip ../$1 -[ -n "$REFERENCE_DATETIME" ] && \ - find . -exec touch --date="$REFERENCE_DATETIME" {} \; -find . -executable -exec chmod 700 {} \; -find . ! -executable -exec chmod 600 {} \; -find . | sort | zip $ZIPOPTS -X -@ $ZIPFILE -mv $ZIPFILE ../$1 -cd .. -rm -rf tmp_dzip +mkdir "$TEMPDIR" +unzip $UNZIPOPTS -d "$TEMPDIR" -- "$1" +(cd "$TEMPDIR"; dzip.sh ./"$ZIPFILE_BASENAME" .) +mv -- "$TEMPDIR"/"$ZIPFILE_BASENAME" "$1" +rm -rf "$TEMPDIR"

1 0

[tor-browser/tor-browser-45.5.1esr-6.0-1] squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
by gk＠torproject.org 07 Dec '16

07 Dec '16

commit 2c396200c8c659c6e2c3ab8e40851aa984da49eb Author: Georg Koppen <gk(a)torproject.org> Date: Tue Nov 29 09:43:16 2016 +0000 squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing This fixes bug 20809: the DuckDuckGo team has changed its server-side code in a way that lets users with JavaScript enabled use the default landing page while those without JavaScript available get redirected directly to the non-JS page. We adapt the search engine URLs accordingly. --- browser/locales/en-US/searchplugins/ddg-onion.xml | 4 ++-- browser/locales/en-US/searchplugins/ddg.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/browser/locales/en-US/searchplugins/ddg-onion.xml b/browser/locales/en-US/searchplugins/ddg-onion.xml index 009da7e..a1f6a28 100644 --- a/browser/locales/en-US/searchplugins/ddg-onion.xml +++ b/browser/locales/en-US/searchplugins/ddg-onion.xml @@ -3,9 +3,9 @@ <Description>Duck Duck Go Onion</Description> <InputEncoding>UTF-8</InputEncoding> <Image height="16" width="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAB8lBMVEUAAADkRQzjPwPjQQXkRQ3iPwTiQQXgPQPeQgrcOwPVNgDVNQDWOgbTMwDRMgDQMwDSMwDRNwTQLgDRJgDSJwDSLgDSNwTjOgDiOADjOQDkPADhQAXzs5v+/fv////0vKbiRQvgPQHpdUr85NzuknPdKgDcIwDnZzj2w7HqeU/gPQLsimb/+PftjWn97Obpb0LdJQDeLQDtjmvsi2jgSBDnbULgOQD/39HgLQDeMgDpeFLgSBH0v670uqbaJQD2qImWvP/G1Ob5+/3u//+fvvXyp47dMwDaLwD0u6v0v6/aNQDiXi/aKQD3qozU7/8gSY2vvtg0ZK/OqLDaKQHYKgLgWTfaNADZMgDZMADZLADzqpD7//+xwdz//9H/5Bn/7Bn//ADofADYMADYMQDZOgPXLgDiZDj//97/0AD3tQDvlgHZOgbXLATXMADWMgDfXjLVLQD///z+0AD/3Rn/yRnwnQDcVjbVMQDyv67wuKTSJwDRHQD+8O/tg3/iQQDwhAHnawHWMADvtKfyva7XQxHga0bQGQD2vbH/u8LXIQCmPQzja07XQxLliGn99fPkcVHvhnGZ5VguvUU5wktBwCcAgxzydVv/8/XmiGngdlL+ysi3+I8LtCE80V6P3YmX4sDleljSNQLzr6D7sKPXNQTSIwAEAbMrAAAAF3RSTlMARqSkRvPz80PTpKRG3fPe3hio9/eoGP50jNsAAAABYktHRB5yCiArAAAAyElEQVQYGQXBvUqCYRiA4fu2V9Tn+UQddI3aCpxaOoU6iU4gcqqpoYbALXBuCuoYmttamq JDiEoh4YP+MOi6BNCh+uYKEGiOVNCXXxA2XDVV/UyfKbRCXTLQWAxbP2vt8Ue/uYDvfim91615sb2um6rqtrr/NFb1cUf1Ybd06areU6lSlYpK79jzK1SyJOkfhOl8JGEcqV5zoKrTRqO6yUzIzNu46ijdM1VV9bhuUJ/nZURExLRzUiPQm3kKXHi4BAEGOmOi78A/L1QoU/VHoTsAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTQtMDEtMTlUMjA6MDE6MTEtMDU6MDAuET6cAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE0LTAxLTE5VDIwOjAxOjExLTA1OjAwX0yGIAAAAABJRU5ErkJggg==</Image> -<Url type="text/html" method="POST" template="http://3g2upl4pq6kufc4m.onion/html/"> +<Url type="text/html" method="POST" template="http://3g2upl4pq6kufc4m.onion"> <Param name="q" value="{searchTerms}"/> </Url> -<SearchForm>http://3g2upl4pq6kufc4m.onion/html/</SearchForm> +<SearchForm>http://3g2upl4pq6kufc4m.onion</SearchForm> </SearchPlugin> diff --git a/browser/locales/en-US/searchplugins/ddg.xml b/browser/locales/en-US/searchplugins/ddg.xml index 8318746..acf4c41 100644 --- a/browser/locales/en-US/searchplugins/ddg.xml +++ b/browser/locales/en-US/searchplugins/ddg.xml @@ -22,9 +22,9 @@ AScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAA AAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMAD AADwDwAA+B8AAA==</Image> -<Url type="text/html" method="POST" template="https://duckduckgo.com/html"> +<Url type="text/html" method="POST" template="https://duckduckgo.com"> <Param name="q" value="{searchTerms}"/> </Url> -<SearchForm>https://duckduckgo.com/</SearchForm> +<SearchForm>https://duckduckgo.com</SearchForm> </SearchPlugin>

1 0

[tor-browser/tor-browser-45.5.1esr-6.5-1] squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
by gk＠torproject.org 07 Dec '16

07 Dec '16

commit 7aa3d81033b34d92c3b01308ad9b700bccd33458 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Nov 29 09:43:16 2016 +0000 squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing This fixes bug 20809: the DuckDuckGo team has changed its server-side code in a way that lets users with JavaScript enabled use the default landing page while those without JavaScript available get redirected directly to the non-JS page. We adapt the search engine URLs accordingly. --- browser/locales/en-US/searchplugins/ddg-onion.xml | 4 ++-- browser/locales/en-US/searchplugins/ddg.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/browser/locales/en-US/searchplugins/ddg-onion.xml b/browser/locales/en-US/searchplugins/ddg-onion.xml index 009da7e..a1f6a28 100644 --- a/browser/locales/en-US/searchplugins/ddg-onion.xml +++ b/browser/locales/en-US/searchplugins/ddg-onion.xml @@ -3,9 +3,9 @@ <Description>Duck Duck Go Onion</Description> <InputEncoding>UTF-8</InputEncoding> <Image height="16" width="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAB8lBMVEUAAADkRQzjPwPjQQXkRQ3iPwTiQQXgPQPeQgrcOwPVNgDVNQDWOgbTMwDRMgDQMwDSMwDRNwTQLgDRJgDSJwDSLgDSNwTjOgDiOADjOQDkPADhQAXzs5v+/fv////0vKbiRQvgPQHpdUr85NzuknPdKgDcIwDnZzj2w7HqeU/gPQLsimb/+PftjWn97Obpb0LdJQDeLQDtjmvsi2jgSBDnbULgOQD/39HgLQDeMgDpeFLgSBH0v670uqbaJQD2qImWvP/G1Ob5+/3u//+fvvXyp47dMwDaLwD0u6v0v6/aNQDiXi/aKQD3qozU7/8gSY2vvtg0ZK/OqLDaKQHYKgLgWTfaNADZMgDZMADZLADzqpD7//+xwdz//9H/5Bn/7Bn//ADofADYMADYMQDZOgPXLgDiZDj//97/0AD3tQDvlgHZOgbXLATXMADWMgDfXjLVLQD///z+0AD/3Rn/yRnwnQDcVjbVMQDyv67wuKTSJwDRHQD+8O/tg3/iQQDwhAHnawHWMADvtKfyva7XQxHga0bQGQD2vbH/u8LXIQCmPQzja07XQxLliGn99fPkcVHvhnGZ5VguvUU5wktBwCcAgxzydVv/8/XmiGngdlL+ysi3+I8LtCE80V6P3YmX4sDleljSNQLzr6D7sKPXNQTSIwAEAbMrAAAAF3RSTlMARqSkRvPz80PTpKRG3fPe3hio9/eoGP50jNsAAAABYktHRB5yCiArAAAAyElEQVQYGQXBvUqCYRiA4fu2V9Tn+UQddI3aCpxaOoU6iU4gcqqpoYbALXBuCuoYmttamq JDiEoh4YP+MOi6BNCh+uYKEGiOVNCXXxA2XDVV/UyfKbRCXTLQWAxbP2vt8Ue/uYDvfim91615sb2um6rqtrr/NFb1cUf1Ybd06areU6lSlYpK79jzK1SyJOkfhOl8JGEcqV5zoKrTRqO6yUzIzNu46ijdM1VV9bhuUJ/nZURExLRzUiPQm3kKXHi4BAEGOmOi78A/L1QoU/VHoTsAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTQtMDEtMTlUMjA6MDE6MTEtMDU6MDAuET6cAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE0LTAxLTE5VDIwOjAxOjExLTA1OjAwX0yGIAAAAABJRU5ErkJggg==</Image> -<Url type="text/html" method="POST" template="http://3g2upl4pq6kufc4m.onion/html/"> +<Url type="text/html" method="POST" template="http://3g2upl4pq6kufc4m.onion"> <Param name="q" value="{searchTerms}"/> </Url> -<SearchForm>http://3g2upl4pq6kufc4m.onion/html/</SearchForm> +<SearchForm>http://3g2upl4pq6kufc4m.onion</SearchForm> </SearchPlugin> diff --git a/browser/locales/en-US/searchplugins/ddg.xml b/browser/locales/en-US/searchplugins/ddg.xml index 8318746..acf4c41 100644 --- a/browser/locales/en-US/searchplugins/ddg.xml +++ b/browser/locales/en-US/searchplugins/ddg.xml @@ -22,9 +22,9 @@ AScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAA AAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMAD AADwDwAA+B8AAA==</Image> -<Url type="text/html" method="POST" template="https://duckduckgo.com/html"> +<Url type="text/html" method="POST" template="https://duckduckgo.com"> <Param name="q" value="{searchTerms}"/> </Url> -<SearchForm>https://duckduckgo.com/</SearchForm> +<SearchForm>https://duckduckgo.com</SearchForm> </SearchPlugin>

1 0

[tor-browser-bundle/master] Moving Go building into utils
by gk＠torproject.org 07 Dec '16

07 Dec '16

commit af596cb55dbcd300c989d02be7fffd1a16a7fb8a Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 23 13:26:45 2016 +0000 Moving Go building into utils --- .../linux/gitian-pluggable-transports.yml | 28 +++++----------------- gitian/descriptors/linux/gitian-utils.yml | 24 +++++++++++++++++++ gitian/mkbundle-linux.sh | 8 ++++++- 3 files changed, 37 insertions(+), 23 deletions(-) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 38804dd..c790a9f 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -45,13 +45,13 @@ files: - "zope.interface.zip" - "twisted.tar.bz2" - "parsley.tar.gz" -- "go14.tar.gz" -- "go.tar.gz" - "dzip.sh" - "gmp-linux32-utils.zip" - "gmp-linux64-utils.zip" - "openssl-linux32-utils.zip" - "openssl-linux64-utils.zip" +- "go-linux32-utils.zip" +- "go-linux64-utils.zip" script: | INSTDIR="$HOME/install" PTDIR="$INSTDIR/Tor/PluggableTransports" @@ -71,29 +71,13 @@ script: | unzip -d $INSTDIR gmp-linux$GBUILD_BITS-utils.zip unzip -d $INSTDIR openssl-linux$GBUILD_BITS-utils.zip + unzip -d $INSTDIR go-linux$GBUILD_BITS-utils.zip + export GOROOT="$INSTDIR/go" + export GOPATH="$HOME/go" + export PATH="$PATH:$GOROOT/bin" # 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" - tar xvf go.tar.gz - cd go/src - ./make.bash - cd ../.. - export PATH="$PATH:$PWD/go/bin" - # Building pyptlib cd pyptlib find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index 7093a0d..b5246f4 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -33,6 +33,8 @@ files: - "gcc.tar.bz2" - "openssl.tar.gz" - "gmp.tar.bz2" +- "go14.tar.gz" +- "go.tar.gz" - "versions" - "dzip.sh" script: | @@ -122,6 +124,27 @@ script: | make install cd .. + # 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 GOROOT="$INSTDIR/go" + tar xvf go.tar.gz + cd go/src + ./make.bash + cd ../.. + # Let's get it zipped up. + mv go $INSTDIR + # Grabbing the remaining results and making sure timestamps don't spoil them # Since we stopped using libfaketime, the binutils, gcc, openssl, # libevent archives are no longer reproducible. The main reason @@ -133,4 +156,5 @@ script: | ~/build/dzip.sh openssl-$OPENSSL_VER-linux$GBUILD_BITS-utils.zip openssl ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-linux$GBUILD_BITS-utils.zip libevent ~/build/dzip.sh gmp-$GMP_VER-linux$GBUILD_BITS-utils.zip gmp + ~/build/dzip.sh go-$GO_VER-linux$GBUILD_BITS-utils.zip go cp *utils.zip $OUTDIR/ diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 430b666..156d2ba 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -110,7 +110,9 @@ if [ ! -f inputs/binutils-$BINUTILS_VER-linux32-utils.zip -o \ ! -f inputs/libevent-${LIBEVENT_TAG_ORIG#release-}-linux32-utils.zip -o \ ! -f inputs/libevent-${LIBEVENT_TAG_ORIG#release-}-linux64-utils.zip -o \ ! -f inputs/gmp-$GMP_VER-linux32-utils.zip -o \ - ! -f inputs/gmp-$GMP_VER-linux64-utils.zip ]; + ! -f inputs/gmp-$GMP_VER-linux64-utils.zip -o \ + ! -f inputs/go-$GO_VER-linux32-utils.zip -o \ + ! -f inputs/go-$GO_VER-linux64-utils.zip ]; then echo echo "****** Starting Utilities Component of Linux Bundle (1/6 for Linux) ******" @@ -135,6 +137,8 @@ then ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-linux64-utils.zip libevent-linux64-utils.zip ln -sf gmp-$GMP_VER-linux32-utils.zip gmp-linux32-utils.zip ln -sf gmp-$GMP_VER-linux64-utils.zip gmp-linux64-utils.zip + ln -sf go-$GO_VER-linux32-utils.zip go-linux32-utils.zip + ln -sf go-$GO_VER-linux64-utils.zip go-linux64-utils.zip cd .. #cp -a result/utils-linux-res.yml inputs/ else @@ -154,6 +158,8 @@ else ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-linux64-utils.zip libevent-linux64-utils.zip ln -sf gmp-$GMP_VER-linux32-utils.zip gmp-linux32-utils.zip ln -sf gmp-$GMP_VER-linux64-utils.zip gmp-linux64-utils.zip + ln -sf go-$GO_VER-linux32-utils.zip go-linux32-utils.zip + ln -sf go-$GO_VER-linux64-utils.zip go-linux64-utils.zip cd .. fi

1 0

[tor-browser-bundle/master] Bug 20758: Make the gb build directory deterministic
by gk＠torproject.org 06 Dec '16

06 Dec '16

commit 27cf6fc8837ab98cb702d8c4db093e7b8f9d1c07 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Dec 6 21:38:57 2016 +0000 Bug 20758: Make the gb build directory deterministic The build directory `gb` uses is created with `ioutil.TempDir()` which results in a different one for every started build with high probability. We make it deterministic with this commit. --- gitian/descriptors/linux/gitian-sandbox.yml | 2 ++ gitian/patches/gb-build-dir.patch | 31 +++++++++++++++++++++++++++++ gitian/versions.nightly | 4 ++-- 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/gitian/descriptors/linux/gitian-sandbox.yml b/gitian/descriptors/linux/gitian-sandbox.yml index 0f4f78c..0c67126 100644 --- a/gitian/descriptors/linux/gitian-sandbox.yml +++ b/gitian/descriptors/linux/gitian-sandbox.yml @@ -29,6 +29,7 @@ files: - "go-linux32-utils.zip" - "go-linux64-utils.zip" - "dzip.sh" +- "gb-build-dir.patch" script: | INSTDIR="$HOME/install" mkdir $INSTDIR/sandbox @@ -59,6 +60,7 @@ script: | # Building gb cd gb + patch -p1 < ../gb-build-dir.patch find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/github.com/constabulary/" ln -sf "$PWD" "$GOPATH/src/github.com/constabulary/gb" diff --git a/gitian/patches/gb-build-dir.patch b/gitian/patches/gb-build-dir.patch new file mode 100644 index 0000000..a52ca69 --- /dev/null +++ b/gitian/patches/gb-build-dir.patch @@ -0,0 +1,31 @@ +From a7b198e3a32509197150d7c2767262a7319ff339 Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Tue, 6 Dec 2016 21:34:16 +0000 +Subject: [PATCH] Make the gb build directory deterministic + + +diff --git a/context.go b/context.go +index 53c00da..d040082 100644 +--- a/context.go ++++ b/context.go +@@ -3,7 +3,6 @@ package gb + import ( + "fmt" + "io" +- "io/ioutil" + "os" + "os/exec" + "path/filepath" +@@ -136,7 +135,8 @@ func NewContext(p Project, opts ...func(*Context) error) (*Context, error) { + }, + GcToolchain(), + } +- workdir, err := ioutil.TempDir("", "gb") ++ workdir := filepath.Join(os.TempDir(), "gb") ++ err := os.Mkdir(workdir, 0777) + if err != nil { + return nil, err + } +-- +2.10.2 + diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 304284d..2df094b 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -48,8 +48,8 @@ GO_X_CRYPTO_TAG=master GO_X_NET_TAG=master OBFS4_TAG=master NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 -ERRORS_TAG=master -GB_TAG=master +ERRORS_TAG=248dadf4e9068a0b3e79f02ed0a610d935de5302 +GB_TAG=06cc925cce6592e922dcc4839a8b44feb384e71e SANDBOX_TAG=master GITIAN_TAG=tor-browser-builder-4

1 0

[tor-browser-bundle/master] Bug 20352: Adding sandbox to our Gitian build
by gk＠torproject.org 06 Dec '16

06 Dec '16

commit 522cee6cb9c83be66cc2a6b5bbfefdb3c2bc3217 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Dec 6 21:20:53 2016 +0000 Bug 20352: Adding sandbox to our Gitian build On Linux we start building Yawning's sandbox code while producing the Linux Tor Browser bundles. For that to work properly we need to use Debian Jessie images and install some packages from backports as not all dependencies are available in Wheezy. --- gitian/Makefile | 6 ++- gitian/descriptors/linux/gitian-sandbox.yml | 77 +++++++++++++++++++++++++++++ gitian/fetch-inputs.sh | 3 ++ gitian/make-vms.sh | 22 ++++++++- gitian/mkbundle-linux.sh | 44 +++++++++++++---- gitian/versions.nightly | 3 ++ 6 files changed, 141 insertions(+), 14 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index a4a757f..5694cbf 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -101,8 +101,7 @@ prep-alpha: ./check-prerequisites.sh $(TORSOCKS) ./fetch-inputs.sh ../../gitian-builder/inputs/ versions.alpha - -clean: clean-utils clean-tor clean-browser clean-pt clean-bundle +clean: clean-utils clean-tor clean-browser clean-pt clean-sandbox clean-bundle rm -f ../../gitian-builder/inputs/*.yml rm -f ../../gitian-builder/inputs/bundle.inputs rm -f ../../gitian-builder/inputs/versions* @@ -124,6 +123,9 @@ clean-browser: clean-bundle clean-pt: clean-bundle rm -f ../../gitian-builder/inputs/pluggable-transports* +clean-sandbox: clean-bundle + rm -f ../../gitian-builder/inputs/sandbox-linux* + clean-bundle: rm -f ../../gitian-builder/inputs/bundle-* diff --git a/gitian/descriptors/linux/gitian-sandbox.yml b/gitian/descriptors/linux/gitian-sandbox.yml new file mode 100644 index 0000000..0f4f78c --- /dev/null +++ b/gitian/descriptors/linux/gitian-sandbox.yml @@ -0,0 +1,77 @@ +--- +name: "sandbox-linux" +distro: "debian" +suites: +- "jessie" +architectures: +- "i386" +- "amd64" +packages: +- "unzip" +- "zip" +- "hardening-wrapper" +# Needed for the sandboxing code +- "libx11-dev" +- "pkg-config" +- "libgtk-3-dev" +backports_packages: +- "libseccomp-dev" +- "libseccomp2" +reference_datetime: "2000-01-01 00:00:00" +remotes: +- "url": "https://github.com/pkg/error" + "dir": "errors" +- "url": "https://github.com/constabulary/gb" + "dir": "gb" +- "url": "https://git.schwanenlied.me/yawning/sandboxed-tor-browser" + "dir": "sandbox" +files: +- "go-linux32-utils.zip" +- "go-linux64-utils.zip" +- "dzip.sh" +script: | + INSTDIR="$HOME/install" + mkdir $INSTDIR/sandbox + export REFERENCE_DATETIME + export TZ=UTC + export LC_ALL=C + umask 0022 + + # Config options for hardening-wrapper for the stub + export DEB_BUILD_HARDENING=1 + export DEB_BUILD_HARDENING_STACKPROTECTOR=1 + export DEB_BUILD_HARDENING_FORTIFY=1 + export DEB_BUILD_HARDENING_FORMAT=1 + export DEB_BUILD_HARDENING_PIE=1 + + unzip -d $INSTDIR go-linux$GBUILD_BITS-utils.zip + export GOROOT="$INSTDIR/go" + export GOPATH="$HOME/go" + export PATH="$PATH:$GOROOT/bin:$GOPATH/bin" + + # Building errors + cd errors + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" + mkdir -p "$GOPATH/src/github.com/pkg/" + ln -sf "$PWD" "$GOPATH/src/github.com/pkg/errors" + go install github.com/pkg/errors + cd .. + + # Building gb + cd gb + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" + mkdir -p "$GOPATH/src/github.com/constabulary/" + ln -sf "$PWD" "$GOPATH/src/github.com/constabulary/gb" + go install github.com/constabulary/gb/cmd/gb + cd .. + + # XXX: Use own C compiler + # Building the sandbox + cd sandbox + make + cp bin/sandboxed-tor-browser $INSTDIR/sandbox + cd .. + + cd $INSTDIR + ~/build/dzip.sh sandbox-linux$GBUILD_BITS.zip sandbox/ + cp sandbox-linux$GBUILD_BITS.zip $OUTDIR/ diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index bf60ca3..b3d5c26 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -293,6 +293,9 @@ goxcrypto https://go.googlesource.com/crypto $GO_X_CRYPTO_TAG goxnet https://go.googlesource.com/net $GO_X_NET_TAG obfs4 https://git.torproject.org/pluggable-transports/obfs4.git $OBFS4_TAG noto-fonts https://github.com/googlei18n/noto-fonts $NOTOFONTS_TAG +errors https://github.com/pkg/errors $ERRORS_TAG +gb https://github.com/constabulary/gb $GB_TAG +sandbox https://git.schwanenlied.me/yawning/sandboxed-tor-browser $SANDBOX_TAG EOF # HTTPS-Everywhere is special, too. We need to initialize the git submodules and diff --git a/gitian/make-vms.sh b/gitian/make-vms.sh index 089865b..7edd2b4 100755 --- a/gitian/make-vms.sh +++ b/gitian/make-vms.sh @@ -32,7 +32,7 @@ build_and_test_vm() { then export LXC_SUITE=$dist export LXC_ARCH=$arch - if [ "$dist" = "wheezy" ]; + if [ "$dist" = "wheezy" -o "$dist" = "jessie" ]; then export DISTRO=debian ./bin/make-base-vm --distro debian --suite $dist --lxc --arch $arch @@ -41,7 +41,7 @@ build_and_test_vm() { ./bin/make-base-vm --suite $dist --lxc --arch $arch fi else - if [ "$dist" = "wheezy" ]; + if [ "$dist" = "wheezy" -o "$dist" = "jessie" ]; then export DISTRO=debian ./bin/make-base-vm --distro debian --suite $dist --arch $arch @@ -89,6 +89,24 @@ do echo done +while ! build_and_test_vm jessie i386 32 +do + stop-target 32 jessie + rm ./base-jessie-amd64* + echo + echo "Jessie i386 VM build failed... Trying again" + echo +done + +while ! build_and_test_vm jessie amd64 64 +do + stop-target 64 jessie + rm ./base-jessie-amd64* + echo + echo "Jessie amd64 VM build failed... Trying again" + echo +done + while ! build_and_test_vm precise i386 32 do stop-target 32 precise diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index f8aaec1..430b666 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -78,6 +78,7 @@ die_msg() { # the utils both if we verify tags and if we don't. LIBEVENT_TAG_ORIG=$LIBEVENT_TAG +SANDBOX_ORIG_TAG=$SANDBOX_TAG if [ "z$VERIFY_TAGS" = "z1" ]; then @@ -112,7 +113,7 @@ if [ ! -f inputs/binutils-$BINUTILS_VER-linux32-utils.zip -o \ ! -f inputs/gmp-$GMP_VER-linux64-utils.zip ]; then echo - echo "****** Starting Utilities Component of Linux Bundle (1/5 for Linux) ******" + echo "****** Starting Utilities Component of Linux Bundle (1/6 for Linux) ******" echo ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit libevent=$LIBEVENT_TAG $DESCRIPTOR_DIR/linux/gitian-utils.yml @@ -138,7 +139,7 @@ then #cp -a result/utils-linux-res.yml inputs/ else echo - echo "****** SKIPPING already built Utilities Component of Linux Bundle (1/5 for Linux) ******" + echo "****** SKIPPING already built Utilities Component of Linux Bundle (1/6 for Linux) ******" echo # We might have built the utilities in the past but maybe the links are # pointing to the wrong version. Refresh them. @@ -160,7 +161,7 @@ if [ ! -f inputs/tor-linux32-gbuilt.zip -o \ ! -f inputs/tor-linux64-gbuilt.zip ]; then echo - echo "****** Starting Tor Component of Linux Bundle (2/5 for Linux) ******" + echo "****** Starting Tor Component of Linux Bundle (2/6 for Linux) ******" echo ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit tor=$TOR_TAG $DESCRIPTOR_DIR/linux/gitian-tor.yml @@ -175,7 +176,7 @@ then #cp -a result/tor-linux-res.yml inputs/ else echo - echo "****** SKIPPING already built Tor Component of Linux Bundle (2/5 for Linux) ******" + echo "****** SKIPPING already built Tor Component of Linux Bundle (2/6 for Linux) ******" echo fi @@ -184,7 +185,7 @@ if [ ! -f inputs/tor-browser-linux32-gbuilt.zip -o \ ! -f inputs/tor-browser-linux64-gbuilt.zip ]; then echo - echo "****** Starting TorBrowser Component of Linux Bundle (3/5 for Linux) ******" + echo "****** Starting TorBrowser Component of Linux Bundle (3/6 for Linux) ******" echo ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit tor-browser=$TORBROWSER_TAG,faketime=$FAKETIME_TAG $DESCRIPTOR_DIR/linux/gitian-firefox.yml @@ -200,7 +201,7 @@ then #cp -a result/torbrowser-linux-res.yml inputs/ else echo - echo "****** SKIPPING already built TorBrowser Component of Linux Bundle (3/5 for Linux) ******" + echo "****** SKIPPING already built TorBrowser Component of Linux Bundle (3/6 for Linux) ******" echo fi @@ -208,7 +209,7 @@ if [ ! -f inputs/pluggable-transports-linux32-gbuilt.zip -o \ ! -f inputs/pluggable-transports-linux64-gbuilt.zip ]; then echo - echo "****** Starting Pluggable Transports Component of Linux Bundle (4/5 for Linux) ******" + echo "****** Starting Pluggable Transports Component of Linux Bundle (4/6 for Linux) ******" echo ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml @@ -222,14 +223,35 @@ then #cp -a result/pluggable-transports-linux-res.yml inputs/ else echo - echo "****** SKIPPING already built Pluggable Transports Component of Linux Bundle (4/5 for Linux) ******" + echo "****** SKIPPING already built Pluggable Transports Component of Linux Bundle (4/6 for Linux) ******" + echo +fi + +if [ ! -f inputs/sandbox-linux32.zip -o \ + ! -f inputs/sandbox-linux64.zip ]; +then + echo + echo "****** Starting Sandbox Component of Linux Bundle (5/6 for Linux) ******" + echo + + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit errors=$ERRORS_TAG,gb=$GB_TAG,sandbox=$SANDBOX_TAG $DESCRIPTOR_DIR/linux/gitian-sandbox.yml + if [ $? -ne 0 ]; + then + exit 1 + fi + + cp -a build/out/sandbox-linux*.zip inputs/ + #cp -a result/sandbox-linux-res.yml inputs/ +else + echo + echo "****** SKIPPING already built Sandbox Component of Linux Bundle (5/6 for Linux) ******" echo fi if [ ! -f inputs/bundle-linux.gbuilt ]; then echo - echo "****** Starting Bundling+Localization of Linux Bundle (5/5 for Linux) ******" + echo "****** Starting Bundling+Localization of Linux Bundle (6/6 for Linux) ******" echo cd $WRAPPER_DIR && ./record-inputs.sh $VERSIONS_FILE && cd $GITIAN_DIR @@ -246,10 +268,12 @@ then cp -a build/out/*.mar $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 cp -a inputs/mar-tools-linux*.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 cp -a inputs/*debug.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 + cp -a inputs/sandbox-linux32.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/sandbox-linux32-${SANDBOX_ORIG_TAG}.zip || exit 1 + cp -a inputs/sandbox-linux64.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/sandbox-linux64-${SANDBOX_ORIG_TAG}.zip || exit 1 touch inputs/bundle-linux.gbuilt else echo - echo "****** SKIPPING already built Bundling+Localization of Linux Bundle (5/5 for Linux) ******" + echo "****** SKIPPING already built Bundling+Localization of Linux Bundle (6/6 for Linux) ******" echo fi diff --git a/gitian/versions.nightly b/gitian/versions.nightly index f487cb5..304284d 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -48,6 +48,9 @@ GO_X_CRYPTO_TAG=master GO_X_NET_TAG=master OBFS4_TAG=master NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 +ERRORS_TAG=master +GB_TAG=master +SANDBOX_TAG=master GITIAN_TAG=tor-browser-builder-4

1 0

[gitian-builder/tor-browser-builder-4] Bug 20352: Enabling Jessie backports for libseccomp
by gk＠torproject.org 06 Dec '16

06 Dec '16

commit dd26189595159bb8f50185a754dd4d0bc61b5787 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Dec 5 07:30:33 2016 +0000 Bug 20352: Enabling Jessie backports for libseccomp --- target-bin/bootstrap-fixup.in | 1 + 1 file changed, 1 insertion(+) diff --git a/target-bin/bootstrap-fixup.in b/target-bin/bootstrap-fixup.in index 738ed82..d8aaed3 100755 --- a/target-bin/bootstrap-fixup.in +++ b/target-bin/bootstrap-fixup.in @@ -13,6 +13,7 @@ elif [ $DISTRIB_NAME = "Debian" ]; then echo "deb http://HOSTIP:3142/ftp.debian.org/debian $DISTRIB_CODENAME main" > $1/etc/apt/sources.list echo "deb http://HOSTIP:3142/security.debian.org/ $DISTRIB_CODENAME/updates main" >> $1/etc/apt/sources.list echo "deb http://HOSTIP:3142/ftp.debian.org/debian $DISTRIB_CODENAME-updates main" >> $1/etc/apt/sources.list + echo "deb http://HOSTIP:3142/ftp.debian.org/debian $DISTRIB_CODENAME-backports main" >> $1/etc/apt/sources.list # grub-legacy conflicts grub-pc dependencies # No grub-legacy on Ubuntu, just on Debian # Work around bcron-run conflict due to cron being removed

1 0

[gitian-builder/tor-browser-builder-4] Bug 20352: add option to install backports packages
by gk＠torproject.org 06 Dec '16

06 Dec '16

commit afe8247f9fdf561b3e0d7701d2f49ef3bd5e6cb4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Dec 5 13:42:04 2016 +0100 Bug 20352: add option to install backports packages The packages listed in the descriptors in 'backports_packages' are installed from the backports. --- bin/gbuild | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bin/gbuild b/bin/gbuild index 512733a..e61fcb6 100755 --- a/bin/gbuild +++ b/bin/gbuild @@ -102,6 +102,11 @@ def build_one_configuration(distro, suite, arch, build_desc) info "Installing additional packages (log in var/install.log)" system! "on-target -u root -e DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends -y install #{build_desc["packages"].join(" ")} > var/install.log 2>&1" + if build_desc.has_key?("backports_packages") + info "Installing additional backport packages (log in var/backports-install.log)" + system! "on-target -u root -e DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends -y -t #{suite}-backports install #{build_desc["backports_packages"].join(" ")} > var/backports-install.log 2>&1" + end + if @options[:upgrade] || system("on-target -u root '[ ! -e /var/cache/gitian/initial-upgrade ]'") info "Upgrading system, may take a while" system! "on-target -u root bash < target-bin/upgrade-system.sh > var/install.log 2>&1"

1 0

[tor-browser-bundle/hardened-builds] Bug 20903: Update gitian branch for nightlies if needed
by gk＠torproject.org 06 Dec '16

06 Dec '16

commit a0c4b74b735e2e2c71bfe9054cde5085ca9033c7 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Dec 6 19:55:17 2016 +0000 Bug 20903: Update gitian branch for nightlies if needed --- gitian/fetch-inputs.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index bbd2c88..65ebc11 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -253,7 +253,13 @@ cd .. git remote set-url origin https://git.torproject.org/builders/gitian-builder.git git fetch origin git fetch --tags origin # XXX - why do we fetch tags specifically? -git checkout "$GITIAN_TAG" +# If we're not verifying tags, then the branch requires an update. +if [ $VERIFY_TAGS -eq 0 ]; +then + git pull +else + git checkout "$GITIAN_TAG" +fi cd inputs while read dir url tag; do

1 0

[tor-browser-bundle/master] Bug 20903: Update gitian branch for nightlies if needed
by gk＠torproject.org 06 Dec '16

06 Dec '16

commit ff22f6b3c8662a6bfcd67c17f86a4ca98564099c Author: Georg Koppen <gk(a)torproject.org> Date: Tue Dec 6 19:55:17 2016 +0000 Bug 20903: Update gitian branch for nightlies if needed --- gitian/fetch-inputs.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 50daec0..bf60ca3 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -254,7 +254,13 @@ cd .. git remote set-url origin https://git.torproject.org/builders/gitian-builder.git git fetch origin git fetch --tags origin # XXX - why do we fetch tags specifically? -git checkout "$GITIAN_TAG" +# If we're not verifying tags, then the branch requires an update. +if [ $VERIFY_TAGS -eq 0 ]; +then + git pull +else + git checkout "$GITIAN_TAG" +fi cd inputs while read dir url tag; do

1 0

[tor-browser-bundle/hardened-builds] Bug 20660: use mar-tools from the release's directory
by gk＠torproject.org 06 Dec '16

06 Dec '16

commit 1a8db0805c7532a3be2b8d524fe50956f7709d64 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Dec 6 16:00:10 2016 +0100 Bug 20660: use mar-tools from the release's directory --- gitian/check-prerequisites.sh | 2 +- tools/update-responses/README.md | 12 ++++------ tools/update-responses/update_responses | 41 +++++++++++++++++++++------------ 3 files changed, 32 insertions(+), 23 deletions(-) diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index 6b88a90..858fd4d 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -68,7 +68,7 @@ then exit 1 fi -update_responses_pkg="libyaml-perl libfile-slurp-perl libxml-writer-perl libio-captureoutput-perl libfile-which-perl libparallel-forkmanager-perl libxml-libxml-perl libwww-perl libjson-perl" +update_responses_pkg="libyaml-perl libfile-slurp-perl libxml-writer-perl libio-captureoutput-perl libparallel-forkmanager-perl libxml-libxml-perl libwww-perl libjson-perl" missing_pkg='' for pkg in $update_responses_pkg do diff --git a/tools/update-responses/README.md b/tools/update-responses/README.md index 5440b0d..5209ed5 100644 --- a/tools/update-responses/README.md +++ b/tools/update-responses/README.md @@ -13,25 +13,23 @@ Dependencies The following perl modules need to be installed to run the script: FindBin YAML File::Slurp Digest::SHA XML::Writer File::Temp - IO::CaptureOutput File::Which Parallel::ForkManager XML::LibXML - LWP JSON + IO::CaptureOutput Parallel::ForkManager XML::LibXML LWP JSON On Debian / Ubuntu you can install them with: ``` # apt-get install libfindbin-libs-perl libyaml-perl libfile-slurp-perl \ libdigest-sha-perl libxml-writer-perl \ - libio-captureoutput-perl libfile-which-perl \ - libparallel-forkmanager-perl libxml-libxml-perl \ - libwww-perl libjson-perl + libio-captureoutput-perl libparallel-forkmanager-perl \ + libxml-libxml-perl libwww-perl libjson-perl ``` On Red Hat / Fedora you can install them with: ``` # for module in FindBin YAML File::Slurp Digest::SHA XML::Writer \ - File::Temp IO::CaptureOutput File::Which \ - Parallel::ForkManager XML::LibXML LWP JSON + File::Temp IO::CaptureOutput Parallel::ForkManager \ + XML::LibXML LWP JSON do yum install "perl($module)"; done ``` diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 1064a01..c776c7f 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -12,7 +12,6 @@ use Cwd; use File::Copy; use File::Temp; use File::Find; -use File::Which; use POSIX qw(setlocale LC_ALL); use IO::CaptureOutput qw(capture_exec); use Parallel::ForkManager; @@ -33,6 +32,8 @@ my %htdocsfiles; my $releases_dir = $config->{releases_dir}; $releases_dir = "$FindBin::Bin/$releases_dir" unless $releases_dir =~ m/^\//; my @check_errors; +my $initPATH = $ENV{PATH}; +my $initLD_LIBRARY_PATH = $ENV{LD_LIBRARY_PATH}; sub exit_error { print STDERR "Error: ", $_[0], "\n"; @@ -243,6 +244,7 @@ sub channel_to_version { sub get_buildinfos { my ($config, $version) = @_; return if exists $config->{versions}{$version}{buildID}; + extract_martools($version); my $files = $config->{versions}{$version}{files}; foreach my $os (keys %$files) { foreach my $lang (keys %{$files->{$os}}) { @@ -378,12 +380,6 @@ sub write_downloads_json { } } -sub check_deps { - foreach my $bin (qw(bunzip2 mar mbsdiff make_incremental_update.sh)) { - exit_error "Cannot find $bin in PATH" unless which($bin); - } -} - sub osname { my ($osname) = capture_exec('uname', '-s'); my ($arch) = capture_exec('uname', '-m'); @@ -399,17 +395,18 @@ sub osname { my $martools_tmpdir; sub extract_martools { + my ($version) = @_; my $osname = osname; - my $marzip = "$FindBin::Bin/../../../gitian-builder/inputs/mar-tools-$osname.zip"; + my $marzip = "$releases_dir/$version/mar-tools-$osname.zip"; $martools_tmpdir = File::Temp->newdir(); my $old_cwd = getcwd; chdir $martools_tmpdir; my (undef, undef, $success) = capture_exec('unzip', $marzip); chdir $old_cwd; exit_error "Error extracting $marzip" unless $success; - $ENV{PATH} .= ":$martools_tmpdir/mar-tools"; - if ($ENV{LD_LIBRARY_PATH}) { - $ENV{LD_LIBRARY_PATH} .= ":$martools_tmpdir/mar-tools"; + $ENV{PATH} = "$martools_tmpdir/mar-tools:$initPATH"; + if ($initLD_LIBRARY_PATH) { + $ENV{LD_LIBRARY_PATH} = "$initLD_LIBRARY_PATH:$martools_tmpdir/mar-tools"; } else { $ENV{LD_LIBRARY_PATH} = "$martools_tmpdir/mar-tools"; } @@ -519,6 +516,23 @@ sub download_version { move "$tmpdir/sha256sums-unsigned-build.txt", "$destdir/sha256sums-unsigned-build.txt"; my %sums = map { chomp; reverse split ' ', $_ } read_file "$destdir/sha256sums-unsigned-build.txt"; + + my $martools = 'mar-tools-' . osname . '.zip'; + exit_error "Error downloading $urldir/$martools\n" + unless getstore("$urldir/$martools", "$tmpdir/$martools") == 200; + exit_error "Error downloading $urldir/$martools.asc\n" + unless getstore("$urldir/$martools.asc", "$tmpdir/$martools.asc") == 200; + if (system('gpg', '--no-default-keyring', '--keyring', + "$FindBin::Bin/$config->{download}{gpg_keyring}", '--verify', + "$tmpdir/$martools.asc", "$tmpdir/$martools")) { + exit_error "Error checking gpg signature for $version/$martools"; + } + exit_error "Wrong checksum for $version/$martools" + unless $sums{$martools} eq sha256_hex(read_file("$tmpdir/$martools")); + move "$tmpdir/$martools", "$destdir/$martools"; + move "$tmpdir/$martools.asc", "$destdir/$martools.asc"; + extract_martools($version); + foreach my $file (sort grep { $_ =~ m/\.mar$/ } keys %sums) { print "Downloading $file\n"; exit_error "Error downloading $urldir/$file\n" @@ -580,7 +594,6 @@ 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); @@ -588,9 +601,8 @@ my %actions = ( }, gen_incrementals => sub { my ($config) = @_; - extract_martools; - check_deps; foreach my $version (channel_to_version($config, @ARGV)) { + extract_martools($version); get_version_files($config, $version); create_incremental_mars_for_version($config, $version); } @@ -598,7 +610,6 @@ my %actions = ( download_missing_versions => sub { my ($config) = @_; my @channels = @ARGV ? @ARGV : keys %{$config->{channels}}; - extract_martools; download_missing_versions($config, @channels); }, check_update_responses_deployement => \&check_update_responses,

1 0

[tor-browser-bundle/master] Bug 20660: use mar-tools from the release's directory
by gk＠torproject.org 06 Dec '16

06 Dec '16

commit 8e22c3006c81a95a53b0e67cbf5e90e91732d9d9 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Dec 6 16:00:10 2016 +0100 Bug 20660: use mar-tools from the release's directory --- gitian/check-prerequisites.sh | 2 +- tools/update-responses/README.md | 12 ++++------ tools/update-responses/update_responses | 41 +++++++++++++++++++++------------ 3 files changed, 32 insertions(+), 23 deletions(-) diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index 6b88a90..858fd4d 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -68,7 +68,7 @@ then exit 1 fi -update_responses_pkg="libyaml-perl libfile-slurp-perl libxml-writer-perl libio-captureoutput-perl libfile-which-perl libparallel-forkmanager-perl libxml-libxml-perl libwww-perl libjson-perl" +update_responses_pkg="libyaml-perl libfile-slurp-perl libxml-writer-perl libio-captureoutput-perl libparallel-forkmanager-perl libxml-libxml-perl libwww-perl libjson-perl" missing_pkg='' for pkg in $update_responses_pkg do diff --git a/tools/update-responses/README.md b/tools/update-responses/README.md index 5440b0d..5209ed5 100644 --- a/tools/update-responses/README.md +++ b/tools/update-responses/README.md @@ -13,25 +13,23 @@ Dependencies The following perl modules need to be installed to run the script: FindBin YAML File::Slurp Digest::SHA XML::Writer File::Temp - IO::CaptureOutput File::Which Parallel::ForkManager XML::LibXML - LWP JSON + IO::CaptureOutput Parallel::ForkManager XML::LibXML LWP JSON On Debian / Ubuntu you can install them with: ``` # apt-get install libfindbin-libs-perl libyaml-perl libfile-slurp-perl \ libdigest-sha-perl libxml-writer-perl \ - libio-captureoutput-perl libfile-which-perl \ - libparallel-forkmanager-perl libxml-libxml-perl \ - libwww-perl libjson-perl + libio-captureoutput-perl libparallel-forkmanager-perl \ + libxml-libxml-perl libwww-perl libjson-perl ``` On Red Hat / Fedora you can install them with: ``` # for module in FindBin YAML File::Slurp Digest::SHA XML::Writer \ - File::Temp IO::CaptureOutput File::Which \ - Parallel::ForkManager XML::LibXML LWP JSON + File::Temp IO::CaptureOutput Parallel::ForkManager \ + XML::LibXML LWP JSON do yum install "perl($module)"; done ``` diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index c60704f..b7f4b63 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -12,7 +12,6 @@ use Cwd; use File::Copy; use File::Temp; use File::Find; -use File::Which; use POSIX qw(setlocale LC_ALL); use IO::CaptureOutput qw(capture_exec); use Parallel::ForkManager; @@ -33,6 +32,8 @@ my %htdocsfiles; my $releases_dir = $config->{releases_dir}; $releases_dir = "$FindBin::Bin/$releases_dir" unless $releases_dir =~ m/^\//; my @check_errors; +my $initPATH = $ENV{PATH}; +my $initLD_LIBRARY_PATH = $ENV{LD_LIBRARY_PATH}; sub exit_error { print STDERR "Error: ", $_[0], "\n"; @@ -253,6 +254,7 @@ sub channel_to_version { sub get_buildinfos { my ($config, $version) = @_; return if exists $config->{versions}{$version}{buildID}; + extract_martools($version); my $files = $config->{versions}{$version}{files}; foreach my $os (keys %$files) { foreach my $lang (keys %{$files->{$os}}) { @@ -393,12 +395,6 @@ sub write_downloads_json { } } -sub check_deps { - foreach my $bin (qw(bunzip2 mar mbsdiff make_incremental_update.sh)) { - exit_error "Cannot find $bin in PATH" unless which($bin); - } -} - sub osname { my ($osname) = capture_exec('uname', '-s'); my ($arch) = capture_exec('uname', '-m'); @@ -414,17 +410,18 @@ sub osname { my $martools_tmpdir; sub extract_martools { + my ($version) = @_; my $osname = osname; - my $marzip = "$FindBin::Bin/../../../gitian-builder/inputs/mar-tools-$osname.zip"; + my $marzip = "$releases_dir/$version/mar-tools-$osname.zip"; $martools_tmpdir = File::Temp->newdir(); my $old_cwd = getcwd; chdir $martools_tmpdir; my (undef, undef, $success) = capture_exec('unzip', $marzip); chdir $old_cwd; exit_error "Error extracting $marzip" unless $success; - $ENV{PATH} .= ":$martools_tmpdir/mar-tools"; - if ($ENV{LD_LIBRARY_PATH}) { - $ENV{LD_LIBRARY_PATH} .= ":$martools_tmpdir/mar-tools"; + $ENV{PATH} = "$martools_tmpdir/mar-tools:$initPATH"; + if ($initLD_LIBRARY_PATH) { + $ENV{LD_LIBRARY_PATH} = "$initLD_LIBRARY_PATH:$martools_tmpdir/mar-tools"; } else { $ENV{LD_LIBRARY_PATH} = "$martools_tmpdir/mar-tools"; } @@ -534,6 +531,23 @@ sub download_version { move "$tmpdir/sha256sums-unsigned-build.txt", "$destdir/sha256sums-unsigned-build.txt"; my %sums = map { chomp; reverse split ' ', $_ } read_file "$destdir/sha256sums-unsigned-build.txt"; + + my $martools = 'mar-tools-' . osname . '.zip'; + exit_error "Error downloading $urldir/$martools\n" + unless getstore("$urldir/$martools", "$tmpdir/$martools") == 200; + exit_error "Error downloading $urldir/$martools.asc\n" + unless getstore("$urldir/$martools.asc", "$tmpdir/$martools.asc") == 200; + if (system('gpg', '--no-default-keyring', '--keyring', + "$FindBin::Bin/$config->{download}{gpg_keyring}", '--verify', + "$tmpdir/$martools.asc", "$tmpdir/$martools")) { + exit_error "Error checking gpg signature for $version/$martools"; + } + exit_error "Wrong checksum for $version/$martools" + unless $sums{$martools} eq sha256_hex(read_file("$tmpdir/$martools")); + move "$tmpdir/$martools", "$destdir/$martools"; + move "$tmpdir/$martools.asc", "$destdir/$martools.asc"; + extract_martools($version); + foreach my $file (sort grep { $_ =~ m/\.mar$/ } keys %sums) { print "Downloading $file\n"; exit_error "Error downloading $urldir/$file\n" @@ -595,7 +609,6 @@ 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); @@ -603,9 +616,8 @@ my %actions = ( }, gen_incrementals => sub { my ($config) = @_; - extract_martools; - check_deps; foreach my $version (channel_to_version($config, @ARGV)) { + extract_martools($version); get_version_files($config, $version); create_incremental_mars_for_version($config, $version); } @@ -613,7 +625,6 @@ my %actions = ( download_missing_versions => sub { my ($config) = @_; my @channels = @ARGV ? @ARGV : keys %{$config->{channels}}; - extract_martools; download_missing_versions($config, @channels); }, check_update_responses_deployement => \&check_update_responses,

1 0

[torbutton/master] Translation updates
by gk＠torproject.org 06 Dec '16

06 Dec '16

commit 265e7cd6715ff91e51b83f5e072bf0047eed5bd0 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Dec 6 14:08:06 2016 +0000 Translation updates --- src/chrome/locale/ar/aboutTor.dtd | 6 +-- src/chrome/locale/ar/aboutTor.properties | 6 --- src/chrome/locale/ar/torbutton.dtd | 2 + src/chrome/locale/de/aboutTor.dtd | 6 +-- src/chrome/locale/de/aboutTor.properties | 6 --- src/chrome/locale/de/torbutton.dtd | 4 +- src/chrome/locale/es/aboutTor.dtd | 6 +-- src/chrome/locale/es/aboutTor.properties | 6 --- src/chrome/locale/es/torbutton.dtd | 6 ++- src/chrome/locale/eu/aboutTor.dtd | 8 ++-- src/chrome/locale/eu/aboutTor.properties | 18 +++---- src/chrome/locale/eu/torbutton.dtd | 2 + src/chrome/locale/fa/aboutTor.dtd | 6 +-- src/chrome/locale/fa/aboutTor.properties | 6 --- src/chrome/locale/fa/torbutton.dtd | 2 + src/chrome/locale/fr/aboutTor.dtd | 6 +-- src/chrome/locale/fr/aboutTor.properties | 6 --- src/chrome/locale/fr/torbutton.dtd | 4 +- src/chrome/locale/fr/torbutton.properties | 8 ++-- src/chrome/locale/it/aboutTor.dtd | 6 +-- src/chrome/locale/it/aboutTor.properties | 6 --- src/chrome/locale/it/torbutton.dtd | 10 ++-- src/chrome/locale/ja/aboutTor.dtd | 6 +-- src/chrome/locale/ja/aboutTor.properties | 6 --- src/chrome/locale/ja/torbutton.dtd | 2 + src/chrome/locale/ko/aboutTor.dtd | 6 +-- src/chrome/locale/ko/aboutTor.properties | 6 --- src/chrome/locale/ko/torbutton.dtd | 2 + src/chrome/locale/nl/aboutTor.dtd | 6 +-- src/chrome/locale/nl/aboutTor.properties | 6 --- src/chrome/locale/nl/torbutton.dtd | 20 ++++---- src/chrome/locale/pl/aboutTor.dtd | 6 +-- src/chrome/locale/pl/aboutTor.properties | 6 --- src/chrome/locale/pl/torbutton.dtd | 2 + src/chrome/locale/pt-BR/aboutDialog.dtd | 19 ++++++++ src/chrome/locale/pt-BR/aboutTBUpdate.dtd | 6 +++ src/chrome/locale/pt-BR/aboutTor.dtd | 60 ++++++++++++------------ src/chrome/locale/pt-BR/aboutTor.properties | 19 +++++--- src/chrome/locale/pt-BR/brand.dtd | 15 ++++-- src/chrome/locale/pt-BR/brand.properties | 17 +++---- src/chrome/locale/pt-BR/torbutton.dtd | 61 ++++++++++++++++++++---- src/chrome/locale/pt-BR/torbutton.properties | 70 +++++++++++++++++++--------- src/chrome/locale/ru/aboutTor.dtd | 6 +-- src/chrome/locale/ru/aboutTor.properties | 6 --- src/chrome/locale/ru/torbutton.dtd | 4 +- src/chrome/locale/sv/aboutTor.dtd | 6 +-- src/chrome/locale/sv/aboutTor.properties | 6 --- src/chrome/locale/sv/torbutton.dtd | 2 + src/chrome/locale/tr/aboutTor.dtd | 6 +-- src/chrome/locale/tr/aboutTor.properties | 6 --- src/chrome/locale/tr/torbutton.dtd | 2 + src/chrome/locale/vi/aboutTBUpdate.dtd | 2 +- src/chrome/locale/vi/aboutTor.dtd | 6 +-- src/chrome/locale/vi/aboutTor.properties | 6 --- src/chrome/locale/vi/torbutton.dtd | 10 ++-- src/chrome/locale/zh-CN/aboutTor.dtd | 6 +-- src/chrome/locale/zh-CN/aboutTor.properties | 8 +--- src/chrome/locale/zh-CN/torbutton.dtd | 2 + 58 files changed, 285 insertions(+), 276 deletions(-) diff --git a/src/chrome/locale/ar/aboutTor.dtd b/src/chrome/locale/ar/aboutTor.dtd index bf90b4f..5180d7f 100644 --- a/src/chrome/locale/ar/aboutTor.dtd +++ b/src/chrome/locale/ar/aboutTor.dtd @@ -17,13 +17,9 @@ <!ENTITY aboutTor.success3.label "يمكنك الآن تصفح الانترنت بشكل يحمي هويتك."> <!ENTITY aboutTor.failure.label "حدث خطأ ما!"> <!ENTITY aboutTor.failure2.label "تور لا يعمل في هذا المتصفح."> -<!ENTITY aboutTor.failure3prefix.label "للمساعدة، يرجى مراسلة "> -<!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> -<!ENTITY aboutTor.failure3suffix.label "."> <!ENTITY aboutTor.search.label "بحث"> -<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> <!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> @@ -35,6 +31,8 @@ <!ENTITY aboutTor.whatnextAnswer.label "لا يمثل تور كل ما تحتاجه للتصفح بشكل يحمي هويتك! قد تحتاج لتغيير بعد عاداتك أثناء التصفّح لضمان سرية هويتك."> <!ENTITY aboutTor.whatnext.label "نصائح للحفاظ على سريّة هويتك »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser User Manual »"> +<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org"> <!ENTITY aboutTor.helpInfo1.label "بإمكانك المساعدة!"> <!ENTITY aboutTor.helpInfo2.label "يمكنك مساعدة شبكة تور و جعلها أكثر سرعة و قوّة بإحدي الطرق الآتية:"> <!ENTITY aboutTor.helpInfo3.label "شغّل نقطة تور »"> diff --git a/src/chrome/locale/ar/aboutTor.properties b/src/chrome/locale/ar/aboutTor.properties index 8befe26..45eb646 100644 --- a/src/chrome/locale/ar/aboutTor.properties +++ b/src/chrome/locale/ar/aboutTor.properties @@ -2,12 +2,6 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=ابحث <a href="%1$S">آمنا</a> مع <a href="%2$S">Startpage</a>. -# The following string is a link which replaces %1$S above. -aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html -# The following string is a link which replaces %2$S above. -aboutTor.searchSP.search.link=https://startpage.com/ - aboutTor.searchDDG.privacy=ابحث <a href="%1$S">آمنا</a> مع <a href="%2$S">DuckDuckGo</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html diff --git a/src/chrome/locale/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd index b0a1d30..ef13900 100644 --- a/src/chrome/locale/ar/torbutton.dtd +++ b/src/chrome/locale/ar/torbutton.dtd @@ -59,3 +59,5 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc "من الممكن أن بعض الخطوط والايقونات معروضة خطأ"> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "ملفات الخط المقدمة من طرف المواقع الإلكترونية محظورة."> <!ENTITY torbutton.circuit_display.title "دائرة تور لهذا الموقع"> +<!ENTITY torbutton.torbrowser_user_manual.label "Tor Browser User Manual"> +<!ENTITY torbutton.torbrowser_user_manual.accesskey "M"> diff --git a/src/chrome/locale/de/aboutTor.dtd b/src/chrome/locale/de/aboutTor.dtd index a46329f..6bed96c 100644 --- a/src/chrome/locale/de/aboutTor.dtd +++ b/src/chrome/locale/de/aboutTor.dtd @@ -17,13 +17,9 @@ <!ENTITY aboutTor.success3.label "Sie können jetzt anonym im Internet surfen."> <!ENTITY aboutTor.failure.label "Irgend etwas lief schief!"> <!ENTITY aboutTor.failure2.label "Tor funktioniert mit diesem Browser nicht."> -<!ENTITY aboutTor.failure3prefix.label "Um Hilfe zu erhalten, kontaktieren Sie bitte"> -<!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> -<!ENTITY aboutTor.failure3suffix.label "."> <!ENTITY aboutTor.search.label "Suche"> -<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> <!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> @@ -35,6 +31,8 @@ <!ENTITY aboutTor.whatnextAnswer.label "Tor ist NICHT alles was benötigt wird, um anonym zu surfen! Sie müssen eventuell einige Gewohnheiten ändern, um sicherzustellen, dass Ihre Identität geschützt bleibt."> <!ENTITY aboutTor.whatnext.label "Tipps, um anonym zu bleiben »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor-Browser-Benutzerhandbuch »"> +<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org"> <!ENTITY aboutTor.helpInfo1.label "Sie können helfen!"> <!ENTITY aboutTor.helpInfo2.label "Es gibt viele Möglichkeiten, um das Tor-Netzwerk schneller und stärker zu machen:"> <!ENTITY aboutTor.helpInfo3.label "Einen Tor-Relaisknoten betreiben »"> diff --git a/src/chrome/locale/de/aboutTor.properties b/src/chrome/locale/de/aboutTor.properties index cb7a1fe..6c79feb 100644 --- a/src/chrome/locale/de/aboutTor.properties +++ b/src/chrome/locale/de/aboutTor.properties @@ -2,12 +2,6 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=<a href="%1$S">Sicheres</a> Suchen mit <a href="%2$S">Startpage</a>. -# The following string is a link which replaces %1$S above. -aboutTor.searchSP.privacy.link=https://startpage.com/deu/protect-privacy.html -# The following string is a link which replaces %2$S above. -aboutTor.searchSP.search.link=https://startpage.com/ - aboutTor.searchDDG.privacy=<a href="%1$S">Sicheres</a> Suchen mit <a href="%2$S">DuckDuckGo</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd index 1e3a967..880013e 100644 --- a/src/chrome/locale/de/torbutton.dtd +++ b/src/chrome/locale/de/torbutton.dtd @@ -13,7 +13,7 @@ <!ENTITY torbutton.button.tooltip "Klicken, um Torbutton zu aktivieren"> <!ENTITY torbutton.prefs.security_settings "Tor-Browser-Sicherheitseinstellungen"> <!ENTITY torbutton.prefs.restore_defaults "Standardeinstellungen wiederherstellen"> -<!ENTITY torbutton.prefs.custom_warning "Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels."> +<!ENTITY torbutton.prefs.custom_warning "Ihre benutzerdefinierten Browser-Einstellungen haben in ungewöhnlichen Sicherheitseinstellungen resultiert. Aus Gründen der Sicherheit und Privatsphäre empfehlen wir Ihnen eine der vorgegebenen Sicherheitsstufen auszuwählen."> <!ENTITY torbutton.cookiedialog.title "Cookie-Schutz verwalten"> <!ENTITY torbutton.cookiedialog.lockCol "Geschützt"> <!ENTITY torbutton.cookiedialog.domainCol "Rechner"> @@ -59,3 +59,5 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc "Manche Schriftarten und Symbole könnten falsch angezeigt werden."> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Von Webseiten bereitgestellte Schriftartdateien sind gesperrt."> <!ENTITY torbutton.circuit_display.title "Tor-Kanal für diese Seite"> +<!ENTITY torbutton.torbrowser_user_manual.label "Tor-Browser-Benutzerhandbuch"> +<!ENTITY torbutton.torbrowser_user_manual.accesskey "M"> diff --git a/src/chrome/locale/es/aboutTor.dtd b/src/chrome/locale/es/aboutTor.dtd index 5c781c8..8f68566 100644 --- a/src/chrome/locale/es/aboutTor.dtd +++ b/src/chrome/locale/es/aboutTor.dtd @@ -17,13 +17,9 @@ <!ENTITY aboutTor.success3.label "Ahora es libre de navegar por Internet anónimamente."> <!ENTITY aboutTor.failure.label "¡Algo fue mal!"> <!ENTITY aboutTor.failure2.label "Tor no está funcionando en este navegador."> -<!ENTITY aboutTor.failure3prefix.label "Para obtener asistencia, por favor contacte"> -<!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> -<!ENTITY aboutTor.failure3suffix.label "."> <!ENTITY aboutTor.search.label "Buscar"> -<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> <!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> @@ -35,6 +31,8 @@ <!ENTITY aboutTor.whatnextAnswer.label "¡Tor NO es todo lo que necesita para navegar anónimamente! Puede necesitar cambiar alguno de sus hábitos de navegación para asegurar que su identidad permanezca segura."> <!ENTITY aboutTor.whatnext.label "Consejos para permenecer anónimo »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Manual de usuario del Navegador Tor »"> +<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org"> <!ENTITY aboutTor.helpInfo1.label "¡Usted puede ayudar!"> <!ENTITY aboutTor.helpInfo2.label "Hay muchas formas en que las puede ayudar a hacer la red Tor más rápida y fuerte."> <!ENTITY aboutTor.helpInfo3.label "Ejecutar un nodo de repetidor Tor »"> diff --git a/src/chrome/locale/es/aboutTor.properties b/src/chrome/locale/es/aboutTor.properties index fe998a0..b0c6899 100644 --- a/src/chrome/locale/es/aboutTor.properties +++ b/src/chrome/locale/es/aboutTor.properties @@ -2,12 +2,6 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=Busque <a href="%1$S">de forma segura</a> con <a href="%2$S">Startpage</a>. -# The following string is a link which replaces %1$S above. -aboutTor.searchSP.privacy.link=https://startpage.com/esp/protect-privacy.html -# The following string is a link which replaces %2$S above. -aboutTor.searchSP.search.link=https://startpage.com/esp/ - aboutTor.searchDDG.privacy=Busque <a href="%1$S">de forma segura</a> con <a href="%2$S">DuckDuckGo</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy?kl=-es diff --git a/src/chrome/locale/es/torbutton.dtd b/src/chrome/locale/es/torbutton.dtd index 74b9e2e..979765a 100644 --- a/src/chrome/locale/es/torbutton.dtd +++ b/src/chrome/locale/es/torbutton.dtd @@ -19,7 +19,7 @@ <!ENTITY torbutton.cookiedialog.domainCol "Servidor (host)"> <!ENTITY torbutton.cookiedialog.nameCol "Nombre"> <!ENTITY torbutton.cookiedialog.pathCol "Ruta"> -<!ENTITY torbutton.cookiedialog.protectCookie "Cookie protegida"> +<!ENTITY torbutton.cookiedialog.protectCookie "Proteger cookie"> <!ENTITY torbutton.cookiedialog.removeCookie "Eliminar cookie"> <!ENTITY torbutton.cookiedialog.unprotectCookie "Desproteger cookie"> <!ENTITY torbutton.cookiedialog.removeAllBut "Eliminar todas excepto las protegidas"> @@ -41,7 +41,7 @@ Mantenga marcada esta casilla para ocultar a los sitios web detalles que pudiera <!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "El mecanismo de representación de fuentes SVG OpenType está deshabilitado."> <!ENTITY torbutton.prefs.sec_gen_desc "En este nivel de seguridad, se aplican los siguientes cambios (ratón encima para detalles):"> <!ENTITY torbutton.prefs.sec_html5_desc "Los medios de vídeo y audio HTML5 se vuelven tipo clic-para-reproducir mediante NoScript."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "En algunos sitios, podría necesitar usar el botón NoScript de barra de herramientas para habilitar estos objetos de medios."> +<!ENTITY torbutton.prefs.sec_html5_tooltip "En algunos sitios, puede que necesite usar el botón NoScript de la barra de herramientas para habilitar estos objetos audiovisuales."> <!ENTITY torbutton.prefs.sec_some_jit_desc "Algunas optimizaciones de rendimiento de JavaScript están deshabilitadas."> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT (compilador JS instantáneo optimizado), Type Inference (deducción del tipo de datos por el compilador), ASM.JS (JS intermedio para alto rendimiento de otros lenguajes)"> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT (compilador JS instantáneo)"> @@ -61,3 +61,5 @@ Mantenga marcada esta casilla para ocultar a los sitios web detalles que pudiera <!ENTITY torbutton.prefs.sec_webfonts_desc "Algunas fuentes e iconos pueden mostrarse de forma incorrecta."> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Los ficheros de fuentes proporcionados por el sitio web están bloqueados."> <!ENTITY torbutton.circuit_display.title "Circuito Tor para este sitio"> +<!ENTITY torbutton.torbrowser_user_manual.label "Manual de usuario del Navegador Tor"> +<!ENTITY torbutton.torbrowser_user_manual.accesskey "M"> diff --git a/src/chrome/locale/eu/aboutTor.dtd b/src/chrome/locale/eu/aboutTor.dtd index 7524fc2..2849b00 100644 --- a/src/chrome/locale/eu/aboutTor.dtd +++ b/src/chrome/locale/eu/aboutTor.dtd @@ -6,7 +6,7 @@ <!ENTITY aboutTor.title "Tori buruz"> -<!ENTITY aboutTor.outOfDateTorOn.label "KONUTZ: nabigatzaile hau zaharkituta dago."> +<!ENTITY aboutTor.outOfDateTorOn.label "KONTUZ: nabigatzaile hau zaharkituta dago."> <!ENTITY aboutTor.outOfDateTorOff.label "BAITA, nabigatzaile hau zaharkituta dago."> <!ENTITY aboutTor.outOfDate2.label "Tipulan sakatu eta ondoren Tor Browser Bundlea egiaztatu hautatu"> @@ -17,13 +17,9 @@ <!ENTITY aboutTor.success3.label "Aske zara orain Internet anonimotasunez nabigatzeko."> <!ENTITY aboutTor.failure.label "Zerbait gaizki joan da!"> <!ENTITY aboutTor.failure2.label "Tor ez da nabigatzaile honetan funtzionatzen ari."> -<!ENTITY aboutTor.failure3prefix.label "Laguntzarako, mesedez hurrengo helbidearekin harremanetan jarri"> -<!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> -<!ENTITY aboutTor.failure3suffix.label "."> <!ENTITY aboutTor.search.label "Bilatu"> -<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> <!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> @@ -35,6 +31,8 @@ <!ENTITY aboutTor.whatnextAnswer.label "Tor EZ da anonimoki nabigatzeko behar duzun guztia! Baliteke zure nabigatze ohitura batzuk aldatu behar izatea zure nortasuna seguru mantentzen dela ziurtatzeko."> <!ENTITY aboutTor.whatnext.label "Anonimo mantentzeko aholkuak »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor nabigatzailearen gidaliburua »"> +<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org"> <!ENTITY aboutTor.helpInfo1.label "Lagundu dezakezu!"> <!ENTITY aboutTor.helpInfo2.label "Tor sarea bizkorragoa eta indartsuagoa egiteko hainbat modutan lagundu dezakezu:"> <!ENTITY aboutTor.helpInfo3.label "Tor errele nodo bat exekutatu »"> diff --git a/src/chrome/locale/eu/aboutTor.properties b/src/chrome/locale/eu/aboutTor.properties index 81d4c44..cc20896 100644 --- a/src/chrome/locale/eu/aboutTor.properties +++ b/src/chrome/locale/eu/aboutTor.properties @@ -2,12 +2,6 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=Bilatu<a href="%1$S">modu seguruan</a> ondokoarekin: <a href="%2$S">Hasierako orria</a>. -# The following string is a link which replaces %1$S above. -aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html -# The following string is a link which replaces %2$S above. -aboutTor.searchSP.search.link=https://startpage.com/ - aboutTor.searchDDG.privacy=Bilatu<a href="%1$S">modu seguruan</a> ondokoarekin: <a href="%2$S">DuckDuckGo</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html @@ -20,9 +14,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=Eman dohaintza orain! +aboutTor.donationBanner.heart=Tor Interneten askatasunaren bihotzean dago +aboutTor.donationBanner.tagline1=Milioika pertsonak Tor-en beharra dute online segurtasun eta pribatutasunerako. +aboutTor.donationBanner.tagline2=Jendea babesten duen jendez osaturiko sarea +aboutTor.donationBanner.tagline3=Jagoletza = Zapalkuntza +aboutTor.donationBanner.tagline4=2006tik kazetariak, aktibistak eta informazioa ezagutarazten dutenak babesten diff --git a/src/chrome/locale/eu/torbutton.dtd b/src/chrome/locale/eu/torbutton.dtd index 9ef6b04..99e3e57 100644 --- a/src/chrome/locale/eu/torbutton.dtd +++ b/src/chrome/locale/eu/torbutton.dtd @@ -59,3 +59,5 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly."> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Webguneak hornitutako letra fitxategiak blokeatuta daude."> <!ENTITY torbutton.circuit_display.title "Gune honetako Tor zirkuitua"> +<!ENTITY torbutton.torbrowser_user_manual.label "Tor Browser User Manual"> +<!ENTITY torbutton.torbrowser_user_manual.accesskey "M"> diff --git a/src/chrome/locale/fa/aboutTor.dtd b/src/chrome/locale/fa/aboutTor.dtd index c0ae835..b748cbe 100644 --- a/src/chrome/locale/fa/aboutTor.dtd +++ b/src/chrome/locale/fa/aboutTor.dtd @@ -17,13 +17,9 @@ <!ENTITY aboutTor.success3.label "اکنون شما به طور ناشناس به اینترنت دسترسی دارید."> <!ENTITY aboutTor.failure.label "خطایی پیش آمده است!"> <!ENTITY aboutTor.failure2.label "تا با این مرورگر کار نمی‌کند."> -<!ENTITY aboutTor.failure3prefix.label "برای کمک، تماس حاصل فرمایید:"> -<!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> -<!ENTITY aboutTor.failure3suffix.label "."> <!ENTITY aboutTor.search.label "جستجو"> -<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> <!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> @@ -35,6 +31,8 @@ <!ENTITY aboutTor.whatnextAnswer.label "تور همه‌ی نیاز شما برای ناشناس ماندن در وب را برآورده نمی‌کند! برای اطمینان از ایمنی هویتتان، نیاز دارید برخی عادات وبگردیتان را تغییر دهید."> <!ENTITY aboutTor.whatnext.label "راهنمایی برای ناشناس ماندن."> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser User Manual »"> +<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org"> <!ENTITY aboutTor.helpInfo1.label "می‌توانید کمک کنید!"> <!ENTITY aboutTor.helpInfo2.label "راه های زیادی برای کمک کردن شما جهت سریعتر کردن و مستحکم کردن شبکه تور وجود دارد:"> <!ENTITY aboutTor.helpInfo3.label "مسيرياب تورى اداره كنيد »"> diff --git a/src/chrome/locale/fa/aboutTor.properties b/src/chrome/locale/fa/aboutTor.properties index a591490..d7f5097 100644 --- a/src/chrome/locale/fa/aboutTor.properties +++ b/src/chrome/locale/fa/aboutTor.properties @@ -2,12 +2,6 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=جستجو <a href="%1$S">ایمن</a> با <a href="%2$S">صفحه شروع</a>. -# The following string is a link which replaces %1$S above. -aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html -# The following string is a link which replaces %2$S above. -aboutTor.searchSP.search.link=https://startpage.com/ - aboutTor.searchDDG.privacy=جستجو <a href="%1$S">ایمن</a> با <a href="%2$S">DuckDuckGo</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html diff --git a/src/chrome/locale/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd index ad234cb..b9c8af8 100644 --- a/src/chrome/locale/fa/torbutton.dtd +++ b/src/chrome/locale/fa/torbutton.dtd @@ -59,3 +59,5 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc "برخی از فونت ها و آیکون های ممکن است نمایش نادرست داشته باشند."> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "فایل های فونتی که در وب سایت ارائه می شوند مسدود شده است."> <!ENTITY torbutton.circuit_display.title "مدار Tor برای این سایت"> +<!ENTITY torbutton.torbrowser_user_manual.label "Tor Browser User Manual"> +<!ENTITY torbutton.torbrowser_user_manual.accesskey "M"> diff --git a/src/chrome/locale/fr/aboutTor.dtd b/src/chrome/locale/fr/aboutTor.dtd index 0fc5b1e..2bb5ec4 100644 --- a/src/chrome/locale/fr/aboutTor.dtd +++ b/src/chrome/locale/fr/aboutTor.dtd @@ -17,13 +17,9 @@ <!ENTITY aboutTor.success3.label "Vous êtes maintenant libre de naviguer sur Internet anonymement."> <!ENTITY aboutTor.failure.label "Une erreur s'est produite !"> <!ENTITY aboutTor.failure2.label "Tor ne fonctionne pas dans ce navigateur."> -<!ENTITY aboutTor.failure3prefix.label "Pour de l'assistance, veuillez contacter"> -<!ENTITY aboutTor.failure3Link "help-fr(a)rt.torproject.org"> -<!ENTITY aboutTor.failure3suffix.label "."> <!ENTITY aboutTor.search.label "Rechercher"> -<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> <!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> @@ -35,6 +31,8 @@ <!ENTITY aboutTor.whatnextAnswer.label "Tor n'est PAS tout ce dont vous avez besoin pour naviguer anonymement! Vous aurez peut-être à changer certaines de vos habitudes de navigation pour garder votre identité en sécurité."> <!ENTITY aboutTor.whatnext.label "Conseils pour rester anonyme »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html#warning"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Guide d'utilisation du navigateur Tor »"> +<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org"> <!ENTITY aboutTor.helpInfo1.label "Vous pouvez aider !"> <!ENTITY aboutTor.helpInfo2.label "Vous pouvez aider à rendre le réseau Tor plus rapide et plus puissant de plusieurs façons :"> <!ENTITY aboutTor.helpInfo3.label "Faire tourner un nœud relais Tor »"> diff --git a/src/chrome/locale/fr/aboutTor.properties b/src/chrome/locale/fr/aboutTor.properties index 174b286..03f3e8e 100644 --- a/src/chrome/locale/fr/aboutTor.properties +++ b/src/chrome/locale/fr/aboutTor.properties @@ -2,12 +2,6 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=Rechercher <a href="%1$S">en toute sécurité</a> avec <a href="%2$S">Startpage</a>. -# The following string is a link which replaces %1$S above. -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 <a href="%1$S">en toute sécurité</a> avec <a href="%2$S">DuckDuckGo</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd index cf67f43..8bf6850 100644 --- a/src/chrome/locale/fr/torbutton.dtd +++ b/src/chrome/locale/fr/torbutton.dtd @@ -46,7 +46,7 @@ <!ENTITY torbutton.prefs.sec_jit_slower_desc "Les scripts pourraient être exécutés plus lentement sur certains sites."> <!ENTITY torbutton.prefs.sec_mathml_desc "Certains mécanismes d'affichage des équations mathématiques sont désactivés."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML est désactivé."> -<!ENTITY torbutton.prefs.sec_medium "Medium"> +<!ENTITY torbutton.prefs.sec_medium "https://www.transifex.com/otf/torproject/translate/#fr_CA/torbutton-torbutt…"> <!ENTITY torbutton.prefs.sec_all_jit_desc "Sur les sites où JavaScript est activé, les optimisations des performances sont désactivées."> <!ENTITY torbutton.prefs.sec_font_rend_desc "Certaines fonctions de rendu de police sont désactivées."> <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Le mécanisme de rendu de police Graphite est désactivé."> @@ -59,3 +59,5 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc "Certains polices et icônes pourraient ne pas s'afficher correctement."> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Les polices fournies par les sites Web sont bloquées."> <!ENTITY torbutton.circuit_display.title "Circuit Tor pour ce site"> +<!ENTITY torbutton.torbrowser_user_manual.label "Tor Browser User Manual"> +<!ENTITY torbutton.torbrowser_user_manual.accesskey "M"> diff --git a/src/chrome/locale/fr/torbutton.properties b/src/chrome/locale/fr/torbutton.properties index 1568a3c..68655b5 100644 --- a/src/chrome/locale/fr/torbutton.properties +++ b/src/chrome/locale/fr/torbutton.properties @@ -1,11 +1,11 @@ torbutton.circuit_display.internet = Internet torbutton.circuit_display.ip_unknown = IP inconnue -torbutton.circuit_display.onion_site = Site onion +torbutton.circuit_display.onion_site = Site Oignon torbutton.circuit_display.this_browser = Ce navigateur -torbutton.circuit_display.relay = relais +torbutton.circuit_display.relay = relayer torbutton.circuit_display.tor_bridge = Bridge torbutton.circuit_display.unknown_country = Pays inconnu -torbutton.content_sizer.margin_tooltip = Le navigateur Tor ajoute cette marge pour s'assurer que la largeur et la hauteur de votre fenêtre soit moins distinctive, et ainsi réduire la capacité des personnes à vous repérer en ligne. +torbutton.content_sizer.margin_tooltip = Le navigateur Tor ajoute cette marge pour rendre la largeur et la hauteur de votre fenêtre moins distinctives, et pour réduire par conséquent la possibilité que l'on vous suive à la trace en ligne. torbutton.panel.tooltip.disabled = Cliquer pour activer Tor torbutton.panel.tooltip.enabled = Cliquer pour désactiver Tor torbutton.panel.label.disabled = Tor Inactif @@ -28,7 +28,7 @@ torbutton.popup.confirm_plugins = Les greffons tels que Flash peuvent nuire à v torbutton.popup.never_ask_again = Ne plus me poser la question. torbutton.popup.confirm_newnym = Le navigateur Tor va fermer toutes les fenêtres et onglets. Tous les sessions ouvertes seront perdues.\n\nVoulez-vous redémarrer le navigateur Tor maintenant pour réinitialiser votre identité ?\n\n -torbutton.slider_notification = Le menu de l'oignon vert a maintenant un curseur de sécurité qui vous laisse ajuster votre niveau de sécurité. Découvrez le ! +torbutton.slider_notification = Le menu de l'oignon vert propose maintenant un curseur de sécurité qui vous laisse ajuster votre niveau de sécurité. Découvrez-le ! torbutton.slider_notification_button = Ouvrir préférences de sécurité torbutton.maximize_warning = Maximiser le navigateur Tor à l'écran peut permettre aux sites Web de déterminer votre taille de moniteur, laquelle peut être utilisée pour vous suivre à la trace. Nous recommandons que vous laissiez les fenêtres du navigateur Tor dans leur taille d'origine. diff --git a/src/chrome/locale/it/aboutTor.dtd b/src/chrome/locale/it/aboutTor.dtd index 17eba77..612dab3 100644 --- a/src/chrome/locale/it/aboutTor.dtd +++ b/src/chrome/locale/it/aboutTor.dtd @@ -17,13 +17,9 @@ <!ENTITY aboutTor.success3.label "Ora sei libero di navigare in internet anonimamente."> <!ENTITY aboutTor.failure.label "Qualcosa è Andato Storto!"> <!ENTITY aboutTor.failure2.label "Tor non sta funzionando su questo browser."> -<!ENTITY aboutTor.failure3prefix.label "Per richiedere assistenza, contattare"> -<!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> -<!ENTITY aboutTor.failure3suffix.label "."> <!ENTITY aboutTor.search.label "Cerca"> -<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> <!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> @@ -35,6 +31,8 @@ <!ENTITY aboutTor.whatnextAnswer.label "Tor NON è tutto ciò che ti serve per navigare anonimamente! Potresti aver bisogno di cambiare le tue abitudini di navigazione per accertarti che la tua identità rimanga al sicuro."> <!ENTITY aboutTor.whatnext.label "Consigli Per Restare Anonimo »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser User Manual »"> +<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org"> <!ENTITY aboutTor.helpInfo1.label "Puoi Aiutare!"> <!ENTITY aboutTor.helpInfo2.label "Ci sono molti modi in cui puoi aiutare a rendere la Rete Tor più veloce e stabile:"> <!ENTITY aboutTor.helpInfo3.label "Gestisci un Nodo Relay di Tor »"> diff --git a/src/chrome/locale/it/aboutTor.properties b/src/chrome/locale/it/aboutTor.properties index 58592a6..af7cd92 100644 --- a/src/chrome/locale/it/aboutTor.properties +++ b/src/chrome/locale/it/aboutTor.properties @@ -2,12 +2,6 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=Cerca <a href="%1$S"> in sicurezza</a>con<a href="%2$S">Starpage</a> -# The following string is a link which replaces %1$S above. -aboutTor.searchSP.privacy.link=https://startpage.com/ita/protect-privacy.html -# The following string is a link which replaces %2$S above. -aboutTor.searchSP.search.link=https://startpage.com/ - aboutTor.searchDDG.privacy=Cerca <a href="%1$S">in modo sicuro</a> con <a href="%2$S">DuckDuckGo</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd index 414cf11..9ff051f 100644 --- a/src/chrome/locale/it/torbutton.dtd +++ b/src/chrome/locale/it/torbutton.dtd @@ -11,9 +11,9 @@ <!ENTITY torbutton.context_menu.cookieProtections "Protezioni dei Cookie..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Fai clic per inizializzare Torbutton"> -<!ENTITY torbutton.prefs.security_settings "Tor Browser Security Settings"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.custom_warning "Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels."> +<!ENTITY torbutton.prefs.security_settings "Impostazioni di Sicurezza Tor Browser"> +<!ENTITY torbutton.prefs.restore_defaults "Ripristina Defaults"> +<!ENTITY torbutton.prefs.custom_warning "Le tue impostazioni del browser sembrano avere preferenze di sicurezza insolite. Per motivi di sicurezza e privacy, ti consigliamo di scegliere uno dei livelli di sicurezza predefiniti."> <!ENTITY torbutton.cookiedialog.title "Gestisci protezione Cookies"> <!ENTITY torbutton.cookiedialog.lockCol "Protetto"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -46,7 +46,7 @@ <!ENTITY torbutton.prefs.sec_jit_slower_desc "Gli scripts su alcuni siti possono girare più lenti."> <!ENTITY torbutton.prefs.sec_mathml_desc "Alcuni meccanismi di visualizzazione di equazioni matematiche sono disabilitati."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML è disabilitato."> -<!ENTITY torbutton.prefs.sec_medium "Medium"> +<!ENTITY torbutton.prefs.sec_medium "Medio"> <!ENTITY torbutton.prefs.sec_all_jit_desc "Nei siti dove è attivato JavaScript le ottimizzazioni sono disabilitate"> <!ENTITY torbutton.prefs.sec_font_rend_desc "Alcuni rendering dei font sono disabilitati."> <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Il meccanismo di rendering font Graphite è disabilitato."> @@ -59,3 +59,5 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc "Alcuni caratteri e icone possono non essere visualizzati correttamente."> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "I font provvisti dal sito sono bloccati."> <!ENTITY torbutton.circuit_display.title "Circuito Tor per questo sito"> +<!ENTITY torbutton.torbrowser_user_manual.label "Tor Browser User Manual"> +<!ENTITY torbutton.torbrowser_user_manual.accesskey "M"> diff --git a/src/chrome/locale/ja/aboutTor.dtd b/src/chrome/locale/ja/aboutTor.dtd index 10844f3..850e13c 100644 --- a/src/chrome/locale/ja/aboutTor.dtd +++ b/src/chrome/locale/ja/aboutTor.dtd @@ -17,13 +17,9 @@ <!ENTITY aboutTor.success3.label "現在、自由に匿名でインターネットをブラウズ出来ます。"> <!ENTITY aboutTor.failure.label "何かが間違っています！"> <!ENTITY aboutTor.failure2.label "Torは、このブラウザでは動作しません。"> -<!ENTITY aboutTor.failure3prefix.label "サポートについては、お問い合わせください。"> -<!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org まで"> -<!ENTITY aboutTor.failure3suffix.label "。"> <!ENTITY aboutTor.search.label "検索"> -<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> <!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> @@ -35,6 +31,8 @@ <!ENTITY aboutTor.whatnextAnswer.label "Torだけが匿名にブラウズするのに必要というわけではないのです！あなたの身元を安全に保つには、ブラウジングの習慣の一部を変える必要があるかもしれません。"> <!ENTITY aboutTor.whatnext.label "匿名性を保つことについてのヒント »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser User Manual »"> +<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org"> <!ENTITY aboutTor.helpInfo1.label "助けてください！"> <!ENTITY aboutTor.helpInfo2.label "Torネットワークをさらに高速に、さらに強力にするのに役立てるたくさんのやり方があります。"> <!ENTITY aboutTor.helpInfo3.label "Torリレーノードを起動 »"> diff --git a/src/chrome/locale/ja/aboutTor.properties b/src/chrome/locale/ja/aboutTor.properties index 317071d..eee047e 100644 --- a/src/chrome/locale/ja/aboutTor.properties +++ b/src/chrome/locale/ja/aboutTor.properties @@ -2,12 +2,6 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=<a href="%2$S">Startpage</a>で<a href="%1$S">安全に</a>検索する -# The following string is a link which replaces %1$S above. -aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html -# The following string is a link which replaces %2$S above. -aboutTor.searchSP.search.link=https://startpage.com/ - aboutTor.searchDDG.privacy=<a href="%2$S">DuckDuckGo</a>で<a href="%1$S">安全に</a>検索する # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd index 9a7704a..a96a09e 100644 --- a/src/chrome/locale/ja/torbutton.dtd +++ b/src/chrome/locale/ja/torbutton.dtd @@ -59,3 +59,5 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc "いくつかのフォントとアイコンは正常に表示されません。"> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Web サイトが提供するフォントはブロックされます。"> <!ENTITY torbutton.circuit_display.title "このサイト用の Tor サーキット"> +<!ENTITY torbutton.torbrowser_user_manual.label "Tor Browser User Manual"> +<!ENTITY torbutton.torbrowser_user_manual.accesskey "M"> diff --git a/src/chrome/locale/ko/aboutTor.dtd b/src/chrome/locale/ko/aboutTor.dtd index 23ca3ac..37d751e 100644 --- a/src/chrome/locale/ko/aboutTor.dtd +++ b/src/chrome/locale/ko/aboutTor.dtd @@ -17,13 +17,9 @@ <!ENTITY aboutTor.success3.label "이제 자유롭게 익명으로 인터넷을 탐색할 수 있습니다."> <!ENTITY aboutTor.failure.label "뭔가 잘못되었습니다!"> <!ENTITY aboutTor.failure2.label "Tor는 이 브라우저에서 작동하지 않습니다."> -<!ENTITY aboutTor.failure3prefix.label "도움을 위해서, 문의해 주세요"> -<!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> -<!ENTITY aboutTor.failure3suffix.label " "> <!ENTITY aboutTor.search.label "검색"> -<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> <!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> @@ -35,6 +31,8 @@ <!ENTITY aboutTor.whatnextAnswer.label "Tor는 완벽한 익명 브라우징을 보장하지 않습니다! 따라서 신분을 안전하게 유지하기 위해서는 브라우징 습관을 바꾸셔야 합니다."> <!ENTITY aboutTor.whatnext.label "익명으로 알짱거릴 때의 팁 >>"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser User Manual »"> +<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org"> <!ENTITY aboutTor.helpInfo1.label "여러분도 도울 수 있습니다!"> <!ENTITY aboutTor.helpInfo2.label "여러분이 Tor 네트워크를 보다 빠르고 강하게 만들 수 있는 방법이 있습니다."> <!ENTITY aboutTor.helpInfo3.label "Tor 중계 서버 node 실행 »"> diff --git a/src/chrome/locale/ko/aboutTor.properties b/src/chrome/locale/ko/aboutTor.properties index 0f526d8..682fecb 100644 --- a/src/chrome/locale/ko/aboutTor.properties +++ b/src/chrome/locale/ko/aboutTor.properties @@ -2,12 +2,6 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=<a href="%2$S">시작페이지</a>를 통해 <a href="%1$S">안전하게</a> 검색 -# The following string is a link which replaces %1$S above. -aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html -# The following string is a link which replaces %2$S above. -aboutTor.searchSP.search.link=https://startpage.com/ - aboutTor.searchDDG.privacy=<a href="%2$S">DuckDuckGo</a>를 통해 <a href="%1$S>안전하게</a> 검색 # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html diff --git a/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd index aa86374..38f875d 100644 --- a/src/chrome/locale/ko/torbutton.dtd +++ b/src/chrome/locale/ko/torbutton.dtd @@ -59,3 +59,5 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc "어떤 글씨체나 아이콘은 올바르지 않게 표시될 수 있습니다."> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "사이트 내장 폰트가 차단되었습니다."> <!ENTITY torbutton.circuit_display.title "Tor circuit for this site"> +<!ENTITY torbutton.torbrowser_user_manual.label "Tor Browser User Manual"> +<!ENTITY torbutton.torbrowser_user_manual.accesskey "M"> diff --git a/src/chrome/locale/nl/aboutTor.dtd b/src/chrome/locale/nl/aboutTor.dtd index 023457e..b93d0e0 100644 --- a/src/chrome/locale/nl/aboutTor.dtd +++ b/src/chrome/locale/nl/aboutTor.dtd @@ -17,13 +17,9 @@ <!ENTITY aboutTor.success3.label "Je kan nu anoniem over het internet browsen."> <!ENTITY aboutTor.failure.label "Er ging iets mis!"> <!ENTITY aboutTor.failure2.label "Tor werkt niet in deze browser."> -<!ENTITY aboutTor.failure3prefix.label "Contacteer voor hulp"> -<!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> -<!ENTITY aboutTor.failure3suffix.label "."> <!ENTITY aboutTor.search.label "Zoeken"> -<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> <!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> @@ -35,6 +31,8 @@ <!ENTITY aboutTor.whatnextAnswer.label "Tor is NIET alles wat je nodig hebt om anoniem te kunnen browsen. Mogelijk is het nodig dat je bepaalde browsegewoontes verandert om te verzekeren dat je identiteit veilig blijft."> <!ENTITY aboutTor.whatnext.label "Tips om anoniem te blijven »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser User Manual »"> +<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org"> <!ENTITY aboutTor.helpInfo1.label "Jij kan helpen!"> <!ENTITY aboutTor.helpInfo2.label "Er zijn veel verschillende manieren hoe jij kan helpen het Tor-netwerk sneller en sterker te maken:"> <!ENTITY aboutTor.helpInfo3.label "Draai een Tor-relaynode »"> diff --git a/src/chrome/locale/nl/aboutTor.properties b/src/chrome/locale/nl/aboutTor.properties index 83c190a..855de1f 100644 --- a/src/chrome/locale/nl/aboutTor.properties +++ b/src/chrome/locale/nl/aboutTor.properties @@ -2,12 +2,6 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=<a href="%1$S">Veilig</a> zoeken met <a href="%2$S">Startpage</a>. -# The following string is a link which replaces %1$S above. -aboutTor.searchSP.privacy.link=https://startpage.com/ned/protect-privacy.html -# The following string is a link which replaces %2$S above. -aboutTor.searchSP.search.link=https://startpage.com/ - aboutTor.searchDDG.privacy=<a href="%1$S">Veilig</a> zoeken met <a href="%2$S">DuckDuckGo</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd index 3b819a7..39e636c 100644 --- a/src/chrome/locale/nl/torbutton.dtd +++ b/src/chrome/locale/nl/torbutton.dtd @@ -1,4 +1,4 @@ -<!ENTITY torbutton.context_menu.new_identity "Nieuwe identiteit"> +<!ENTITY torbutton.context_menu.new_identity "Nieuwe Identiteit"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Nieuw Tor-circuit voor deze website"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> @@ -8,26 +8,26 @@ <!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "Controleer op updates voor de Tor-browser..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> -<!ENTITY torbutton.context_menu.cookieProtections "Cookiebeveiligingen..."> +<!ENTITY torbutton.context_menu.cookieProtections "Cookie Beveiligingen"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> -<!ENTITY torbutton.button.tooltip "Klik hier om Torbutton te initialiseren"> -<!ENTITY torbutton.prefs.security_settings "Tor-browserbeveiligingsinstellingen"> +<!ENTITY torbutton.button.tooltip "Klik hier om Tor-knop te initialiseren"> +<!ENTITY torbutton.prefs.security_settings "Tor-browser Beveiligingsinstellingen"> <!ENTITY torbutton.prefs.restore_defaults "Standaardwaarden herstellen"> -<!ENTITY torbutton.prefs.custom_warning "Je aangepaste browservoorkeuren hebben geleid tot ongebruikelijke beveiligingsinstellingen. Uit veiligheids- en privacy-overwegen raden we je aan een van de standaardbeveiligingsniveau's te kiezen."> -<!ENTITY torbutton.cookiedialog.title "Beheer cookiebeveiligingen"> +<!ENTITY torbutton.prefs.custom_warning "Je aangepaste browservoorkeuren hebben geleid tot ongebruikelijke beveiligingsinstellingen. Uit veiligheids- en privacy-overwegingen raden we je aan één van de standaardbeveiligingsniveaus te kiezen."> +<!ENTITY torbutton.cookiedialog.title "Beheer Cookie Beveiligingen"> <!ENTITY torbutton.cookiedialog.lockCol "Beveiligd"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> <!ENTITY torbutton.cookiedialog.nameCol "Naam"> <!ENTITY torbutton.cookiedialog.pathCol "Pad"> <!ENTITY torbutton.cookiedialog.protectCookie "Cookie beveiligen"> <!ENTITY torbutton.cookiedialog.removeCookie "Cookie verwijderen"> -<!ENTITY torbutton.cookiedialog.unprotectCookie "Cookiebeveiliging opheffen"> -<!ENTITY torbutton.cookiedialog.removeAllBut "Alle cookies behalve beveiligde verwijderen"> +<!ENTITY torbutton.cookiedialog.unprotectCookie "Cookie beveiliging opheffen"> +<!ENTITY torbutton.cookiedialog.removeAllBut "Alle cookies, met uitzondering van de beveiligde, verwijderen"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Beveilig nieuwe cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Beveilig nieuwe cookies niet"> <!ENTITY torbutton.prefs.restrict_thirdparty "Beperk cookies en andere tracking-gegevens van derden"> <!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R"> -<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Vink dit vakje aan om te voorkomen dat functies van je browser worden misbruikt om je te volgen op het internet. Gemodificeerde functies zijn o.a. URL's, uitzendingskanalen, de browsercache, cookies, favicons, HTTP-auth-hoofdingen, koppelingsvoorverbindingen, localStorage, mediaSource-URL's, OCSP-verzoeken, SharedWorkers en TLS-sessietickets."> +<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Vink dit vakje aan om te voorkomen dat functies van je browser worden misbruikt om je te volgen op het internet. Gemodificeerde functies zijn o.a. URL's, uitzendingskanalen, de browsercache, cookies, favicons, HTTP Auth headers, koppeling-voorverbindingen, lokale opslag, mediabron-URL's, OCSP-verzoeken, Gedeelde-werkers en TLS-sessietickets."> <!ENTITY torbutton.prefs.resist_fingerprinting "Verander details die je onderscheiden van andere Tor Browser gebruikers"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Vink dit vakje aan om websites geen inzicht te geven in dingen die uniek aan je zijn, zoals je batterijstatus, computersnelheid, toetsenbordindeling, taal, geïnstalleerde plug-ins en hun locatie, netwerkstatus, schermoriëntatie, schermgrootte, zoomniveaus per site, ondersteunde bestandstypes, systeemkleuren en WebGL-mogelijkheden."> @@ -59,3 +59,5 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc "Sommige lettertypen en pictogrammen worden mogelijk niet goed weergegeven. "> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Door websites aangeleverde lettertypen worden geblokkeerd."> <!ENTITY torbutton.circuit_display.title "Tor-circuit voor deze website"> +<!ENTITY torbutton.torbrowser_user_manual.label "Tor Browser Gebruikershandleiding"> +<!ENTITY torbutton.torbrowser_user_manual.accesskey "M"> diff --git a/src/chrome/locale/pl/aboutTor.dtd b/src/chrome/locale/pl/aboutTor.dtd index e307e5b..c92a61f 100644 --- a/src/chrome/locale/pl/aboutTor.dtd +++ b/src/chrome/locale/pl/aboutTor.dtd @@ -17,13 +17,9 @@ <!ENTITY aboutTor.success3.label "Możesz teraz swobodnie przeglądać Internet anonimowo."> <!ENTITY aboutTor.failure.label "Coś poszło nie tak!"> <!ENTITY aboutTor.failure2.label "Tor nie działa w tej przeglądarce."> -<!ENTITY aboutTor.failure3prefix.label "Aby uzyskać pomoc, prosimy o kontakt"> -<!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> -<!ENTITY aboutTor.failure3suffix.label "."> <!ENTITY aboutTor.search.label "Szukaj"> -<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> <!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> @@ -35,6 +31,8 @@ <!ENTITY aboutTor.whatnextAnswer.label "Tor, to NIE jest wszystko czego potrzebujesz, aby przeglądać sieć anonimowo! Być może potrzeba będzie zmienić niektóre Twoje nawyki internetowe, aby zapewnić Twojej tożsamości bezpieczeństwo."> <!ENTITY aboutTor.whatnext.label "Porady: Jak pozostać anonimowym w internecie »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser User Manual »"> +<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org"> <!ENTITY aboutTor.helpInfo1.label "Możesz pomóc!"> <!ENTITY aboutTor.helpInfo2.label "Istnieje wiele sposobów, abyś mógł uczynić sieć Tor'a szybszą i silniejszą:"> <!ENTITY aboutTor.helpInfo3.label "Uruchom Przekaźnikowy Węzeł Tora »"> diff --git a/src/chrome/locale/pl/aboutTor.properties b/src/chrome/locale/pl/aboutTor.properties index 5a66e6a..b41a372 100644 --- a/src/chrome/locale/pl/aboutTor.properties +++ b/src/chrome/locale/pl/aboutTor.properties @@ -2,12 +2,6 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=Szukaj <a href="%1$S">bezpiecznie</a> używając wyszukiwarki <a href="%2$S">Startpage</a>. -# The following string is a link which replaces %1$S above. -aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html -# The following string is a link which replaces %2$S above. -aboutTor.searchSP.search.link=https://startpage.com/ - aboutTor.searchDDG.privacy=Szukaj <a href="%1$S">bezpiecznie</a> używając wyszukiwarki <a href="%2$S">DuckDuckGo</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html diff --git a/src/chrome/locale/pl/torbutton.dtd b/src/chrome/locale/pl/torbutton.dtd index d1a76fd..1a3c8f1 100644 --- a/src/chrome/locale/pl/torbutton.dtd +++ b/src/chrome/locale/pl/torbutton.dtd @@ -59,3 +59,5 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc "Niektóre czcionki i ikony mogą być wyświetlane niepoprawnie."> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Pliki czcionek dostarczane przez strony internetowe są blokowane."> <!ENTITY torbutton.circuit_display.title "Obwód Tor dla tej strony"> +<!ENTITY torbutton.torbrowser_user_manual.label "Tor Browser User Manual"> +<!ENTITY torbutton.torbrowser_user_manual.accesskey "M"> diff --git a/src/chrome/locale/pt-BR/aboutDialog.dtd b/src/chrome/locale/pt-BR/aboutDialog.dtd new file mode 100644 index 0000000..1965f21 --- /dev/null +++ b/src/chrome/locale/pt-BR/aboutDialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "&brandShortName; foi programada por "> + +<!ENTITY project.tpoLink "o/a &vendorShortName;"> +<!ENTITY project.end ", uma organização sem fins lucrativos para defender a sua privacidade e liberdade na internet."> + +<!ENTITY help.start "Você gostaria de ajudar?"> + +<!ENTITY help.donateLink "Doar"> +<!ENTITY help.or "ou"> + +<!ENTITY help.getInvolvedLink "envolver-se"> +<!ENTITY help.end "!"> + +<!ENTITY bottomLinks.questions "Perguntas?"> + +<!ENTITY bottomLinks.grow "Ajude a Rede Tor a crescer!"> + +<!ENTITY bottomLinks.license "Informações de licenciamento "> +<!ENTITY tor.TrademarkStatement "'Tor' e 'Logo da Cebola' são marcas registradas do Projeto Tor, Inc."> diff --git a/src/chrome/locale/pt-BR/aboutTBUpdate.dtd b/src/chrome/locale/pt-BR/aboutTBUpdate.dtd new file mode 100644 index 0000000..c56a6d6 --- /dev/null +++ b/src/chrome/locale/pt-BR/aboutTBUpdate.dtd @@ -0,0 +1,6 @@ +<!ENTITY aboutTBUpdate.title "Atualizar o Navegador Tor"> +<!ENTITY aboutTBUpdate.updated "O Navegador Tor foi atualizado."> +<!ENTITY aboutTBUpdate.linkPrefix "Para obter as informações mais recentes sobre esta versão"> +<!ENTITY aboutTBUpdate.linkLabel "visite nosso site."> +<!ENTITY aboutTBUpdate.linkSuffix "."> +<!ENTITY aboutTBUpdate.changeLogHeading "Registro de modificações:"> diff --git a/src/chrome/locale/pt-BR/aboutTor.dtd b/src/chrome/locale/pt-BR/aboutTor.dtd index 9f14022..3b039f7 100644 --- a/src/chrome/locale/pt-BR/aboutTor.dtd +++ b/src/chrome/locale/pt-BR/aboutTor.dtd @@ -1,47 +1,47 @@  -<!ENTITY aboutTor.title "About Tor"> +<!ENTITY aboutTor.title "Sobre Tor"> -<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date."> -<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date."> -<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update."> +<!ENTITY aboutTor.outOfDateTorOn.label "AVISO: este navegador está desatualizado."> +<!ENTITY aboutTor.outOfDateTorOff.label "AINDA, este navegador está desatualizado."> +<!ENTITY aboutTor.outOfDate2.label "Clique na cebola e escolha Verificar Atualizações do Navegador Tor."> -<!ENTITY aboutTor.check.label "Test Tor Network Settings"> +<!ENTITY aboutTor.check.label "Testar as configurações de rede Tor"> -<!ENTITY aboutTor.success.label "Congratulations!"> -<!ENTITY aboutTor.success2.label "This browser is configured to use Tor."> -<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously."> -<!ENTITY aboutTor.failure.label "Something Went Wrong!"> -<!ENTITY aboutTor.failure2.label "Tor is not working in this browser."> -<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact "> -<!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> -<!ENTITY aboutTor.failure3suffix.label "."> +<!ENTITY aboutTor.success.label "Boas-vindas ao Navegador Tor!"> +<!ENTITY aboutTor.success2.label "Conectad0 à rede Tor!"> +<!ENTITY aboutTor.success3.label "Sinta-se à vontade para navegar anonimamente na Internet."> +<!ENTITY aboutTor.failure.label "Alguma coisa deu errado!"> +<!ENTITY aboutTor.failure2.label "Tor não está funcionando neste navegador. "> + +<!ENTITY aboutTor.search.label "Buscar"> -<!ENTITY aboutTor.search.label "Search"> -<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> +<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> -<!ENTITY aboutTor.torInfo1.label "Additional Info:"> -<!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> -<!ENTITY aboutTor.torInfo3.label "Exit Node:"> -<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors."> -<!ENTITY aboutTor.whatnextQuestion.label "What Next?"> -<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe."> -<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous »"> +<!ENTITY aboutTor.torInfo1.label "Para mais informações:"> +<!ENTITY aboutTor.torInfo2.label "País e Endereço IP:"> +<!ENTITY aboutTor.torInfo3.label "Nó de saída:"> +<!ENTITY aboutTor.torInfo4.label "Este servidor não registra nenhuma informação sobre os seus usuários."> +<!ENTITY aboutTor.whatnextQuestion.label "O que mais?"> +<!ENTITY aboutTor.whatnextAnswer.label "Tor NÃO é tudo o que você precisa para navegar anonimamente! Para isso, você precisará mudar alguns hábitos de utilização da Internet, que garantirão a proteção da sua identidade. "> +<!ENTITY aboutTor.whatnext.label "Dicas para garantir seu anonimato""> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> -<!ENTITY aboutTor.helpInfo1.label "You Can Help!"> -<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:"> -<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node »"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Manual de Uso do Navegador Tor » "> +<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org"> +<!ENTITY aboutTor.helpInfo1.label "Você pode ajudar!"> +<!ENTITY aboutTor.helpInfo2.label "Existem várias maneiras de ajudar a rede Tor a tornar-se mais rápida e eficaz:"> +<!ENTITY aboutTor.helpInfo3.label "Rodar um Nó de Retransmissor Tor »"> <!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> -<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services »"> +<!ENTITY aboutTor.helpInfo4.label "Trabalhar voluntariamente""> <!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.helpInfo5.label "Make a Donation »"> +<!ENTITY aboutTor.helpInfo5.label "Fazer uma doação""> <!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> -<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy."> -<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project »"> +<!ENTITY aboutTor.footer.label "O Projeto Tor é uma organização sem fins lucrativos - EUA 501(c)(3) -, dedicada à pesquisa, ao desenvolvimento e à educação relacionados ao anonimato e à privacidade na Internet."> +<!ENTITY aboutTor.learnMore.label "Informe-se mais sobre o Projeto Tor""> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> diff --git a/src/chrome/locale/pt-BR/aboutTor.properties b/src/chrome/locale/pt-BR/aboutTor.properties index 02088f0..6ecd449 100644 --- a/src/chrome/locale/pt-BR/aboutTor.properties +++ b/src/chrome/locale/pt-BR/aboutTor.properties @@ -2,14 +2,21 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +aboutTor.searchDDG.privacy=Buscar <a href="%1$S">com segurança</a> utilizando <a href="%2$S">DuckDuckGo</a>. # The following string is a link which replaces %1$S above. -aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. -aboutTor.searchSP.search.link=https://startpage.com/ +aboutTor.searchDDG.search.link=https://duckduckgo.com/ -aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +aboutTor.searchDC.privacy=Buscar <a href="%1$S">com segurança</a> utilizando <a href="%2$S">Disconnect.me</a>. # The following string is a link which replaces %1$S above. -aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above. -aboutTor.searchDDG.search.link=https://duckduckgo.com/ +aboutTor.searchDC.search.link=https://search.disconnect.me/ + +aboutTor.donationBanner.donate=Doe Agora! +aboutTor.donationBanner.heart=O Tor é o coração da liberdade na Internet +aboutTor.donationBanner.tagline1=Milhares de pessoas dependem do Tor para Segurança & Privacidade Online +aboutTor.donationBanner.tagline2=Uma Rede de Pessoas Protegendo Pessoas +aboutTor.donationBanner.tagline3=Vigilância = Opressão +aboutTor.donationBanner.tagline4=Protegendo Jornalistas, Ativistas & Denunciantes Desde 2006 diff --git a/src/chrome/locale/pt-BR/brand.dtd b/src/chrome/locale/pt-BR/brand.dtd index 59f665e..960990d 100644 --- a/src/chrome/locale/pt-BR/brand.dtd +++ b/src/chrome/locale/pt-BR/brand.dtd @@ -2,7 +2,14 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "Tor Browser"> -<!ENTITY brandFullName "Tor Browser"> -<!ENTITY vendorShortName "Tor Project"> -<!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> +<!ENTITY brandShorterName "Navegador Tor"> +<!ENTITY brandShortName "Navegador Tor"> +<!ENTITY brandFullName "Navegador Tor"> +<!ENTITY vendorShortName "Projeto Tor"> +<!ENTITY trademarkInfo.part1 "Firefox e os logotipos do Firefox são marcas registradas da Fundação Mozilla."> + + +<!ENTITY plugins.installed.find "Clique para carregar os plugins de sistema instalados"> +<!ENTITY plugins.installed.enable "Ativar plugins"> +<!ENTITY plugins.installed.disable "Desativar plugins"> +<!ENTITY plugins.installed.disable.tip "Clique para evitar o carregamento dos plugins de sistema "> diff --git a/src/chrome/locale/pt-BR/brand.properties b/src/chrome/locale/pt-BR/brand.properties index f63def3..d4e9519 100644 --- a/src/chrome/locale/pt-BR/brand.properties +++ b/src/chrome/locale/pt-BR/brand.properties @@ -2,14 +2,15 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=Tor Browser -brandFullName=Tor Browser -vendorShortName=Tor Project +brandShorterName=Navegador Tor +brandShortName=Navegador Tor +brandFullName=Navegador Tor +vendorShortName=Projeto Tor -homePageSingleStartMain=Firefox Start, a fast home page with built-in search -homePageImport=Import your home page from %S +homePageSingleStartMain=Firefox Start, uma página inicial rápida com pesquisa embutida +homePageImport=Importar sua página inicial de %S -homePageMigrationPageTitle=Home Page Selection -homePageMigrationDescription=Please select the home page you wish to use: +homePageMigrationPageTitle=Seleção da Página Inicial +homePageMigrationDescription=Por favor, selecione a página inicial que você deseja usar: -syncBrandShortName=Sync +syncBrandShortName=Sincronizar diff --git a/src/chrome/locale/pt-BR/torbutton.dtd b/src/chrome/locale/pt-BR/torbutton.dtd index d7de048..673c067 100644 --- a/src/chrome/locale/pt-BR/torbutton.dtd +++ b/src/chrome/locale/pt-BR/torbutton.dtd @@ -1,22 +1,63 @@ <!ENTITY torbutton.context_menu.new_identity "Nova Identidade"> <!ENTITY torbutton.context_menu.new_identity_key "Eu"> -<!ENTITY torbutton.context_menu.networksettings "Abrir Configurações de Rede"> -<!ENTITY torbutton.context_menu.downloadUpdate "Baixar atualização do pacote Tor para navegadores..."> +<!ENTITY torbutton.context_menu.new_circuit "Novo Circuito Tor para este Site"> +<!ENTITY torbutton.context_menu.new_circuit_key "C"> +<!ENTITY torbutton.context_menu.preferences "Configurações de Segurança..."> +<!ENTITY torbutton.context_menu.preferences.key "S"> +<!ENTITY torbutton.context_menu.networksettings "Configurações da Rede Tor..."> +<!ENTITY torbutton.context_menu.networksettings.key "N"> +<!ENTITY torbutton.context_menu.downloadUpdate "Verificar atualizações do Navegador Tor..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> -<!ENTITY torbutton.context_menu.cookieProtections "Proteções para Cookies"> +<!ENTITY torbutton.context_menu.cookieProtections "Proteções contra Cookies..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> -<!ENTITY torbutton.button.tooltip "Clique para iniciar o Botão do Tor"> -<!ENTITY torbutton.prefs.restore_defaults "Restaurar padrão"> +<!ENTITY torbutton.button.tooltip "Clique para iniciar o Torbutton"> +<!ENTITY torbutton.prefs.security_settings "Configurações de Segurança do Navegador Tor"> +<!ENTITY torbutton.prefs.restore_defaults "Restaurar Padrões"> +<!ENTITY torbutton.prefs.custom_warning "As configurações personalizadas do seu navegador ficaram fora do comum. Por razões de segurança e de privacidade, recomendamos que você escolha um dos níveis padrões de segurança. "> <!ENTITY torbutton.cookiedialog.title "Gerenciar Proteções de Cookies"> <!ENTITY torbutton.cookiedialog.lockCol "Protegido"> <!ENTITY torbutton.cookiedialog.domainCol "Hospedeiro"> <!ENTITY torbutton.cookiedialog.nameCol "Nome"> <!ENTITY torbutton.cookiedialog.pathCol "Caminho"> -<!ENTITY torbutton.cookiedialog.protectCookie "Protoger Cookie"> +<!ENTITY torbutton.cookiedialog.protectCookie "Proteger Cookie"> <!ENTITY torbutton.cookiedialog.removeCookie "Remover Cookie"> <!ENTITY torbutton.cookiedialog.unprotectCookie "Desproteger Cookie"> -<!ENTITY torbutton.cookiedialog.removeAllBut "Remover Tudo Exceto Protegidos"> +<!ENTITY torbutton.cookiedialog.removeAllBut "Remover Todos Exceto os Protegidos"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Proteger Novos Cookies"> -<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Não Prototeger Novos COOKIES"> -<!ENTITY torbutton.prefs.restrict_thirdparty "Restringir os cookies de terceiros e outros dados de controle"> -<!ENTITY torbutton.prefs.resist_fingerprinting "Alterar os dados que distinguem você de outros usuários do Tor Browser"> +<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Não Proteger Novos Cookies"> +<!ENTITY torbutton.prefs.restrict_thirdparty "Restringir os cookies de terceiros e outros dados de rastreamento"> +<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R"> +<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Deixe esta opção sempre marcada para impedir que funcionalidades de navegação sejam usadas para rastreá-la(o) durante a sua navegação. Funcionalidades alteradas incluem janelas pop-up, canais de transmissão, o cache de memória, cookies, favicons, "> +<!ENTITY torbutton.prefs.resist_fingerprinting "Alterar os detalhes que distinguem você de outros usuários do Navegador Tor"> +<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Deixe esta opção marcada para ocultar suas informações individuais, como o status da bateria, a performance do computados, o formato de teclado, a localização e os plugins instalados, a lista de plugins instalados, o status da sua rede, a posição de tela, o tamanho de tela, níveis de zoom de alguns sites, tipos de arquivos compatíveis, cores de sistema, e capacidade de WebGL."> +<!ENTITY torbutton.prefs.sec_caption "Nível de Segurança"> +<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider permite que você desabilite certas funcionalidades de navegação que podem torná-la mais vulnerável a tentativas de ataque."> +<!ENTITY torbutton.prefs.sec_low "Baixo (padrão)"> +<!ENTITY torbutton.prefs.sec_low_usable_desc "Isto proporciona a experiência mais utilizável."> +<!ENTITY torbutton.prefs.sec_low_desc "Nesse nível de segurança, todas as funções do navegador são ativadas. "> +<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "O mecanismo de renderização de fonte SVG OpenType está desabilitado."> +<!ENTITY torbutton.prefs.sec_gen_desc "Neste nível de segurança, as seguintes mudanças se aplicam (passe o mouse para mais detalhes):"> +<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video e mídia de audio torna-se clique-para-tocar através do NoScript."> +<!ENTITY torbutton.prefs.sec_html5_tooltip "Em alguns sites, talvez você precise usar o botão da barra de ferramentas NoScript para habilitar esses objetos de mídia."> +<!ENTITY torbutton.prefs.sec_some_jit_desc "Algumas otimizações de perfomance JavaScript estão desabilitadas."> +<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Tipo de Inferência, ASM JS."> +<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Linha de Base JIT."> +<!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts podem rodar mais devagar em alguns sites."> +<!ENTITY torbutton.prefs.sec_mathml_desc "Alguns mecanismos para mostrar equações matemáticas estão desabilitados."> +<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML foi desabilitado."> +<!ENTITY torbutton.prefs.sec_medium "Média "> +<!ENTITY torbutton.prefs.sec_all_jit_desc "As otimizações de performance serão desabilitadas nos sites em JavaScript estiver habilitado."> +<!ENTITY torbutton.prefs.sec_font_rend_desc "Alguns recursos de renderização de fontes estão desabilitados."> +<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "O mecanismo de renderização de fonte Graphite está desabilitado."> +<!ENTITY torbutton.prefs.sec_svg_desc "Alguns tipos de imagem foram desabilitadas."> +<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "Imagens SVG foram desabilitadas."> +<!ENTITY torbutton.prefs.sec_js_https_desc "O JavaScript é desabilitado por padrão em todos os sites não-HTTPS."> +<!ENTITY torbutton.prefs.sec_js_desc_tooltip "O JavaScript pode ser ativado individualmente em cada site, clicando no botão da barra de ferramentas NoScript."> +<!ENTITY torbutton.prefs.sec_high "Alto"> +<!ENTITY torbutton.prefs.sec_all_js_desc "Por padrão, o JavaScript é desabilitado em todos os sites."> +<!ENTITY torbutton.prefs.sec_webfonts_desc "Algumas fontes e ícones podem ser exibidos incorretamente."> +<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Arquivos de fontes fornecidos pelo sítio web estão bloqueados."> +<!ENTITY torbutton.circuit_display.title "Circuito Tor para este site"> +<!ENTITY torbutton.torbrowser_user_manual.label "Manual de Uso do Navegador Tor"> +<!ENTITY torbutton.torbrowser_user_manual.accesskey "M"> diff --git a/src/chrome/locale/pt-BR/torbutton.properties b/src/chrome/locale/pt-BR/torbutton.properties index 6a58d4b..5cfb0af 100644 --- a/src/chrome/locale/pt-BR/torbutton.properties +++ b/src/chrome/locale/pt-BR/torbutton.properties @@ -1,27 +1,51 @@ -torbutton.panel.tooltip.disabled = Clique para habilitar Tor -torbutton.panel.tooltip.enabled = Clique para desabilitar Tor -torbutton.panel.label.disabled = Tor desabilitado -torbutton.panel.label.enabled = Tor habilitado -extensions.torbutton(a)torproject.org.description = Torbutton fornece um botão para rapidamente configurar o Tor e facilmente limpar dados de navegação privados. -torbutton.popup.external.title = Carregar conteúdo externo? -torbutton.popup.external.app = Uma aplicação externa é necessária para manipular:\n\n -torbutton.popup.external.note = \n\nNOTA: Aplicações externas NÃO são seguras por padrão e podem desmascarar você!\n -torbutton.popup.external.suggest = \nSe este arquivo não é confiável, você deveria salvá-lo para vê-lo quando estiver offline ou usando uma MV,\nou considere usar um proxy Tor transparente como o Tails LiveCD ou torsocks.\n -torbutton.popup.launch = Rode a aplicação -torbutton.popup.cancel = Cancelado -torbutton.popup.dontask = Sempre ative aplicações a partir de agora -torbutton.popup.prompted_language = Para proporcionar mais privacidade a você, o Torbutton pode requisitar a versão em inglês de páginas da web. Isso pode fazer com que páginas que você prefere ler na sua língua nativa apareçam em Inglês. -torbutton.popup.no_newnym = O Torbutton não pode te dar uma nova identidade com segurança. Ele não tem acesso à Porta de Controle Tor.\n\\n\nVocê está usando o Tor Browser Bundle? -torbutton.title.prompt_torbrowser = Informação Importante do Torbutton -torbutton.popup.prompt_torbrowser = O Torbutton agora funciona de forma diferente: você não pode mais desliga-lo.\n\nFizemos essa mudança porque não é seguro utilizar o Torbutton em navegador que ao mesmo tempo seja usado para navegação não-Tor. Eram causados bugs demais que não pudemos resolver de nenhuma outra forma.\n\nSe você deseja continuar usando o Firefox normalmente, você deve desinstalar o Torbutton e baixar o Tor Browser Bundle. As configurações de privacidade do Tor Browser também são superiores àquelas do Firefox comum, mesmo quando era usado com o Torbutton.\n\nPara remover o Torbutton, vá em Ferramentas->Complementes->Extensões e clique no botão remover próximo ao Torbutton. -torbutton.popup.short_torbrowser = Informação Importante do Torbutton!\n\nO Torbutton agora mantem-se sempre habilitado.\n\nClique no Torbutton para mais informações. +torbutton.circuit_display.internet = Internet +torbutton.circuit_display.ip_unknown = IP desconhecido +torbutton.circuit_display.onion_site = Site Onion +torbutton.circuit_display.this_browser = Este navegador +torbutton.circuit_display.relay = retransmitir +torbutton.circuit_display.tor_bridge = Ponte +torbutton.circuit_display.unknown_country = País desconhecido +torbutton.content_sizer.margin_tooltip = O Navegador Tor inclui esta margem para que a altura e a largura da janela sejam menos distinguíveis, o que reduz a possibilidade de que alguém rastreie a sua navegação . +torbutton.panel.tooltip.disabled = Clique para habilitar o Tor +torbutton.panel.tooltip.enabled = Clique para desabilitar o Tor +torbutton.panel.label.disabled = O Tor está desabilitado +torbutton.panel.label.enabled = O Tor está habilitado +extensions.torbutton(a)torproject.org.description = O Torbutton fornece uma opção para configurar as preferências do Tor e, com rapidez e facilidade, limpar os dados de navegação privada. +torbutton.popup.external.title = Fazer o download de um tipo de arquivo externo? +torbutton.popup.external.app = O Navegador Tor não pode exibir este arquivo. Você precisa abri-lo com um outro aplicativo.\n\n +torbutton.popup.external.note = Alguns tipos de arquivos podem fazer com que aplicativos se conectem à Internet sem usar o Tor.\n\n +torbutton.popup.external.suggest = Para sua segurança, você só deve abrir arquivos baixados enquanto estiver desconectado, ou usar um Live CD do Tor, como o Tails.\n +torbutton.popup.launch = Fazer o download do arquivo +torbutton.popup.cancel = Cancelar +torbutton.popup.dontask = Fazer o download dos arquivos automaticamente de agora em diante +torbutton.popup.prompted_language = Para proporcionar-lhe mais privacidade, o Torbutton pode requisitar a versão em inglês das páginas da web. Isso pode fazer com que as páginas que você prefere ler na sua língua nativa apareçam em Inglês. +torbutton.popup.no_newnym = O Torbutton não pode dar-lhe uma nova identidade com segurança. Ele não tem acesso à Porta de Controle do Tor.\n\nVocê está usando o Pacote do Navegador Tor? +torbutton.title.prompt_torbrowser = Informação importante do Torbutton +torbutton.popup.prompt_torbrowser = O Torbutton agora está funcionando de outra maneira: você não pode mais desligá-lo.\n\nNós fizemos esta mudança porque não é seguro usar o Torbutton em um navegador que também é usado para navegação não-Tor. Havia muitos bugs que nós não conseguíamos resolver de nenhum outro modo.\n\nSe você quiser continuar usando o Firefox normalmente, deverá desinstalar o Torbutton e fazer o download do Pacote do Navegador Tor. As configurações de privacidade do Navegador Tor também são superiores àquelas do Firefox comum, mesmo quando era usado com o Torbutton.\n\nPara remover o Torbutton, vá até Ferramentas->Complementos->Extensões e clique no botão Remover próximo ao Torbutton. +torbutton.popup.short_torbrowser = Informação Importante do Torbutton!\n\nO Torbutton agora estará sempre habilitado.\n\nClique no Torbutton para mais informações. -torbutton.popup.confirm_plugins = Plugins como Flash podem prejudicar sua privacidade e seu anonimato.\n\nPodem também ignorar o Tor para revelar sua localização atual e endereço IP.\n\nVocê tem certeza que deseja habilitar o uso de plugins?\n\n -torbutton.popup.never_ask_again = Não me perguntar novamente +torbutton.popup.confirm_plugins = Plugins como o Flash podem prejudicar sua privacidade e o seu anonimato.\n\nPode ser ainda que eles ignorem o Tor e revelem a sua localização atual e o endereço de IP.\n\nVocê tem certeza que deseja habilitar o uso de plugins?\n\n +torbutton.popup.never_ask_again = Não me pergunte novamente +torbutton.popup.confirm_newnym = O navegador Tor fechará todas as janelas e abas. Todas as sessões de websites serão perdidas.\n\nVocê deseja reiniciar o navegador Tor agora para reiniciar a sua identidade?\n\n + +torbutton.slider_notification = O menu cebola verde agora dispõe de uma opcão que lhe permite ajustar o seu nivel de seguranca. Dê uma conferida! +torbutton.slider_notification_button = Abra as definições de segurança. + +torbutton.maximize_warning = Maximizar o Navegador Tor pode permitir aos websites determinar o tamanho do seu monitor, que pode ser usado para rastreá-lo. Nós recomendamos que você deixe a janela do Navegador Tor no seu tamanho original. # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=Este website (%S) tentou acessar dados sobre imagem(ns) em um elemento canvas da página. Como dados de imagem do canvas podem ser usados para descobrir informações sobre seu computador, nenhum dado de imagem foi retornado desta vez. -canvas.allow=Permitir no Futuro +canvas.siteprompt=Este website (%S) tentou extrair dados de imagem CANVAS HTML5, que podem ser usados para identificar o seu computador.\n\nVocê deseja que o Navegador Tor permita que este website extraia dados de imagem CANVAS HTML5? +canvas.notNow=Por enquanto, não +canvas.notNowAccessKey=N +canvas.allow=Permitir canvas.allowAccessKey=Um -canvas.never=Nunca para esse site -canvas.neverAccessKey=c +canvas.never=Nunca a este site (recomendado) +canvas.neverAccessKey=e + +# Profile/startup error messages. Strings are kept here for ease of translation. +# LOCALIZATION NOTE: %S is the application name. +profileProblemTitle=Problema com o Perfil %S +profileReadOnly=Não é possível executar %S a partir de um sistema de arquivo "somente-leitura". Por favor, copie %S em um outro local antes de tentar utilizá-lo. +profileReadOnlyMac=Não é possível executar %S a partir de um sistema de arquivo "somente-leitura". Por favor, copie %S no seu Desktop ou em uma pasta de Aplicações antes de tentar utilizá-lo.\n +profileAccessDenied=%S não possui permissão para acessar o perfil. Por favor, ajuste as suas permissões de arquivo de sistema e tente novamente. +profileMigrationFailed=Migração de seu perfil %S existente falhou.\nNovas configurações serão utilizadas. diff --git a/src/chrome/locale/ru/aboutTor.dtd b/src/chrome/locale/ru/aboutTor.dtd index bcc257a..5225aca 100644 --- a/src/chrome/locale/ru/aboutTor.dtd +++ b/src/chrome/locale/ru/aboutTor.dtd @@ -17,13 +17,9 @@ <!ENTITY aboutTor.success3.label "Теперь Вы можете просматривать интернет-сайты в анонимном режиме."> <!ENTITY aboutTor.failure.label "Что-то пошло не так!"> <!ENTITY aboutTor.failure2.label "Tor не работает в этом браузере."> -<!ENTITY aboutTor.failure3prefix.label "Чтобы получить помощь, обращайтесь:"> -<!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> -<!ENTITY aboutTor.failure3suffix.label "."> <!ENTITY aboutTor.search.label "Поиск"> -<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> <!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> @@ -35,6 +31,8 @@ <!ENTITY aboutTor.whatnextAnswer.label "Tor НЕ является исчерпывающим средством для анонимного использования сети! Возможно, чтобы обезопасить свои личные данные, Вам придется изменить некоторые привычки работы в Интернете."> <!ENTITY aboutTor.whatnext.label "Рекомендации для сохранения анонимности »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser руководство пользователя"> +<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org"> <!ENTITY aboutTor.helpInfo1.label "Вы можете помочь!"> <!ENTITY aboutTor.helpInfo2.label "Есть много способов сделать сеть Tor более быстрой и устойчивой:"> <!ENTITY aboutTor.helpInfo3.label "Запустить ретранслятор Tor »"> diff --git a/src/chrome/locale/ru/aboutTor.properties b/src/chrome/locale/ru/aboutTor.properties index 055faae..232db84 100644 --- a/src/chrome/locale/ru/aboutTor.properties +++ b/src/chrome/locale/ru/aboutTor.properties @@ -2,12 +2,6 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=Ищите <a href="%1$S">конфиденциально</a> на <a href="%2$S">Стартовой странице</a>. -# The following string is a link which replaces %1$S above. -aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html -# The following string is a link which replaces %2$S above. -aboutTor.searchSP.search.link=https://startpage.com/ - aboutTor.searchDDG.privacy=Ищите <a href="%1$S">конфиденциально</a> с <a href="%2$S">DuckDuckGo</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd index 17b9cef..b78e255 100644 --- a/src/chrome/locale/ru/torbutton.dtd +++ b/src/chrome/locale/ru/torbutton.dtd @@ -46,7 +46,7 @@ <!ENTITY torbutton.prefs.sec_jit_slower_desc "Сценарии на некоторых сайтах могут работать медленнее."> <!ENTITY torbutton.prefs.sec_mathml_desc "Некоторые механизмы отображения математических уравнений отключены."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML отключен."> -<!ENTITY torbutton.prefs.sec_medium "Medium"> +<!ENTITY torbutton.prefs.sec_medium "Средний"> <!ENTITY torbutton.prefs.sec_all_jit_desc "На сайтах с применением JavaScript оптимизация отключена."> <!ENTITY torbutton.prefs.sec_font_rend_desc "Некоторые функции отрисовки шрифтов отключены."> <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Механизм визуализации шрифта Graphite отключен."> @@ -59,3 +59,5 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc "Некоторые шрифты и значки могут отображаться некорректно."> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Файлы шрифтов, предоставленные сайтом, заблокированы"> <!ENTITY torbutton.circuit_display.title "Цепочка Tor для этого сайта"> +<!ENTITY torbutton.torbrowser_user_manual.label "Tor Browser руководство пользователя"> +<!ENTITY torbutton.torbrowser_user_manual.accesskey "M"> diff --git a/src/chrome/locale/sv/aboutTor.dtd b/src/chrome/locale/sv/aboutTor.dtd index 5f4cf5e..4e0473d 100644 --- a/src/chrome/locale/sv/aboutTor.dtd +++ b/src/chrome/locale/sv/aboutTor.dtd @@ -17,13 +17,9 @@ <!ENTITY aboutTor.success3.label "Du kan nu surfa på nätet anonymt."> <!ENTITY aboutTor.failure.label "Någonting gick fel!"> <!ENTITY aboutTor.failure2.label "Tor fungerar inte i den här webbläsaren."> -<!ENTITY aboutTor.failure3prefix.label "För assistans (på engelska), vänligen kontakta"> -<!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> -<!ENTITY aboutTor.failure3suffix.label "."> <!ENTITY aboutTor.search.label "Sök"> -<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> <!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> @@ -35,6 +31,8 @@ <!ENTITY aboutTor.whatnextAnswer.label "Tor är INTE allt som behövs för att vara anonym på nätet! Du behöver kanske ändra några av dina vanor för att säkerställa att din identitet förblir skyddad."> <!ENTITY aboutTor.whatnext.label "Tips på hur man förblir anonym »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser bruksanvisning »"> +<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org"> <!ENTITY aboutTor.helpInfo1.label "Du kan hjälpa till!"> <!ENTITY aboutTor.helpInfo2.label "Det finns många sätt du kan hjälpa till med att göra Tor-nätverket snabbare och säkrare:"> <!ENTITY aboutTor.helpInfo3.label "Kör ett Tor-relä »"> diff --git a/src/chrome/locale/sv/aboutTor.properties b/src/chrome/locale/sv/aboutTor.properties index 3b0ddcd..e23e864 100644 --- a/src/chrome/locale/sv/aboutTor.properties +++ b/src/chrome/locale/sv/aboutTor.properties @@ -2,12 +2,6 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=Sök <a href="%1$S">säkert</a> med <a href="%2$S">Startpage</a>. -# The following string is a link which replaces %1$S above. -aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html -# The following string is a link which replaces %2$S above. -aboutTor.searchSP.search.link=https://startpage.com/ - aboutTor.searchDDG.privacy=Sök <a href="%1$S">säkert</a> med <a href="%2$S">DuckDuckGo</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd index 4560ccc..6789162 100644 --- a/src/chrome/locale/sv/torbutton.dtd +++ b/src/chrome/locale/sv/torbutton.dtd @@ -59,3 +59,5 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc "Vissa typsnitt ock ikoner kan visas felaktigt."> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Typsnitt som tillhandahålls av webbsidor är blockerade."> <!ENTITY torbutton.circuit_display.title "Tor-krets för den här webbsidan"> +<!ENTITY torbutton.torbrowser_user_manual.label "Tor Browser bruksanvisning"> +<!ENTITY torbutton.torbrowser_user_manual.accesskey "M"> diff --git a/src/chrome/locale/tr/aboutTor.dtd b/src/chrome/locale/tr/aboutTor.dtd index d68d838..b9ecb4d 100644 --- a/src/chrome/locale/tr/aboutTor.dtd +++ b/src/chrome/locale/tr/aboutTor.dtd @@ -17,13 +17,9 @@ <!ENTITY aboutTor.success3.label "Artık İnternet'te özgürce ve anonim olarak dolaşabilirsiniz."> <!ENTITY aboutTor.failure.label "Bir Şeyler Ters Gitti!"> <!ENTITY aboutTor.failure2.label "Tor bu tarayıcı ile çalışmıyor."> -<!ENTITY aboutTor.failure3prefix.label "Yardım almak için bizimle görüşün"> -<!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> -<!ENTITY aboutTor.failure3suffix.label "."> <!ENTITY aboutTor.search.label "Arama"> -<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> <!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> @@ -35,6 +31,8 @@ <!ENTITY aboutTor.whatnextAnswer.label "Tor, anonim kalmanız için gerek duyacağınız her şeyi sağlamaz! Kimliğinizin güvende kalması için bazı İnternet alışkanlıklarınızı değiştirmeniz gerekebilir."> <!ENTITY aboutTor.whatnext.label "Anonim Kalma İpuçları »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser User Manual »"> +<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org"> <!ENTITY aboutTor.helpInfo1.label "Yardım Edebilirsiniz!"> <!ENTITY aboutTor.helpInfo2.label "Tor ağını daha hızlı güçlü kılmaya yardımcı olabilmenin çeşitli yolları var:"> <!ENTITY aboutTor.helpInfo3.label "Tor Aktarıcı Noktası Çalıştır »"> diff --git a/src/chrome/locale/tr/aboutTor.properties b/src/chrome/locale/tr/aboutTor.properties index 322cc2e..2c34500 100644 --- a/src/chrome/locale/tr/aboutTor.properties +++ b/src/chrome/locale/tr/aboutTor.properties @@ -2,12 +2,6 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=<a href="%2$S">Startpage</a> kullanarak <a href="%1$S">güvenli</a> arama yapın. -# The following string is a link which replaces %1$S above. -aboutTor.searchSP.privacy.link=https://startpage.com/tur/protect-privacy.html -# The following string is a link which replaces %2$S above. -aboutTor.searchSP.search.link=https://startpage.com/ - aboutTor.searchDDG.privacy=<a href="%2$S">DuckDuckGo</a> kullanarak <a href="%1$S">güvenli</a> arama yapın. # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd index 116e0fc..5eadf22 100644 --- a/src/chrome/locale/tr/torbutton.dtd +++ b/src/chrome/locale/tr/torbutton.dtd @@ -59,3 +59,5 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc "Bazı yazı tipi ve simgeler düzgün görüntülenemeyebilir."> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Web sitesi tarafından sunulan yazı tipi dosyaları engellenir."> <!ENTITY torbutton.circuit_display.title "Bu site için Tor devresi"> +<!ENTITY torbutton.torbrowser_user_manual.label "Tor Browser User Manual"> +<!ENTITY torbutton.torbrowser_user_manual.accesskey "M"> diff --git a/src/chrome/locale/vi/aboutTBUpdate.dtd b/src/chrome/locale/vi/aboutTBUpdate.dtd index 3086fe2..d1c233c 100644 --- a/src/chrome/locale/vi/aboutTBUpdate.dtd +++ b/src/chrome/locale/vi/aboutTBUpdate.dtd @@ -1,4 +1,4 @@ -<!ENTITY aboutTBUpdate.title "Cập nhật về Trình duyệt Tor"> +<!ENTITY aboutTBUpdate.title "Nâng cấp trình duyệt Tor"> <!ENTITY aboutTBUpdate.updated "Trình duyệt Tor đã được cập nhật"> <!ENTITY aboutTBUpdate.linkPrefix "Dành cho những thông tin cập nhật mới nhất về bản phát hành này,"> <!ENTITY aboutTBUpdate.linkLabel "đến thăm trang của chúng tôi"> diff --git a/src/chrome/locale/vi/aboutTor.dtd b/src/chrome/locale/vi/aboutTor.dtd index 951f44c..f788f86 100644 --- a/src/chrome/locale/vi/aboutTor.dtd +++ b/src/chrome/locale/vi/aboutTor.dtd @@ -17,13 +17,9 @@ <!ENTITY aboutTor.success3.label "Bây giờ bạn sẽ tự do lướt web ẩn danh."> <!ENTITY aboutTor.failure.label "Có gì đó đã sai!"> <!ENTITY aboutTor.failure2.label "Tor không hoạt động trên trình duyệt này."> -<!ENTITY aboutTor.failure3prefix.label "Để được trợ giúp, vui lòng liên lạc"> -<!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> -<!ENTITY aboutTor.failure3suffix.label "."> <!ENTITY aboutTor.search.label "Tìm kiếm"> -<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> <!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> @@ -35,6 +31,8 @@ <!ENTITY aboutTor.whatnextAnswer.label "Tor KHÔNG phải là tất cả những gì bạn cần để ẩn danh! Bạn cần nên thay đổi một vài thói quen lướt net để chắc chắn rằng xác minh danh tính sẽ an toàn."> <!ENTITY aboutTor.whatnext.label "Gợi ý cho việc ẩn danh »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Hướng dẫn sử dụng Trình duyệt Tor »"> +<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org"> <!ENTITY aboutTor.helpInfo1.label "Bạn có thể giúp đỡ!"> <!ENTITY aboutTor.helpInfo2.label "Có nhiều cách mà bạn có thể giúp mạng Tor nhanh hơn và tốt hơn."> <!ENTITY aboutTor.helpInfo3.label "Chạy một đầu mối tiếp sức Tor »"> diff --git a/src/chrome/locale/vi/aboutTor.properties b/src/chrome/locale/vi/aboutTor.properties index 7984d21..3b26bc7 100644 --- a/src/chrome/locale/vi/aboutTor.properties +++ b/src/chrome/locale/vi/aboutTor.properties @@ -2,12 +2,6 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=Tìm kiếm <a href="%1$S">một cách an toàn</a>với <a href="%2$S"> Trang bắt đầu</a>. -# The following string is a link which replaces %1$S above. -aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html -# The following string is a link which replaces %2$S above. -aboutTor.searchSP.search.link=https://startpage.com/ - aboutTor.searchDDG.privacy=Tìm kiếm <a href="%1$S">một cách an toàn</a>với <a href="%2$S"> DuckDuckGo</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html diff --git a/src/chrome/locale/vi/torbutton.dtd b/src/chrome/locale/vi/torbutton.dtd index c1b4a0a..6d27ca7 100644 --- a/src/chrome/locale/vi/torbutton.dtd +++ b/src/chrome/locale/vi/torbutton.dtd @@ -11,9 +11,9 @@ <!ENTITY torbutton.context_menu.cookieProtections "Những sự bảo vệ Cookie..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Bấm chuột để khởi chạy Torbutton"> -<!ENTITY torbutton.prefs.security_settings "Tor Browser Security Settings"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.custom_warning "Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels."> +<!ENTITY torbutton.prefs.security_settings "Những cài đặt bảo mật cho trình duyệt Tor"> +<!ENTITY torbutton.prefs.restore_defaults "Khôi phục trạng thái mặc định"> +<!ENTITY torbutton.prefs.custom_warning "Những điều chỉnh trong trình duyệt của bạn vừa tạo ra những lỗi bảo mật bất thường. Vì những lý do bảo mật và riêng tư, chúng tôi khuyến cáo bạn chọn những cấp độ bảo mật mặc định khác."> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -46,7 +46,7 @@ <!ENTITY torbutton.prefs.sec_jit_slower_desc "Những đoạn mã trên một số trang có thể chạy chậm hơn."> <!ENTITY torbutton.prefs.sec_mathml_desc "Một vài cơ chế hiển thị công thức toán học bị vô hiệu."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathMK bị vô hiệu"> -<!ENTITY torbutton.prefs.sec_medium "Medium"> +<!ENTITY torbutton.prefs.sec_medium "Vừa phải"> <!ENTITY torbutton.prefs.sec_all_jit_desc "Trên những trang nơi JavaScript được cho phép, việc tối ưu hóa hiệu suất bị vô hiệu."> <!ENTITY torbutton.prefs.sec_font_rend_desc "Một vài chức năng tô vẽ phông chữ bị vô hiệu."> <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Cơ chế tô vẽ phông chữ Graphite bị vô hiệu."> @@ -59,3 +59,5 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc "Một vài phông chữ và biểu tượng có thể hiển thị không đúng."> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Những tập tin phông chữ do trang web cung cấp bị chặn."> <!ENTITY torbutton.circuit_display.title "Đầu nối Tor dành cho trang này."> +<!ENTITY torbutton.torbrowser_user_manual.label "Hướng dẫn sử dụng trình duyệt Tor"> +<!ENTITY torbutton.torbrowser_user_manual.accesskey "M"> diff --git a/src/chrome/locale/zh-CN/aboutTor.dtd b/src/chrome/locale/zh-CN/aboutTor.dtd index 426ec5e..1408d98 100644 --- a/src/chrome/locale/zh-CN/aboutTor.dtd +++ b/src/chrome/locale/zh-CN/aboutTor.dtd @@ -17,13 +17,9 @@ <!ENTITY aboutTor.success3.label "现在即可自由地匿名访问互联网。"> <!ENTITY aboutTor.failure.label "出错了！"> <!ENTITY aboutTor.failure2.label "Tor 无法在该浏览器下运行。"> -<!ENTITY aboutTor.failure3prefix.label "如需帮助，请联系："> -<!ENTITY aboutTor.failure3Link "help-zh(a)rt.torproject.org"> -<!ENTITY aboutTor.failure3suffix.label "。"> <!ENTITY aboutTor.search.label "安全的搜索引擎"> -<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> <!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> @@ -35,6 +31,8 @@ <!ENTITY aboutTor.whatnextAnswer.label "仅仅使用 Tor 无法实现匿名浏览。为了确保身份安全，你可能需要改变某些浏览习惯。"> <!ENTITY aboutTor.whatnext.label "匿名提示 »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser 用户手册 »"> +<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org"> <!ENTITY aboutTor.helpInfo1.label "你也可以帮忙！"> <!ENTITY aboutTor.helpInfo2.label "可通过很多方式提供帮助，让 Tor 网络变得更快更强大："> <!ENTITY aboutTor.helpInfo3.label "运行 Tor 中继节点 »"> diff --git a/src/chrome/locale/zh-CN/aboutTor.properties b/src/chrome/locale/zh-CN/aboutTor.properties index 421ac52..7622354 100644 --- a/src/chrome/locale/zh-CN/aboutTor.properties +++ b/src/chrome/locale/zh-CN/aboutTor.properties @@ -2,12 +2,6 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=使用<a href="%2$S">Startpage</a><a href="%1$S">安全</a>搜索。 -# The following string is a link which replaces %1$S above. -aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html -# The following string is a link which replaces %2$S above. -aboutTor.searchSP.search.link=https://startpage.com/ - aboutTor.searchDDG.privacy=使用<a href="%2$S">DuckDuckGo</a><a href="%1$S">安全</a>搜索。 # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html @@ -23,6 +17,6 @@ aboutTor.searchDC.search.link=https://search.disconnect.me/ aboutTor.donationBanner.donate=立即捐助！ aboutTor.donationBanner.heart=Tor 是互联网自由的核心 aboutTor.donationBanner.tagline1=数百万人依靠 Tor 安全、私密地上网 -aboutTor.donationBanner.tagline2=A Network of People Protecting People +aboutTor.donationBanner.tagline2=人们互相保护组成的网络 aboutTor.donationBanner.tagline3=监视即压迫 aboutTor.donationBanner.tagline4=为记者、告密者及活动人士提供保护，专注匿名安全 10 年 diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd index 86c18bf..55f94c3 100644 --- a/src/chrome/locale/zh-CN/torbutton.dtd +++ b/src/chrome/locale/zh-CN/torbutton.dtd @@ -59,3 +59,5 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc "某些字体和图标可能无法正确显示。"> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "禁用网站提供的字体文件。"> <!ENTITY torbutton.circuit_display.title "为此站点使用的 Tor 线路"> +<!ENTITY torbutton.torbrowser_user_manual.label "Tor Browser 用户手册"> +<!ENTITY torbutton.torbrowser_user_manual.accesskey "M">

1 0

[torbutton/master] Bug 20556: Import pt-BR strings from now on
by gk＠torproject.org 06 Dec '16

06 Dec '16

commit e2fc692ca82ee04eff6d8ffd2313116638d2f6a4 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Dec 6 14:07:15 2016 +0000 Bug 20556: Import pt-BR strings from now on --- trans_tools/import-translations.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh index cfaa05c..9153692 100755 --- a/trans_tools/import-translations.sh +++ b/trans_tools/import-translations.sh @@ -2,7 +2,7 @@ # This var comes from the TBB locale list. # XXX: Find some way to keep this, tor-launcher, and Tor Browser in sync -BUNDLE_LOCALES="ar de es fa fr it ko nl pl pt ru tr vi zh-CN" +BUNDLE_LOCALES="ar de es fa fr it ko nl pl pt-BR ru tr vi zh-CN" # XXX: Basque (eu) by request in #10687. # This is not used for official builds, but should remain

1 0

[tor-browser-bundle/master] Bug 20556: update pt-PT users to pt-BR
by gk＠torproject.org 06 Dec '16

06 Dec '16

commit c3e365d6eb07ea07a4187380aebe2c6015a50346 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Nov 8 16:46:19 2016 +0100 Bug 20556: update pt-PT users to pt-BR --- tools/update-responses/config.yml | 2 ++ tools/update-responses/update_responses | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index c0559e2..8daa8e1 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -40,6 +40,8 @@ versions: - 6.5a4 migrate_archs: osx32: osx64 + migrate_langs: + pt-PT: pt-BR osx32: minSupportedOSVersion: 10.8 detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index b61e379..c60704f 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -355,6 +355,7 @@ sub write_htaccess { foreach my $channel (@channels) { my $htaccess = "RewriteEngine On\n"; my $version = $config->{channels}{$channel}; + my $migrate_langs = $config->{versions}{$version}{migrate_langs} // {}; my $files = $config->{versions}{$version}{files}; $htaccess .= "RewriteRule ^[^\/]+/$version/ no-update.xml $flags\n"; foreach my $os (sort keys %$files) { @@ -367,6 +368,10 @@ sub write_htaccess { $htaccess .= "RewriteRule ^$bt/[^\/]+/$lang " . "$version-$os-$lang.xml $flags\n"; } + foreach my $lang (sort keys %$migrate_langs) { + $htaccess .= "RewriteRule ^$bt/[^\/]+/$lang " + . "$version-$os-$migrate_langs->{$lang}.xml $flags\n"; + } $htaccess .= "RewriteRule ^$bt/ $version-$os-en-US.xml $flags\n"; } }

1 0

[tor-browser-bundle/master] Bug 20556: Move to pt-BR for Portuguese
by gk＠torproject.org 06 Dec '16

06 Dec '16

commit 06fe66a1d2d366078a63147447389e397cfbf505 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Nov 8 12:53:18 2016 +0000 Bug 20556: Move to pt-BR for Portuguese It seems our translators are only doing pt-BR while we are fetching pt-PT strings from Mozilla and ship our portuguese bundles as pt-PT ones. We should move to pt-BR ones instead. --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions b/gitian/versions index 71faeff..4d1ae98 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,5 +1,5 @@ TORBROWSER_VERSION_TYPE=release -BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" +BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-BR ru tr vi zh-CN" BUNDLE_LOCALES_LINUX="ja" BUNDLE_LOCALES_WIN32="ja" BUNDLE_LOCALES_MAC="ja-JP-mac" diff --git a/gitian/versions.alpha b/gitian/versions.alpha index e3bc120..0cc7999 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -1,5 +1,5 @@ TORBROWSER_VERSION_TYPE=alpha -BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" +BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-BR ru tr vi zh-CN" BUNDLE_LOCALES_LINUX="ja" BUNDLE_LOCALES_WIN32="ja" BUNDLE_LOCALES_MAC="ja-JP-mac" diff --git a/gitian/versions.beta b/gitian/versions.beta index 222f529..8027bd9 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -1,5 +1,5 @@ TORBROWSER_VERSION_TYPE=beta -BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" +BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-BR ru tr vi zh-CN" BUNDLE_LOCALES_LINUX="ja" BUNDLE_LOCALES_WIN32="ja" BUNDLE_LOCALES_MAC="ja-JP-mac"

1 0

[tor-browser/tor-browser-45.5.1esr-6.5-1] Bug 20707: Avoid localization failure in about:preferences
by gk＠torproject.org 05 Dec '16

05 Dec '16

commit 94e3f300550ee9ee1e11f60b83b97e3e13d4de23 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Nov 18 12:42:22 2016 -0800 Bug 20707: Avoid localization failure in about:preferences This fixes problem with our 20244 patches in non-US-English locales. If those patches are uplifted, then Mozilla can localize the strings. In the meantime, this patch removes our localizable strings from privacy.xul altogether. Our torbutton code overlays localized strings anyway. (This patch should not be uplifted.) --- browser/components/preferences/in-content/privacy.xul | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/browser/components/preferences/in-content/privacy.xul b/browser/components/preferences/in-content/privacy.xul index d180ee2..0487db7 100644 --- a/browser/components/preferences/in-content/privacy.xul +++ b/browser/components/preferences/in-content/privacy.xul @@ -137,8 +137,8 @@ <hbox align="center"> <checkbox id="thirdpartyIsolateCB" preference="privacy.thirdparty.isolate" - accesskey="&thirdpartyIsolate.accesskey;" - label="&thirdpartyIsolate.label;" + accesskey="R" + label="Restrict third party cookies and other tracking data" onsyncfrompreference="return gPrivacyPane.readThirdPartyIsolate();" onsynctopreference="return gPrivacyPane.writeThirdPartyIsolate();"/> </hbox> @@ -147,8 +147,8 @@ <hbox align="center"> <checkbox id="resistFingerprintingCB" preference="privacy.resistFingerprinting" - accesskey="&resistFingerprinting.accesskey;" - label="&resistFingerprinting.label;" /> + accesskey="F" + label="Change details that distinguish you from other Tor Browser users" /> </hbox> </vbox> </groupbox>

1 0

[tor-browser/tor-browser-45.5.1esr-6.5-1] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 05 Dec '16

05 Dec '16

commit fdf24ff74128d674358878e998e8048306e48bb4 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 18 12:01:44 2016 +0000 fixup! Bug #4234: Use the Firefox Update Process for Tor Browser. This fixes bug 20709. --- browser/app/profile/firefox.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 64ab700..ce16a75 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -147,7 +147,7 @@ pref("app.update.badge", false); pref("app.update.staging.enabled", true); // Update service URL: -pref("app.update.url", "https://aus1.torproject.org/dist/torbrowser/update_2/%CHANNEL%/%BUILD_TARGE…"); +pref("app.update.url", "https://aus1.torproject.org/torbrowser/update_2/%CHANNEL%/%BUILD_TARGET%/%V…"); // app.update.url.manual is in branding section // app.update.url.details is in branding section

1 0

[tor-browser/tor-browser-45.5.1esr-6.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 05 Dec '16

05 Dec '16

commit a80e28aed0db10bcbbb604644eef9ccae3939e7f Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Nov 14 10:46:45 2016 -0800 fixup! TB4: Tor Browser's Firefox preference overrides. --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 1f1db9e..a5b6aa9 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -147,6 +147,7 @@ pref("ui.use_standins_for_native_colors", true); // https://bugzilla.mozilla.org // bug 18950 for more details. pref("browser.reader.detectedFirstArticle", true); pref("reader.parse-on-load.enabled", false); +pref("privacy.use_utc_timezone", true); // Third party stuff pref("network.cookie.cookieBehavior", 1);

1 0

[tor-browser/tor-browser-45.5.1esr-6.5-1] Bug 16622: Pref to spoof time zone as UTC
by gk＠torproject.org 05 Dec '16

05 Dec '16

commit b3a3ef3688f3c196210d2004961fe2f8c5dba83b Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Nov 14 10:22:09 2016 -0800 Bug 16622: Pref to spoof time zone as UTC --- toolkit/xre/nsAppRunner.cpp | 9 +++++++++ toolkit/xre/nsAppRunner.h | 3 +++ 2 files changed, 12 insertions(+) diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index f0cdd41..81f949a 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -4680,6 +4680,8 @@ XREMain::XRE_mainRun() OverrideDefaultLocaleIfNeeded(); + UseUTCTimeZoneIfNeeded(); + #ifdef MOZ_CRASHREPORTER nsCString userAgentLocale; // Try a localized string first. This pref is always a localized string in @@ -5385,3 +5387,10 @@ OverrideDefaultLocaleIfNeeded() { setlocale(LC_ALL, "C.UTF-8") || setlocale(LC_ALL, "C"); } } + +void +UseUTCTimeZoneIfNeeded() { + if (mozilla::Preferences::GetBool("privacy.use_utc_timezone", false)) { + SaveToEnv("TZ=UTC"); + } +} diff --git a/toolkit/xre/nsAppRunner.h b/toolkit/xre/nsAppRunner.h index c7048e0..cab42a4 100644 --- a/toolkit/xre/nsAppRunner.h +++ b/toolkit/xre/nsAppRunner.h @@ -96,6 +96,9 @@ WriteConsoleLog(); void OverrideDefaultLocaleIfNeeded(); +void +UseUTCTimeZoneIfNeeded(); + #ifdef XP_WIN void UseParentConsole();

1 0

[tor-browser-bundle/hardened-builds] Bug 20837: activate iat-mode for certain obfs4 bridges.
by gk＠torproject.org 02 Dec '16

02 Dec '16

commit 1cab20e4122796a020c71961f0648d07dc25692f Author: David Fifield <david(a)bamsoftware.com> Date: Tue Nov 29 16:08:33 2016 -0800 Bug 20837: activate iat-mode for certain obfs4 bridges. https://lists.torproject.org/pipermail/tor-project/2016-November/000776.html --- Bundle-Data/PTConfigs/bridge_prefs.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 6b112d6..664e607 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -18,9 +18,9 @@ pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 83.21 pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 154.35.22.10:9332 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 198.245.60.50:443 752CF7825B3B9EA6A98C83AC41F7099D67007EA5 cert=xpmQtKUqQ/6v5X7ijgYE/f03+l2/EuQ1dexjyUhh16wQlu/cpXUGalmhDIlhuiQPNEKmKw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=1"); pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 83.212.101.3:50001 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=2"); pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 154.35.22.11:7920 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 154.35.22.12:80 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 154.35.22.13:443 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); @@ -33,7 +33,7 @@ pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 154.35.22.9:80 C73 pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 154.35.22.9:443 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 154.35.22.12:4148 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.18", "obfs4 154.35.22.13:6041 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com");

1 0

[tor-browser-bundle/maint-6.0] Bug 20837: activate iat-mode for certain obfs4 bridges.
by gk＠torproject.org 02 Dec '16

02 Dec '16

commit c692d3d162088f8b645ea5fec6ef05d57116c00c Author: David Fifield <david(a)bamsoftware.com> Date: Tue Nov 29 16:08:33 2016 -0800 Bug 20837: activate iat-mode for certain obfs4 bridges. https://lists.torproject.org/pipermail/tor-project/2016-November/000776.html --- Bundle-Data/PTConfigs/bridge_prefs.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 6b112d6..664e607 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -18,9 +18,9 @@ pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 83.21 pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 154.35.22.10:9332 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 198.245.60.50:443 752CF7825B3B9EA6A98C83AC41F7099D67007EA5 cert=xpmQtKUqQ/6v5X7ijgYE/f03+l2/EuQ1dexjyUhh16wQlu/cpXUGalmhDIlhuiQPNEKmKw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=1"); pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 83.212.101.3:50001 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=2"); pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 154.35.22.11:7920 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 154.35.22.12:80 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 154.35.22.13:443 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); @@ -33,7 +33,7 @@ pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 154.35.22.9:80 C73 pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 154.35.22.9:443 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 154.35.22.12:4148 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.18", "obfs4 154.35.22.13:6041 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com");

1 0